Create 2.304.0 runner release

2025-12-10 12:36:23 +00:00 · 2023-04-26 16:04:26 -04:00
313 changed files with 2613 additions and 6020 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:1": {},
 		"ghcr.io/devcontainers/features/dotnet": {
-			"version": "6.0.412"
+			"version": "6.0.405"
 		},
 		"ghcr.io/devcontainers/features/node:1": {
 			"version": "16"
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+# https://editorconfig.org/
+
+[*]
+charset = utf-8 # Set default charset to utf-8
+insert_final_newline = true # ensure all files end with a single newline
+trim_trailing_whitespace = true # attempt to remove trailing whitespace on save
+
+[*.md]
+trim_trailing_whitespace = false # in markdown, "two trailing spaces" is unfortunately meaningful; it means `<br>`
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,20 +0,0 @@
-version: 2
-updates:
- package-ecosystem: "docker"
-  directory: "/images"
-  schedule:
-    interval: "daily" 
-  target-branch: "main" 
- package-ecosystem: "nuget"
-  directory: "/src"
-  schedule:
-    interval: "daily" 
-  target-branch: "main" 
- package-ecosystem: "npm"
-  directory: "/src/Misc/expressionFunc/hashFiles"
-  schedule:
-    interval: "daily" 
-  target-branch: "main" 
-  allow:
-  - dependency-type: direct
-  - dependency-type: production # check only dependencies, which are going to the compiled app, not supporting tools like @vue-cli
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -53,9 +53,6 @@ jobs:
        uses: docker/build-push-action@v3
        with:
          context: ./images
-          platforms: |
-            linux/amd64
-            linux/arm64
          tags: |
            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.version }}
            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -699,9 +699,6 @@ jobs:
        uses: docker/build-push-action@v3
        with:
          context: ./images
-          platforms: |
-            linux/amd64
-            linux/arm64
          tags: |
            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.version }}
            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
--- a/.github/workflows/stale-bot.yml
+++ b/.github/workflows/stale-bot.yml
@@ -1,17 +0,0 @@
-name: ‘Close stale Runner issues’
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 1' # every monday at midnight
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v8
-        with:
-          stale-issue-message: ‘This issue is stale because it has been open 365 days with no activity. Remove stale label or comment or this will be closed in 15 days.’
-          close-issue-message: ‘This issue was closed because it has been stalled for 15 days with no activity.’
-          exempt-issue-labels: ‘keep’
-          days-before-stale: 365
-          days-before-close: 15
-          debug-only: true
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -157,7 +157,7 @@ cat (Runner/Worker)_TIMESTAMP.log # view your log file
 ## Styling

 We use the .NET Foundation and CoreCLR style guidelines [located here](
-https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/coding-style.md)
+https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md)

 ### Format C# Code

