Merge in 'release/6.0' changes

dotnet · Nov 12, 2022 · 481b2a4 · 481b2a4
2 parents 876c649 + 888e697
commit 481b2a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -47,13 +47,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+      <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+      <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
@@ -52,7 +52,7 @@ done
 # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
 cpuname=$(uname -m)
 case $cpuname in
-  aarch64)
+  arm64|aarch64)
     buildarch=arm64
     ;;
   amd64|x86_64)
@@ -61,7 +61,7 @@ case $cpuname in
   armv*l)
     buildarch=arm
     ;;
-  i686)
+  i[3-6]86)
     buildarch=x86
     ;;
   *)

diff --git a/global.json b/global.json
@@ -18,7 +18,7 @@
     "rollForward": "latestMajor"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.2"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.7"
   }
 }