From cd198aa01fd0d7cb44c81e3d4fd5ce54321423a6 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Thu, 13 Jul 2023 12:03:02 +0200
Subject: [PATCH 1/3] Update .NET8 to p6

---
 .devcontainer/Dockerfile        | 2 +-
 .devcontainer/devcontainer.json | 4 ++--
 .vscode/settings.json           | 4 ++--
 global.json                     | 8 +++-----
 4 files changed, 8 insertions(+), 10 deletions(-)

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/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"
   },

From 5e645a3f7f8a645b93300edc519582e4baeeb165 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Thu, 13 Jul 2023 14:14:58 +0200
Subject: [PATCH 2/3] Update prebuilds

---
 eng/SourceBuildPrebuiltBaseline.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
     -->
-    <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.5" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.5" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.5" />
+    <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.8" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.8" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.8" />
     <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" />

From 3cf12d6687947019dda0c61602fd67a8e11572d4 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Thu, 13 Jul 2023 15:26:38 -0700
Subject: [PATCH 3/3] nugetaudit off for sdk tests

---
 tests/fsharp/SDKTests/Directory.Build.props | 4 ++++
 1 file changed, 4 insertions(+)

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 @@
 <Project>
   <!-- empty to prevent directory crawling -->
+    <PropertyGroup>
+        <NuGetAudit>false</NuGetAudit>
+    </PropertyGroup>
+
 </Project>