diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1de6b14a8a23..5a3783493604 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
-
+
https://github.com/dotnet/arcade
- 99023a1f05a0bb03257f473e48b376c8fb78f845
+ 1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e
-
+
https://github.com/dotnet/arcade
- 99023a1f05a0bb03257f473e48b376c8fb78f845
+ 1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e
-
+
https://github.com/dotnet/arcade
- 99023a1f05a0bb03257f473e48b376c8fb78f845
+ 1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e
https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup
diff --git a/eng/Versions.props b/eng/Versions.props
index 1856fd2722e9..bcb0cb4a1a4d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,7 +24,7 @@
2.0.0
4.0.0
1.5.0
- 1.0.0-beta.21228.7
+ 1.0.0-beta.21322.2
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 2205c9e81173..085e8a75c573 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -211,12 +211,12 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
InstallDotNet -dotnetRoot $dotnetRoot -version $version -architecture $architecture -skipNonVersionedFiles $false -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
}
-function InstallDotNet([string] $dotnetRoot,
- [string] $version,
- [string] $architecture = "",
- [string] $runtime = "",
- [bool] $skipNonVersionedFiles = $false,
- [string] $runtimeSourceFeed = "",
+function InstallDotNet([string] $dotnetRoot,
+ [string] $version,
+ [string] $architecture = "",
+ [string] $runtime = "",
+ [bool] $skipNonVersionedFiles = $false,
+ [string] $runtimeSourceFeed = "",
[string] $runtimeSourceFeedKey = "") {
$installScript = GetDotNetInstallScript $dotnetRoot
@@ -323,7 +323,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 ($vsRequirements.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) {
@@ -523,7 +532,7 @@ function InitializeNativeTools() {
}
}
-function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
+function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
{
if (Test-Path variable:global:_ToolsetBuildProj) {
return $global:_ToolsetBuildProj
diff --git a/global.json b/global.json
index 1d7c8f564c64..c46da9d1deba 100644
--- a/global.json
+++ b/global.json
@@ -6,7 +6,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21228.7",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21228.7"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21322.2",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21322.2"
}
}