From 4e50eb756dc7a15d4d6c69a1f2e316cdd7091b0b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:45:17 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20220411.6

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22206.10 -> To Version 7.0.0-beta.22211.6

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.22201.1 -> To Version 1.0.0-beta.22208.1 (parent: Microsoft.DotNet.Arcade.Sdk
---
 eng/Version.Details.xml      | 16 ++++++++--------
 eng/Versions.props           |  2 +-
 eng/common/dotnet-install.sh |  4 ++--
 global.json                  |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0dbb3a73b..918a639ca 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,19 +197,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22206.10">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22211.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha>
+      <Sha>d2715c6ef2c3e2847925250f0a8012344fbb9846</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22206.10">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22211.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha>
+      <Sha>d2715c6ef2c3e2847925250f0a8012344fbb9846</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22206.10">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22211.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha>
+      <Sha>d2715c6ef2c3e2847925250f0a8012344fbb9846</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22164.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@@ -221,9 +221,9 @@
       <Sha>00accce73f32b91a59d3be28c1f6993c3cd4df3e</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22201.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22208.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>701e3e746609e6592da9143f9a4782c41e828ec0</Sha>
+      <Sha>c52e008e5cfd83344739acb2f6d5ef4586f4b426</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index e9b5d6d03..1c3e4d126 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,7 +26,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22206.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22211.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index 5c94e9863..abd045a32 100755
--- 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
     ;;
   loongarch64)
@@ -64,7 +64,7 @@ case $cpuname in
   armv*l)
     buildarch=arm
     ;;
-  i686)
+  i[3-6]86)
     buildarch=x86
     ;;
   *)
diff --git a/global.json b/global.json
index 5e6f88b13..12435019d 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22206.10"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22211.6",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22211.6"
   }
 }