From f8030a88f47d4f35f5cd5972a11018fb7e7f8ce5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 02:31:26 +0000
Subject: [PATCH 1/2] Upgrade dotnet sdk to v6.0.421

---
 .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..e314c8d37eb 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.421"
+    },
+    "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..87ce170b475 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.421"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)
 
diff --git a/src/global.json b/src/global.json
index adf50e1f70f..e7028fe0dd4 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.412"
+    "version": "6.0.421"
   }
-}
\ No newline at end of file
+}

From 0ad3c7a38839d94de1d3d908a83a148b8798d8f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 02:35:21 +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..bc6d8b81918 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm
@@ -1 +1 @@
-7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3
\ No newline at end of file
+c5a3e4cd472f3c0c2a1f23f7a87f2e6846191a861854272617e640c38a7251cd
diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64
index 462079eb82e..a216cab41da 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64
@@ -1 +1 @@
-6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7
\ No newline at end of file
+5dd09bb18e19781494afc7a43a0ce38c831729688ada6a27c210ec6029b3aa33
diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64
index 074f8215d98..80355c98f3a 100644
--- a/src/Misc/contentHash/dotnetRuntime/linux-x64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-x64
@@ -1 +1 @@
-921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5
\ No newline at end of file
+037eb8a22786ee51e0cd394b20d2f28307e2c585c8d41b0619e57ad7462f3188
diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64
index f90128d6351..67d3a9599a5 100644
--- a/src/Misc/contentHash/dotnetRuntime/osx-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64
@@ -1 +1 @@
-50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b
\ No newline at end of file
+e15a38100da60868bf19fb28313ba5ab6860c3f097b6a0750ce0a39d68cd3ba4
diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64
index 24c54202d83..0fad609916d 100644
--- a/src/Misc/contentHash/dotnetRuntime/osx-x64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-x64
@@ -1 +1 @@
-16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd
\ No newline at end of file
+7c4a8e7e64a1ceb9b43188881818ac1edf339e6457ffaa2d2f425206e8e22cee
diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64
index a24ec6fe3ed..e100c4e7cf1 100644
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -1 +1 @@
-e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87
\ No newline at end of file
+d811097b767228dc1292a07f980963f3ffc96aaafda1205ecdf7de3e70d375fb
diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64
index 3fd49d6c5e6..3f18f688bf7 100644
--- a/src/Misc/contentHash/dotnetRuntime/win-x64
+++ b/src/Misc/contentHash/dotnetRuntime/win-x64
@@ -1 +1 @@
-16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb
\ No newline at end of file
+d2792f0b3ef57af2fc45fd0d8cc4f0b003bf5818211c26b0cbf8ebfffb42259e