diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6bbfd4a733b..9fedd50950b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -87,25 +87,25 @@
-
+
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/arcade
- 1685a12f35cfb396f9352d63736eb675673b0e20
+ 685c1a4fa207d81e881a402a32ffa1c0fb191b42
diff --git a/eng/Versions.props b/eng/Versions.props
index e4f98ce30a9..6daf298c14d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,9 +39,9 @@
- 6.0.0-beta.21323.1
- 6.0.0-beta.21323.1
- 6.0.0-beta.21323.1
+ 6.0.0-beta.21328.2
+ 6.0.0-beta.21328.2
+ 6.0.0-beta.21328.2
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 5619c7aaee1..4b255203249 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 76db2c9a513..c37bf04a1f1 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"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"
},
"sdk": {
"version": "6.0.100-preview.4.21255.9"