Merge in 'release/3.1' changes

dotnet · Jul 9, 2021 · ec374cf · ec374cf
2 parents ec2894b + 70f1620
commit ec374cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -418,17 +418,17 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
       <Sha>904ee5cc71a77faea808d43636a4e3e8c175c006</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21322.2">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21359.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
+      <Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21322.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21359.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
+      <Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21322.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21359.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
+      <Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.17-servicing.21315.14" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -64,7 +64,7 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21322.2</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21359.1</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->

diff --git 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
@@ -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"
   }
 }