From 30511c714203943fe423ca78084df0f34ff88cb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Jun 2023 13:45:10 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20230619.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23319.3 Dependency coherency updates Microsoft.SourceBuild.Intermediate.xliff-tasks,Microsoft.SourceLink.GitHub From Version 1.0.0-beta.23305.1 -> To Version 1.0.0-beta.23312.2 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/common/dotnet-install.sh | 4 ++++ eng/common/tools.ps1 | 2 +- global.json | 6 +++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ee34b26ed4..0d024b26253 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/xliff-tasks - d033e96327903618482de22f76c971c7fe91e8f4 + 4234ffac87e305da80597cb46dc0d4a87fc4f7c2 @@ -34,14 +34,14 @@ - + https://github.com/dotnet/arcade - 9994c5ed43856c35591d94ead68ef501a020eb2e + a7352a700a522e0d1c3e65ec4cbe5df238d60f92 - + https://github.com/dotnet/sourcelink - 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 + 4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index abd045a3247..7e69e3a9e24 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 ffe0b4e2dfc..c9eced9f7df 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 ebe7b5f658d..4cc3d8346b7 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.100-preview.4.23260.5", + "version": "8.0.100-preview.5.23303.2", "allowPrerelease": true, "rollForward": "latestPatch" }, "tools": { - "dotnet": "8.0.100-preview.4.23260.5", + "dotnet": "8.0.100-preview.5.23303.2", "vs": { "version": "17.5", "components": [ @@ -18,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23319.3", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 13a43114f5bffe964e8dc5f156818ed4dabcaa14 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 20 Jun 2023 17:48:39 +0200 Subject: [PATCH 2/7] fix net8p5 api --- global.json | 2 +- tests/scripts/scriptlib.fsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 4cc3d8346b7..91fa5c905a0 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "tools": { "dotnet": "8.0.100-preview.5.23303.2", "vs": { - "version": "17.5", + "version": "17.6", "components": [ "Microsoft.VisualStudio.Component.FSharp" ] diff --git a/tests/scripts/scriptlib.fsx b/tests/scripts/scriptlib.fsx index 071196cf876..b074b78ba25 100644 --- a/tests/scripts/scriptlib.fsx +++ b/tests/scripts/scriptlib.fsx @@ -99,7 +99,7 @@ module Scripting = | "" -> exe | _ -> Path.Combine(baseDir,exe) |> Path.GetFullPath - let exec cmdArgs (workDir: FilePath) envs (path: FilePath) arguments = + let exec cmdArgs (workDir: FilePath) envs (path: FilePath) (arguments: string) = let exePath = path |> processExePath workDir let processInfo = new ProcessStartInfo(exePath, arguments) From 3085440f1df9ab86673523d40b3fbf28fbbd9e64 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 20 Jun 2023 18:24:27 +0200 Subject: [PATCH 3/7] Fix trimming test for p5 --- tests/AheadOfTime/Trimming/check.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/AheadOfTime/Trimming/check.ps1 b/tests/AheadOfTime/Trimming/check.ps1 index db57fbd7cb3..ef8f6be89e4 100644 --- a/tests/AheadOfTime/Trimming/check.ps1 +++ b/tests/AheadOfTime/Trimming/check.ps1 @@ -47,4 +47,4 @@ CheckTrim -root "SelfContained_Trimming_Test" -tfm "net472" -outputfile "FSharp. CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net472" -outputfile "StaticLinkedFSharpCore_Trimming_Test.exe" -expected_len -1 # Check net8.0 trimmed assemblies -CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net8.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248 +CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net8.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821760 From 24890f9d011e1f1c3bc44e48685b80455c8e988a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jun 2023 13:52:20 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/arcade build 20230620.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23320.3 Dependency coherency updates Microsoft.SourceBuild.Intermediate.xliff-tasks,Microsoft.SourceLink.GitHub From Version 1.0.0-beta.23305.1 -> To Version 1.0.0-beta.23312.2 (parent: Microsoft.DotNet.Arcade.Sdk --- 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 0d024b26253..df7756e56b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ - + https://github.com/dotnet/arcade - a7352a700a522e0d1c3e65ec4cbe5df238d60f92 + 06d73ccc1f421af06c2794741a9913f474f66b3d diff --git a/global.json b/global.json index 91fa5c905a0..69c511874c8 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23319.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 15476434de4de96997ddbc9b98eb7a7be793e498 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Thu, 22 Jun 2023 12:10:52 +0200 Subject: [PATCH 5/7] Update Version.Details.xml --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df7756e56b8..fd6b6a3f893 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,9 +6,9 @@ 4234ffac87e305da80597cb46dc0d4a87fc4f7c2 - + https://github.com/dotnet/source-build-reference-packages - 3e92e7cead1e08476973f637007bb22cde7843ca + 4163a212b06740e791c3dfe7ea1258565229af07 From d0de827f3366632b63bc0b8e0da2bd020f666455 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jun 2023 12:53:10 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20230620.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23320.3 From ec750b08d2029dde7734f34427676d2cf3035b30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jun 2023 13:30:07 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/arcade build 20230622.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23322.2 Dependency coherency updates Microsoft.SourceBuild.Intermediate.xliff-tasks,Microsoft.SourceLink.GitHub From Version 1.0.0-beta.23305.1 -> To Version 1.0.0-beta.23312.2 (parent: Microsoft.DotNet.Arcade.Sdk --- 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 fd6b6a3f893..7bdb0171cef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ - + https://github.com/dotnet/arcade - 06d73ccc1f421af06c2794741a9913f474f66b3d + 9747cf5ac4abb6a5a13cf31fa78b91d599180e07 diff --git a/global.json b/global.json index 69c511874c8..be73102efcc 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23322.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } }