8000 Move RestoreUseStaticGraphEvaluation setting inside repo (#78429) · dotnet/roslyn@e57ec16 · GitHub
[go: up one dir, main page]
Skip to content

Commit e57ec16

Browse files
ViktorHoferViktorHofer
authored
Move RestoreUseStaticGraphEvaluation setting inside repo (#78429)
* Move RestoreUseStaticGraphEvaluation setting inside repo Extracted from dotnet/dotnet#176 The above PR removes the DotNetBuild.props VMR / SB entrypoint. All settings will move into the repo infra. The RestoreUseStaticGraphEvaluation property needs to be set before Arcade's Build.proj builds the solution and in the repo infra so that dotnet/msbuild/NuGet commands use that restore mode. Therefore, also define it in eng/Build.props which is imported by Build.proj and remove the prop from the build scripts. Move the DotNetBuild condition inline into the two places that now set it. * Fixes and PR feedback * Add D.Solution.props to make restore consistent * Add condition and update comment * try a workaround * Revert change in editorfeatures project
1 parent c04730a commit e57ec16

File tree

7 files changed

+20
-13
lines changed

7 files changed

+20
-13
lines changed

‎Directory.Solution.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
3+
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
4+
<!-- For solution restore, msbuild doesn't honor the property set in Settings.props. -->
5+
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
6+
</PropertyGroup>
7+
8+
</Project>

‎eng/Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!-- Build.props is imported by Arcade SDK's Build.proj and controls how the repository gets built. -->
2+
<Project>
3+
4+
<!-- RestoreUseStaticGraphEvaluation will cause prebuilts when building source-only. -->
5+
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
6+
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
7+
</PropertyGroup>
8+
9+
</Project>

‎eng/DotNetBuild.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
2828
<PropertyGroup>
2929
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)Roslyn.sln"</InnerBuildArgs>
30-
<InnerBuildArgs Condition="'$(DotNetBuildSourceOnly)'=='true'">$(InnerBuildArgs) /p:RestoreUseStaticGraphEvaluation=false</InnerBuildArgs>
3130
</PropertyGroup>
3231
</Target>
3332

‎eng/build.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@ function BuildSolution() {
266266
$generateDocumentationFile = if ($skipDocumentation) { "/p:GenerateDocumentationFile=false" } else { "" }
267267
$roslynUseHardLinks = if ($ci) { "/p:ROSLYNUSEHARDLINKS=true" } else { "" }
268268

269-
$restoreUseStaticGraphEvaluation = $true
270-
271269
try {
272270
MSBuild $toolsetBuildProj `
273271
$bl `
@@ -287,7 +285,6 @@ function BuildSolution() {
287285
/p:TreatWarningsAsErrors=$warnAsError `
288286
/p:EnableNgenOptimization=$applyOptimizationData `
289287
/p:IbcOptimizationDataDir=$ibcDir `
290-
/p:RestoreUseStaticGraphEvaluation=$restoreUseStaticGraphEvaluation `
291288
/p:VisualStudioIbcDrop=$ibcDropName `
292289
/p:VisualStudioDropAccessToken=$officialVisualStudioDropAccessToken `
293290
$suppressExtensionDeployment `

‎eng/build.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ prepare_machine=false
8080
warn_as_error=false
8181
properties=""
8282
source_build=false
83-
restoreUseStaticGraphEvaluation=true
8483
solution_to_build="Compilers.slnf"
8584

8685
args=""
@@ -174,10 +173,8 @@ while [[ $# > 0 ]]; do
174173
--warnaserror)
175174
warn_as_error=true
176175
;;
177-
--sourcebuild)
176+
--sourcebuild|-sb)
178177
source_build=true
179-
# RestoreUseStaticGraphEvaluation will cause prebuilts
180-
restoreUseStaticGraphEvaluation=false
181178
;;
182179
--solution)
183180
solution_to_build=$2
@@ -307,7 +304,6 @@ function BuildSolution {
307304
/p:Publish=$publish \
308305
/p:Sign=$sign \
309306
/p:RunAnalyzersDuringBuild=$run_analyzers \
310-
/p:RestoreUseStaticGraphEvaluation=$restoreUseStaticGraphEvaluation \
311307
/p:BootstrapBuildPath="$bootstrap_dir" \
312308
/p:ContinuousIntegrationBuild=$ci \
313309
/p:TreatWarningsAsErrors=true \

‎eng/targets/Settings.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<CommonExtensionInstallationRoot>CommonExtensions</CommonExtensionInstallationRoot>
2121
<LanguageServicesExtensionInstallationFolder>Microsoft\VBCSharp\LanguageServices</LanguageServicesExtensionInstallationFolder>
2222

23-
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
23+
<!-- RestoreUseStaticGraphEvaluation will cause prebuilts when building source-only. -->
24+
<RestoreUseStaticGraphEvaluation Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</RestoreUseStaticGraphEvaluation>
2425

2526
<!-- Disable the implicit nuget fallback folder as it makes it hard to locate and copy ref assemblies to the test output folder -->
2627
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>

‎eng/test-determinism.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
5757

5858
Stop-Processes
5959

60-
$restoreUseStaticGraphEvaluation = $true
61-
6260
Write-Host "Building $solution using $bootstrapDir"
6361
MSBuild $toolsetBuildProj `
6462
/p:Projects=$solution `
@@ -73,7 +71,6 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
7371
/p:DeterministicSourcePaths=true `
7472
/p:RunAnalyzers=false `
7573
/p:RunAnalyzersDuringBuild=false `
76-
/p:RestoreUseStaticGraphEvaluation=$restoreUseStaticGraphEvaluation `
7774
/bl:$logFilePath
7875

7976
Stop-Processes

0 commit comments

Comments
 (0)
0