diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ec8b7d283..aaff41fe1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "features": { "ghcr.io/devcontainers/features/docker-in-docker:1": {}, "ghcr.io/devcontainers/features/dotnet": { - "version": "6.0.300" + "version": "6.0.405" }, "ghcr.io/devcontainers/features/node:1": { "version": "16" diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm b/src/Misc/contentHash/dotnetRuntime/linux-arm index 548e328e2..dbfd84342 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm @@ -1 +1 @@ -1d709d93e5d3c6c6c656a61aa6c1781050224788a05b0e6ecc4c3c0408bdf89c \ No newline at end of file +39f2a931565d6a10e695ac8ed14bb9dcbb568151410349b32dbf9c27bae29602 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64 index 6b2e4f7cc..1115e60a4 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64 @@ -1 +1 @@ -b92a47cfeaad02255b1f7a377060651b73ae5e5db22a188dbbcb4183ab03a03d \ No newline at end of file +29ffb303537d8ba674fbebc7729292c21c4ebd17b3198f91ed593ef4cbbb67b5 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64 index b92a76c85..506b437a4 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-x64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-x64 @@ -1 +1 @@ -68a9a8ef0843a8bb74241894f6f63fd76241a82295c5337d3cc7a940a314c78e \ No newline at end of file +de6868a836fa3cb9e5ddddbc079da1c25e819aa2d2fc193cc9931c353687c57c \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64 index 04681bcfc..e7e6bec44 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64 @@ -1 +1 @@ -02c7126ff4d63ee2a0ae390c81434c125630522aadf35903bbeebb1a99d8af99 \ No newline at end of file +339d3e1a5fd28450c0fe6cb820cc7aae291f0f9e2d153ac34e1f7b080e35d30e \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64 index 9da58b8a0..7df68786a 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-x64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-x64 @@ -1 +1 @@ -c9d5a542f8d765168855a89e83ae0a8970d00869041c4f9a766651c04c72b212 \ No newline at end of file +dcb7f606c1d7d290381e5020ee73e7f16dcbd2f20ac9b431362ccbb5120d449c \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64 index 8d279b041..0083dfe9c 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/win-arm64 @@ -1 +1 @@ -39d0683f0f115a211cb10c473e9574c16549a19d4e9a6c637ded3d7022bf809f +1bbcb0e9a2cf4be4b1fce77458de139b70ac58efcbb415a6db028b9373ae1673 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64 index 5eaabf918..447a48f1d 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-x64 +++ b/src/Misc/contentHash/dotnetRuntime/win-x64 @@ -1 +1 @@ -d94f2fbaf210297162bc9f3add819d73682c3aa6899e321c3872412b924d5504 \ No newline at end of file +44cd25f3c104d0abb44d262397a80e0b2c4f206465c5d899a22eec043dac0fb3 \ No newline at end of file diff --git a/src/Misc/runnerdotnetruntimeassets b/src/Misc/runnerdotnetruntimeassets index fa2d9e04b..a6a407c3f 100644 --- a/src/Misc/runnerdotnetruntimeassets +++ b/src/Misc/runnerdotnetruntimeassets @@ -74,6 +74,7 @@ Microsoft.Win32.Registry.dll mscordaccore.dll mscordaccore_amd64_amd64_6.0.522.21309.dll mscordaccore_arm64_arm64_6.0.522.21309.dll +mscordaccore_amd64_amd64_6.0.1322.58009.dll mscordbi.dll mscorlib.dll mscorrc.debug.dll diff --git a/src/dev.sh b/src/dev.sh index 82abcf769..fed033d38 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.300" +DOTNETSDK_VERSION="6.0.405" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index 19c87f2a5..5f5ece165 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.300" + "version": "6.0.405" } }