From ca6d6132f9ac6b98076c100d161804d229223d95 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:30:29 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210205.5 (#722)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 4 ++--
eng/common/dotnet-install.sh | 9 ++-------
global.json | 2 +-
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6582e6758..0955822f8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- 2b430e5bbfaec37a6cead2f0cf79157f01f1a623
+ fc83e59329203724d4a63c4f6c843be62983a35e
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 a2110e0ac..8c724895a 100644
--- a/global.json
+++ b/global.json
@@ -17,6 +17,6 @@
"xcopy-msbuild": "16.8.0-preview2.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21101.7"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5"
}
}