diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b8207ac5551..a0f26aa7e97 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.420" + }, + "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/Misc/contentHash/dotnetRuntime/linux-arm b/src/Misc/contentHash/dotnetRuntime/linux-arm index 467165a2e04..98048a69fa0 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm @@ -1 +1 @@ -7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3 \ No newline at end of file +bb198a7f7bf0de6f3cd2db234682d6ee55f582af5bb833f41d43818a43d59157 diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64 index 462079eb82e..636d83c0e53 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64 @@ -1 +1 @@ -6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7 \ No newline at end of file +8f3df1c79fe70ed70ebc4f347ca0e4b67ae37f410525505a4e071726b809832e diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64 index 074f8215d98..1d0a2b0d153 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-x64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-x64 @@ -1 +1 @@ -921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5 \ No newline at end of file +25c127e86140bb737299bf045ff265d84f87bd7afd4041cd607bb600b721ed71 diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64 index f90128d6351..a68aa16a35f 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64 @@ -1 +1 @@ -50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b \ No newline at end of file +57b928ea35fab58c25f8ac6a9c77db4781617d7f36d7c523e128c8dff77570b3 diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64 index 24c54202d83..ed9252b56cc 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-x64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-x64 @@ -1 +1 @@ -16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd \ No newline at end of file +614162385824675712d018a1dfaabfb48a8e41ec52881ef3cd630388d0a558f9 diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64 index a24ec6fe3ed..0628f1b521d 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/win-arm64 @@ -1 +1 @@ -e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87 \ No newline at end of file +c8f556958caab88f3e74a5cf614c73131157107b5b18f6a6b27e8dba990b938a diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64 index 3fd49d6c5e6..4db344c655e 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-x64 +++ b/src/Misc/contentHash/dotnetRuntime/win-x64 @@ -1 +1 @@ -16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb \ No newline at end of file +cf7566e889bae1aeddc637d4d9e5c8cf8458c054af8a19c328418aee8720139f diff --git a/src/dev.sh b/src/dev.sh index 7e1b91610f6..2fd0eacc7ed 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.420" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index adf50e1f70f..f35fb2f37f1 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.412" + "version": "6.0.420" } -} \ No newline at end of file +}