diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 82df3d1aea0..dd76dd5f080 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=7.0.203-bullseye-slim-amd64
+ARG VARIANT=8.0.100-preview.6-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 b1e0e82b525..65d02d8098b 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# (.NET 7)",
+ "name": "F# (.NET 8)",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
// Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
- "VARIANT": "7.0.203-bullseye-slim-amd64"
+ "VARIANT": "8.0.100-preview.6-bookworm-slim-amd64"
}
},
"hostRequirements": {
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9cc57c917b1..3fa58d2fc5a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -36,7 +36,6 @@
"csharp.suppressDotnetRestoreNotification": true,
"csharp.suppressHiddenDiagnostics": true,
"omnisharp.autoStart": false,
- "omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
"omnisharp.disableMSBuildDiagnosticWarning": true,
"omnisharp.enableRoslynAnalyzers": false,
@@ -53,5 +52,6 @@
"front_matter_title": ""
}
},
- "editor.inlayHints.enabled": "offUnlessPressed"
+ "editor.inlayHints.enabled": "offUnlessPressed",
+ "dotnet.defaultSolution": "FSharp.Compiler.Service.sln"
}
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 0ef8d79d1d6..35f04471c9f 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/global.json b/global.json
index 69c511874c8..1c91d872ed0 100644
--- a/global.json
+++ b/global.json
@@ -1,16 +1,14 @@
{
"sdk": {
- "version": "8.0.100-preview.5.23303.2",
+ "version": "8.0.100-preview.6.23330.14",
"allowPrerelease": true,
"rollForward": "latestPatch"
},
"tools": {
- "dotnet": "8.0.100-preview.5.23303.2",
+ "dotnet": "8.0.100-preview.6.23330.14",
"vs": {
"version": "17.6",
- "components": [
- "Microsoft.VisualStudio.Component.FSharp"
- ]
+ "components": ["Microsoft.VisualStudio.Component.FSharp"]
},
"xcopy-msbuild": "17.6.0-2"
},
diff --git a/tests/fsharp/SDKTests/Directory.Build.props b/tests/fsharp/SDKTests/Directory.Build.props
index bb5b23d29d0..b8ed27bf510 100644
--- a/tests/fsharp/SDKTests/Directory.Build.props
+++ b/tests/fsharp/SDKTests/Directory.Build.props
@@ -1,3 +1,7 @@
+
+ false
+
+