Skip to content

Commit e6a5c75

Browse files
authored
Use .NET8 rc1 (#15968)
1 parent 4dc1f3a commit e6a5c75

File tree

7 files changed

+14
-19
lines changed

7 files changed

+14
-19
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
55

6-
ARG VARIANT=8.0.100-preview.7-bookworm-slim-amd64
6+
ARG VARIANT=8.0.100-rc.1-bookworm-slim-amd64
77
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}
88

99
# Avoid warnings by switching to noninteractive

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
7+
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0, 8.0, etc.
88
// Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
9-
"VARIANT": "8.0.100-preview.7-bookworm-slim-amd64"
9+
"VARIANT": "8.0.100-rc.1-bookworm-slim-amd64"
1010
}
1111
},
1212
"hostRequirements": {

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
These will go away when repo updates targeting to net8.0
1212
Tracked with https://github.com/dotnet/fsharp/issues/14765
1313
-->
14-
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.9" />
15-
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.9" />
16-
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.9" />
14+
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.11" />
15+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.11" />
16+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.11" />
1717
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0.0" />
1818
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0.0" />
1919
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0.0" />

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.7.23376.3",
3+
"version": "8.0.100-rc.1.23455.8",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "8.0.100-preview.7.23376.3",
8+
"dotnet": "8.0.100-rc.1.23455.8",
99
"vs": {
1010
"version": "17.6",
1111
"components": [

tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net472;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<LangVersion>preview</LangVersion>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<DotNetBuildOffline>true</DotNetBuildOffline>

tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net472;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net7.0</TargetFrameworks>
66
<LangVersion>preview</LangVersion>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<DotNetBuildOffline>true</DotNetBuildOffline>

tests/AheadOfTime/Trimming/check.ps1

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,11 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) {
3535
}
3636
}
3737

38+
# NOTE: Trimming now errors out on desktop TFMs, as shown below:
39+
# error NETSDK1124: Trimming assemblies requires .NET Core 3.0 or higher.
3840

3941
# Check net7.0 trimmed assemblies
40-
CheckTrim -root "SelfContained_Trimming_Test" -tfm "net7.0" -outputfile "FSharp.Core.dll" -expected_len 287744
41-
42-
# Check net472 trimmed assemblies -- net472 doesn't actually trim, this just checks that everything is usable when published trimmed
43-
CheckTrim -root "SelfContained_Trimming_Test" -tfm "net472" -outputfile "FSharp.Core.dll" -expected_len -1
44-
45-
# Disabled due to bug: https://github.com/dotnet/fsharp/issues/15167
46-
# Check net472 trimmed / static linked assemblies
47-
CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net472" -outputfile "StaticLinkedFSharpCore_Trimming_Test.exe" -expected_len -1
42+
CheckTrim -root "SelfContained_Trimming_Test" -tfm "net8.0" -outputfile "FSharp.Core.dll" -expected_len 287744
4843

4944
# Check net7.0 trimmed assemblies
50-
CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net7.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248
45+
CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net8.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821760

0 commit comments

Comments
 (0)