Move workload management out of eng\common

dotnet · Mar 3, 2022 · 2f93672 · 2f93672
1 parent d63fe28
commit 2f93672
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/eng/common/Install-DotNetWorkloads.ps1 → eng/Install-DotNetWorkloads.ps1 b/eng/common/Install-DotNetWorkloads.ps1 → eng/Install-DotNetWorkloads.ps1
diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1
@@ -187,6 +187,13 @@ function Ensure-DotnetSdk() {
   throw "Could not find dotnet executable in $dotnetInstallDir"
 }
 
+function InitializeDotNetWorkloads()
+{
+  # Install any dotnet workloads specified in global.json
+  $globalJsonPath = Join-Path $RepoRoot 'global.json'
+  & $PSScriptRoot\Install-DotNetWorkloads.ps1 -globalJsonPath $globalJsonPath | Out-Null
+}
+
 # Walks up the source tree, starting at the given file's directory, and returns a FileInfo object for the first .csproj file it finds, if any.
 function Get-ProjectFile([object]$fileInfo) {
   Push-Location

diff --git a/eng/build.sh b/eng/build.sh
@@ -297,6 +297,12 @@ if [[ "$restore" == true && "$source_build" != true ]]; then
   dotnet tool restore
 fi
 
+if [[ "$restore" == true ]]; then
+  # Install any dotnet workloads specified in global.json
+  # TODO: Call Install-DotNetWorkloads.ps1 instead
+  dotnet workload install macos
+fi
+
 bootstrap_dir=""
 if [[ "$bootstrap" == true ]]; then
   MakeBootstrapBuild

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -233,13 +233,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   return $global:_DotNetInstallDir = $dotnetRoot
 }
 
-function InitializeDotNetWorkloads()
-{
-  # Install any dotnet workloads specified in global.json
-  $globalJsonPath = Join-Path $RepoRoot 'global.json'
-  & $PSScriptRoot\Install-DotNetWorkloads.ps1 -globalJsonPath $globalJsonPath | Out-Null
-}
-
 function Retry($downloadBlock, $maxRetries = 5) {
   $retries = 1
 
@@ -335,8 +328,6 @@ function InstallDotNet([string] $dotnetRoot,
       & $installScript @variation
       $installSuccess = $true
 
-      InitializeDotNetWorkloads
-
       break
     }
     catch {

diff --git a/eng/common/tools.sh b/eng/common/tools.sh
@@ -231,10 +231,6 @@ function InstallDotNet {
     echo "Attempting to install dotnet from $variationName."
     bash "$install_script" "${variation[@]}" && installSuccess=1
     if [[ "$installSuccess" -eq 1 ]]; then
-      # Install any dotnet workloads specified in global.json
-      # TODO: Call Install-DotNetWorkloads.ps1 instead
-      # TODO: Also do this during repeat restore
-      dotnet workload install macos
       break
     fi
 

diff --git a/eng/test-determinism.ps1 b/eng/test-determinism.ps1
@@ -282,6 +282,8 @@ try {
   $script:bootstrapConfiguration = "Release"
   $bootstrapDir = Make-BootstrapBuild
 
+  InitializeDotNetWorkloads
+
   Run-Test
   exit 0
 }