From d24ffeb57f4d74b5ab19342bc0faf07db1a5f23d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 00:14:37 +0000 Subject: [PATCH 1/2] Upgrade dotnet sdk to v6.0.419 --- .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..cf43008b640 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.419" + }, + "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..2a8053f5446 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.419" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index adf50e1f70f..bf923c69ce8 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.412" + "version": "6.0.419" } -} \ No newline at end of file +} From d2a8e72a54367d76bbf9c7cd746c4dbed0be4685 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 00:18:14 +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..9882385b145 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm @@ -1 +1 @@ -7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3 \ No newline at end of file +0019970449a8cb0c34b8dbe4518b6f4534dd5fcedddbc8ca01e4d98546fb4463 diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64 index 462079eb82e..c570c126c1c 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64 @@ -1 +1 @@ -6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7 \ No newline at end of file +5850bccc40a0102365efc80a9898a6899c1ee34bb5ee8bea6d21031c88aa6304 diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64 index 074f8215d98..7901e89053c 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-x64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-x64 @@ -1 +1 @@ -921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5 \ No newline at end of file +b17b340082a99669909646c9b2acf8eece2d0c9513bc5e87d0cc4d4773577279 diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64 index f90128d6351..f997df867b1 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64 @@ -1 +1 @@ -50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b \ No newline at end of file +5724a291e6fdd40d153ff78b0ba6c23e32c6054719012df80780ece9381b781b diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64 index 24c54202d83..17c2583f8cd 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-x64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-x64 @@ -1 +1 @@ -16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd \ No newline at end of file +8600b078bc17fc6cf259d2305a327ee01005c4ec33a0bb520a2a6e79699e0d7e diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64 index a24ec6fe3ed..b252a05f380 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/win-arm64 @@ -1 +1 @@ -e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87 \ No newline at end of file +3fff2ce42b47f3a37bd37a3d6019c51d88386fbf85d67c7b996b8f0a1c3a24f4 diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64 index 3fd49d6c5e6..da704e63c75 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-x64 +++ b/src/Misc/contentHash/dotnetRuntime/win-x64 @@ -1 +1 @@ -16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb \ No newline at end of file +13625b82b93294d47c47da7579da1092cb673031fb14fa93e58b6b289e339a4b