diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index aaff41fe1..c31211d25 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.405" + "version": "6.0.412" }, "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 dbfd84342..467165a2e 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm @@ -1 +1 @@ -39f2a931565d6a10e695ac8ed14bb9dcbb568151410349b32dbf9c27bae29602 \ No newline at end of file +7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64 index 1115e60a4..462079eb8 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64 @@ -1 +1 @@ -29ffb303537d8ba674fbebc7729292c21c4ebd17b3198f91ed593ef4cbbb67b5 \ No newline at end of file +6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64 index 506b437a4..074f8215d 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-x64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-x64 @@ -1 +1 @@ -de6868a836fa3cb9e5ddddbc079da1c25e819aa2d2fc193cc9931c353687c57c \ No newline at end of file +921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64 index e7e6bec44..f90128d63 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64 @@ -1 +1 @@ -339d3e1a5fd28450c0fe6cb820cc7aae291f0f9e2d153ac34e1f7b080e35d30e \ No newline at end of file +50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64 index 7df68786a..24c54202d 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-x64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-x64 @@ -1 +1 @@ -dcb7f606c1d7d290381e5020ee73e7f16dcbd2f20ac9b431362ccbb5120d449c \ No newline at end of file +16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64 index 0083dfe9c..a24ec6fe3 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/win-arm64 @@ -1 +1 @@ -1bbcb0e9a2cf4be4b1fce77458de139b70ac58efcbb415a6db028b9373ae1673 \ No newline at end of file +e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64 index 447a48f1d..3fd49d6c5 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-x64 +++ b/src/Misc/contentHash/dotnetRuntime/win-x64 @@ -1 +1 @@ -44cd25f3c104d0abb44d262397a80e0b2c4f206465c5d899a22eec043dac0fb3 \ No newline at end of file +16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb \ No newline at end of file diff --git a/src/Misc/runnerdotnetruntimeassets b/src/Misc/runnerdotnetruntimeassets index a6a407c3f..f2a5f05bb 100644 --- a/src/Misc/runnerdotnetruntimeassets +++ b/src/Misc/runnerdotnetruntimeassets @@ -75,6 +75,7 @@ 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 +mscordaccore_amd64_amd64_6.0.2023.32017.dll mscordbi.dll mscorlib.dll mscorrc.debug.dll diff --git a/src/dev.sh b/src/dev.sh index 6ed5462a7..7e1b91610 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.405" +DOTNETSDK_VERSION="6.0.412" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index 5f5ece165..adf50e1f7 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.405" + "version": "6.0.412" } -} +} \ No newline at end of file