Commit086a177

authored

Allow source-build cache setup ifSetUpSourceBuildIntermediateNupkgCache is true (#15854)

1 parentc62eeb5 commit086a177Copy full SHA for 086a177

File tree

-5

lines changed

src/Microsoft.DotNet.Arcade.Sdk/tools
- SourceBuild
  - SourceBuildArcadeTools.targets
- Tools.proj

-5

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,6 @@`
`11`	`11`	`<PackageReferenceInclude="Microsoft.DotNet.SourceBuild.Tasks"Version="$(MicrosoftDotNetSourceBuildTasksVersion)"IsImplicitlyDefined="true" />`
`12`	`12`	`</ItemGroup>`
`13`	`13`
`14`		`- <PropertyGroup>`
`15`		`- <SetUpSourceBuildIntermediateNupkgCacheCondition="'$(SetUpSourceBuildIntermediateNupkgCache)' == ''">true</SetUpSourceBuildIntermediateNupkgCache>`
`16`		`- </PropertyGroup>`
`17`		`-`
`18`	`14`	`<!-- Because the condition here is rather complex, it should read as the following:`
`19`	`15`	`- Don't collect intermediates if running the product build`
`20`	`16`	`- Otherwise, collect if we're forcing it using SetUpSourceBuildIntermediateNupkgCache`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,13 @@`
`92`	`92`	`Condition="'$(Restore)' == 'true'"/>`
`93`	`93`	`</Target>`
`94`	`94`
	`95`	`+ <PropertyGroup>`
	`96`	`+ <SetUpSourceBuildIntermediateNupkgCacheCondition="'$(SetUpSourceBuildIntermediateNupkgCache)' == ''">true</SetUpSourceBuildIntermediateNupkgCache>`
	`97`	`+ </PropertyGroup>`
	`98`	`+`
`95`	`99`	`<ImportProject="SourceBuild/SourceBuildArcadeTools.targets"Condition="'$(ArcadeBuildFromSource)' == 'true' or`
`96`		`- '$(DotNetBuildRepo)' == 'true'" />`
	`100`	`+ '$(DotNetBuildRepo)' == 'true' or`
	`101`	`+ '$(SetUpSourceBuildIntermediateNupkgCache)' == 'true'" />`
`97`	`102`
`98`	`103`	`<!-- Repository extensibility point-->`
`99`	`104`	`<ImportProject="$(RepositoryEngineeringDir)Tools.props"Condition="Exists('$(RepositoryEngineeringDir)Tools.props')" />`

Comments

(0)