diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee76fad56f13..63e36878ceda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -233,22 +233,22 @@ - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 https://github.com/dotnet/source-build @@ -259,9 +259,9 @@ https://github.com/dotnet/runtime 91599fff26619cb8bccb7b39c39590e7cd9a4379 - + https://github.com/dotnet/xliff-tasks - 5836ac11931b8e663c5cf81027dc834cbf41ecdd + 71c811561ad4dcf46825a5077fbcc668ab74754f diff --git a/eng/Versions.props b/eng/Versions.props index 736f6cebc354..6cb9c0aa048d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 2.0.0-beta1.21223.1 4.0.0 5.0.0 - 6.0.0-beta.21323.1 + 6.0.0-beta.21328.2 3.1.0 6.0.0-preview.7.21328.2 4.3.0 @@ -154,7 +154,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.21323.1 + 6.0.0-beta.21328.2 4.8.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aaee1d..4b2552032493 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } + if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { + $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" + } else { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { diff --git a/global.json b/global.json index 55eb12bad5d7..2f413109ad9a 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21323.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21323.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21328.2" } }