From 66a5e692b2196a83a28ec4ec8086ed9940b2c68f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 6 Feb 2021 13:50:54 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20210205.5 (#9638)

[master] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21075-02 to 1.1.0-beta-21101-02 (parent: Microsoft.DotNet.Arcade.Sdk)
  - XliffTasks: from 1.0.0-beta.21080.1 to 1.0.0-beta.21103.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
 eng/Version.Details.xml      | 16 ++++++++--------
 eng/Versions.props           |  2 +-
 eng/common/dotnet-install.sh |  9 ++-------
 global.json                  |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67cbe66f7..44008dc1f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -148,25 +148,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21101.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21105.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
+      <Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21101.7">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21105.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
+      <Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
     </Dependency>
     <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
       <Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21075-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21101-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>dfe619dc722be42d475595c755c958afe6177554</Sha>
+      <Sha>ca11cbd5e7fac44ae5a7228f5cd89d9df99dd90e</Sha>
     </Dependency>
-    <Dependency Name="XliffTasks" Version="1.0.0-beta.21080.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="XliffTasks" Version="1.0.0-beta.21103.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>5826a134d8b5c6ad3d865ee066e5257f6a1523e8</Sha>
+      <Sha>257d8978123dcd3c029ad93cbaffded900dce450</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1cb57fc3d..fa63d1cd6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21101.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21105.5</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 25b69f878..d6efeb443 100755
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -49,13 +49,8 @@ while [[ $# > 0 ]]; do
   shift
 done
 
-# Use uname to determine what the CPU is.
-cpuname=$(uname -p)
-# Some Linux platforms report unknown for platform, but the arch for machine.
-if [[ "$cpuname" == "unknown" ]]; then
-  cpuname=$(uname -m)
-fi
-
+# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
+cpuname=$(uname -m)
 case $cpuname in
   aarch64)
     buildarch=arm64
diff --git a/global.json b/global.json
index 6d441f235..c79ef24c4 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21101.7"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5"
   }
 }