From 545a600630c56b6f656317213b978336d63b2af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Fri, 5 Jul 2024 09:23:48 +0200
Subject: [PATCH] Make "dotnet workload restore" conditional

---
 .github/workflows/build.yml | 4 ++--
 Directory.Build.props       | 1 +
 eng/Tools.props             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5262f663..cc2e8ed0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,12 +67,12 @@ jobs:
 
     - name: Build, test and pack
       if: ${{ runner.os == 'Windows' }}
-      run: eng\common\CIBuild.cmd -configuration Release -prepareMachine -integrationTest /p:SuppressSymbolPackageFormatValidation=true
+      run: eng\common\CIBuild.cmd -configuration Release -prepareMachine -integrationTest /p:RestoreDotNetWorkloads=true
 
     - name: Build, test and pack
       if: ${{ runner.os != 'Windows' }}
       shell: pwsh
-      run: ./eng/common/cibuild.sh -configuration Release -prepareMachine -integrationTest /p:SuppressSymbolPackageFormatValidation=true
+      run: ./eng/common/cibuild.sh -configuration Release -prepareMachine -integrationTest /p:RestoreDotNetWorkloads=true
 
     - name: Attest artifacts
       uses: actions/attest-build-provenance@bdd51370e0416ac948727f861e03c2f05d32d78e # v1.3.2
diff --git a/Directory.Build.props b/Directory.Build.props
index 1edc44c9..69ec0e41 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,6 +14,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <SuppressSymbolPackageFormatValidation>true</SuppressSymbolPackageFormatValidation>
     <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)eng\CodeAnalysis.ruleset</CodeAnalysisRuleset>
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
diff --git a/eng/Tools.props b/eng/Tools.props
index 03602c80..7b481936 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -8,7 +8,7 @@
     Restore the .NET workloads immediately after the .NET tooling has been installed by Arcade.
   -->
 
-  <Target Name="RestoreWorkloads" AfterTargets="InstallDotNetCore">
+  <Target Name="RestoreWorkloads" AfterTargets="InstallDotNetCore" Condition=" '$(RestoreDotNetWorkloads)' == 'true' ">
     <Message Text="Installing the .NET workloads required to build the solution..." />
 
     <Exec Command='"$(DotNetTool)" workload restore' WorkingDirectory="$(RepoRoot)" ConsoleToMSBuild="true">