Enable opting out of native toolset install (#2675)

dotnet · May 3, 2019 · 34a2b5b · 34a2b5b
1 parent 9c7a49b
commit 34a2b5b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
@@ -122,7 +122,7 @@ try {
     . $configureToolsetScript
   }
 
-  if ($restore) {
+  if (($restore) -and ($null -eq $env:DisableNativeToolsetInstalls)) {
     InitializeNativeTools
   }
 

diff --git a/eng/common/build.sh b/eng/common/build.sh
@@ -218,7 +218,7 @@ if [[ -n "${useInstalledDotNetCli:-}" ]]; then
   use_installed_dotnet_cli="$useInstalledDotNetCli"
 fi
 
-if [[ "$restore" == true ]]; then
+if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; then
   InitializeNativeTools
 fi
 

diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh