diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4428bb64f..451ec3f51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,33 +192,33 @@ - + https://github.com/dotnet/arcade - 70d269dfe645525adb6836d25d8a97d7960eda1a + a8aae93d709533604b73c619268415c6ccc71292 - + https://github.com/dotnet/arcade - 70d269dfe645525adb6836d25d8a97d7960eda1a + a8aae93d709533604b73c619268415c6ccc71292 - + https://github.com/dotnet/arcade - 70d269dfe645525adb6836d25d8a97d7960eda1a + a8aae93d709533604b73c619268415c6ccc71292 https://github.com/dotnet/source-build-reference-packages c71ce108eda9f657c9f58a613a1fe56b6b08235d - + https://github.com/dotnet/sourcelink - 339f00dd30bac695b67bbfd1f7faf5a3c7f1e984 + 9dd9f81089f875d2452db9d6c8397a8e0b19d688 - + https://github.com/dotnet/xliff-tasks - 54bc9a1ac8a39083216bb8f5447c8d34fdd290f7 + 356eacdd8cb90407089a4a8863b802ffeae03882 diff --git a/eng/Versions.props b/eng/Versions.props index a6068a8eb..97f327b93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22266.1 + 7.0.0-beta.22275.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 797f05292..423bd962e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,6 +635,10 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } + if (Test-Path variable:NativeToolsOnMachine) { + Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." + $nativeArgs += @{ PathPromotion = $true } + } & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } diff --git a/global.json b/global.json index 2f7501646..1c926823a 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22266.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22266.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22275.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22275.2" } }