diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64bf89654025..927669a3992f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -418,17 +418,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-extensions 60938620996db86debee5cf1652e70a6ec5cb3e7 - + https://github.com/dotnet/arcade - 1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e + 1b4ae2cf54c730564509227fa4f4dd8a7c31dc81 - + https://github.com/dotnet/arcade - 1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e + 1b4ae2cf54c730564509227fa4f4dd8a7c31dc81 - + https://github.com/dotnet/arcade - 1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e + 1b4ae2cf54c730564509227fa4f4dd8a7c31dc81 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions diff --git a/eng/Versions.props b/eng/Versions.props index 754dcb09944f..21615a88f412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,7 +64,7 @@ --> - 1.0.0-beta.21322.2 + 1.0.0-beta.21359.1 3.4.1-beta4-20127-10 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 085e8a75c573..e5a3374921a6 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -325,7 +325,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" - $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } + $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 { diff --git a/global.json b/global.json index 1b2701dd11fb..7a858e45b53a 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21322.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21322.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21359.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21359.1" } }