From 77655e8c76d95995373e772e20d523fd2becfd7d Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 10:15:41 -0400 Subject: [PATCH 1/5] Bump version to 2.320.1 to test new arm builds Signed-off-by: Satadru Pramanik --- releaseVersion | 2 +- src/runnerversion | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releaseVersion b/releaseVersion index ef96e25e847..feb5f1ab9d9 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ - +2.320.1 diff --git a/src/runnerversion b/src/runnerversion index 8084ad3118b..feb5f1ab9d9 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.320.0 +2.320.1 From 72c3ae82c9c24872cb8055dfd00767db4092e2f9 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 10:23:57 -0400 Subject: [PATCH 2/5] Add note about changed version. Signed-off-by: Satadru Pramanik --- releaseNote.md | 1 + 1 file changed, 1 insertion(+) diff --git a/releaseNote.md b/releaseNote.md index 70d85af2dcd..7ee21e0179a 100644 --- a/releaseNote.md +++ b/releaseNote.md @@ -1,5 +1,6 @@ ## What's Changed +- Bump version to active builds for arm with .Net 8.0 - Adding Snapshot additional mapping tokens https://github.com/actions/runner/pull/3468 - Create launch httpclient using the right handler and setting https://github.com/actions/runner/pull/3476 - Fix missing default user-agent for jitconfig runner https://github.com/actions/runner/pull/3473 From c54cf7c413ecd9504a0d562ca97f914909770cb6 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 10:25:43 -0400 Subject: [PATCH 3/5] Adjust workflow to build artifacts. Signed-off-by: Satadru Pramanik --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c041cf336a7..805c606c80c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,14 +67,14 @@ jobs: # Create runner package tar.gz/zip - name: Package Release - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' run: | ${{ matrix.devScript }} package Release working-directory: src # Upload runner package tar.gz/zip as artifact - name: Publish Artifact - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4 with: name: runner-package-${{ matrix.runtime }} From 67d882caafe70ddc62275ee43a25746b79898d5f Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 12:41:01 -0400 Subject: [PATCH 4/5] Update to .Net 9.0 to fix ARM32 Y2038 breakage. This updates .Net to 9.0.100-rc.2.24474.11 . See https://github.com/actions/runner/issues/3505 https://github.com/dotnet/runtime/issues/101444 https://github.com/dotnet/runtime/issues/96460 https://github.com/dotnet/runtime/pull/102410 (Looks like this has not been backported to .Net 8.x...) Signed-off-by: Satadru Pramanik --- .devcontainer/devcontainer.json | 2 +- src/Runner.Common/Runner.Common.csproj | 2 +- src/Runner.Listener/Runner.Listener.csproj | 2 +- src/Runner.PluginHost/Runner.PluginHost.csproj | 2 +- src/Runner.Plugins/Runner.Plugins.csproj | 2 +- src/Runner.Sdk/Runner.Sdk.csproj | 2 +- src/Runner.Worker/Runner.Worker.csproj | 2 +- src/Sdk/Sdk.csproj | 2 +- src/Test/Test.csproj | 2 +- src/dev.sh | 2 +- src/global.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d3aa5d77451..673f18b9465 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": "8.0.403" + "version": "9.0.100-rc.2.24474.11" }, "ghcr.io/devcontainers/features/node:1": { "version": "20" diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index 6c4635626a2..5339116c45e 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index afd528128a5..48c7559b019 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.PluginHost/Runner.PluginHost.csproj b/src/Runner.PluginHost/Runner.PluginHost.csproj index 81a8d2e4304..49272a23405 100644 --- a/src/Runner.PluginHost/Runner.PluginHost.csproj +++ b/src/Runner.PluginHost/Runner.PluginHost.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.Plugins/Runner.Plugins.csproj b/src/Runner.Plugins/Runner.Plugins.csproj index a786cf1cd1b..60d7662b7f7 100644 --- a/src/Runner.Plugins/Runner.Plugins.csproj +++ b/src/Runner.Plugins/Runner.Plugins.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.Sdk/Runner.Sdk.csproj b/src/Runner.Sdk/Runner.Sdk.csproj index 55dbf12627c..dc3b27349c2 100644 --- a/src/Runner.Sdk/Runner.Sdk.csproj +++ b/src/Runner.Sdk/Runner.Sdk.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj index 53c1610df3e..3b252bb85ed 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index 7ba739498a4..4ce624bab85 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index aebe242096f..0685192bfa8 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051 diff --git a/src/dev.sh b/src/dev.sh index 795c135a232..091ef0e3f4e 100755 --- a/src/dev.sh +++ b/src/dev.sh @@ -17,7 +17,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout" DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x" PACKAGE_DIR="$SCRIPT_DIR/../_package" DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk" -DOTNETSDK_VERSION="8.0.403" +DOTNETSDK_VERSION="9.0.100-rc.2.24474.11" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index ff3b5e098b3..2dd360f846e 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.403" + "version": "9.0.100-rc.2.24474.11" } } From e1a4e10a5580e965d19e48e9f0399789c1a91d33 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 23 Oct 2024 13:02:28 -0400 Subject: [PATCH 5/5] Bump versions of packages to avoid NU1903 NU1902 warnings. Signed-off-by: Satadru Pramanik --- src/Runner.Common/Runner.Common.csproj | 2 +- src/Runner.Listener/Runner.Listener.csproj | 2 +- src/Runner.Worker/Runner.Worker.csproj | 2 +- src/Sdk/Sdk.csproj | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index 5339116c45e..fbf431ec7c3 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index 48c7559b019..f1e65ffc1b7 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj index 3b252bb85ed..1a135cfe1fc 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index 4ce624bab85..3fe6b4029b7 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -18,14 +18,16 @@ + - - + + +