Skip to content

Commit 086a177

Browse files
authored
Allow source-build cache setup if SetUpSourceBuildIntermediateNupkgCache is true (#15854)
1 parent c62eeb5 commit 086a177

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeTools.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
<PackageReference Include="Microsoft.DotNet.SourceBuild.Tasks" Version="$(MicrosoftDotNetSourceBuildTasksVersion)" IsImplicitlyDefined="true" />
1212
</ItemGroup>
1313

14-
<PropertyGroup>
15-
<SetUpSourceBuildIntermediateNupkgCache Condition="'$(SetUpSourceBuildIntermediateNupkgCache)' == ''">true</SetUpSourceBuildIntermediateNupkgCache>
16-
</PropertyGroup>
17-
1814
<!-- Because the condition here is rather complex, it should read as the following:
1915
- Don't collect intermediates if running the product build
2016
- Otherwise, collect if we're forcing it using SetUpSourceBuildIntermediateNupkgCache

src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,13 @@
9292
Condition="'$(Restore)' == 'true'"/>
9393
</Target>
9494

95+
<PropertyGroup>
96+
<SetUpSourceBuildIntermediateNupkgCache Condition="'$(SetUpSourceBuildIntermediateNupkgCache)' == ''">true</SetUpSourceBuildIntermediateNupkgCache>
97+
</PropertyGroup>
98+
9599
<Import Project="SourceBuild/SourceBuildArcadeTools.targets" Condition="'$(ArcadeBuildFromSource)' == 'true' or
96-
'$(DotNetBuildRepo)' == 'true'" />
100+
'$(DotNetBuildRepo)' == 'true' or
101+
'$(SetUpSourceBuildIntermediateNupkgCache)' == 'true'" />
97102

98103
<!-- Repository extensibility point -->
99104
<Import Project="$(RepositoryEngineeringDir)Tools.props" Condition="Exists('$(RepositoryEngineeringDir)Tools.props')" />

0 commit comments

Comments
 (0)