Upgrade dotnet sdk to v6.0.422

Install gpg-agent during actions/runner container image build (#3294 )
`add-apt-repository` depends on `gpg-agent`
2025-12-10 20:36:49 +00:00 · 2024-05-20 00:21:52 +00:00 · 2024-05-17 09:55:44 -04:00 · 2024-05-15 18:01:06 +00:00 · 2024-05-14 13:50:33 -04:00 · 2024-05-13 17:40:23 -04:00
21 changed files with 18 additions and 26 deletions
--- 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.421"
+      "version": "6.0.422"
    },
    "ghcr.io/devcontainers/features/node:1": {
      "version": "16"
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -39,12 +39,15 @@ ENV RUNNER_MANUALLY_TRAP_SIG=1
 ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1
 ENV ImageOS=ubuntu22

-RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends \
-    sudo \
-    lsb-release \
+# 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows
+RUN apt update -y \
+    && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common \
    && rm -rf /var/lib/apt/lists/*

+# Configure git-core/ppa based on guidance here:  https://git-scm.com/download/linux
+RUN add-apt-repository ppa:git-core/ppa \
+    && apt update -y
+
 RUN adduser --disabled-password --gecos "" --uid 1001 runner \
    && groupadd docker --gid 123 \
    && usermod -aG sudo runner \
--- a/2
+++ b/2
@@ -1 +1 @@
-2.316.1
+<Update to ./src/runnerversion when creating release>
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm
@@ -1 +0,0 @@
-54d95a44d118dba852395991224a6b9c1abe916858c87138656f80c619e85331
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64
@@ -1 +0,0 @@
-68015af17f06a824fa478e62ae7393766ce627fd5599ab916432a14656a19a52
--- a/src/Misc/contentHash/dotnetRuntime/linux-x64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-x64
@@ -1 +0,0 @@
-a2628119ca419cb54e279103ffae7986cdbd0814d57c73ff0dc74c38be08b9ae
--- a/src/Misc/contentHash/dotnetRuntime/osx-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64
@@ -1 +0,0 @@
-de71ca09ead807e1a2ce9df0a5b23eb7690cb71fff51169a77e4c3992be53dda
--- a/src/Misc/contentHash/dotnetRuntime/osx-x64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-x64
@@ -1 +0,0 @@
-d009e05e6b26d614d65be736a15d1bd151932121c16a9ff1b986deadecc982b9
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -1 +0,0 @@
-f730db39c2305800b4653795360ba9c10c68f384a46b85d808f1f9f0ed3c42e4
--- a/src/Misc/contentHash/dotnetRuntime/win-x64
+++ b/src/Misc/contentHash/dotnetRuntime/win-x64
@@ -1 +0,0 @@
-a35b5722375490e9473cdcccb5e18b41eba3dbf4344fe31abc9821e21f18ea5a
--- a/src/Misc/contentHash/externals/linux-arm
+++ b/src/Misc/contentHash/externals/linux-arm
@@ -1 +0,0 @@
-4bf3e1af0d482af1b2eaf9f08250248a8c1aea8ec20a3c5be116d58cdd930009
--- a/src/Misc/contentHash/externals/linux-arm64
+++ b/src/Misc/contentHash/externals/linux-arm64
@@ -1 +0,0 @@
-ec1719a8cb4d8687328aa64f4aa7c4e3498a715d8939117874782e3e6e63a14b
--- a/src/Misc/contentHash/externals/linux-x64
+++ b/src/Misc/contentHash/externals/linux-x64
@@ -1 +0,0 @@
-50538de29f173bb73f708c4ed2c8328a62b8795829b97b2a6cb57197e2305287
--- a/src/Misc/contentHash/externals/osx-arm64
+++ b/src/Misc/contentHash/externals/osx-arm64
@@ -1 +0,0 @@
-a0a96cbb7593643b69e669bf14d7b29b7f27800b3a00bb3305aebe041456c701
--- a/src/Misc/contentHash/externals/osx-x64
+++ b/src/Misc/contentHash/externals/osx-x64
@@ -1 +0,0 @@
-6255b22692779467047ecebd60ad46984866d75cdfe10421d593a7b51d620b09
--- a/src/Misc/contentHash/externals/win-arm64
+++ b/src/Misc/contentHash/externals/win-arm64
@@ -1 +0,0 @@
-6ff1abd055dc35bfbf06f75c2f08908f660346f66ad1d8f81c910068e9ba029d
--- a/src/Misc/contentHash/externals/win-x64
+++ b/src/Misc/contentHash/externals/win-x64
@@ -1 +0,0 @@
-433a6d748742d12abd20dc2a79b62ac3d9718ae47ef26f8e84dc8c180eea3659
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -5,10 +5,11 @@ PRECACHE=$2
 NODE_URL=https://nodejs.org/dist
 UNOFFICIAL_NODE_URL=https://unofficial-builds.nodejs.org/download/release
 NODE_ALPINE_URL=https://github.com/actions/alpine_nodejs/releases/download
+# When you update Node versions you must also create a new release of alpine_nodejs at that updated version.
+# Follow the instructions here: https://github.com/actions/alpine_nodejs?tab=readme-ov-file#getting-started
 NODE16_VERSION="16.20.2"
-NODE20_VERSION="20.8.1"
-# used only for win-arm64, remove node16 unofficial version when official version is available
-NODE16_UNOFFICIAL_VERSION="16.20.0"
+NODE20_VERSION="20.13.1"
+NODE16_UNOFFICIAL_VERSION="16.20.0" # used only for win-arm64, remove node16 unofficial version when official version is available

 get_abs_path() {
  # exploits the fact that pwd will print abs path when no args
--- a/src/Runner.Common/JobServerQueue.cs
+++ b/src/Runner.Common/JobServerQueue.cs
@@ -709,7 +709,9 @@ namespace GitHub.Runner.Common
                            {
                                Trace.Info("Catch exception during update steps, skip update Results.");
                                Trace.Error(e);
-                                if (!_resultsServiceOnly)
+                                _resultsServiceExceptionsCount++;
+                                // If we hit any exceptions uploading to Results, let's skip any additional uploads to Results unless Results is serving logs
+                                if (!_resultsServiceOnly && _resultsServiceExceptionsCount > 3)
                                {
                                    _resultsClientInitiated = false;
                                    SendResultsTelemetry(e);
--- 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="6.0.421"
+DOTNETSDK_VERSION="6.0.422"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)

--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "6.0.421"
+    "version": "6.0.422"
  }
 }
Author	SHA1	Message	Date
github-actions[bot]	9a3abd6814	Upgrade dotnet sdk to v6.0.422	2024-05-20 00:21:52 +00:00
John Wesley Walker III	bd7235ef62	Install `gpg-agent` during actions/runner container image build (#3294 ) `add-apt-repository` depends on `gpg-agent`	2024-05-17 09:55:44 -04:00
John Wesley Walker III	0f15173045	Make it easy to install `git` on an Action Runner Image (#3273 ) (We don't actually install `git`. We simply get the prerequisites out of the way.)	2024-05-15 18:01:06 +00:00
Patrick Ellis	76dc3a28c0	Upgrade node20: 20.8.1 → 20.13.1 (#3284 ) * Upgrade node20: 20.8.1 → 20.13.1 * Call out the release process for `alpine_nodejs` in a comment * move the comment to the end of the line so it's more obvious which variable it's talking about	2024-05-14 13:50:33 -04:00
Patrick Ellis	c67e7f2813	Delete all the contentHash files (#3285 ) Nothing uses them anymore after #3074.	2024-05-13 17:40:23 -04:00
Yang Cao	54052b94fb	Also do not give up when uploading steps metadata (#3280 )	2024-05-10 11:02:29 -04:00
				`@@ -1 +0,0 @@`
				`54d95a44d118dba852395991224a6b9c1abe916858c87138656f80c619e85331`
				`@@ -1 +0,0 @@`
				`68015af17f06a824fa478e62ae7393766ce627fd5599ab916432a14656a19a52`
				`@@ -1 +0,0 @@`
				`a2628119ca419cb54e279103ffae7986cdbd0814d57c73ff0dc74c38be08b9ae`
				`@@ -1 +0,0 @@`
				`de71ca09ead807e1a2ce9df0a5b23eb7690cb71fff51169a77e4c3992be53dda`
				`@@ -1 +0,0 @@`
				`d009e05e6b26d614d65be736a15d1bd151932121c16a9ff1b986deadecc982b9`
				`@@ -1 +0,0 @@`
				`f730db39c2305800b4653795360ba9c10c68f384a46b85d808f1f9f0ed3c42e4`
				`@@ -1 +0,0 @@`
				`a35b5722375490e9473cdcccb5e18b41eba3dbf4344fe31abc9821e21f18ea5a`
				`@@ -1 +0,0 @@`
				`4bf3e1af0d482af1b2eaf9f08250248a8c1aea8ec20a3c5be116d58cdd930009`
				`@@ -1 +0,0 @@`
				`ec1719a8cb4d8687328aa64f4aa7c4e3498a715d8939117874782e3e6e63a14b`