From c2685610e5469586e0dbb38bc84c3a83e1b9c014 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 12 Apr 2023 16:51:40 +0200
Subject: [PATCH 1/2] Update .NET and devcontainer

---
 .devcontainer/Dockerfile        |  2 +-
 .devcontainer/devcontainer.json | 26 ++++++++++++--------------
 .vscode/settings.json           |  4 ++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 0d31aa0f1d..82df3d1aea 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.202-bullseye-slim-amd64
+ARG VARIANT=7.0.203-bullseye-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 cfba72ce23..b1e0e82b52 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
         "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.202-bullseye-slim-amd64"
+            "VARIANT": "7.0.203-bullseye-slim-amd64"
         }
     },
     "hostRequirements": {
@@ -14,19 +14,17 @@
         "memory": "4gb",
         "storage": "32gb"
     },
+    "customizations": {
+        "vscode": {
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "ms-dotnettools.csharp",
+                "Ionide.Ionide-fsharp",
+                "tintoy.msbuild-project-tools"
+            ]
+        }
+    },
 
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": [
-        "ms-dotnettools.csharp",
-        "Ionide.Ionide-fsharp",
-        "tintoy.msbuild-project-tools"
-    ],
-    //"onCreateCommand": [ // It is a bit buggy in codespaces, so for now, need to run it manually.
-    //    "/bin/bash",
-    //    "-c",
-    //    "./build.sh",
-    //    "-c",
-    //    "Debug"
-    //],
+    "onCreateCommand": [ "dotnet", "build", "FSharp.Compiler.Service.sln"],
     "waitFor": "onCreateCommand"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f1629c99e8..9cc57c917b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -16,13 +16,13 @@
         "*.fs": "${capture}.fsi"
     },
     "FSharp.suggestGitignore": false,
-    "FSharp.enableMSBuildProjectGraph": false,
+    "FSharp.enableMSBuildProjectGraph": true,
     "FSharp.enableAdaptiveLspServer": true,
     "FSharp.workspacePath": "FSharp.Compiler.Service.sln",
     "FSharp.workspaceModePeekDeepLevel": 1,
-    "FSharp.enableBackgroundServices": false,
     "FSharp.excludeProjectDirectories": [
         ".git",
+        ".vscode",
         "eng",
         "artifacts",
         "fcs-samples",

From 2bc3e3a8b195963624ad979c2db051e4aa1f8a8b Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 12 Apr 2023 16:53:54 +0200
Subject: [PATCH 2/2] Update .NET and devcontainer

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index b7b566d711..59f2a3742c 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "7.0.202",
+    "version": "7.0.203",
     "allowPrerelease": true,
     "rollForward": "latestPatch"
   },
   "tools": {
-    "dotnet": "7.0.202",
+    "dotnet": "7.0.203",
     "vs": {
       "version": "17.5",
       "components": ["Microsoft.VisualStudio.Component.FSharp"]