diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 21047a0fef..fa0ecc1e99 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- 234e0726c7384ee84bf08550f2d16a1ff2d5c543
+ 9747cf5ac4abb6a5a13cf31fa78b91d599180e07
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index abd045a324..7e69e3a9e2 100755
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -54,6 +54,10 @@ cpuname=$(uname -m)
case $cpuname in
arm64|aarch64)
buildarch=arm64
+ if [ "$(getconf LONG_BIT)" -lt 64 ]; then
+ # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
+ buildarch=arm
+ fi
;;
loongarch64)
buildarch=loongarch64
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index ffe0b4e2df..c9eced9f7d 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -379,7 +379,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}
# Minimum VS version to require.
- $vsMinVersionReqdStr = '16.8'
+ $vsMinVersionReqdStr = '17.6'
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
# If the version of msbuild is going to be xcopied,
diff --git a/global.json b/global.json
index 33599d7a62..da725e8f69 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"sdk": {
- "version": "8.0.100-preview.4.23260.5"
+ "version": "8.0.100-preview.5.23303.2"
},
"tools": {
- "dotnet": "8.0.100-preview.4.23260.5",
+ "dotnet": "8.0.100-preview.5.23303.2",
"runtimes": {
"dotnet": [
"6.0.4"
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23302.3"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23322.2"
}
}
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index be2b5f6bef..eedce7c18d 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -2,6 +2,6 @@
- CA1014
+ CA1014;CA1861