Merge pull request #6696 from microsoft/merges/master-to-dev16.2

Merge master to dev16.2
dotnet · May 7, 2019 · bdf1bec · bdf1bec
2 parents 8cc3c7e + 4034f53
commit bdf1bec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19252.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19255.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ed63a7faf2d119829dd971be91bb46b6ebaa1dd2</Sha>
+      <Sha>6a34948f7bdbc3ceb2fb16441b49f7748a462646</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
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/global.json b/global.json
@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19252.2",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19255.2",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }