Skip to content

Commit 3908237

Browse files
authored
Merge pull request #15594 from vzarytovskii/update-dotnet-8-preview6
Update .NET8 to p6
2 parents c08591a + c7606f3 commit 3908237

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
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=7.0.203-bullseye-slim-amd64
6+
ARG VARIANT=8.0.100-preview.6-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
@@ -1,12 +1,12 @@
11
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
22
{
3-
"name": "F# (.NET 7)",
3+
"name": "F# (.NET 8)",
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
77
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
88
// Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
9-
"VARIANT": "7.0.203-bullseye-slim-amd64"
9+
"VARIANT": "8.0.100-preview.6-bookworm-slim-amd64"
1010
}
1111
},
1212
"hostRequirements": {

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"csharp.suppressDotnetRestoreNotification": true,
3737
"csharp.suppressHiddenDiagnostics": true,
3838
"omnisharp.autoStart": false,
39-
"omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
4039
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
4140
"omnisharp.disableMSBuildDiagnosticWarning": true,
4241
"omnisharp.enableRoslynAnalyzers": false,
@@ -53,5 +52,6 @@
5352
"front_matter_title": ""
5453
}
5554
},
56-
"editor.inlayHints.enabled": "offUnlessPressed"
55+
"editor.inlayHints.enabled": "offUnlessPressed",
56+
"dotnet.defaultSolution": "FSharp.Compiler.Service.sln"
5757
}

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.5" />
15-
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.5" />
16-
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.5" />
14+
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.8" />
15+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.8" />
16+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.8" />
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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.5.23303.2",
3+
"version": "8.0.100-preview.6.23330.14",
44
"allowPrerelease": true,
55
"rollForward": "latestPatch"
66
},
77
"tools": {
8-
"dotnet": "8.0.100-preview.5.23303.2",
8+
"dotnet": "8.0.100-preview.6.23330.14",
99
"vs": {
1010
"version": "17.6",
11-
"components": [
12-
"Microsoft.VisualStudio.Component.FSharp"
13-
]
11+
"components": ["Microsoft.VisualStudio.Component.FSharp"]
1412
},
1513
"xcopy-msbuild": "17.6.0-2"
1614
},
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
<Project>
22
<!-- empty to prevent directory crawling -->
3+
<PropertyGroup>
4+
<NuGetAudit>false</NuGetAudit>
5+
</PropertyGroup>
6+
37
</Project>

0 commit comments

Comments
 (0)