From eccd14e004184f785077c4030bb1a1c9bd1a1a8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 14:37:45 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#13955) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/common/build.ps1 | 5 +++++ global.json | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3db85fb8b..d9213a612 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,14 +8,14 @@ - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..33a6f2d0e 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/global.json b/global.json index 281deb7ea..e977ed73b 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22470.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22470.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22471.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22471.2" } } -- GitLab