@@ -165,4 +165,4 @@ To format both staged and unstaged .cs files
 ```
 cd ./src
 ./dev.(cmd|sh) format
-```
+```
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,18 +1,14 @@
-# Source: https://github.com/dotnet/dotnet-docker
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 as build

-ARG TARGETOS
-ARG TARGETARCH
 ARG RUNNER_VERSION
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2
+ARG RUNNER_ARCH="x64"
+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.1
 ARG DOCKER_VERSION=20.10.23

 RUN apt update -y && apt install curl unzip -y

 WORKDIR /actions-runner
-RUN export RUNNER_ARCH=${TARGETARCH} \
-    && if [ "$RUNNER_ARCH" = "amd64" ]; then export RUNNER_ARCH=x64 ; fi \
-    && curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-${TARGETOS}-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \
+RUN curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \
    && tar xzf ./runner.tar.gz \
    && rm runner.tar.gz

@@ -20,14 +16,13 @@ RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-c
    && unzip ./runner-container-hooks.zip -d ./k8s \
    && rm runner-container-hooks.zip

-RUN export RUNNER_ARCH=${TARGETARCH} \
-    && if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \
+RUN export DOCKER_ARCH=x86_64 \
    && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
-    && curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \
+    && curl -fLo docker.tgz https://download.docker.com/linux/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \
    && tar zxvf docker.tgz \
    && rm -rf docker.tgz

-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0

 ENV DEBIAN_FRONTEND=noninteractive
 ENV RUNNER_MANUALLY_TRAP_SIG=1
@@ -36,7 +31,6 @@ ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1
 RUN apt-get update -y \
    && apt-get install -y --no-install-recommends \
    sudo \
-    lsb-release \
    && rm -rf /var/lib/apt/lists/*

 RUN adduser --disabled-password --gecos "" --uid 1001 runner \
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,19 +1,18 @@
 ## Features
- Support linux/arm64 docker build (#2601)
- Add node20 to runner (#2732)
- Update node16 to latest version (#2736)
- Remove node12 from runner (#2717)
+- Runner changes for communication with Results service (#2510, #2531, #2535, #2516) 
+- Add `*.ghe.localhost` domains to hosted server check (#2536) 
+- Add `OrchestrationId` to user-agent for better telemetry correlation. (#2568) 
+
+## Bugs
+- Fix JIT configurations on Windows (#2497) 
+- Guard against NullReference while creating HostContext (#2343) 
+- Handles broken symlink in `Which` (#2150, #2196) 
+- Adding curl retry for external tool downloads (#2552, #2557) 
+- Limit the time we wait for waiting websocket to connect. (#2554) 

 ## Misc
- Pass timeout in ExecutionContext instead of StepsRunner (#2714)
- Return early on invalid_client OAuth exception (#2721)
- Expose results service endpoint as environment variable (#2726)
- Update HTTPEventSourceListener to trace the right events (#2727)
- Change RunnerId/AgentId from int32 to uint64 (#2661)
- Configure stale bot for Runner (#2729)
- Add in dependabot security scanning/updates (#2743)
- Bump dotnet sdk to latest version (#2733)
- Switch from InnerException to ErrorCode on disableupdate check (#2718)
+- Bump container hooks version to 0.3.1 in runner image (#2496) 
+- Runner changes to communicate with vNext services (#2487, #2500, #2505, #2541, #2547) 

 _Note: Actions Runner follows a progressive release policy, so the latest release might not be available to your enterprise, organization, or repository yet. 
 To confirm which version of the Actions Runner you should expect, please view the download instructions for your enterprise, organization, or repository. 
--- a/2
+++ b/2
@@ -1 +1 @@
-2.308.0
+2.304.0
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -1,5 +1,5 @@
 [*.cs]
-charset = utf-8-bom
+charset = utf-8
 insert_final_newline = true

 csharp_new_line_before_else = true
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm
@@ -1 +1 @@
-7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3
+39f2a931565d6a10e695ac8ed14bb9dcbb568151410349b32dbf9c27bae29602
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64
@@ -1 +1 @@
-6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7
+29ffb303537d8ba674fbebc7729292c21c4ebd17b3198f91ed593ef4cbbb67b5
--- a/src/Misc/contentHash/dotnetRuntime/linux-x64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-x64
@@ -1 +1 @@
-921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5
+de6868a836fa3cb9e5ddddbc079da1c25e819aa2d2fc193cc9931c353687c57c
--- a/src/Misc/contentHash/dotnetRuntime/osx-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64
@@ -1 +1 @@
-50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b
+339d3e1a5fd28450c0fe6cb820cc7aae291f0f9e2d153ac34e1f7b080e35d30e
--- a/src/Misc/contentHash/dotnetRuntime/osx-x64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-x64
@@ -1 +1 @@
-16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd
+dcb7f606c1d7d290381e5020ee73e7f16dcbd2f20ac9b431362ccbb5120d449c
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -1 +1 @@
-e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87
+1bbcb0e9a2cf4be4b1fce77458de139b70ac58efcbb415a6db028b9373ae1673
--- a/src/Misc/contentHash/dotnetRuntime/win-x64
+++ b/src/Misc/contentHash/dotnetRuntime/win-x64
@@ -1 +1 @@
-16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb
+44cd25f3c104d0abb44d262397a80e0b2c4f206465c5d899a22eec043dac0fb3
--- a/src/Misc/contentHash/externals/linux-arm
+++ b/src/Misc/contentHash/externals/linux-arm
@@ -1 +1 @@
-5bdddd32bab1e57af252b470579083049496e9e39b6e4f50de01232581f9a2d8
+3807dcbf947e840c33535fb466b096d76bf09e5c0254af8fc8cbbb24c6388222
--- a/src/Misc/contentHash/externals/linux-arm64
+++ b/src/Misc/contentHash/externals/linux-arm64
@@ -1 +1 @@
-54b3b3a72da93db0fa38708c759fceadddb70cacdd3620a079084a242126dd78
+ee01eee80cd8a460a4b9780ee13fdd20f25c59e754b4ccd99df55fbba2a85634
--- a/src/Misc/contentHash/externals/linux-x64
+++ b/src/Misc/contentHash/externals/linux-x64
@@ -1 +1 @@
-e7f2da271abb174285c3a757503538b3e9792e9d731b0382b6d1f21bb59a79ba
+a9fb9c14e24e79aec97d4da197dd7bfc6364297d6fce573afb2df48cc9a931f8
--- a/src/Misc/contentHash/externals/osx-arm64
+++ b/src/Misc/contentHash/externals/osx-arm64
@@ -1 +1 @@
-2481c5b0d06b2b5621635f2568b86a43b0e5b259fed1298167ba4f33d4c464c7
+a4e0e8fc62eba0967a39c7d693dcd0aeb8b2bed0765f9c38df80d42884f65341
--- a/src/Misc/contentHash/externals/osx-x64
+++ b/src/Misc/contentHash/externals/osx-x64
@@ -1 +1 @@
-85de7677165e65ec69b8a9e344c0811efa51b7fe5376a1aa083505c560ea6f57
+17ac17fbe785b3d6fa2868d8d17185ebfe0c90b4b0ddf6b67eac70e42bcd989b
--- a/src/Misc/contentHash/externals/win-arm64
+++ b/src/Misc/contentHash/externals/win-arm64
@@ -1 +1 @@
-763d18de11c11fd299c0e75e98fefc8a0e6605ae0ad6aba3bbc110db2262ab41
+89f24657a550f1e818b0e9975e5b80edcf4dd22b7d4bccbb9e48e37f45d30fb1
--- a/src/Misc/contentHash/externals/win-x64
+++ b/src/Misc/contentHash/externals/win-x64
@@ -1 +1 @@
-16f3cc545dfe10e84df43746073fc64d3c44d1891782532805aeb2118869a55d
+24fd131b5dce33ef16038b771407bc0507da8682a72fb3b7780607235f76db0b
--- a/src/Misc/expressionFunc/hashFiles/package-lock.json
+++ b/src/Misc/expressionFunc/hashFiles/package-lock.json
--- a/src/Misc/expressionFunc/hashFiles/package.json
+++ b/src/Misc/expressionFunc/hashFiles/package.json
@@ -25,13 +25,11 @@
  },
  "devDependencies": {
    "@types/node": "^12.7.12",
-    "@typescript-eslint/eslint-plugin": "^6.3.0",
-    "@typescript-eslint/parser": "^6.3.0",
-    "@vercel/ncc": "^0.36.1",
+    "@typescript-eslint/parser": "^5.15.0",
+    "@vercel/ncc": "^0.36.0",
    "eslint": "^8.11.0",
-    "eslint-plugin-github": "^4.9.2",
-    "eslint-plugin-prettier": "^5.0.0",
-    "prettier": "^3.0.1",
-    "typescript": "^5.1.6"
+    "eslint-plugin-github": "^4.3.5",
+    "prettier": "^1.19.1",
+    "typescript": "^3.6.4"
  }
 }
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -4,10 +4,8 @@ PRECACHE=$2

 NODE_URL=https://nodejs.org/dist
 UNOFFICIAL_NODE_URL=https://unofficial-builds.nodejs.org/download/release
-NODE16_VERSION="16.20.1"
-NODE20_VERSION="20.5.0"
-# used only for win-arm64, remove node16 unofficial version when official version is available
-NODE16_UNOFFICIAL_VERSION="16.20.0"
+NODE12_VERSION="12.22.7"
+NODE16_VERSION="16.16.0"

 get_abs_path() {
  # exploits the fact that pwd will print abs path when no args
@@ -139,10 +137,10 @@ function acquireExternalTool() {

 # Download the external tools only for Windows.
 if [[ "$PACKAGERUNTIME" == "win-x64" || "$PACKAGERUNTIME" == "win-x86" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.exe" node12/bin
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.lib" node12/bin
    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.exe" node16/bin
    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.lib" node16/bin
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.exe" node20/bin
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.lib" node20/bin
    if [[ "$PRECACHE" != "" ]]; then
        acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
    fi
@@ -151,10 +149,8 @@ fi
 # Download the external tools only for Windows.
 if [[ "$PACKAGERUNTIME" == "win-arm64" ]]; then
    # todo: replace these with official release when available
-    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_UNOFFICIAL_VERSION}/$PACKAGERUNTIME/node.exe" node16/bin
-    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_UNOFFICIAL_VERSION}/$PACKAGERUNTIME/node.lib" node16/bin
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.exe" node20/bin
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.lib" node20/bin
+    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.exe" node16/bin
+    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.lib" node16/bin
    if [[ "$PRECACHE" != "" ]]; then
        acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
    fi
@@ -162,30 +158,29 @@ fi

 # Download the external tools only for OSX.
 if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-darwin-x64.tar.gz" node12 fix_nested_dir
    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-darwin-x64.tar.gz" node16 fix_nested_dir
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-darwin-x64.tar.gz" node20 fix_nested_dir
 fi

 if [[ "$PACKAGERUNTIME" == "osx-arm64" ]]; then
    # node.js v12 doesn't support macOS on arm64.
    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-darwin-arm64.tar.gz" node16 fix_nested_dir
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-darwin-arm64.tar.gz" node20 fix_nested_dir
 fi

 # Download the external tools for Linux PACKAGERUNTIMEs.
 if [[ "$PACKAGERUNTIME" == "linux-x64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-x64.tar.gz" node12 fix_nested_dir
+    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE12_VERSION}/alpine/x64/node-v${NODE12_VERSION}-alpine-x64.tar.gz" node12_alpine
    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-x64.tar.gz" node16 fix_nested_dir
    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE16_VERSION}/alpine/x64/node-v${NODE16_VERSION}-alpine-x64.tar.gz" node16_alpine
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-x64.tar.gz" node20 fix_nested_dir
-    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE20_VERSION}/alpine/x64/node-v${NODE20_VERSION}-alpine-x64.tar.gz" node20_alpine
 fi

 if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-arm64.tar.gz" node12 fix_nested_dir
    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-arm64.tar.gz" node16 fix_nested_dir
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-arm64.tar.gz" node20 fix_nested_dir
 fi

 if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-armv7l.tar.gz" node12 fix_nested_dir
    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-armv7l.tar.gz" node16 fix_nested_dir
-    acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-armv7l.tar.gz" node20 fix_nested_dir
 fi
--- a/src/Misc/runnerdotnetruntimeassets
+++ b/src/Misc/runnerdotnetruntimeassets
@@ -75,7 +75,6 @@ mscordaccore.dll
 mscordaccore_amd64_amd64_6.0.522.21309.dll
 mscordaccore_arm64_arm64_6.0.522.21309.dll
 mscordaccore_amd64_amd64_6.0.1322.58009.dll
-mscordaccore_amd64_amd64_6.0.2023.32017.dll
 mscordbi.dll
 mscorlib.dll
 mscorrc.debug.dll
--- a/src/Runner.Common/ActionCommand.cs
+++ b/src/Runner.Common/ActionCommand.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Generic;

--- a/src/Runner.Common/ActionResult.cs
+++ b/src/Runner.Common/ActionResult.cs
@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Common
+namespace GitHub.Runner.Common
 {
    public enum ActionResult
    {
@@ -10,4 +10,4 @@

        Skipped = 3
    }
-}
+}
--- a/src/Runner.Common/BrokerServer.cs
+++ b/src/Runner.Common/BrokerServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
--- a/src/Runner.Common/CommandLineParser.cs
+++ b/src/Runner.Common/CommandLineParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using GitHub.DistributedTask.Logging;
 using GitHub.Runner.Sdk;
--- a/src/Runner.Common/ConfigurationStore.cs
+++ b/src/Runner.Common/ConfigurationStore.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.IO;
 using System.Linq;
@@ -18,7 +18,7 @@ namespace GitHub.Runner.Common
        private bool? _isHostedServer;

        [DataMember(EmitDefaultValue = false)]
-        public ulong AgentId { get; set; }
+        public int AgentId { get; set; }

        [DataMember(EmitDefaultValue = false)]
        public string AgentName { get; set; }
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace GitHub.Runner.Common
 {
@@ -132,7 +132,6 @@ namespace GitHub.Runner.Common
                    public static readonly string GenerateServiceConfig = "generateServiceConfig";
                    public static readonly string Help = "help";
                    public static readonly string Local = "local";
-                    public static readonly string NoDefaultLabels = "no-default-labels";
                    public static readonly string Replace = "replace";
                    public static readonly string DisableUpdate = "disableupdate";
                    public static readonly string Once = "once"; // Keep this around since customers still relies on it
@@ -154,8 +153,7 @@ namespace GitHub.Runner.Common
            public static class Features
            {
                public static readonly string DiskSpaceWarning = "runner.diskspace.warning";
-                public static readonly string Node16Warning = "DistributedTask.AddWarningToNode16Action";
-                public static readonly string LogTemplateErrorsAsDebugMessages = "DistributedTask.LogTemplateErrorsAsDebugMessages";
+                public static readonly string Node12Warning = "DistributedTask.AddWarningToNode12Action";
                public static readonly string UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate";
                public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks";
            }
@@ -171,8 +169,7 @@ namespace GitHub.Runner.Common
            public static readonly string UnsupportedStopCommandTokenDisabled = "You cannot use a endToken that is an empty string, the string 'pause-logging', or another workflow command. For more information see: https://docs.github.com/actions/learn-github-actions/workflow-commands-for-github-actions#example-stopping-and-starting-workflow-commands or opt into insecure command execution by setting the `ACTIONS_ALLOW_UNSECURE_STOPCOMMAND_TOKENS` environment variable to `true`.";
            public static readonly string UnsupportedSummarySize = "$GITHUB_STEP_SUMMARY upload aborted, supports content up to a size of {0}k, got {1}k. For more information see: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-markdown-summary";
            public static readonly string SummaryUploadError = "$GITHUB_STEP_SUMMARY upload aborted, an error occurred when uploading the summary. For more information see: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-markdown-summary";
-            public static readonly string EnforcedNode12DetectedAfterEndOfLife = "The following actions uses node12 which is deprecated and will be forced to run on node16: {0}. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/";
-            public static readonly string EnforcedNode12DetectedAfterEndOfLifeEnvVariable = "Node16ForceActionsWarnings";
+            public static readonly string Node12DetectedAfterEndOfLife = "Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: {0}. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/.";
        }

        public static class RunnerEvent
@@ -264,7 +261,6 @@ namespace GitHub.Runner.Common
                public static readonly string AccessToken = "system.accessToken";
                public static readonly string Culture = "system.culture";
                public static readonly string PhaseDisplayName = "system.phaseDisplayName";
-                public static readonly string JobRequestType = "system.jobRequestType";
                public static readonly string OrchestrationId = "system.orchestrationId";
            }
        }
--- a/src/Runner.Common/ExtensionManager.cs
+++ b/src/Runner.Common/ExtensionManager.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
--- a/src/Runner.Common/HostContext.cs
+++ b/src/Runner.Common/HostContext.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
--- a/src/Runner.Common/HostTraceListener.cs
+++ b/src/Runner.Common/HostTraceListener.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.Diagnostics;
 using System.Globalization;
--- a/src/Runner.Common/HttpClientHandlerFactory.cs
+++ b/src/Runner.Common/HttpClientHandlerFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.Http;
 using GitHub.Runner.Sdk;

@@ -24,4 +24,4 @@ namespace GitHub.Runner.Common
            return client;
        }
    }
-}
+}
--- a/src/Runner.Common/JobNotification.cs
+++ b/src/Runner.Common/JobNotification.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
@@ -37,10 +37,10 @@ namespace GitHub.Runner.Common
        {
            ConnectMonitor(monitorSocketAddress);
        }
-
+        
        private void StartMonitor(Guid jobId, string accessToken, Uri serverUri)
        {
-            if (String.IsNullOrEmpty(accessToken))
+            if(String.IsNullOrEmpty(accessToken)) 
            {
                Trace.Info("No access token could be retrieved to start the monitor.");
                return;
@@ -82,7 +82,7 @@ namespace GitHub.Runner.Common
                    _monitorSocket.Send(Encoding.UTF8.GetBytes(message));
                    Trace.Info("Finished EndMonitor writing to socket");

-                    await Task.Delay(TimeSpan.FromSeconds(2));
+                    await Task.Delay(TimeSpan.FromSeconds(2));                    
                }
            }
            catch (SocketException e)
--- a/src/Runner.Common/JobServer.cs
+++ b/src/Runner.Common/JobServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -11,10 +11,10 @@ using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
-using GitHub.Services.OAuth;
-using GitHub.Services.Results.Client;
 using GitHub.Services.WebApi;
 using GitHub.Services.WebApi.Utilities.Internal;
+using GitHub.Services.Results.Client;
+using GitHub.Services.OAuth;

 namespace GitHub.Runner.Common
 {
@@ -254,7 +254,7 @@ namespace GitHub.Runner.Common
                {
                    failedAttemptsToPostBatchedLinesByWebsocket++;
                    Trace.Info($"Caught exception during append web console line to websocket, let's fallback to sending via non-websocket call (total calls: {totalBatchedLinesAttemptedByWebsocket}, failed calls: {failedAttemptsToPostBatchedLinesByWebsocket}, websocket state: {this._websocketClient?.State}).");
-                    Trace.Verbose(ex.ToString());
+                    Trace.Error(ex);
                    if (totalBatchedLinesAttemptedByWebsocket > _minWebsocketBatchedLinesCountToConsider)
                    {
                        // let's consider failure percentage
--- a/src/Runner.Common/JobServerQueue.cs
+++ b/src/Runner.Common/JobServerQueue.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -756,17 +756,17 @@ namespace GitHub.Runner.Common
                    timelineRecord.State = rec.State ?? timelineRecord.State;
                    timelineRecord.WorkerName = rec.WorkerName ?? timelineRecord.WorkerName;

-                    if (rec.ErrorCount > 0)
+                    if (rec.ErrorCount != null && rec.ErrorCount > 0)
                    {
                        timelineRecord.ErrorCount = rec.ErrorCount;
                    }

-                    if (rec.WarningCount > 0)
+                    if (rec.WarningCount != null && rec.WarningCount > 0)
                    {
                        timelineRecord.WarningCount = rec.WarningCount;
                    }

-                    if (rec.NoticeCount > 0)
+                    if (rec.NoticeCount != null && rec.NoticeCount > 0)
                    {
                        timelineRecord.NoticeCount = rec.NoticeCount;
                    }
@@ -797,7 +797,7 @@ namespace GitHub.Runner.Common
            foreach (var record in mergedRecords)
            {
                Trace.Verbose($"    Record: t={record.RecordType}, n={record.Name}, s={record.State}, st={record.StartTime}, {record.PercentComplete}%, ft={record.FinishTime}, r={record.Result}: {record.CurrentOperation}");
-                if (record.Issues != null)
+                if (record.Issues != null && record.Issues.Count > 0)
                {
                    foreach (var issue in record.Issues)
                    {
@@ -807,7 +807,7 @@ namespace GitHub.Runner.Common
                    }
                }

-                if (record.Variables != null)
+                if (record.Variables != null && record.Variables.Count > 0)
                {
                    foreach (var variable in record.Variables)
                    {
--- a/src/Runner.Common/JobStatusEventArgs.cs
+++ b/src/Runner.Common/JobStatusEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using GitHub.DistributedTask.WebApi;

 namespace GitHub.Runner.Common
--- a/src/Runner.Common/LaunchServer.cs
+++ b/src/Runner.Common/LaunchServer.cs
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Services.Launch.Client;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Runner.Common
-{
-    [ServiceLocator(Default = typeof(LaunchServer))]
-    public interface ILaunchServer : IRunnerService
-    {
-        void InitializeLaunchClient(Uri uri, string token);
-
-        Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList, CancellationToken cancellationToken);
-    }
-
-    public sealed class LaunchServer : RunnerService, ILaunchServer
-    {
-        private LaunchHttpClient _launchClient;
-
-        public void InitializeLaunchClient(Uri uri, string token)
-        {
-            var httpMessageHandler = HostContext.CreateHttpClientHandler();
-            this._launchClient = new LaunchHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
-        }
-
-        public Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList,
-            CancellationToken cancellationToken)
-        {
-            if (_launchClient != null)
-            {
-                return _launchClient.GetResolveActionsDownloadInfoAsync(planId, jobId, actionReferenceList,
-                    cancellationToken: cancellationToken);
-            }
-
-            throw new InvalidOperationException("Launch client is not initialized.");
-        }
-    }
-}
--- a/src/Runner.Common/Logging.cs
+++ b/src/Runner.Common/Logging.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;

 namespace GitHub.Runner.Common
--- a/src/Runner.Common/ProcessInvoker.cs
+++ b/src/Runner.Common/ProcessInvoker.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Common.Util;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Generic;
--- a/src/Runner.Common/ResultsServer.cs
+++ b/src/Runner.Common/ResultsServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Headers;
@@ -131,13 +131,13 @@ namespace GitHub.Runner.Common

        private void InitializeWebsocketClient(string liveConsoleFeedUrl, string accessToken, TimeSpan delay, bool retryConnection = false)
        {
-            if (string.IsNullOrEmpty(accessToken))
+            if (!string.IsNullOrEmpty(accessToken))
            {
                Trace.Info($"No access token from server");
                return;
            }

-            if (string.IsNullOrEmpty(liveConsoleFeedUrl))
+            if (!string.IsNullOrEmpty(liveConsoleFeedUrl))
            {
                Trace.Info($"No live console feed url from server");
                return;
@@ -222,7 +222,7 @@ namespace GitHub.Runner.Common
                        {
                            var delay = BackoffTimerHelper.GetRandomBackoff(MinDelayForWebsocketReconnect, MaxDelayForWebsocketReconnect);
                            Trace.Info($"Websocket is not open, let's attempt to connect back again with random backoff {delay} ms.");
-                            Trace.Verbose(ex.ToString());
+                            Trace.Error(ex);
                            retries++;
                            InitializeWebsocketClient(_liveConsoleFeedUrl, _token, delay);
                        }
--- a/src/Runner.Common/RunServer.cs
+++ b/src/Runner.Common/RunServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -19,15 +19,7 @@ namespace GitHub.Runner.Common

        Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken token);

-        Task CompleteJobAsync(
-            Guid planId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            IList<StepResult> stepResults,
-            IList<Annotation> jobAnnotations,
-            string environmentUrl,
-            CancellationToken token);
+        Task CompleteJobAsync(Guid planId, Guid jobId, TaskResult result, Dictionary<String, VariableValue> outputs, IList<StepResult> stepResults, CancellationToken token);

        Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken token);
    }
@@ -60,23 +52,14 @@ namespace GitHub.Runner.Common
        {
            CheckConnection();
            return RetryRequest<AgentJobRequestMessage>(
-                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, cancellationToken), cancellationToken,
-                shouldRetry: ex => ex is not TaskOrchestrationJobAlreadyAcquiredException);
+                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, cancellationToken), cancellationToken);
        }

-        public Task CompleteJobAsync(
-            Guid planId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            IList<StepResult> stepResults,
-            IList<Annotation> jobAnnotations,
-            string environmentUrl,
-            CancellationToken cancellationToken)
+        public Task CompleteJobAsync(Guid planId, Guid jobId, TaskResult result, Dictionary<String, VariableValue> outputs, IList<StepResult> stepResults, CancellationToken cancellationToken)
        {
            CheckConnection();
            return RetryRequest(
-                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, cancellationToken), cancellationToken);
+                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, cancellationToken), cancellationToken);
        }

        public Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken cancellationToken)
--- a/src/Runner.Common/RunnerDotcomServer.cs
+++ b/src/Runner.Common/RunnerDotcomServer.cs
@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using System;
 using System.Collections.Generic;
 using System.Threading;
--- a/src/Runner.Common/RunnerServer.cs
+++ b/src/Runner.Common/RunnerServer.cs
@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -27,8 +27,8 @@ namespace GitHub.Runner.Common

        // Configuration
        Task<TaskAgent> AddAgentAsync(Int32 agentPoolId, TaskAgent agent);
-        Task DeleteAgentAsync(int agentPoolId, ulong agentId);
-        Task DeleteAgentAsync(ulong agentId);
+        Task DeleteAgentAsync(int agentPoolId, int agentId);
+        Task DeleteAgentAsync(int agentId);
        Task<List<TaskAgentPool>> GetAgentPoolsAsync(string agentPoolName = null, TaskAgentPoolType poolType = TaskAgentPoolType.Automation);
        Task<List<TaskAgent>> GetAgentsAsync(int agentPoolId, string agentName = null);
        Task<List<TaskAgent>> GetAgentsAsync(string agentName);
@@ -50,7 +50,7 @@ namespace GitHub.Runner.Common
        Task<PackageMetadata> GetPackageAsync(string packageType, string platform, string version, bool includeToken, CancellationToken cancellationToken);

        // agent update
-        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState, string trace);
+        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState, string trace);
    }

    public sealed class RunnerServer : RunnerService, IRunnerServer
@@ -239,13 +239,13 @@ namespace GitHub.Runner.Common
            return _genericTaskAgentClient.ReplaceAgentAsync(agentPoolId, agent);
        }

-        public Task DeleteAgentAsync(int agentPoolId, ulong agentId)
+        public Task DeleteAgentAsync(int agentPoolId, int agentId)
        {
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.DeleteAgentAsync(agentPoolId, agentId);
        }

-        public Task DeleteAgentAsync(ulong agentId)
+        public Task DeleteAgentAsync(int agentId)
        {
            return DeleteAgentAsync(0, agentId); // agentPool is ignored server side
        }
@@ -315,7 +315,7 @@ namespace GitHub.Runner.Common
            return _genericTaskAgentClient.GetPackageAsync(packageType, platform, version, includeToken, cancellationToken: cancellationToken);
        }

-        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState, string trace)
+        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState, string trace)
        {
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState, trace);
--- a/src/Runner.Common/RunnerService.cs
+++ b/src/Runner.Common/RunnerService.cs
@@ -80,11 +80,10 @@ namespace GitHub.Runner.Common
            }
            await RetryRequest<Unit>(wrappedFunc, cancellationToken, maxRetryAttemptsCount);
        }
-
+        
        protected async Task<T> RetryRequest<T>(Func<Task<T>> func,
            CancellationToken cancellationToken,
-            int maxRetryAttemptsCount = 5,
-            Func<Exception, bool> shouldRetry = null
+            int maxRetryAttemptsCount = 5
        )
        {
            var retryCount = 0;
@@ -97,7 +96,7 @@ namespace GitHub.Runner.Common
                    return await func();
                }
                // TODO: Add handling of non-retriable exceptions: https://github.com/github/actions-broker/issues/122
-                catch (Exception ex) when (retryCount < maxRetryAttemptsCount && (shouldRetry == null || shouldRetry(ex)))
+                catch (Exception ex) when (retryCount < maxRetryAttemptsCount)
                {
                    Trace.Error("Catch exception during request");
                    Trace.Error(ex);
--- a/src/Runner.Common/StdoutTraceListener.cs
+++ b/src/Runner.Common/StdoutTraceListener.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
@@ -93,4 +93,4 @@ namespace GitHub.Runner.Common
            IndentLevel--;
        }
    }
-}
+}
--- a/src/Runner.Common/ThrottlingReportHandler.cs
+++ b/src/Runner.Common/ThrottlingReportHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
--- a/src/Runner.Common/TraceManager.cs
+++ b/src/Runner.Common/TraceManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using GitHub.DistributedTask.Logging;
--- a/src/Runner.Common/Tracing.cs
+++ b/src/Runner.Common/Tracing.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
--- a/src/Runner.Common/Unit.cs
+++ b/src/Runner.Common/Unit.cs
@@ -1,8 +1,8 @@
-// Represents absence of value.
+// Represents absence of value.
 namespace GitHub.Runner.Common
 {
    public readonly struct Unit
    {
        public static readonly Unit Value = default;
    }
-}
+}
--- a/src/Runner.Common/Util/EncodingUtil.cs
+++ b/src/Runner.Common/Util/EncodingUtil.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;
--- a/src/Runner.Common/Util/EnumUtil.cs
+++ b/src/Runner.Common/Util/EnumUtil.cs
@@ -4,7 +4,7 @@

    public static class EnumUtil
    {
-        public static T? TryParse<T>(string value) where T : struct
+        public static T? TryParse<T>(string value) where T: struct
        {
            T val;
            if (Enum.TryParse(value ?? string.Empty, ignoreCase: true, result: out val))
--- a/src/Runner.Common/Util/MessageUtil.cs
+++ b/src/Runner.Common/Util/MessageUtil.cs
@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Common.Util
+namespace GitHub.Runner.Common.Util
 {
    using System;
    using GitHub.DistributedTask.WebApi;
--- a/src/Runner.Common/Util/NodeUtil.cs
+++ b/src/Runner.Common/Util/NodeUtil.cs
@@ -6,7 +6,13 @@ namespace GitHub.Runner.Common.Util
    public static class NodeUtil
    {
        private const string _defaultNodeVersion = "node16";
-        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node16", "node20" });
+
+#if (OS_OSX || OS_WINDOWS) && ARM64
+        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node16" });
+#else
+        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node12", "node16" });
+#endif
+
        public static string GetInternalNodeVersion()
        {
            var forcedInternalNodeVersion = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ForcedInternalNodeVersion);
--- a/src/Runner.Common/Util/VarUtil.cs
+++ b/src/Runner.Common/Util/VarUtil.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace GitHub.Runner.Common.Util
 {
--- a/src/Runner.Listener/BrokerMessageListener.cs
+++ b/src/Runner.Listener/BrokerMessageListener.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -97,7 +97,7 @@ namespace GitHub.Runner.Listener
                    Trace.Info("Runner OAuth token has been revoked. Unable to pull message.");
                    throw;
                }
-                catch (AccessDeniedException e) when (e.ErrorCode == 1)
+                catch (AccessDeniedException e) when (e.InnerException is InvalidTaskAgentVersionException)
                {
                    throw;
                }
--- a/src/Runner.Listener/Checks/ActionsCheck.cs
+++ b/src/Runner.Listener/Checks/ActionsCheck.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -90,4 +90,4 @@ namespace GitHub.Runner.Listener.Check
            return result;
        }
    }
-}
+}
--- a/src/Runner.Listener/Checks/CheckUtil.cs
+++ b/src/Runner.Listener/Checks/CheckUtil.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.IO;
@@ -351,39 +351,21 @@ namespace GitHub.Runner.Listener.Check
        private readonly Dictionary<string, HashSet<string>> _ignoredEvent = new()
        {
            {
-                "System.Net.Http",
+                "Microsoft-System-Net-Http",
                new HashSet<string>
                {
                    "Info",
                    "Associate",
+                    "Enter",
+                    "Exit"
                }
            },
            {
-                "System.Net.Security",
-                new HashSet<string>
-                {
-                    "Info",
-                    "DumpBuffer",
-                    "SslStreamCtor",
-                    "SecureChannelCtor",
-                    "NoDelegateNoClientCert",
-                    "CertsAfterFiltering",
-                    "UsingCachedCredential",
-                    "SspiSelectedCipherSuite"
-                }
-            },
-            {
-                "Private.InternalDiagnostics.System.Net.Http",
-                new HashSet<string>
-                {
-                    "Info",
-                    "Associate",
-                }
-            },
-            {
-                "Private.InternalDiagnostics.System.Net.Security",
+                "Microsoft-System-Net-Security",
                new HashSet<string>
                {
+                    "Enter",
+                    "Exit",
                    "Info",
                    "DumpBuffer",
                    "SslStreamCtor",
@@ -409,8 +391,8 @@ namespace GitHub.Runner.Listener.Check
        {
            base.OnEventSourceCreated(eventSource);

-            if (eventSource.Name.Contains("System.Net.Http") ||
-                eventSource.Name.Contains("System.Net.Security"))
+            if (eventSource.Name == "Microsoft-System-Net-Http" ||
+                eventSource.Name == "Microsoft-System-Net-Security")
            {
                EnableEvents(eventSource, EventLevel.Verbose, EventKeywords.All);
            }
@@ -433,4 +415,4 @@ namespace GitHub.Runner.Listener.Check
            }
        }
    }
-}
+}
--- a/src/Runner.Listener/Checks/GitCheck.cs
+++ b/src/Runner.Listener/Checks/GitCheck.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
--- a/src/Runner.Listener/Checks/ICheckExtension.cs
+++ b/src/Runner.Listener/Checks/ICheckExtension.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using GitHub.Runner.Common;

@@ -27,4 +27,4 @@ namespace GitHub.Runner.Listener.Check

        public List<string> Logs { get; set; }
    }
-}
+}
--- a/src/Runner.Listener/Checks/InternetCheck.cs
+++ b/src/Runner.Listener/Checks/InternetCheck.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -56,4 +56,4 @@ namespace GitHub.Runner.Listener.Check
            return result;
        }
    }
-}
+}
--- a/src/Runner.Listener/Checks/NodeJsCheck.cs
+++ b/src/Runner.Listener/Checks/NodeJsCheck.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
--- a/src/Runner.Listener/CommandSettings.cs
+++ b/src/Runner.Listener/CommandSettings.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Listener.Configuration;
+using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Common.Util;
 using System;
 using System.Collections;
@@ -29,8 +29,8 @@ namespace GitHub.Runner.Listener
        private readonly Dictionary<string, string[]> validOptions = new()
        {
            // Valid configure flags and args
-            [Constants.Runner.CommandLine.Commands.Configure] =
-                new string[]
+            [Constants.Runner.CommandLine.Commands.Configure] = 
+                new string[] 
                {
                    Constants.Runner.CommandLine.Flags.DisableUpdate,
                    Constants.Runner.CommandLine.Flags.Ephemeral,
@@ -38,7 +38,6 @@ namespace GitHub.Runner.Listener
                    Constants.Runner.CommandLine.Flags.Replace,
                    Constants.Runner.CommandLine.Flags.RunAsService,
                    Constants.Runner.CommandLine.Flags.Unattended,
-                    Constants.Runner.CommandLine.Flags.NoDefaultLabels,
                    Constants.Runner.CommandLine.Args.Auth,
                    Constants.Runner.CommandLine.Args.Labels,
                    Constants.Runner.CommandLine.Args.MonitorSocketAddress,
@@ -86,7 +85,6 @@ namespace GitHub.Runner.Listener
        public bool Ephemeral => TestFlag(Constants.Runner.CommandLine.Flags.Ephemeral);
        public bool GenerateServiceConfig => TestFlag(Constants.Runner.CommandLine.Flags.GenerateServiceConfig);
        public bool Help => TestFlag(Constants.Runner.CommandLine.Flags.Help);
-        public bool NoDefaultLabels => TestFlag(Constants.Runner.CommandLine.Flags.NoDefaultLabels);
        public bool Unattended => TestFlag(Constants.Runner.CommandLine.Flags.Unattended);
        public bool Version => TestFlag(Constants.Runner.CommandLine.Flags.Version);
        public bool RemoveLocalConfig => TestFlag(Constants.Runner.CommandLine.Flags.Local);
@@ -184,7 +182,7 @@ namespace GitHub.Runner.Listener
            {
                command = Constants.Runner.CommandLine.Commands.Warmup;
            }
-
+            
            return command;
        }

--- a/src/Runner.Listener/Configuration/ConfigurationManager.cs
+++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
@@ -137,7 +137,7 @@ namespace GitHub.Runner.Listener.Configuration
                    GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
                    runnerSettings.ServerUrl = authResult.TenantUrl;
                    runnerSettings.UseV2Flow = authResult.UseV2Flow;
-                    Trace.Info($"Using V2 flow: {runnerSettings.UseV2Flow}");
+                    _term.WriteLine($"Using V2 flow: {runnerSettings.UseV2Flow}");
                    creds = authResult.ToVssCredentials();
                    Trace.Info("cred retrieved via GitHub auth");
                }
@@ -259,7 +259,7 @@ namespace GitHub.Runner.Listener.Configuration
                    if (command.GetReplace())
                    {
                        // Update existing agent with new PublicKey, agent version.
-                        agent = UpdateExistingAgent(agent, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate, command.NoDefaultLabels);
+                        agent = UpdateExistingAgent(agent, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate);

                        try
                        {
@@ -293,7 +293,7 @@ namespace GitHub.Runner.Listener.Configuration
                else
                {
                    // Create a new agent.
-                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate, command.NoDefaultLabels);
+                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate);

                    try
                    {
@@ -554,7 +554,7 @@ namespace GitHub.Runner.Listener.Configuration
        }


-        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate, bool noDefaultLabels)
+        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate)
        {
            ArgUtil.NotNull(agent, nameof(agent));
            agent.Authorization = new TaskAgentAuthorization
@@ -571,16 +571,9 @@ namespace GitHub.Runner.Listener.Configuration

            agent.Labels.Clear();

-            if (!noDefaultLabels)
-            {
-                agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));
-                agent.Labels.Add(new AgentLabel(VarUtil.OS, LabelType.System));
-                agent.Labels.Add(new AgentLabel(VarUtil.OSArchitecture, LabelType.System));
-            }
-            else if (userLabels.Count == 0)
-            {
-                throw new NotSupportedException("Disabling default labels via --no-default-labels without specifying --labels is not supported");
-            }
+            agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));
+            agent.Labels.Add(new AgentLabel(VarUtil.OS, LabelType.System));
+            agent.Labels.Add(new AgentLabel(VarUtil.OSArchitecture, LabelType.System));

            foreach (var userLabel in userLabels)
            {
@@ -590,7 +583,7 @@ namespace GitHub.Runner.Listener.Configuration
            return agent;
        }

-        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate, bool noDefaultLabels)
+        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate)
        {
            TaskAgent agent = new(agentName)
            {
@@ -605,16 +598,9 @@ namespace GitHub.Runner.Listener.Configuration
                DisableUpdate = disableUpdate
            };

-            if (!noDefaultLabels)
-            {
-                agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));
-                agent.Labels.Add(new AgentLabel(VarUtil.OS, LabelType.System));
-                agent.Labels.Add(new AgentLabel(VarUtil.OSArchitecture, LabelType.System));
-            }
-            else if (userLabels.Count == 0)
-            {
-                throw new NotSupportedException("Disabling default labels via --no-default-labels without specifying --labels is not supported");
-            }
+            agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));
+            agent.Labels.Add(new AgentLabel(VarUtil.OS, LabelType.System));
+            agent.Labels.Add(new AgentLabel(VarUtil.OSArchitecture, LabelType.System));

            foreach (var userLabel in userLabels)
            {
--- a/src/Runner.Listener/Configuration/CredentialManager.cs
+++ b/src/Runner.Listener/Configuration/CredentialManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using GitHub.Runner.Common;
--- a/src/Runner.Listener/Configuration/NativeWindowsServiceHelper.cs
+++ b/src/Runner.Listener/Configuration/NativeWindowsServiceHelper.cs
@@ -1,4 +1,4 @@
-#if OS_WINDOWS
+#if OS_WINDOWS
 #pragma warning disable CA1416
 using System;
 using System.Collections;
--- a/src/Runner.Listener/Configuration/PromptManager.cs
+++ b/src/Runner.Listener/Configuration/PromptManager.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Common;
+using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using System;

--- a/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs
+++ b/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs
@@ -1,4 +1,4 @@
-#if OS_WINDOWS
+#if OS_WINDOWS
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
--- a/src/Runner.Listener/Configuration/RSAFileKeyManager.cs
+++ b/src/Runner.Listener/Configuration/RSAFileKeyManager.cs
@@ -1,4 +1,4 @@
-#if OS_LINUX || OS_OSX
+#if OS_LINUX || OS_OSX
 using System;
 using System.IO;
 using System.Security.Cryptography;
--- a/src/Runner.Listener/Configuration/ServiceControlManager.cs
+++ b/src/Runner.Listener/Configuration/ServiceControlManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitHub.Runner.Common;
@@ -68,7 +68,7 @@ namespace GitHub.Runner.Listener.Configuration
                // Lets add a suffix with a random number to reduce the chance of collisions between runner names once we truncate
                var random = new Random();
                var num = random.Next(1000, 9999).ToString();
-                runnerNameSubstring += $"-{num}";
+                runnerNameSubstring +=$"-{num}";
                serviceName = StringUtil.Format(serviceNamePattern, repoOrOrgNameSubstring, runnerNameSubstring);
            }

@@ -76,12 +76,12 @@ namespace GitHub.Runner.Listener.Configuration

            Trace.Info($"Service name '{serviceName}' display name '{serviceDisplayName}' will be used for service configuration.");
        }
-#if (OS_LINUX || OS_OSX)
-        const int MaxServiceNameLength = 150;
-        const int MaxRepoOrgCharacters = 70;
-#elif OS_WINDOWS
+        #if (OS_LINUX || OS_OSX)
+            const int MaxServiceNameLength = 150;
+            const int MaxRepoOrgCharacters = 70;
+        #elif OS_WINDOWS
            const int MaxServiceNameLength = 80;
            const int MaxRepoOrgCharacters = 45;
-#endif
+        #endif
    }
 }
--- a/src/Runner.Listener/Configuration/SystemdControlManager.cs
+++ b/src/Runner.Listener/Configuration/SystemdControlManager.cs
@@ -1,4 +1,4 @@
-#if OS_LINUX
+#if OS_LINUX
 using System;
 using System.Collections.Generic;
 using System.IO;
--- a/src/Runner.Listener/Configuration/Validators.cs
+++ b/src/Runner.Listener/Configuration/Validators.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Common.Util;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Linq;
--- a/src/Runner.Listener/Configuration/WindowsServiceControlManager.cs
+++ b/src/Runner.Listener/Configuration/WindowsServiceControlManager.cs
@@ -1,4 +1,4 @@
-#if OS_WINDOWS
+#if OS_WINDOWS
 #pragma warning disable CA1416
 using System;
 using System.IO;
--- a/src/Runner.Listener/InternalsVisibleTo.cs
+++ b/src/Runner.Listener/InternalsVisibleTo.cs
@@ -1,3 +1,3 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;

 [assembly: InternalsVisibleTo("Test")]
--- a/src/Runner.Listener/JobDispatcher.cs
+++ b/src/Runner.Listener/JobDispatcher.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -15,7 +15,6 @@ using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using GitHub.Services.WebApi.Jwt;
-using Sdk.RSWebApi.Contracts;
 using Pipelines = GitHub.DistributedTask.Pipelines;

 namespace GitHub.Runner.Listener
@@ -373,8 +372,6 @@ namespace GitHub.Runner.Listener
                TaskCompletionSource<int> firstJobRequestRenewed = new();
                var notification = HostContext.GetService<IJobNotification>();

-                var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
-
                // lock renew cancellation token.
                using (var lockRenewalTokenSource = new CancellationTokenSource())
                using (var workerProcessCancelTokenSource = new CancellationTokenSource())
@@ -382,6 +379,8 @@ namespace GitHub.Runner.Listener
                    long requestId = message.RequestId;
                    Guid lockToken = Guid.Empty; // lockToken has never been used, keep this here of compat

+                    var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
+
                    // start renew job request
                    Trace.Info($"Start renew job request {requestId} for job {message.JobId}.");
                    Task renewJobRequest = RenewJobRequestAsync(message, systemConnection, _poolId, requestId, lockToken, orchestrationId, firstJobRequestRenewed, lockRenewalTokenSource.Token);
@@ -406,7 +405,7 @@ namespace GitHub.Runner.Listener
                        await renewJobRequest;

                        // complete job request with result Cancelled
-                        await CompleteJobRequestAsync(_poolId, message, systemConnection, lockToken, TaskResult.Canceled);
+                        await CompleteJobRequestAsync(_poolId, message, lockToken, TaskResult.Canceled);
                        return;
                    }

@@ -545,6 +544,7 @@ namespace GitHub.Runner.Listener
                                    detailInfo = string.Join(Environment.NewLine, workerOutput);
                                    Trace.Info($"Return code {returnCode} indicate worker encounter an unhandled exception or app crash, attach worker stdout/stderr to JobRequest result.");

+
                                    var jobServer = await InitializeJobServerAsync(systemConnection);
                                    await LogWorkerProcessUnhandledException(jobServer, message, detailInfo);

@@ -552,7 +552,7 @@ namespace GitHub.Runner.Listener
                                    if (detailInfo.Contains(typeof(System.IO.IOException).ToString(), StringComparison.OrdinalIgnoreCase))
                                    {
                                        Trace.Info($"Finish job with result 'Failed' due to IOException.");
-                                        await ForceFailJob(jobServer, message, detailInfo);
+                                        await ForceFailJob(jobServer, message);
                                    }
                                }

@@ -567,7 +567,7 @@ namespace GitHub.Runner.Listener
                                await renewJobRequest;

                                // complete job request
-                                await CompleteJobRequestAsync(_poolId, message, systemConnection, lockToken, result, detailInfo);
+                                await CompleteJobRequestAsync(_poolId, message, lockToken, result, detailInfo);

                                // print out unhandled exception happened in worker after we complete job request.
                                // when we run out of disk space, report back to server has higher priority.
@@ -664,7 +664,7 @@ namespace GitHub.Runner.Listener
                            await renewJobRequest;

                            // complete job request
-                            await CompleteJobRequestAsync(_poolId, message, systemConnection, lockToken, resultOnAbandonOrCancel);
+                            await CompleteJobRequestAsync(_poolId, message, lockToken, resultOnAbandonOrCancel);
                        }
                        finally
                        {
@@ -1065,7 +1065,7 @@ namespace GitHub.Runner.Listener
            }
        }

-        private async Task CompleteJobRequestAsync(int poolId, Pipelines.AgentJobRequestMessage message, ServiceEndpoint systemConnection, Guid lockToken, TaskResult result, string detailInfo = null)
+        private async Task CompleteJobRequestAsync(int poolId, Pipelines.AgentJobRequestMessage message, Guid lockToken, TaskResult result, string detailInfo = null)
        {
            Trace.Entering();

@@ -1077,7 +1077,7 @@ namespace GitHub.Runner.Listener

            if (this._isRunServiceJob)
            {
-                Trace.Verbose($"Skip CompleteJobRequestAsync call from Listener because it's RunService job");
+                Trace.Verbose($"Skip FinishAgentRequest call from Listener because MessageType is {message.MessageType}");
                return;
            }

@@ -1117,7 +1117,7 @@ namespace GitHub.Runner.Listener
        }

        // log an error issue to job level timeline record
-        private async Task LogWorkerProcessUnhandledException(IRunnerService server, Pipelines.AgentJobRequestMessage message, string detailInfo)
+        private async Task LogWorkerProcessUnhandledException(IRunnerService server, Pipelines.AgentJobRequestMessage message, string errorMessage)
        {
            if (server is IJobServer jobServer)
            {
@@ -1129,11 +1129,34 @@ namespace GitHub.Runner.Listener
                    TimelineRecord jobRecord = timeline.Records.FirstOrDefault(x => x.Id == message.JobId && x.RecordType == "Job");
                    ArgUtil.NotNull(jobRecord, nameof(jobRecord));

-                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
+                    try
+                    {
+                        if (!string.IsNullOrEmpty(errorMessage) &&
+                            message.Variables.TryGetValue("DistributedTask.EnableRunnerIPCDebug", out var enableRunnerIPCDebug) &&
+                            StringUtil.ConvertToBoolean(enableRunnerIPCDebug.Value))
+                        {
+                            // the trace should be best effort and not affect any job result
+                            var match = _invalidJsonRegex.Match(errorMessage);
+                            if (match.Success &&
+                                match.Groups.Count == 2)
+                            {
+                                var jsonPosition = int.Parse(match.Groups[1].Value);
+                                var serializedJobMessage = JsonUtility.ToString(message);
+                                var originalJson = serializedJobMessage.Substring(jsonPosition - 10, 20);
+                                errorMessage = $"Runner sent Json at position '{jsonPosition}': {originalJson} ({Convert.ToBase64String(Encoding.UTF8.GetBytes(originalJson))})\n{errorMessage}";
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Trace.Error(ex);
+                        errorMessage = $"Fail to check json IPC error: {ex.Message}\n{errorMessage}";
+                    }
+
+                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = errorMessage };
                    unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
                    jobRecord.ErrorCount++;
                    jobRecord.Issues.Add(unhandledExceptionIssue);
-
                    await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, new TimelineRecord[] { jobRecord }, CancellationToken.None);
                }
                catch (Exception ex)
@@ -1144,13 +1167,13 @@ namespace GitHub.Runner.Listener
            }
            else
            {
-                Trace.Info("Job server does not support handling unhandled exception yet, error message: {0}", detailInfo);
+                Trace.Info("Job server does not support handling unhandled exception yet, error message: {0}", errorMessage);
                return;
            }
        }

        // raise job completed event to fail the job.
-        private async Task ForceFailJob(IRunnerService server, Pipelines.AgentJobRequestMessage message, string detailInfo)
+        private async Task ForceFailJob(IRunnerService server, Pipelines.AgentJobRequestMessage message)
        {
            if (server is IJobServer jobServer)
            {
@@ -1169,15 +1192,7 @@ namespace GitHub.Runner.Listener
            {
                try
                {
-                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
-                    var unhandledAnnotation = unhandledExceptionIssue.ToAnnotation();
-                    var jobAnnotations = new List<Annotation>();
-                    if (unhandledAnnotation.HasValue)
-                    {
-                        jobAnnotations.Add(unhandledAnnotation.Value);
-                    }
-
-                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, environmentUrl: null, CancellationToken.None);
+                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, CancellationToken.None);
                }
                catch (Exception ex)
                {
--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -123,15 +123,8 @@ namespace GitHub.Runner.Listener
                    Trace.Error("Catch exception during create session.");
                    Trace.Error(ex);

-                    if (ex is VssOAuthTokenRequestException vssOAuthEx && creds.Federated is VssOAuthCredential vssOAuthCred)
+                    if (ex is VssOAuthTokenRequestException && creds.Federated is VssOAuthCredential vssOAuthCred)
                    {
-                        // "invalid_client" means the runner registration has been deleted from the server.
-                        if (string.Equals(vssOAuthEx.Error, "invalid_client", StringComparison.OrdinalIgnoreCase))
-                        {
-                            _term.WriteError("Failed to create a session. The runner registration has been deleted from the server, please re-configure.");
-                            return false;
-                        }
-
                        // Check whether we get 401 because the runner registration already removed by the service.
                        // If the runner registration get deleted, we can't exchange oauth token.
                        Trace.Error("Test oauth app registration.");
@@ -252,7 +245,7 @@ namespace GitHub.Runner.Listener
                    _accessTokenRevoked = true;
                    throw;
                }
-                catch (AccessDeniedException e) when (e.ErrorCode == 1)
+                catch (AccessDeniedException e) when (e.InnerException is InvalidTaskAgentVersionException)
                {
                    throw;
                }
--- a/src/Runner.Listener/Program.cs
+++ b/src/Runner.Listener/Program.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Common;
+using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using System;
 using System.Globalization;
@@ -138,7 +138,7 @@ namespace GitHub.Runner.Listener
                }

            }
-            catch (AccessDeniedException e) when (e.ErrorCode == 1)
+            catch (AccessDeniedException e) when (e.InnerException is InvalidTaskAgentVersionException)
            {
                terminal.WriteError($"An error occured: {e.Message}");
                trace.Error(e);
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -549,17 +549,7 @@ namespace GitHub.Runner.Listener
                                    {
                                        var runServer = HostContext.CreateService<IRunServer>();
                                        await runServer.ConnectAsync(new Uri(messageRef.RunServiceUrl), creds);
-                                        try
-                                        {
-                                            jobRequestMessage =
-                                            await runServer.GetJobMessageAsync(messageRef.RunnerRequestId,
-                                            messageQueueLoopTokenSource.Token);
-                                        }
-                                        catch (TaskOrchestrationJobAlreadyAcquiredException)
-                                        {
-                                            Trace.Info("Job is already acquired, skip this message.");
-                                            continue;
-                                        }
+                                        jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
                                    }

                                    jobDispatcher.Run(jobRequestMessage, runOnce);
@@ -683,8 +673,7 @@ Config Options:
 --token string         Registration token. Required if unattended
 --name string          Name of the runner to configure (default {Environment.MachineName ?? "myrunner"})
 --runnergroup string   Name of the runner group to add this runner to (defaults to the default runner group)
- --labels string        Custom labels that will be added to the runner. This option is mandatory if --no-default-labels is used.
- --no-default-labels    Disables adding the default labels: 'self-hosted,{Constants.Runner.Platform},{Constants.Runner.PlatformArchitecture}'
+ --labels string        Extra labels in addition to the default: 'self-hosted,{Constants.Runner.Platform},{Constants.Runner.PlatformArchitecture}'
 --local                Removes the runner config files from your local machine. Used as an option to the remove command
 --work string          Relative runner work directory (default {Constants.Path.WorkDirectory})
 --replace              Replace any existing runner with the same name (default false)
--- a/src/Runner.Listener/RunnerJobRequestRef.cs
+++ b/src/Runner.Listener/RunnerJobRequestRef.cs
@@ -1,4 +1,4 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;

 namespace GitHub.Runner.Listener
 {
--- a/src/Runner.Listener/SelfUpdater.cs
+++ b/src/Runner.Listener/SelfUpdater.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -38,7 +38,7 @@ namespace GitHub.Runner.Listener
        private ITerminal _terminal;
        private IRunnerServer _runnerServer;
        private int _poolId;
-        private ulong _agentId;
+        private int _agentId;
        private readonly ConcurrentQueue<string> _updateTrace = new();
        private Task _cloneAndCalculateContentHashTask;
        private string _dotnetRuntimeCloneDirectory;
--- a/src/Runner.PluginHost/Program.cs
+++ b/src/Runner.PluginHost/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
--- a/src/Runner.Plugins/Artifact/FileContainerServer.cs
+++ b/src/Runner.Plugins/Artifact/FileContainerServer.cs
@@ -682,4 +682,4 @@ namespace GitHub.Runner.Plugins.Artifact
            : base(message, inner)
        { }
    }
-}
+}
--- a/src/Runner.Plugins/Artifact/PipelinesServer.cs
+++ b/src/Runner.Plugins/Artifact/PipelinesServer.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Actions.Pipelines.WebApi;
 using GitHub.Services.WebApi;
@@ -36,7 +36,7 @@ namespace GitHub.Runner.Plugins.Artifact

            return await _pipelinesHttpClient.CreateArtifactAsync(
                parameters,
-                pipelineId,
+                pipelineId, 
                runId,
                cancellationToken: cancellationToken) as Pipelines.ActionsStorageArtifact;
        }
--- a/src/Runner.Plugins/Artifact/PublishArtifact.cs
+++ b/src/Runner.Plugins/Artifact/PublishArtifact.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -97,8 +97,8 @@ namespace GitHub.Runner.Plugins.Artifact
                    size,
                    token);

-                context.Output($"Associated artifact {artifactName} ({artifact.ContainerId}) with run #{buildId}");
+                context.Output($"Associated artifact {artifactName} ({artifact.ContainerId}) with run #{buildId}"); 
            }
        }
    }
-}
+}
--- a/src/Runner.Plugins/Repository/GitCliManager.cs
+++ b/src/Runner.Plugins/Repository/GitCliManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
--- a/src/Runner.Plugins/Repository/v1.0/GitSourceProvider.cs
+++ b/src/Runner.Plugins/Repository/v1.0/GitSourceProvider.cs
@@ -1,4 +1,4 @@
-using Pipelines = GitHub.DistributedTask.Pipelines;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 using System;
 using System.Collections.Generic;
 using System.Threading;
--- a/src/Runner.Plugins/Repository/v1.0/RepositoryPlugin.cs
+++ b/src/Runner.Plugins/Repository/v1.0/RepositoryPlugin.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;
--- a/src/Runner.Plugins/Repository/v1.1/GitSourceProvider.cs
+++ b/src/Runner.Plugins/Repository/v1.1/GitSourceProvider.cs
@@ -1,4 +1,4 @@
-using Pipelines = GitHub.DistributedTask.Pipelines;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 using System;
 using System.Collections.Generic;
 using System.Threading;
--- a/src/Runner.Plugins/Repository/v1.1/RepositoryPlugin.cs
+++ b/src/Runner.Plugins/Repository/v1.1/RepositoryPlugin.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;
--- a/src/Runner.Sdk/ActionPlugin.cs
+++ b/src/Runner.Sdk/ActionPlugin.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Headers;
@@ -220,12 +220,20 @@ namespace GitHub.Runner.Sdk
            return input;
        }

-        private Dictionary<string, string> _commandEscapeMappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        private Dictionary<string, string> _commandEscapeMappings = new(StringComparer.OrdinalIgnoreCase)
        {
-            { ";", "%3B" },
-            { "\r", "%0D" },
-            { "\n", "%0A" },
-            { "]", "%5D" },
+            {
+                ";", "%3B"
+            },
+            {
+                "\r", "%0D"
+            },
+            {
+                "\n", "%0A"
+            },
+            {
+                "]", "%5D"
+            },
        };
    }
 }
--- a/src/Runner.Sdk/BuildConstants.cs
+++ b/src/Runner.Sdk/BuildConstants.cs
@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Sdk
+namespace GitHub.Runner.Sdk
 {
    /***
     * WARNING: This file is automatically regenerated on layout so the runner can provide version/commit info (do not manually edit it).
--- a/src/Runner.Sdk/ProcessInvoker.cs
+++ b/src/Runner.Sdk/ProcessInvoker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;
--- a/src/Runner.Sdk/RunnerWebProxy.cs
+++ b/src/Runner.Sdk/RunnerWebProxy.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -69,10 +69,6 @@ namespace GitHub.Runner.Sdk
                return;
            }

-            if (!string.IsNullOrEmpty(httpProxyAddress) && !Uri.TryCreate(httpProxyAddress, UriKind.Absolute, out var _))
-            {
-                httpProxyAddress = PrependHttpIfMissing(httpProxyAddress);
-            }
            if (!string.IsNullOrEmpty(httpProxyAddress) && Uri.TryCreate(httpProxyAddress, UriKind.Absolute, out var proxyHttpUri))
            {
                _httpProxyAddress = proxyHttpUri.OriginalString;
@@ -103,10 +99,6 @@ namespace GitHub.Runner.Sdk
                }
            }

-            if (!string.IsNullOrEmpty(httpsProxyAddress) && !Uri.TryCreate(httpsProxyAddress, UriKind.Absolute, out var _))
-            {
-                httpsProxyAddress = PrependHttpIfMissing(httpsProxyAddress);
-            }
            if (!string.IsNullOrEmpty(httpsProxyAddress) && Uri.TryCreate(httpsProxyAddress, UriKind.Absolute, out var proxyHttpsUri))
            {
                _httpsProxyAddress = proxyHttpsUri.OriginalString;
@@ -248,20 +240,5 @@ namespace GitHub.Runner.Sdk

            return false;
        }
-
-        private string PrependHttpIfMissing(string proxyAddress)
-        {
-            // much like in golang, see https://github.com/golang/net/blob/f5464ddb689c015d1abf4df78a806a54af977e6c/http/httpproxy/proxy.go#LL156C31-L156C31
-            if (!proxyAddress.StartsWith("http://", StringComparison.Ordinal) && !proxyAddress.StartsWith("https://", StringComparison.Ordinal))
-            {
-                var prependedProxyAddress = "http://" + proxyAddress;
-                if (Uri.TryCreate(prependedProxyAddress, UriKind.Absolute, out var _))
-                {
-                    // if prepending http:// turns the proxyAddress into a valid Uri, then use that
-                    return prependedProxyAddress;
-                }
-            }
-            return proxyAddress;
-        }
    }
 }
--- a/src/Runner.Sdk/Util/ArgUtil.cs
+++ b/src/Runner.Sdk/Util/ArgUtil.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;

 namespace GitHub.Runner.Sdk
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .308.0
 .304.0