diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e66fd483..f3ceeada 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,25 +11,25 @@ - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + a68ec1edf328e737b31a09cb49e1929c28e91d0c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 733313d1..65e67e9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 + 6.0.0-beta.21324.3 + 6.0.0-beta.21324.3 1.22.0 1.1.2 2.0.0 @@ -82,7 +82,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21101-02 1.1.0-beta-21101-02 - 6.0.0-beta.21319.2 + 6.0.0-beta.21324.3 1.0.0-beta.21106.1 1.1.0-beta.21117.3 1.0.0-prerelease.21103.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aa..7942ffaf 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 ($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) { diff --git a/global.json b/global.json index b0ba98b7..c96b64c8 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "dotnet": "6.0.100-preview.4.21255.9" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21319.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3" } }