diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6833196a77b..f9036d33d67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - ed63a7faf2d119829dd971be91bb46b6ebaa1dd2 + 6a34948f7bdbc3ceb2fb16441b49f7748a462646 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index ed9f754ea83..d7e3799ebd9 100644 --- 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 index e14210632aa..d038959ab46 100644 --- 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 index 1ce2d8648e0..5f68f541811 100644 --- 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" } }