Use .NET8 rc1 (dotnet#15968)

jwosty · Sep 14, 2023 · e6a5c75 · e6a5c75
1 parent 4dc1f3a
commit e6a5c75
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git 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
@@ -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/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
     -->
-    <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.9" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.9" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.9" />
+    <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.11" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.11" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.11" />
     <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0.0" />
     <UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0.0" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0.0" />

diff --git 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": [

diff --git 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 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DotNetBuildOffline>true</DotNetBuildOffline>

diff --git a/...Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj b/...Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;net7.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DotNetBuildOffline>true</DotNetBuildOffline>

diff --git a/tests/AheadOfTime/Trimming/check.ps1 b/tests/AheadOfTime/Trimming/check.ps1
@@ -35,16 +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 "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
+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 "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 8821760