From afdab89f167c482a5a2b6e20fc9d0c46d0284289 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:31:01 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210205.5 (#929)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/dotnet-install.sh | 9 ++-------
global.json | 2 +-
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 36507319..dc174c80 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 2b430e5bbfaec37a6cead2f0cf79157f01f1a623
+ fc83e59329203724d4a63c4f6c843be62983a35e
-
+
https://github.com/dotnet/arcade
- 2b430e5bbfaec37a6cead2f0cf79157f01f1a623
+ fc83e59329203724d4a63c4f6c843be62983a35e
-
+
https://github.com/dotnet/arcade
- 2b430e5bbfaec37a6cead2f0cf79157f01f1a623
+ fc83e59329203724d4a63c4f6c843be62983a35e
-
+
https://github.com/dotnet/arcade
- 2b430e5bbfaec37a6cead2f0cf79157f01f1a623
+ fc83e59329203724d4a63c4f6c843be62983a35e
-
+
https://github.com/dotnet/arcade
- 2b430e5bbfaec37a6cead2f0cf79157f01f1a623
+ fc83e59329203724d4a63c4f6c843be62983a35e
https://github.com/dotnet/arcade-services
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index 25b69f87..d6efeb44 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 6e998b4a..12eecf7b 100644
--- a/global.json
+++ b/global.json
@@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21101.7"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5"
}
}