From 69563e996476356c9a706085cbf657a90594c5cb Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 13 Sep 2023 12:14:04 +0200 Subject: [PATCH 1/5] Use .NET8 rc1 --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 4 ++-- global.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9d9c61fd951..8bb334d1e44 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -ARG VARIANT=8.0.100-preview.7-bookworm-slim-amd64 +ARG VARIANT=8.0.100-rc.1-bookworm-slim-amd64 FROM mcr.microsoft.com/dotnet/sdk:${VARIANT} # Avoid warnings by switching to noninteractive diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 267a727690d..5c994fe70c4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,9 +4,9 @@ "build": { "dockerfile": "Dockerfile", "args": { - // Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0 + // Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0, 8.0, etc. // Append -bullseye(-slim), -focal, or -jammy to pin to an OS version. - "VARIANT": "8.0.100-preview.7-bookworm-slim-amd64" + "VARIANT": "8.0.100-rc.1-bookworm-slim-amd64" } }, "hostRequirements": { diff --git a/global.json b/global.json index c13db59bc51..f3ea6f34664 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.100-preview.7.23376.3", + "version": "8.0.100-rc.1.23455.8", "allowPrerelease": true, "rollForward": "latestMajor" }, "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rc.1.23455.8", "vs": { "version": "17.6", "components": [ From c462df2c3f8e26e8296eef3f7137d492e64a0bad Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 13 Sep 2023 15:09:13 +0200 Subject: [PATCH 2/5] Update prebuilts + trimming tests --- eng/SourceBuildPrebuiltBaseline.xml | 6 +++--- .../SelfContained_Trimming_Test.fsproj | 2 +- tests/AheadOfTime/Trimming/check.ps1 | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 12e7e3149d0..2be856079d4 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -11,9 +11,9 @@ These will go away when repo updates targeting to net8.0 Tracked with https://github.com/dotnet/fsharp/issues/14765 --> - - - + + + diff --git a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj index 3939fec5527..d122eec74c3 100644 --- a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj +++ b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj @@ -2,7 +2,7 @@ Exe - net472;net7.0 + net7.0 preview true true diff --git a/tests/AheadOfTime/Trimming/check.ps1 b/tests/AheadOfTime/Trimming/check.ps1 index f7e7da74385..0f15a8bfb18 100644 --- a/tests/AheadOfTime/Trimming/check.ps1 +++ b/tests/AheadOfTime/Trimming/check.ps1 @@ -39,12 +39,5 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) { # Check net7.0 trimmed assemblies CheckTrim -root "SelfContained_Trimming_Test" -tfm "net7.0" -outputfile "FSharp.Core.dll" -expected_len 287744 -# Check net472 trimmed assemblies -- net472 doesn't actually trim, this just checks that everything is usable when published trimmed -CheckTrim -root "SelfContained_Trimming_Test" -tfm "net472" -outputfile "FSharp.Core.dll" -expected_len -1 - -# Disabled due to bug: https://github.com/dotnet/fsharp/issues/15167 -# Check net472 trimmed / static linked assemblies -CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net472" -outputfile "StaticLinkedFSharpCore_Trimming_Test.exe" -expected_len -1 - # Check net7.0 trimmed assemblies CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net7.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248 From c5fa3bda18626bcd96f38893d89501f3498973c2 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 13 Sep 2023 15:09:52 +0200 Subject: [PATCH 3/5] Update prebuilts + trimming tests --- .../SelfContained_Trimming_Test.fsproj | 2 +- tests/AheadOfTime/Trimming/check.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj index d122eec74c3..f3d591548f8 100644 --- a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj +++ b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 preview true true diff --git a/tests/AheadOfTime/Trimming/check.ps1 b/tests/AheadOfTime/Trimming/check.ps1 index 0f15a8bfb18..a4ec96c37f1 100644 --- a/tests/AheadOfTime/Trimming/check.ps1 +++ b/tests/AheadOfTime/Trimming/check.ps1 @@ -37,7 +37,7 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) { # Check net7.0 trimmed assemblies -CheckTrim -root "SelfContained_Trimming_Test" -tfm "net7.0" -outputfile "FSharp.Core.dll" -expected_len 287744 +CheckTrim -root "SelfContained_Trimming_Test" -tfm "ne8.0" -outputfile "FSharp.Core.dll" -expected_len 287744 # Check net7.0 trimmed assemblies -CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net7.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248 +CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net8.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248 From 94314185273775cd6aacb4477f06ce4b05ae4ac6 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 13 Sep 2023 16:53:55 +0200 Subject: [PATCH 4/5] Update check.ps1 --- tests/AheadOfTime/Trimming/check.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/AheadOfTime/Trimming/check.ps1 b/tests/AheadOfTime/Trimming/check.ps1 index a4ec96c37f1..3676b250a26 100644 --- a/tests/AheadOfTime/Trimming/check.ps1 +++ b/tests/AheadOfTime/Trimming/check.ps1 @@ -35,9 +35,11 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) { } } +# NOTE: Trimming now errors out on desktop TFMs, as shown below: +# error NETSDK1124: Trimming assemblies requires .NET Core 3.0 or higher. # Check net7.0 trimmed assemblies -CheckTrim -root "SelfContained_Trimming_Test" -tfm "ne8.0" -outputfile "FSharp.Core.dll" -expected_len 287744 +CheckTrim -root "SelfContained_Trimming_Test" -tfm "net8.0" -outputfile "FSharp.Core.dll" -expected_len 287744 # Check net7.0 trimmed assemblies CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net8.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248 From 52536d951efdb30e3dcae2d3dd14247a3e227e12 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 13 Sep 2023 17:48:57 +0200 Subject: [PATCH 5/5] Trimming adjustments --- .../StaticLinkedFSharpCore_Trimming_Test.fsproj | 2 +- tests/AheadOfTime/Trimming/check.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj index 615e885dabb..d76d33610d6 100644 --- a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj +++ b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj @@ -2,7 +2,7 @@ Exe - net472;net7.0 + net7.0 preview true true diff --git a/tests/AheadOfTime/Trimming/check.ps1 b/tests/AheadOfTime/Trimming/check.ps1 index 3676b250a26..23c3cdfb4b3 100644 --- a/tests/AheadOfTime/Trimming/check.ps1 +++ b/tests/AheadOfTime/Trimming/check.ps1 @@ -42,4 +42,4 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) { CheckTrim -root "SelfContained_Trimming_Test" -tfm "net8.0" -outputfile "FSharp.Core.dll" -expected_len 287744 # Check net7.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