From 9adfc26c5752cfd38268735641b9bb4f83a8534e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 00:26:50 +0000 Subject: [PATCH 1/2] Upgrade dotnet sdk to v6.0.415 --- .devcontainer/devcontainer.json | 2 +- src/dev.sh | 2 +- src/global.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 151f0a9e0ab..48c066480dc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "features": { "ghcr.io/devcontainers/features/docker-in-docker:1": {}, "ghcr.io/devcontainers/features/dotnet": { - "version": "6.0.414" + "version": "6.0.415" }, "ghcr.io/devcontainers/features/node:1": { "version": "16" diff --git a/src/dev.sh b/src/dev.sh index df231281784..6a339753d03 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.414" +DOTNETSDK_VERSION="6.0.415" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index 2ea7e46caa6..1c3ec6209d5 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.414" + "version": "6.0.415" } } From 94de0a2549b4bec91fd4d7a1baadb1e8815e6b1c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 00:32:22 +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 9c49686d8db..38054f7add4 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm @@ -1 +1 @@ -7539d33c35b0bc94ee67e3c0de1a6bac5ef89ce8e8efaa110131fa0520a54fb4 \ No newline at end of file +531b31914e525ecb12cc5526415bc70a112ebc818f877347af1a231011f539c5 diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64 index b249cc0c3d8..a1c56d11360 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64 @@ -1 +1 @@ -d71a31f9a17e1a41d6e1edea596edfa68a0db5948ed160e86f2154a547f4dd10 \ No newline at end of file +722dd5fa5ecc207fcccf67f6e502d689f2119d8117beff2041618fba17dc66a4 diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64 index bfadedbc0e4..899d0603ab8 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-x64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-x64 @@ -1 +1 @@ -3c2f700d8a995efe7895614ee07d9c7880f872d214b45983ad6163e1931870ab \ No newline at end of file +8ca75c76e15ab9dc7fe49a66c5c74e171e7fabd5d26546fda8931bd11bff30f9 diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64 index 05dd69b3049..46f9644876f 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64 @@ -1 +1 @@ -b2d85c95ecad13d352f4c7d31c64dbb0d9c6381b48fa5874c4c72a43a025a8a1 \ No newline at end of file +70496eb1c99b39b3373b5088c95a35ebbaac1098e6c47c8aab94771f3ffbf501 diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64 index d6b3f380ede..1389d7ecd3d 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-x64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-x64 @@ -1 +1 @@ -417d835c1a108619886b4bb5d25988cb6c138eb7b4c00320b1d9455c5630bff9 \ No newline at end of file +4f8d48727d535daabcaec814e0dafb271c10625366c78e7e022ca7477a73023f diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64 index d9ab17e2639..63f3c0ebfea 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/win-arm64 @@ -1 +1 @@ -8f35aaecfb53426ea10816442e23065142bab9dd0fb712a29e0fc471d13c44ac \ No newline at end of file +d54d7428f2b9200a0030365a6a4e174e30a1b29b922f8254dffb2924bd09549d diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64 index 0c85041b651..8c31497b21c 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-x64 +++ b/src/Misc/contentHash/dotnetRuntime/win-x64 @@ -1 +1 @@ -811c7debdfc54d074385b063b83c997e5360c8a9160cd20fe777713968370063 \ No newline at end of file +eaa939c45307f46b7003902255b3a2a09287215d710984107667e03ac493eb26