Disable static restore in more locations (#66567)

* Disable static restore in more locations * Run compilers CI when build scripts change * Include compiler generators in compilers code change check * Remove separate restore in bootstrap build
dotnet · Jan 30, 2023 · 3a3f4fe · 3a3f4fe
1 parent 52cb962
commit 3a3f4fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -206,6 +206,8 @@ stages:
           include:
           - src/Compilers/*
           - src/Dependencies/*
+          - eng/*
+          - src/Tools/Source/CompilerGeneratorTools/*
 
   - job: Correctness_Build_Artifacts
     dependsOn: Determine_Changes
@@ -322,12 +324,6 @@ stages:
     steps:
       - template: eng/pipelines/checkout-windows-task.yml
 
-      - task: PowerShell@2
-        displayName: Restore
-        inputs:
-          filePath: eng/build.ps1
-          arguments: -configuration Debug -prepareMachine -ci -restore -binaryLogName Restore.binlog
-
       - powershell: .\eng\test-rebuild.ps1 -ci -configuration Release
         displayName: Run BuildValidator
 

diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1
@@ -301,6 +301,10 @@ function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string]
 
   if ($ci) {
     $args += " /p:ContinuousIntegrationBuild=true"
+    # Temporarily disable RestoreUseStaticGraphEvaluation to work around this NuGet issue 
+    # in our CI builds
+    # https://github.com/NuGet/Home/issues/12373
+    $args += " /p:RestoreUseStaticGraphEvaluation=false"
   }
 
   if ($bootstrapDir -ne "") {

diff --git a/eng/test-determinism.ps1 b/eng/test-determinism.ps1
@@ -52,6 +52,11 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
 
   Stop-Processes
 
+  # Temporarily disable RestoreUseStaticGraphEvaluation to work around this NuGet issue 
+  # in our CI builds
+  # https://github.com/NuGet/Home/issues/12373
+  $restoreUseStaticGraphEvaluation = if ($ci) { $false } else { $true }
+
   Write-Host "Building $solution using $bootstrapDir"
   MSBuild $toolsetBuildProj `
      /p:Projects=$solution `
@@ -65,7 +70,7 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
      /p:BootstrapBuildPath=$bootstrapDir `
      /p:RunAnalyzers=false `
      /p:RunAnalyzersDuringBuild=false `
-     /p:RestoreUseStaticGraphEvaluation=true `
+     /p:RestoreUseStaticGraphEvaluation=$restoreUseStaticGraphEvaluation `
      /bl:$logFilePath
 
   Stop-Processes

diff --git a/eng/test-rebuild.ps1 b/eng/test-rebuild.ps1
@@ -33,7 +33,7 @@ try {
 
   if (-not $noBuild) {
     Write-Host "Building Roslyn"
-    Exec-Block { & (Join-Path $PSScriptRoot "build.ps1") -build -bootstrap -ci:$ci -useGlobalNuGetCache:$useGlobalNuGetCache -configuration:$configuration -pack -binaryLog }
+    Exec-Block { & (Join-Path $PSScriptRoot "build.ps1") -restore -build -bootstrap -ci:$ci -useGlobalNuGetCache:$useGlobalNuGetCache -configuration:$configuration -pack -binaryLog }
   }
 
   Subst-TempDir