[main] Update dependencies from dotnet/arcade (#1098)

[main] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -3,25 +3,25 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21321.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21324.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
+      <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21321.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21324.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
+      <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21321.2">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21324.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
+      <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21321.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21324.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
+      <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21321.2">
+    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21324.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
+      <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
       <Uri>https://github.com/dotnet/arcade-services</Uri>

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) {

global.json

@@ -11,6 +11,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3"
   }
 }