From 93842baaa9cb37a4bb52f3ce4a163b5fd5b3bd73 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 00:15:34 +0000
Subject: [PATCH 1/2] Upgrade dotnet sdk to v6.0.418

---
 .devcontainer/devcontainer.json | 46 ++++++++++++++++-----------------
 src/dev.sh                      |  2 +-
 src/global.json                 |  4 +--
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b8207ac5551..245547cd564 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,24 +1,24 @@
 {
-	"name": "Actions Runner Devcontainer",
-	"image": "mcr.microsoft.com/devcontainers/base:focal",
-	"features": {
-		"ghcr.io/devcontainers/features/docker-in-docker:1": {},
-		"ghcr.io/devcontainers/features/dotnet": {
-			"version": "6.0.412"
-		},
-		"ghcr.io/devcontainers/features/node:1": {
-			"version": "16"
-		}
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-azuretools.vscode-docker",
-				"ms-dotnettools.csharp",
-				"eamodio.gitlens"
-			]
-		}
-	},
-	"postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
-	"remoteUser": "vscode"
-}
\ No newline at end of file
+  "name": "Actions Runner Devcontainer",
+  "image": "mcr.microsoft.com/devcontainers/base:focal",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:1": {},
+    "ghcr.io/devcontainers/features/dotnet": {
+      "version": "6.0.418"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "16"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-docker",
+        "ms-dotnettools.csharp",
+        "eamodio.gitlens"
+      ]
+    }
+  },
+  "postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
+  "remoteUser": "vscode"
+}
diff --git a/src/dev.sh b/src/dev.sh
index 7e1b91610f6..fbd2ed14de3 100755
--- a/src/dev.sh
+++ b/src/dev.sh
@@ -22,7 +22,7 @@ DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
 PACKAGE_DIR="$SCRIPT_DIR/../_package"
 PACKAGE_TRIMS_DIR="$SCRIPT_DIR/../_package_trims"
 DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="6.0.412"
+DOTNETSDK_VERSION="6.0.418"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)
 
diff --git a/src/global.json b/src/global.json
index adf50e1f70f..b014aea0838 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.412"
+    "version": "6.0.418"
   }
-}
\ No newline at end of file
+}

From edda60fd7e75f764d69304741362202af2a08e9e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 00:18:59 +0000
Subject: [PATCH 2/2] Update computed hashes

---
 src/Misc/contentHash/dotnetRuntime/linux-arm   | 2 +-
 src/Misc/contentHash/dotnetRuntime/linux-arm64 | 2 +-
 src/Misc/contentHash/dotnetRuntime/linux-x64   | 2 +-
 src/Misc/contentHash/dotnetRuntime/osx-arm64   | 2 +-
 src/Misc/contentHash/dotnetRuntime/osx-x64     | 2 +-
 src/Misc/contentHash/dotnetRuntime/win-arm64   | 2 +-
 src/Misc/contentHash/dotnetRuntime/win-x64     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm b/src/Misc/contentHash/dotnetRuntime/linux-arm
index 467165a2e04..32b253d10c8 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm
@@ -1 +1 @@
-7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3
\ No newline at end of file
+c97895f870a3ee242fde0165b97cf03eb320ca5277d6fbbf2a38c3618fe7512c
diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64
index 462079eb82e..65b07482345 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64
@@ -1 +1 @@
-6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7
\ No newline at end of file
+ed1206c5a7e5ca324a23254bb61e832a279ee521978a2b2357a17e4b4934ac3b
diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64
index 074f8215d98..7212760057b 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-x64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-x64
@@ -1 +1 @@
-921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5
\ No newline at end of file
+b690cd07a67f6d7b738b30f1f597a9359cf99274fc1b9d3e6bd236a42a52a295
diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64
index f90128d6351..98e34503ade 100644
--- a/src/Misc/contentHash/dotnetRuntime/osx-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64
@@ -1 +1 @@
-50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b
\ No newline at end of file
+67f154d5720bc82fd4e5f5cfd297a9bd0e127d688957db8537249fb7bbb03da0
diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64
index 24c54202d83..192da480003 100644
--- a/src/Misc/contentHash/dotnetRuntime/osx-x64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-x64
@@ -1 +1 @@
-16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd
\ No newline at end of file
+8aceef104af6f4ad16d0d06867198b95bdaf8c9ad4dcc47bb2e0f76854205640
diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64
index a24ec6fe3ed..6139e8674a9 100644
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -1 +1 @@
-e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87
\ No newline at end of file
+f7d66c145fd5e5f604c73648bc541dc7ed6212b2caf2a8adb64e15be7958c851
diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64
index 3fd49d6c5e6..fbdfe5de076 100644
--- a/src/Misc/contentHash/dotnetRuntime/win-x64
+++ b/src/Misc/contentHash/dotnetRuntime/win-x64
@@ -1 +1 @@
-16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb
\ No newline at end of file
+90582431a12c4e8331e263d4596ddabc1d5715acacf51e9324b643727612d410