diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 14a4602c056..d4664d53f4a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -99,25 +99,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
diff --git a/eng/Versions.props b/eng/Versions.props
index fd34ae82543..73cf7d7550c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -43,9 +43,9 @@
- 6.0.0-beta.21101.7
- 6.0.0-beta.21101.7
- 6.0.0-beta.21101.7
+ 6.0.0-beta.21105.5
+ 6.0.0-beta.21105.5
+ 6.0.0-beta.21105.5
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index 25b69f8787f..d6efeb44340 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/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
index a07ba0363b0..0edb2ae276e 100644
--- a/eng/common/performance/performance-setup.ps1
+++ b/eng/common/performance/performance-setup.ps1
@@ -3,7 +3,7 @@ Param(
[string] $CoreRootDirectory,
[string] $BaselineCoreRootDirectory,
[string] $Architecture="x64",
- [string] $Framework="net6.0",
+ [string] $Framework="net5.0",
[string] $CompilationMode="Tiered",
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
[string] $Branch=$env:BUILD_SOURCEBRANCH,
@@ -36,7 +36,7 @@ $HelixSourcePrefix = "pr"
$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
-if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net6.0")) {
+if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) {
$Queue = "Windows.10.Amd64.ClientRS5.Open"
}
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 365cc22a083..7321feb5c7e 100755
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY
core_root_directory=
baseline_core_root_directory=
architecture=x64
-framework=net6.0
+framework=net5.0
compilation_mode=tiered
repository=$BUILD_REPOSITORY_NAME
branch=$BUILD_SOURCEBRANCH
diff --git a/global.json b/global.json
index c3ded09a74e..2962f91c748 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21101.7",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21101.7"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.5"
},
"sdk": {
"version": "6.0.100-preview.1.21077.13"