From 3e9c6734641658c53de57e4601a3808a425e9ce5 Mon Sep 17 00:00:00 2001
From: Florian Verdonck <florian.verdonck@outlook.com>
Date: Tue, 9 Jul 2024 23:21:04 +0200
Subject: [PATCH] Bump SDK to 8.0.300 (#3100)

* Initial bump to 8.0.300

* Bump tools
---
 .config/dotnet-tools.json       | 16 ++++++++++------
 .devcontainer/Dockerfile        | 25 +++++++++++++++++++++----
 .devcontainer/devcontainer.json |  9 ++++-----
 global.json                     |  2 +-
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index b843844031..88a54a76b8 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -6,25 +6,29 @@
       "version": "0.19.2",
       "commands": [
         "dotnet-fsharplint"
-      ]
+      ],
+      "rollForward": false
     },
     "fantomas": {
-      "version": "6.3.0",
+      "version": "6.3.9",
       "commands": [
         "fantomas"
-      ]
+      ],
+      "rollForward": false
     },
     "fsdocs-tool": {
-      "version": "20.0.0",
+      "version": "21.0.0-beta-002",
       "commands": [
         "fsdocs"
-      ]
+      ],
+      "rollForward": false
     },
     "fsharp-analyzers": {
       "version": "0.25.0",
       "commands": [
         "fsharp-analyzers"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
\ No newline at end of file
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 03b1644856..084ce71ecc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,14 +1,31 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.200
+FROM mcr.microsoft.com/dotnet/sdk:8.0.300
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
 
+# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
+# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
+# will be updated to match your local UID/GID (when using the dockerFile property).
+# See https://aka.ms/vscode-remote/containers/non-root-user for details.
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
 # Configure apt and install packages
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
-    # Verify bash, git, process tools, lsb-release (common in install instructions for CLIs) installed
-    && apt-get -y install bash git openssh-client less iproute2 procps lsb-release \
-    && apt-get -y install gnupg \
+    #
+    # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
+    && apt-get -y install git iproute2 procps lsb-release \
+    #
+    # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
+    && groupadd --gid $USER_GID $USERNAME \
+    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    # [Optional] Add sudo support for the non-root user
+    && apt-get install -y sudo \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
+    && chmod 0440 /etc/sudoers.d/$USERNAME \
+    #
     # Clean up
     && apt-get autoremove -y \
     && apt-get clean -y \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9d2a75b571..7508c7ec0f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,7 +7,9 @@
     },
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
+	"features": {
+		"ghcr.io/devcontainers/features/github-cli:1": {}
+	},
 
 	// Configure tool-specific properties.
 	"customizations": {
@@ -21,15 +23,12 @@
 			]
 		}
 	},
-	"features": {
-		"ghcr.io/devcontainers/features/github-cli:1": {}
-	},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [ 8901 ],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "dotnet restore",
+	"postCreateCommand": "dotnet tool restore && dotnet restore",
 
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	"remoteUser": "root"
diff --git a/global.json b/global.json
index dba63d31b9..8d0a1c0ac3 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.200",
+    "version": "8.0.300",
     "rollForward": "latestMinor"
   }
 }
\ No newline at end of file