From 179c2678a0d4d870d513a82a5415854db6f12151 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 12:50:14 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20230609.8 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23302.3 -> To Version 8.0.0-beta.23309.8 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21047a0fef..ca21225efd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + 9994c5ed43856c35591d94ead68ef501a020eb2e diff --git a/global.json b/global.json index 33599d7a62..8e3afce7a7 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23302.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8" } } From ed948dcf63dc3c32c4c6279baaf4754e73a528ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Jun 2023 12:49:42 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20230619.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23302.3 -> To Version 8.0.0-beta.23319.1 --- eng/Version.Details.xml | 4 ++-- eng/common/dotnet-install.sh | 4 ++++ eng/common/tools.ps1 | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca21225efd..a268ce5aee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + dfc6882da43decb37f12e0d9011ce82b25225578 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 8e3afce7a7..72771b13f5 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.23309.8" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23319.1" } } From ca3a9ae913ef0856100b45405868ad08a30e3a05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jun 2023 12:49:30 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20230622.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23302.3 -> To Version 8.0.0-beta.23322.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a268ce5aee..fa0ecc1e99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - dfc6882da43decb37f12e0d9011ce82b25225578 + 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 diff --git a/global.json b/global.json index 72771b13f5..da725e8f69 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23319.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23322.2" } } From 44467b66f15395bd5cb9b3094acc1b0e8e4fa232 Mon Sep 17 00:00:00 2001 From: Taylor Southwick Date: Wed, 28 Jun 2023 11:16:33 -0700 Subject: [PATCH 4/4] ignore new warning in tests --- test/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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