From 52303a201855142731ed8afbfdac7d6ae9d32f7c Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 14 Aug 2024 17:59:51 +0200 Subject: [PATCH 1/4] Update to .NET9p7 SDK --- .devcontainer/devcontainer.json | 10 +++++----- global.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 49bc4403ff5..ac63d29017f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,12 +1,12 @@ // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: { "name": "F#", - "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.6", + "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.7", "features": { - "ghcr.io/devcontainers/features/common-utils:2.4.3": {}, - "ghcr.io/devcontainers/features/git:1.2.0": {}, - "ghcr.io/devcontainers/features/github-cli:1.0.11": {}, - "ghcr.io/devcontainers/features/dotnet:2.1.0": {} + "ghcr.io/devcontainers/features/common-utils:2.4.6": {}, + "ghcr.io/devcontainers/features/git:1.3.2": {}, + "ghcr.io/devcontainers/features/github-cli:1.0.13": {}, + "ghcr.io/devcontainers/features/dotnet:2.1.2": {} }, "hostRequirements": { "cpus": 2, diff --git a/global.json b/global.json index 17b7d9a82e6..cba76266b3a 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "9.0.100-preview.6.24328.19", + "version": "9.0.100-preview.7.24407.12", "allowPrerelease": true }, "tools": { - "dotnet": "9.0.100-preview.6.24328.19", + "dotnet": "9.0.100-preview.7.24407.12", "vs": { "version": "17.8", "components": [ From 649e88a808862054c4c08048f07f9d8f586fa869 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 14 Aug 2024 18:25:47 +0200 Subject: [PATCH 2/4] Add dotnet9 feed --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 72a88909ad8..e348c8b6abe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,8 @@ + + From 18704f042b995a3ec668011390ec5dedb66bc9c3 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 14 Aug 2024 19:43:42 +0200 Subject: [PATCH 3/4] Update trimming --- 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 dcaafb03ce0..a43b941d121 100644 --- a/tests/AheadOfTime/Trimming/check.ps1 +++ b/tests/AheadOfTime/Trimming/check.ps1 @@ -43,7 +43,7 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) { # error NETSDK1124: Trimming assemblies requires .NET Core 3.0 or higher. # Check net7.0 trimmed assemblies -CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 286208 +CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 287232 # Check net8.0 trimmed assemblies CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8819712 From 0c6e0a8647eb30eea0721d7089e99818b5f210ec Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 14 Aug 2024 20:36:54 +0200 Subject: [PATCH 4/4] update trimming #2 --- 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 a43b941d121..0f37c11cf31 100644 --- a/tests/AheadOfTime/Trimming/check.ps1 +++ b/tests/AheadOfTime/Trimming/check.ps1 @@ -46,4 +46,4 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) { CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 287232 # Check net8.0 trimmed assemblies -CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8819712 +CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248