Fix release workflow.

Release 2.312.0 runner
2025-12-10 12:36:23 +00:00 · 2024-01-16 22:54:01 -05:00 · 2024-01-16 22:28:51 -05:00
147 changed files with 1268 additions and 3400 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,13 +4,10 @@
  "features": {
    "ghcr.io/devcontainers/features/docker-in-docker:1": {},
    "ghcr.io/devcontainers/features/dotnet": {
-      "version": "8.0.404"
+      "version": "6.0.418"
    },
    "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
-    },
-    "ghcr.io/devcontainers/features/sshd:1": {
-      "version": "latest"
+      "version": "16"
    }
  },
  "customizations": {
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,11 +5,6 @@ updates:
  schedule:
    interval: "daily" 
  target-branch: "main" 
- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "daily" 
-  target-branch: "main" 
 - package-ecosystem: "nuget"
  directory: "/src"
  schedule:
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:

    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

    # Build runner layout
    - name: Build & Layout Release
@@ -75,7 +75,7 @@ jobs:
    # Upload runner package tar.gz/zip as artifact
    - name: Publish Artifact
      if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: runner-package-${{ matrix.runtime }}
        path: |
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -23,7 +23,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/dotnet-upgrade.yml
+++ b/.github/workflows/dotnet-upgrade.yml
@@ -15,7 +15,7 @@ jobs:
      DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Get current major minor version
        id: fetch_current_version
        shell: bash
@@ -51,7 +51,7 @@ jobs:
        run: echo "::error links::feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} https://github.com/actions/runner/tree/feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}::Branch feature/dotnetsdk-upgrade/${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} already exists. Please take a look and delete that branch if you wish to recreate"
      - name: Create a warning annotation if no need to update
        if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 0 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
-        run: echo "::warning ::Latest DotNet SDK patch is ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}, and we are on ${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}. No need to update"
+        run: echo "::warning ::Latest DotNet SDK patch is ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}, and we are on ${{ steps.fetch_latest_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}. No need to update"
      - name: Update patch version
        if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 1 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
        shell: bash
@@ -89,7 +89,7 @@ jobs:
    if: ${{ needs.dotnet-update.outputs.SHOULD_UPDATE == 1 && needs.dotnet-update.outputs.BRANCH_EXISTS == 0 }}
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
      with:
        ref: feature/dotnetsdk-upgrade/${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
    - name: Create Pull Request
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,24 @@
+name: Lint
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          # Ensure full list of changed files within `super-linter`
+          fetch-depth: 0
+      - name: Run linters
+        uses: github/super-linter@v4
+        env:
+          DEFAULT_BRANCH: ${{ github.base_ref }}
+          EDITORCONFIG_FILE_NAME: .editorconfig
+          LINTER_RULES_PATH: /src/
+          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_CSHARP: true
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -20,17 +20,15 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Compute image version
        id: image
        uses: actions/github-script@v6
-        env:
-          RUNNER_VERSION: ${{ github.event.inputs.runnerVersion }}
        with:
          script: |
            const fs = require('fs');
-            const inputRunnerVersion = process.env.RUNNER_VERSION;
+            const inputRunnerVersion = "${{ github.event.inputs.runnerVersion }}"
            if (inputRunnerVersion) {
              console.log(`Using input runner version ${inputRunnerVersion}`)
              core.setOutput('version', inputRunnerVersion);
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
    if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main'
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

    # Make sure ./releaseVersion match ./src/runnerversion
    # Query GitHub release ensure version is not used
@@ -87,7 +87,7 @@ jobs:

    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

    # Build runner layout
    - name: Build & Layout Release
@@ -117,11 +117,12 @@ jobs:
      working-directory: _package

    # Upload runner package tar.gz/zip as artifact.
+    # Since each package name is unique, so we don't need to put ${{matrix}} info into artifact name
    - name: Publish Artifact
      if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
-        name: runner-packages-${{ matrix.runtime }}
+        name: runner-packages
        path: |
          _package

@@ -130,43 +131,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:

-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

    # Download runner package tar.gz/zip produced by 'build' job
-    - name: Download Artifact (win-x64)
-      uses: actions/download-artifact@v4
+    - name: Download Artifact
+      uses: actions/download-artifact@v1
      with:
-        name: runner-packages-win-x64
-        path: ./
-    - name: Download Artifact (win-arm64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-win-arm64
-        path: ./
-    - name: Download Artifact (osx-x64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-osx-x64
-        path: ./
-    - name: Download Artifact (osx-arm64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-osx-arm64
-        path: ./
-    - name: Download Artifact (linux-x64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-linux-x64
-        path: ./
-    - name: Download Artifact (linux-arm)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-linux-arm
-        path: ./
-    - name: Download Artifact (linux-arm64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-linux-arm64
+        name: runner-packages
        path: ./

    # Create ReleaseNote file
@@ -296,7 +267,7 @@ jobs:
      IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Compute image version
        id: image
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,4 @@ _dotnetsdk
 TestResults
 TestLogs
 .DS_Store
-.mono
 **/*.DotSettings.user
--- a/docs/checks/nodejs.md
+++ b/docs/checks/nodejs.md
@@ -4,9 +4,9 @@

 Make sure the built-in node.js has access to GitHub.com or GitHub Enterprise Server.

-The runner carries its own copy of node.js executable under `<runner_root>/externals/node20/`.
+The runner carries its own copy of node.js executable under `<runner_root>/externals/node16/`.

-All javascript base Actions will get executed by the built-in `node` at `<runner_root>/externals/node20/`.
+All javascript base Actions will get executed by the built-in `node` at `<runner_root>/externals/node16/`.

 > Not the `node` from `$PATH`

--- a/docs/start/envlinux.md
+++ b/docs/start/envlinux.md
@@ -4,7 +4,16 @@

 ## Supported Distributions and Versions

-Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#linux)."
+x64
+  - Red Hat Enterprise Linux 7+
+  - CentOS 7+
+  - Oracle Linux 7+
+  - Fedora 29+
+  - Debian 9+
+  - Ubuntu 16.04+
+  - Linux Mint 18+
+  - openSUSE 15+
+  - SUSE Enterprise Linux (SLES) 12 SP2+

 ## Install .Net Core 3.x Linux Dependencies

--- a/docs/start/envosx.md
+++ b/docs/start/envosx.md
@@ -4,6 +4,7 @@

 ## Supported Versions

-Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#macos)."
+  - macOS High Sierra (10.13) and later versions
+  - x64 and arm64 (Apple Silicon)

 ## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore30)
--- a/docs/start/envwin.md
+++ b/docs/start/envwin.md
@@ -2,6 +2,11 @@

 ## Supported Versions

-Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#windows)."
+ - Windows 7 64-bit
+ - Windows 8.1 64-bit
+ - Windows 10 64-bit
+ - Windows Server 2012 R2 64-bit
+ - Windows Server 2016 64-bit
+ - Windows Server 2019 64-bit

 ## [More .NET Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore30)
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,12 +1,12 @@
 # Source: https://github.com/dotnet/dotnet-docker
-FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy as build
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build

 ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.1
-ARG DOCKER_VERSION=27.3.1
-ARG BUILDX_VERSION=0.18.0
+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.5.0
+ARG DOCKER_VERSION=24.0.6
+ARG BUILDX_VERSION=0.11.2

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

@@ -32,22 +32,17 @@ RUN export RUNNER_ARCH=${TARGETARCH} \
        "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \
    && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx

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

 ENV DEBIAN_FRONTEND=noninteractive
 ENV RUNNER_MANUALLY_TRAP_SIG=1
 ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1
 ENV ImageOS=ubuntu22

-# '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 curl jq unzip \
-    && 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 \
-    && apt install -y git \
+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,42 +1,36 @@
 ## What's Changed
-
-* Fix release workflow to use distinct artifact names by @ericsciple in https://github.com/actions/runner/pull/3485
-* Update dotnet sdk to latest version @6.0.425 by @github-actions in https://github.com/actions/runner/pull/3433
-* add ref and type to job completion in run service by @yaananth in https://github.com/actions/runner/pull/3492
-* Remove Broker Migration Message logging by @luketomlinson in https://github.com/actions/runner/pull/3493
-* Bump dotnet SDK to dotnet 8. by @TingluoHuang in https://github.com/actions/runner/pull/3500
-* Remove dotnet8 compatibility test. by @TingluoHuang in https://github.com/actions/runner/pull/3502
-* Remove node16 from the runner. by @TingluoHuang in https://github.com/actions/runner/pull/3503
-* send action name for run service by @yaananth in https://github.com/actions/runner/pull/3520
-* Handle runner not found by @ericsciple in https://github.com/actions/runner/pull/3536
-* Publish job telemetry to run-service. by @TingluoHuang in https://github.com/actions/runner/pull/3545
-* Fetch repo-level runner groups from API in v2 flow by @lucavallin in https://github.com/actions/runner/pull/3546
-* Allow runner to check service connection in background. by @TingluoHuang in https://github.com/actions/runner/pull/3542
-* Expose ENV for cache service v2. by @TingluoHuang in https://github.com/actions/runner/pull/3548
-* Update runner docker image. by @TingluoHuang in https://github.com/actions/runner/pull/3511
-* Bump Azure.Storage.Blobs from 12.19.1 to 12.23.0 in /src by @dependabot in https://github.com/actions/runner/pull/3549
-* fix dotnet-upgrade.yml to print right version by @TingluoHuang in https://github.com/actions/runner/pull/3550
-* Update dotnet sdk to latest version @8.0.404 by @github-actions in https://github.com/actions/runner/pull/3552
-* Configure dependabot to check github-actions updates by @Goooler in https://github.com/actions/runner/pull/3333
-* Bump actions/checkout from 3 to 4 by @dependabot in https://github.com/actions/runner/pull/3556
+* Fix `buildx` installation by @ajschmidt8 in https://github.com/actions/runner/pull/2952
+* Create close-features and close-bugs bot for runner issues by @ruvceskistefan in https://github.com/actions/runner/pull/2909
+* Send disableUpdate as query parameter  by @luketomlinson in https://github.com/actions/runner/pull/2970
+* Handle SelfUpdate Flow when Package is provided in Message  by @luketomlinson in https://github.com/actions/runner/pull/2926
+* Bump container hook version to 0.5.0 in runner image by @nikola-jokic in https://github.com/actions/runner/pull/3003
+* Set `ImageOS` environment variable in runner images by @int128 in https://github.com/actions/runner/pull/2878
+* Mark job as failed on worker crash. by @TingluoHuang in https://github.com/actions/runner/pull/3006
+* Include whether http proxy configured as part of UserAgent. by @TingluoHuang in https://github.com/actions/runner/pull/3009
+* Add codeload to the list of service we check during '--check'. by @TingluoHuang in https://github.com/actions/runner/pull/3011
+* close reason update by @ruvceskistefan in https://github.com/actions/runner/pull/3027
+* Update envlinux.md by @adjn in https://github.com/actions/runner/pull/3040
+* Extend `--check` to check Results-Receiver service. by @TingluoHuang in https://github.com/actions/runner/pull/3078
+* Use Azure SDK to upload files to Azure Blob by @yacaovsnc in https://github.com/actions/runner/pull/3033
+* Remove code in runner for handling trimmed packages. by @TingluoHuang in https://github.com/actions/runner/pull/3074
+* Update dotnet sdk to latest version @6.0.418 by @github-actions in https://github.com/actions/runner/pull/3085
+* Patch Curl to no longer use -k by @thboop in https://github.com/actions/runner/pull/3091

 ## New Contributors
-* @lucavallin made their first contribution in https://github.com/actions/runner/pull/3546
-* @Goooler made their first contribution in https://github.com/actions/runner/pull/3333
+* @int128 made their first contribution in https://github.com/actions/runner/pull/2878
+* @adjn made their first contribution in https://github.com/actions/runner/pull/3040

-**Full Changelog**: https://github.com/actions/runner/compare/v2.320.0...v2.321.0
+**Full Changelog**: https://github.com/actions/runner/compare/v2.311.0...v2.312.0

-_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.
+_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. 
 See https://docs.github.com/en/enterprise-cloud@latest/actions/hosting-your-own-runners/adding-self-hosted-runners_

 ## Windows x64
-
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.

 The following snipped needs to be run on `powershell`:
-
-```powershell
+``` powershell
 # Create a folder under the drive root
 mkdir \actions-runner ; cd \actions-runner
 # Download the latest runner package
@@ -46,13 +40,13 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ;
 [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
 ```

-## Windows arm64
+## [Pre-release] Windows arm64
+**Warning:** Windows arm64 runners are currently in preview status and use [unofficial versions of nodejs](https://unofficial-builds.nodejs.org/). They are not intended for production workflows.

 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.

 The following snipped needs to be run on `powershell`:
-
-```powershell
+``` powershell
 # Create a folder under the drive root
 mkdir \actions-runner ; cd \actions-runner
 # Download the latest runner package
@@ -64,7 +58,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ;

 ## OSX x64

-```bash
+``` bash
 # Create a folder
 mkdir actions-runner && cd actions-runner
 # Download the latest runner package
@@ -75,7 +69,7 @@ tar xzf ./actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz

 ## OSX arm64 (Apple silicon)

-```bash
+``` bash
 # Create a folder
 mkdir actions-runner && cd actions-runner
 # Download the latest runner package
@@ -86,7 +80,7 @@ tar xzf ./actions-runner-osx-arm64-<RUNNER_VERSION>.tar.gz

 ## Linux x64

-```bash
+``` bash
 # Create a folder
 mkdir actions-runner && cd actions-runner
 # Download the latest runner package
@@ -97,7 +91,7 @@ tar xzf ./actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz

 ## Linux arm64

-```bash
+``` bash
 # Create a folder
 mkdir actions-runner && cd actions-runner
 # Download the latest runner package
@@ -108,7 +102,7 @@ tar xzf ./actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz

 ## Linux arm

-```bash
+``` bash
 # Create a folder
 mkdir actions-runner && cd actions-runner
 # Download the latest runner package
@@ -118,7 +112,6 @@ tar xzf ./actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
 ```

 ## Using your self hosted runner
-
 For additional details about configuring, running, or shutting down the runner please check out our [product docs.](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/adding-self-hosted-runners)

 ## SHA-256 Checksums
--- a/2
+++ b/2
@@ -1 +1 @@
-2.321.0
+2.312.0
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm
@@ -0,0 +1 @@
+54d95a44d118dba852395991224a6b9c1abe916858c87138656f80c619e85331
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64
@@ -0,0 +1 @@
+68015af17f06a824fa478e62ae7393766ce627fd5599ab916432a14656a19a52
--- a/src/Misc/contentHash/dotnetRuntime/linux-x64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-x64
@@ -0,0 +1 @@
+a2628119ca419cb54e279103ffae7986cdbd0814d57c73ff0dc74c38be08b9ae
--- a/src/Misc/contentHash/dotnetRuntime/osx-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64
@@ -0,0 +1 @@
+de71ca09ead807e1a2ce9df0a5b23eb7690cb71fff51169a77e4c3992be53dda
--- a/src/Misc/contentHash/dotnetRuntime/osx-x64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-x64
@@ -0,0 +1 @@
+d009e05e6b26d614d65be736a15d1bd151932121c16a9ff1b986deadecc982b9
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -0,0 +1 @@
+f730db39c2305800b4653795360ba9c10c68f384a46b85d808f1f9f0ed3c42e4
--- a/src/Misc/contentHash/dotnetRuntime/win-x64
+++ b/src/Misc/contentHash/dotnetRuntime/win-x64
@@ -0,0 +1 @@
+a35b5722375490e9473cdcccb5e18b41eba3dbf4344fe31abc9821e21f18ea5a
--- a/src/Misc/contentHash/externals/linux-arm
+++ b/src/Misc/contentHash/externals/linux-arm
@@ -0,0 +1 @@
+4bf3e1af0d482af1b2eaf9f08250248a8c1aea8ec20a3c5be116d58cdd930009
--- a/src/Misc/contentHash/externals/linux-arm64
+++ b/src/Misc/contentHash/externals/linux-arm64
@@ -0,0 +1 @@
+ec1719a8cb4d8687328aa64f4aa7c4e3498a715d8939117874782e3e6e63a14b
--- a/src/Misc/contentHash/externals/linux-x64
+++ b/src/Misc/contentHash/externals/linux-x64
@@ -0,0 +1 @@
+50538de29f173bb73f708c4ed2c8328a62b8795829b97b2a6cb57197e2305287
--- a/src/Misc/contentHash/externals/osx-arm64
+++ b/src/Misc/contentHash/externals/osx-arm64
@@ -0,0 +1 @@
+a0a96cbb7593643b69e669bf14d7b29b7f27800b3a00bb3305aebe041456c701
--- a/src/Misc/contentHash/externals/osx-x64
+++ b/src/Misc/contentHash/externals/osx-x64
@@ -0,0 +1 @@
+6255b22692779467047ecebd60ad46984866d75cdfe10421d593a7b51d620b09
--- a/src/Misc/contentHash/externals/win-arm64
+++ b/src/Misc/contentHash/externals/win-arm64
@@ -0,0 +1 @@
+6ff1abd055dc35bfbf06f75c2f08908f660346f66ad1d8f81c910068e9ba029d
--- a/src/Misc/contentHash/externals/win-x64
+++ b/src/Misc/contentHash/externals/win-x64
@@ -0,0 +1 @@
+433a6d748742d12abd20dc2a79b62ac3d9718ae47ef26f8e84dc8c180eea3659
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -3,10 +3,12 @@ PACKAGERUNTIME=$1
 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
-NODE20_VERSION="20.18.0"
+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"

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

 # Download the external tools only for Windows.
 if [[ "$PACKAGERUNTIME" == "win-x64" || "$PACKAGERUNTIME" == "win-x86" ]]; then
+    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
@@ -147,6 +151,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
    if [[ "$PRECACHE" != "" ]]; then
@@ -156,24 +162,30 @@ fi

 # Download the external tools only for OSX.
 if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
+    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${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-x64.tar.gz" node16 fix_nested_dir
+    acquireExternalTool "$NODE_ALPINE_URL/v${NODE16_VERSION}/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 "$NODE_ALPINE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-alpine-x64.tar.gz" node20_alpine
 fi

 if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then
+    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${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/layoutbin/RunnerService.js
+++ b/src/Misc/layoutbin/RunnerService.js
@@ -114,11 +114,6 @@ var runService = function () {
            );
            stopping = true;
          }
-        } else if (code === 5) {
-          console.log(
-            "Runner listener exit with Session Conflict error, stop the service, no retry needed."
-          );
-          stopping = true;
        } else {
          var messagePrefix = "Runner listener exit with undefined return code";
          unknownFailureRetryCount++;
--- a/src/Misc/layoutbin/runsvc.sh
+++ b/src/Misc/layoutbin/runsvc.sh
@@ -10,7 +10,7 @@ if [ -f ".path" ]; then
    echo ".path=${PATH}"
 fi

-nodever="node20"
+nodever=${GITHUB_ACTIONS_RUNNER_FORCED_NODE_VERSION:-node16}

 # insert anything to setup env when running as a service
 # run the host process which keep the listener alive
--- a/src/Misc/layoutbin/update.sh.template
+++ b/src/Misc/layoutbin/update.sh.template
@@ -135,17 +135,12 @@ if [[ "$currentplatform" == 'darwin'  && restartinteractiverunner -eq 0 ]]; then
    then
        # inspect the open file handles to find the node process
        # we can't actually inspect the process using ps because it uses relative paths and doesn't follow symlinks
-        nodever="node20"
+        nodever="node16"
        path=$(lsof -a -g "$procgroup" -F n | grep $nodever/bin/node | grep externals | tail -1 | cut -c2-)
-        if [[ $? -ne 0 || -z "$path" ]] # Fallback if RunnerService.js was started with node16
+        if [[ $? -ne 0 || -z "$path" ]] # Fallback if RunnerService.js was started with node12
        then
-            nodever="node16"
+            nodever="node12"
            path=$(lsof -a -g "$procgroup" -F n | grep $nodever/bin/node | grep externals | tail -1 | cut -c2-)
-            if [[ $? -ne 0 || -z "$path" ]] # Fallback if RunnerService.js was started with node12
-            then
-                nodever="node12"
-                path=$(lsof -a -g "$procgroup" -F n | grep $nodever/bin/node | grep externals | tail -1 | cut -c2-)
-            fi
        fi
        if [[ $? -eq 0 && -n "$path" ]]
        then
@@ -183,19 +178,6 @@ if [[ "$currentplatform" == 'darwin'  && restartinteractiverunner -eq 0 ]]; then
    fi
 fi

-# update runsvc.sh
-if [ -f "$rootfolder/runsvc.sh" ]
-then
-    date "+[%F %T-%4N] Update runsvc.sh" >> "$logfile" 2>&1
-    cat "$rootfolder/bin/runsvc.sh" > "$rootfolder/runsvc.sh"
-    if [ $? -ne 0 ]
-    then
-        date "+[%F %T-%4N] Can't update $rootfolder/runsvc.sh using $rootfolder/bin/runsvc.sh" >> "$logfile" 2>&1
-        mv -fv "$logfile" "$logfile.failed"
-        exit 1
-    fi
-fi
-
 date "+[%F %T-%4N] Update succeed" >> "$logfile"

 touch update.finished
--- a/src/Misc/layoutroot/run-helper.cmd.template
+++ b/src/Misc/layoutroot/run-helper.cmd.template
@@ -49,10 +49,5 @@ if %ERRORLEVEL% EQU 4 (
  exit /b 1
 )

-if %ERRORLEVEL% EQU 5 (
-  echo "Runner listener exit with Session Conflict error, stop the service, no retry needed."
-  exit /b 0
-)
-
 echo "Exiting after unknown error code: %ERRORLEVEL%"
 exit /b 0
--- a/src/Misc/layoutroot/run-helper.sh.template
+++ b/src/Misc/layoutroot/run-helper.sh.template
@@ -70,9 +70,6 @@ elif [[ $returnCode == 4 ]]; then
        "$DIR"/safe_sleep.sh 1
    done
    exit 2
-elif [[ $returnCode == 5 ]]; then
-    echo "Runner listener exit with Session Conflict error, stop the service, no retry needed."
-    exit 0
 else
    echo "Exiting with unknown error code: ${returnCode}"
    exit 0
--- a/src/Misc/layoutroot/run.sh
+++ b/src/Misc/layoutroot/run.sh
@@ -38,7 +38,7 @@ runWithManualTrap() {
        cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh
        "$DIR"/run-helper.sh $* &
        PID=$!
-        wait $PID
+        wait -f $PID
        returnCode=$?
        if [[ $returnCode -eq 2 ]]; then
            echo "Restarting runner..."
@@ -84,4 +84,4 @@ if [[ -z "$RUNNER_MANUALLY_TRAP_SIG" ]]; then
    run $*
 else
    runWithManualTrap $*
-fi
+fi
--- a/src/Runner.Common/ActionsRunServer.cs
+++ b/src/Runner.Common/ActionsRunServer.cs
@@ -20,12 +20,12 @@ namespace GitHub.Runner.Common
    {
        private bool _hasConnection;
        private VssConnection _connection;
-        private ActionsRunServerHttpClient _actionsRunServerClient;
+        private TaskAgentHttpClient _taskAgentClient;

        public async Task ConnectAsync(Uri serverUrl, VssCredentials credentials)
        {
            _connection = await EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(100));
-            _actionsRunServerClient = _connection.GetClient<ActionsRunServerHttpClient>();
+            _taskAgentClient = _connection.GetClient<TaskAgentHttpClient>();
            _hasConnection = true;
        }

@@ -42,7 +42,7 @@ namespace GitHub.Runner.Common
            CheckConnection();
            var jobMessage = RetryRequest<AgentJobRequestMessage>(async () =>
                                                    {
-                                                        return await _actionsRunServerClient.GetJobMessageAsync(id, cancellationToken);
+                                                        return await _taskAgentClient.GetJobMessageAsync(id, cancellationToken);
                                                    }, cancellationToken);

            return jobMessage;
--- a/src/Runner.Common/BrokerServer.cs
+++ b/src/Runner.Common/BrokerServer.cs
@@ -7,7 +7,6 @@ using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
-using GitHub.Services.WebApi;
 using Sdk.RSWebApi.Contracts;
 using Sdk.WebApi.WebApi.RawClient;

@@ -18,14 +17,7 @@ namespace GitHub.Runner.Common
    {
        Task ConnectAsync(Uri serverUrl, VssCredentials credentials);

-        Task<TaskAgentSession> CreateSessionAsync(TaskAgentSession session, CancellationToken cancellationToken);
-        Task DeleteSessionAsync(CancellationToken cancellationToken);
-
-        Task<TaskAgentMessage> GetRunnerMessageAsync(Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate, CancellationToken token);
-
-        Task UpdateConnectionIfNeeded(Uri serverUri, VssCredentials credentials);
-
-        Task ForceRefreshConnection(VssCredentials credentials);
+        Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate);
    }

    public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -52,53 +44,13 @@ namespace GitHub.Runner.Common
            }
        }

-        public async Task<TaskAgentSession> CreateSessionAsync(TaskAgentSession session, CancellationToken cancellationToken)
+        public Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken cancellationToken, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate)
        {
            CheckConnection();
-            var jobMessage = await _brokerHttpClient.CreateSessionAsync(session, cancellationToken);
+            var jobMessage = RetryRequest<TaskAgentMessage>(
+                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, os, architecture, disableUpdate, cancellationToken), cancellationToken);

            return jobMessage;
        }
-
-        public Task<TaskAgentMessage> GetRunnerMessageAsync(Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-            var brokerSession = RetryRequest<TaskAgentMessage>(
-                async () => await _brokerHttpClient.GetRunnerMessageAsync(sessionId, version, status, os, architecture, disableUpdate, cancellationToken), cancellationToken, shouldRetry: ShouldRetryException);
-
-
-            return brokerSession;
-        }
-
-        public async Task DeleteSessionAsync(CancellationToken cancellationToken)
-        {
-            CheckConnection();
-            await _brokerHttpClient.DeleteSessionAsync(cancellationToken);
-        }
-
-        public Task UpdateConnectionIfNeeded(Uri serverUri, VssCredentials credentials)
-        {
-            if (_brokerUri != serverUri || !_hasConnection)
-            {
-                return ConnectAsync(serverUri, credentials);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        public Task ForceRefreshConnection(VssCredentials credentials)
-        {
-            return ConnectAsync(_brokerUri, credentials);
-        }
-
-        public bool ShouldRetryException(Exception ex)
-        {
-            if (ex is AccessDeniedException || ex is RunnerNotFoundException)
-            {
-                return false;
-            }
-
-            return true;
-        }
    }
 }
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -153,12 +153,12 @@ namespace GitHub.Runner.Common
                public const int RetryableError = 2;
                public const int RunnerUpdating = 3;
                public const int RunOnceRunnerUpdating = 4;
-                public const int SessionConflict = 5;
            }

            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 UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate";
                public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks";
@@ -175,6 +175,11 @@ 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 DetectedNodeAfterEndOfLifeMessage = "Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: {0}. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.";
+            public static readonly string DeprecatedNodeDetectedAfterEndOfLifeActions = "DeprecatedNodeActionsMessageWarnings";
+            public static readonly string DeprecatedNodeVersion = "node16";
+            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 class RunnerEvent
@@ -245,13 +250,14 @@ namespace GitHub.Runner.Common
                public static readonly string RequireJobContainer = "ACTIONS_RUNNER_REQUIRE_JOB_CONTAINER";
                public static readonly string RunnerDebug = "ACTIONS_RUNNER_DEBUG";
                public static readonly string StepDebug = "ACTIONS_STEP_DEBUG";
+                public static readonly string AllowActionsUseUnsecureNodeVersion = "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION";
            }

            public static class Agent
            {
                public static readonly string ToolsDirectory = "agent.ToolsDirectory";

-                // Set this env var to "nodeXY" to downgrade the node version for internal functions (e.g hashfiles). This does NOT affect the version of node actions.
+                // Set this env var to "node12" to downgrade the node version for internal functions (e.g hashfiles). This does NOT affect the version of node actions.
                public static readonly string ForcedInternalNodeVersion = "ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION";
                public static readonly string ForcedActionsNodeVersion = "ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION";
                public static readonly string PrintLogToStdout = "ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT";
--- a/src/Runner.Common/HostContext.cs
+++ b/src/Runner.Common/HostContext.cs
@@ -36,7 +36,6 @@ namespace GitHub.Runner.Common
        event EventHandler Unloading;
        void ShutdownRunner(ShutdownReason reason);
        void WritePerfCounter(string counter);
-        void LoadDefaultUserAgents();
    }

    public enum StartupType
@@ -68,7 +67,6 @@ namespace GitHub.Runner.Common
        private StartupType _startupType;
        private string _perfFile;
        private RunnerWebProxy _webProxy = new();
-        private string _hostType = string.Empty;

        public event EventHandler Unloading;
        public CancellationToken RunnerShutdownToken => _runnerShutdownTokenSource.Token;
@@ -80,7 +78,6 @@ namespace GitHub.Runner.Common
        {
            // Validate args.
            ArgUtil.NotNullOrEmpty(hostType, nameof(hostType));
-            _hostType = hostType;

            _loadContext = AssemblyLoadContext.GetLoadContext(typeof(HostContext).GetTypeInfo().Assembly);
            _loadContext.Unloading += LoadContext_Unloading;
@@ -199,16 +196,6 @@ namespace GitHub.Runner.Common
                }
            }

-            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY")))
-            {
-                _trace.Warning($"Runner is running under insecure mode: HTTPS server certificate validation has been turned off by GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY environment variable.");
-            }
-
-            LoadDefaultUserAgents();
-        }
-
-        public void LoadDefaultUserAgents()
-        {
            if (string.IsNullOrEmpty(WebProxy.HttpProxyAddress) && string.IsNullOrEmpty(WebProxy.HttpsProxyAddress))
            {
                _trace.Info($"No proxy settings were found based on environmental variables (http_proxy/https_proxy/HTTP_PROXY/HTTPS_PROXY)");
@@ -218,6 +205,11 @@ namespace GitHub.Runner.Common
                _userAgents.Add(new ProductInfoHeaderValue("HttpProxyConfigured", bool.TrueString));
            }

+            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY")))
+            {
+                _trace.Warning($"Runner is running under insecure mode: HTTPS server certificate validation has been turned off by GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY environment variable.");
+            }
+
            var credFile = GetConfigFile(WellKnownConfigFile.Credentials);
            if (File.Exists(credFile))
            {
@@ -252,11 +244,6 @@ namespace GitHub.Runner.Common
                _trace.Info($"Adding extra user agent '{extraUserAgentHeader}' to all HTTP requests.");
                _userAgents.Add(extraUserAgentHeader);
            }
-
-            var currentProcess = Process.GetCurrentProcess();
-            _userAgents.Add(new ProductInfoHeaderValue("Pid", currentProcess.Id.ToString()));
-            _userAgents.Add(new ProductInfoHeaderValue("CreationTime", Uri.EscapeDataString(DateTime.UtcNow.ToString("O"))));
-            _userAgents.Add(new ProductInfoHeaderValue($"({_hostType})"));
        }

        public string GetDirectory(WellKnownDirectory directory)
--- a/src/Runner.Common/JobServer.cs
+++ b/src/Runner.Common/JobServer.cs
@@ -4,7 +4,6 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Net.Security;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
@@ -180,10 +179,6 @@ namespace GitHub.Runner.Common
                    userAgentValues.AddRange(UserAgentUtility.GetDefaultRestUserAgent());
                    userAgentValues.AddRange(HostContext.UserAgents);
                    this._websocketClient.Options.SetRequestHeader("User-Agent", string.Join(" ", userAgentValues.Select(x => x.ToString())));
-                    if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY")))
-                    {
-                        this._websocketClient.Options.RemoteCertificateValidationCallback = (_, _, _, _) => true;
-                    }

                    this._websocketConnectTask = ConnectWebSocketClient(feedStreamUrl, delay);
                }
--- a/src/Runner.Common/JobServerQueue.cs
+++ b/src/Runner.Common/JobServerQueue.cs
@@ -19,7 +19,7 @@ namespace GitHub.Runner.Common
        TaskCompletionSource<int> JobRecordUpdated { get; }
        event EventHandler<ThrottlingEventArgs> JobServerQueueThrottling;
        Task ShutdownAsync();
-        void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultsServiceOnly = false);
+        void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultsServiceOnly = false, bool enableTelemetry = false);
        void QueueWebConsoleLine(Guid stepRecordId, string line, long? lineNumber = null);
        void QueueFileUpload(Guid timelineId, Guid timelineRecordId, string type, string name, string path, bool deleteSource);
        void QueueResultsUpload(Guid timelineRecordId, string name, string path, string type, bool deleteSource, bool finalize, bool firstBlock, long totalLines);
@@ -74,7 +74,6 @@ namespace GitHub.Runner.Common
        private readonly List<JobTelemetry> _jobTelemetries = new();
        private bool _queueInProcess = false;
        private bool _resultsServiceOnly = false;
-        private int _resultsServiceExceptionsCount = 0;
        private Stopwatch _resultsUploadTimer = new();
        private Stopwatch _actionsUploadTimer = new();

@@ -105,10 +104,11 @@ namespace GitHub.Runner.Common
            _resultsServer = hostContext.GetService<IResultsServer>();
        }

-        public void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultsServiceOnly = false)
+        public void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultsServiceOnly = false, bool enableTelemetry = false)
        {
            Trace.Entering();
            _resultsServiceOnly = resultsServiceOnly;
+            _enableTelemetry = enableTelemetry;

            var serviceEndPoint = jobRequest.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));

@@ -139,12 +139,6 @@ namespace GitHub.Runner.Common
                _resultsClientInitiated = true;
            }

-            // Enable telemetry if we have both results service and actions service
-            if (_resultsClientInitiated && !_resultsServiceOnly)
-            {
-                _enableTelemetry = true;
-            }
-
            if (_queueInProcess)
            {
                Trace.Info("No-opt, all queue process tasks are running.");
@@ -557,10 +551,6 @@ namespace GitHub.Runner.Common
                            {
                                await UploadSummaryFile(file);
                            }
-                            if (string.Equals(file.Type, CoreAttachmentType.ResultsDiagnosticLog, StringComparison.OrdinalIgnoreCase))
-                            {
-                                await UploadResultsDiagnosticLogsFile(file);
-                            }
                            else if (String.Equals(file.Type, CoreAttachmentType.ResultsLog, StringComparison.OrdinalIgnoreCase))
                            {
                                if (file.RecordId != _jobTimelineRecordId)
@@ -580,9 +570,9 @@ namespace GitHub.Runner.Common
                            Trace.Info("Catch exception during file upload to results, keep going since the process is best effort.");
                            Trace.Error(ex);
                            errorCount++;
-                            _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)
+                            if (!_resultsServiceOnly)
                            {
                                _resultsClientInitiated = false;
                                SendResultsTelemetry(ex);
@@ -613,7 +603,7 @@ namespace GitHub.Runner.Common

        private void SendResultsTelemetry(Exception ex)
        {
-            var issue = new Issue() { Type = IssueType.Warning, Message = $"Caught exception with results. {HostContext.SecretMasker.MaskSecrets(ex.Message)}" };
+            var issue = new Issue() { Type = IssueType.Warning, Message = $"Caught exception with results. {ex.Message}" };
            issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.ResultsUploadFailure;

            var telemetryRecord = new TimelineRecord()
@@ -709,9 +699,7 @@ namespace GitHub.Runner.Common
                            {
                                Trace.Info("Catch exception during update steps, skip update Results.");
                                Trace.Error(e);
-                                _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)
+                                if (!_resultsServiceOnly)
                                {
                                    _resultsClientInitiated = false;
                                    SendResultsTelemetry(e);
@@ -934,17 +922,6 @@ namespace GitHub.Runner.Common
            await UploadResultsFile(file, summaryHandler);
        }

-        private async Task UploadResultsDiagnosticLogsFile(ResultsUploadFileInfo file)
-        {
-            Trace.Info($"Starting to upload diagnostic logs file to results service {file.Name}, {file.Path}");
-            ResultsFileUploadHandler diagnosticLogsHandler = async (file) =>
-            {
-                await _resultsServer.CreateResultsDiagnosticLogsAsync(file.PlanId, file.JobId, file.Path, CancellationToken.None);
-            };
-
-            await UploadResultsFile(file, diagnosticLogsHandler);
-        }
-
        private async Task UploadResultsStepLogFile(ResultsUploadFileInfo file)
        {
            Trace.Info($"Starting upload of step log file to results service {file.Name}, {file.Path}");
--- a/src/Runner.Common/LaunchServer.cs
+++ b/src/Runner.Common/LaunchServer.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
 using GitHub.Services.Launch.Client;
+using GitHub.Services.WebApi;

 namespace GitHub.Runner.Common
 {
@@ -24,21 +23,8 @@ namespace GitHub.Runner.Common

        public void InitializeLaunchClient(Uri uri, string token)
        {
-            // Using default 100 timeout
-            RawClientHttpRequestSettings settings = VssUtil.GetHttpRequestSettings(null);
-
-            // Create retry handler
-            IEnumerable<DelegatingHandler> delegatingHandlers = new List<DelegatingHandler>();
-            if (settings.MaxRetryRequest > 0)
-            {
-                delegatingHandlers = new DelegatingHandler[] { new VssHttpRetryMessageHandler(settings.MaxRetryRequest) };
-            }
-
-            // Setup RawHttpMessageHandler without credentials
-            var httpMessageHandler = new RawHttpMessageHandler(new NoOpCredentials(null), settings);
-            var pipeline = HttpClientFactory.CreatePipeline(httpMessageHandler, delegatingHandlers);
-
-            this._launchClient = new LaunchHttpClient(uri, pipeline, token, disposeHandler: true);
+            var httpMessageHandler = HostContext.CreateHttpClientHandler();
+            this._launchClient = new LaunchHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
        }

        public Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList,
--- a/src/Runner.Common/ResultsServer.cs
+++ b/src/Runner.Common/ResultsServer.cs
@@ -35,8 +35,6 @@ namespace GitHub.Runner.Common

        Task UpdateResultsWorkflowStepsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId,
            IEnumerable<TimelineRecord> records, CancellationToken cancellationToken);
-
-        Task CreateResultsDiagnosticLogsAsync(string planId, string jobId, string file, CancellationToken cancellationToken);
    }

    public sealed class ResultServer : RunnerService, IResultsServer
@@ -143,18 +141,6 @@ namespace GitHub.Runner.Common
            throw new InvalidOperationException("Results client is not initialized.");
        }

-        public Task CreateResultsDiagnosticLogsAsync(string planId, string jobId, string file,
-            CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                return _resultsClient.UploadResultsDiagnosticLogsAsync(planId, jobId, file,
-                    cancellationToken: cancellationToken);
-            }
-
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
        public ValueTask DisposeAsync()
        {
            CloseWebSocket(WebSocketCloseStatus.NormalClosure, CancellationToken.None);
--- a/src/Runner.Common/RunServer.cs
+++ b/src/Runner.Common/RunServer.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using Sdk.RSWebApi.Contracts;
@@ -28,7 +27,6 @@ namespace GitHub.Runner.Common
            IList<StepResult> stepResults,
            IList<Annotation> jobAnnotations,
            string environmentUrl,
-            IList<Telemetry> telemetry,
            CancellationToken token);

        Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken token);
@@ -62,11 +60,8 @@ namespace GitHub.Runner.Common
        {
            CheckConnection();
            return RetryRequest<AgentJobRequestMessage>(
-                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, VarUtil.OS, cancellationToken), cancellationToken,
-                shouldRetry: ex =>
-                    ex is not TaskOrchestrationJobNotFoundException &&          // HTTP status 404
-                    ex is not TaskOrchestrationJobAlreadyAcquiredException &&   // HTTP status 409
-                    ex is not TaskOrchestrationJobUnprocessableException);      // HTTP status 422
+                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, cancellationToken), cancellationToken,
+                shouldRetry: ex => ex is not TaskOrchestrationJobAlreadyAcquiredException);
        }

        public Task CompleteJobAsync(
@@ -77,12 +72,11 @@ namespace GitHub.Runner.Common
            IList<StepResult> stepResults,
            IList<Annotation> jobAnnotations,
            string environmentUrl,
-            IList<Telemetry> telemetry,
            CancellationToken cancellationToken)
        {
            CheckConnection();
            return RetryRequest(
-                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, telemetry, cancellationToken), cancellationToken);
+                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, cancellationToken), cancellationToken);
        }

        public Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken cancellationToken)
--- a/src/Runner.Common/Runner.Common.csproj
+++ b/src/Runner.Common/Runner.Common.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
  </PropertyGroup>

@@ -15,11 +15,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
+    <PackageReference Include="System.Threading.Channels" Version="4.4.0" />
  </ItemGroup>

  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
--- a/src/Runner.Common/RunnerDotcomServer.cs
+++ b/src/Runner.Common/RunnerDotcomServer.cs
@@ -46,11 +46,7 @@ namespace GitHub.Runner.Common
            var githubApiUrl = "";
            var gitHubUrlBuilder = new UriBuilder(githubUrl);
            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
-            var isOrgRunner = path.Length == 1;
-            var isRepoOrEnterpriseRunner = path.Length == 2;
-            var isRepoRunner = isRepoOrEnterpriseRunner && !string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase);
-
-            if (isOrgRunner)
+            if (path.Length == 1)
            {
                // org runner
                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
@@ -62,31 +58,21 @@ namespace GitHub.Runner.Common
                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
                }
            }
-            else if (isRepoOrEnterpriseRunner)
+            else if (path.Length == 2)
            {
-                // Repository runner
-                if (isRepoRunner)
+                // repo or enterprise runner.
+                if (!string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase))
                {
-                    if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/repos/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
-                    }
-                    else
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/repos/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
-                    }
+                    return null;
+                }
+
+                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
                }
                else
                {
-                    // Enterprise runner
-                    if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
-                    }
-                    else
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
-                    }
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
                }
            }
            else
@@ -104,11 +90,7 @@ namespace GitHub.Runner.Common
            var githubApiUrl = "";
            var gitHubUrlBuilder = new UriBuilder(githubUrl);
            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
-            var isOrgRunner = path.Length == 1;
-            var isRepoOrEnterpriseRunner = path.Length == 2;
-            var isRepoRunner = isRepoOrEnterpriseRunner && !string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase);
-
-            if (isOrgRunner)
+            if (path.Length == 1)
            {
                // org runner
                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
@@ -120,31 +102,21 @@ namespace GitHub.Runner.Common
                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runner-groups";
                }
            }
-            else if (isRepoOrEnterpriseRunner)
+            else if (path.Length == 2)
            {
-                // Repository Runner
-                if (isRepoRunner)
+                // repo or enterprise runner.
+                if (!string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase))
                {
-                    if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/repos/{path[0]}/{path[1]}/actions/runner-groups";
-                    }
-                    else
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/repos/{path[0]}/{path[1]}/actions/runner-groups";
-                    }
+                    return null;
+                }
+
+                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runner-groups";
                }
                else
                {
-                    // Enterprise Runner
-                    if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runner-groups";
-                    }
-                    else
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runner-groups";
-                    }
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runner-groups";
                }
            }
            else
--- a/src/Runner.Common/Util/NodeUtil.cs
+++ b/src/Runner.Common/Util/NodeUtil.cs
@@ -5,8 +5,8 @@ namespace GitHub.Runner.Common.Util
 {
    public static class NodeUtil
    {
-        private const string _defaultNodeVersion = "node20";
-        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node20" });
+        private const string _defaultNodeVersion = "node16";
+        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node16", "node20" });
        public static string GetInternalNodeVersion()
        {
            var forcedInternalNodeVersion = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ForcedInternalNodeVersion);
--- a/src/Runner.Listener/BrokerMessageListener.cs
+++ b/src/Runner.Listener/BrokerMessageListener.cs
@@ -11,10 +11,9 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
-using GitHub.Runner.Common.Util;
 using GitHub.Services.Common;
+using GitHub.Runner.Common.Util;
 using GitHub.Services.OAuth;
-using GitHub.Services.WebApi;

 namespace GitHub.Runner.Listener
 {
@@ -25,15 +24,7 @@ namespace GitHub.Runner.Listener
        private TimeSpan _getNextMessageRetryInterval;
        private TaskAgentStatus runnerStatus = TaskAgentStatus.Online;
        private CancellationTokenSource _getMessagesTokenSource;
-        private VssCredentials _creds;
-        private TaskAgentSession _session;
        private IBrokerServer _brokerServer;
-        private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new();
-        private bool _accessTokenRevoked = false;
-        private readonly TimeSpan _sessionCreationRetryInterval = TimeSpan.FromSeconds(30);
-        private readonly TimeSpan _sessionConflictRetryLimit = TimeSpan.FromMinutes(4);
-        private readonly TimeSpan _clockSkewRetryLimit = TimeSpan.FromMinutes(30);
-

        public override void Initialize(IHostContext hostContext)
        {
@@ -43,141 +34,15 @@ namespace GitHub.Runner.Listener
            _brokerServer = HostContext.GetService<IBrokerServer>();
        }

-        public async Task<CreateSessionResult> CreateSessionAsync(CancellationToken token)
+        public async Task<Boolean> CreateSessionAsync(CancellationToken token)
        {
-            Trace.Entering();
-
-            // Settings
-            var configManager = HostContext.GetService<IConfigurationManager>();
-            _settings = configManager.LoadSettings();
-            var serverUrl = _settings.ServerUrlV2;
-            Trace.Info(_settings);
-
-            if (string.IsNullOrEmpty(_settings.ServerUrlV2))
-            {
-                throw new InvalidOperationException("ServerUrlV2 is not set");
-            }
-
-            // Create connection.
-            Trace.Info("Loading Credentials");
-            var credMgr = HostContext.GetService<ICredentialManager>();
-            _creds = credMgr.LoadCredentials();
-
-            var agent = new TaskAgentReference
-            {
-                Id = _settings.AgentId,
-                Name = _settings.AgentName,
-                Version = BuildConstants.RunnerPackage.Version,
-                OSDescription = RuntimeInformation.OSDescription,
-            };
-            var currentProcess = Process.GetCurrentProcess();
-            string sessionName = $"{Environment.MachineName ?? "RUNNER"} (PID: {currentProcess.Id})";
-            var taskAgentSession = new TaskAgentSession(sessionName, agent);
-
-            string errorMessage = string.Empty;
-            bool encounteringError = false;
-
-            while (true)
-            {
-                token.ThrowIfCancellationRequested();
-                Trace.Info($"Attempt to create session.");
-                try
-                {
-                    Trace.Info("Connecting to the Broker Server...");
-                    await _brokerServer.ConnectAsync(new Uri(serverUrl), _creds);
-                    Trace.Info("VssConnection created");
-
-                    _term.WriteLine();
-                    _term.WriteSuccessMessage("Connected to GitHub");
-                    _term.WriteLine();
-
-                    _session = await _brokerServer.CreateSessionAsync(taskAgentSession, token);
-
-                    Trace.Info($"Session created.");
-                    if (encounteringError)
-                    {
-                        _term.WriteLine($"{DateTime.UtcNow:u}: Runner reconnected.");
-                        _sessionCreationExceptionTracker.Clear();
-                        encounteringError = false;
-                    }
-
-                    return CreateSessionResult.Success;
-                }
-                catch (OperationCanceledException) when (token.IsCancellationRequested)
-                {
-                    Trace.Info("Session creation has been cancelled.");
-                    throw;
-                }
-                catch (TaskAgentAccessTokenExpiredException)
-                {
-                    Trace.Info("Runner OAuth token has been revoked. Session creation failed.");
-                    _accessTokenRevoked = true;
-                    throw;
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error("Catch exception during create session.");
-                    Trace.Error(ex);
-
-                    if (ex is VssOAuthTokenRequestException vssOAuthEx && _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. Runner registrations are automatically deleted for runners that have not connected to the service recently.");
-                            return CreateSessionResult.Failure;
-                        }
-
-                        // 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.");
-                        var oauthTokenProvider = new VssOAuthTokenProvider(vssOAuthCred, new Uri(serverUrl));
-                        var authError = await oauthTokenProvider.ValidateCredentialAsync(token);
-                        if (string.Equals(authError, "invalid_client", StringComparison.OrdinalIgnoreCase))
-                        {
-                            _term.WriteError("Failed to create a session. The runner registration has been deleted from the server, please re-configure. Runner registrations are automatically deleted for runners that have not connected to the service recently.");
-                            return CreateSessionResult.Failure;
-                        }
-                    }
-
-                    if (!IsSessionCreationExceptionRetriable(ex))
-                    {
-                        _term.WriteError($"Failed to create session. {ex.Message}");
-                        if (ex is TaskAgentSessionConflictException)
-                        {
-                            return CreateSessionResult.SessionConflict;
-                        }
-                        return CreateSessionResult.Failure;
-                    }
-
-                    if (!encounteringError) //print the message only on the first error
-                    {
-                        _term.WriteError($"{DateTime.UtcNow:u}: Runner connect error: {ex.Message}. Retrying until reconnected.");
-                        encounteringError = true;
-                    }
-
-                    Trace.Info("Sleeping for {0} seconds before retrying.", _sessionCreationRetryInterval.TotalSeconds);
-                    await HostContext.Delay(_sessionCreationRetryInterval, token);
-                }
-            }
+            await RefreshBrokerConnection();
+            return await Task.FromResult(true);
        }

        public async Task DeleteSessionAsync()
        {
-            if (_session != null && _session.SessionId != Guid.Empty)
-            {
-                if (!_accessTokenRevoked)
-                {
-                    using (var ts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
-                    {
-                        await _brokerServer.DeleteSessionAsync(ts.Token);
-                    }
-                }
-                else
-                {
-                    Trace.Warning("Runner OAuth token has been revoked. Skip deleting session.");
-                }
-            }
+            await Task.CompletedTask;
        }

        public void OnJobStatus(object sender, JobStatusEventArgs e)
@@ -208,13 +73,12 @@ namespace GitHub.Runner.Listener
                _getMessagesTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token);
                try
                {
-                    message = await _brokerServer.GetRunnerMessageAsync(_session.SessionId,
+                    message = await _brokerServer.GetRunnerMessageAsync(_getMessagesTokenSource.Token,
                                                                        runnerStatus,
                                                                        BuildConstants.RunnerPackage.Version,
                                                                        VarUtil.OS,
                                                                        VarUtil.OSArchitecture,
-                                                                        _settings.DisableUpdate,
-                                                                        _getMessagesTokenSource.Token);
+                                                                        _settings.DisableUpdate);

                    if (message == null)
                    {
@@ -242,10 +106,6 @@ namespace GitHub.Runner.Listener
                {
                    throw;
                }
-                catch (RunnerNotFoundException)
-                {
-                    throw;
-                }
                catch (Exception ex)
                {
                    Trace.Error("Catch exception during get next message.");
@@ -283,7 +143,7 @@ namespace GitHub.Runner.Listener
                        }

                        // re-create VssConnection before next retry
-                        await RefreshBrokerConnectionAsync();
+                        await RefreshBrokerConnection();

                        Trace.Info("Sleeping for {0} seconds before retrying.", _getNextMessageRetryInterval.TotalSeconds);
                        await HostContext.Delay(_getNextMessageRetryInterval, token);
@@ -313,11 +173,6 @@ namespace GitHub.Runner.Listener
            }
        }

-        public async Task RefreshListenerTokenAsync(CancellationToken cancellationToken)
-        {
-            await RefreshBrokerConnectionAsync();
-        }
-
        public async Task DeleteMessageAsync(TaskAgentMessage message)
        {
            await Task.CompletedTask;
@@ -329,7 +184,6 @@ namespace GitHub.Runner.Listener
                ex is TaskAgentPoolNotFoundException ||
                ex is TaskAgentSessionExpiredException ||
                ex is AccessDeniedException ||
-                ex is RunnerNotFoundException ||
                ex is VssUnauthorizedException)
            {
                Trace.Info($"Non-retriable exception: {ex.Message}");
@@ -342,84 +196,12 @@ namespace GitHub.Runner.Listener
            }
        }

-        private bool IsSessionCreationExceptionRetriable(Exception ex)
-        {
-            if (ex is TaskAgentNotFoundException)
-            {
-                Trace.Info("The runner no longer exists on the server. Stopping the runner.");
-                _term.WriteError("The runner no longer exists on the server. Please reconfigure the runner.");
-                return false;
-            }
-            else if (ex is TaskAgentSessionConflictException)
-            {
-                Trace.Info("The session for this runner already exists.");
-                _term.WriteError("A session for this runner already exists.");
-                if (_sessionCreationExceptionTracker.ContainsKey(nameof(TaskAgentSessionConflictException)))
-                {
-                    _sessionCreationExceptionTracker[nameof(TaskAgentSessionConflictException)]++;
-                    if (_sessionCreationExceptionTracker[nameof(TaskAgentSessionConflictException)] * _sessionCreationRetryInterval.TotalSeconds >= _sessionConflictRetryLimit.TotalSeconds)
-                    {
-                        Trace.Info("The session conflict exception have reached retry limit.");
-                        _term.WriteError($"Stop retry on SessionConflictException after retried for {_sessionConflictRetryLimit.TotalSeconds} seconds.");
-                        return false;
-                    }
-                }
-                else
-                {
-                    _sessionCreationExceptionTracker[nameof(TaskAgentSessionConflictException)] = 1;
-                }
-
-                Trace.Info("The session conflict exception haven't reached retry limit.");
-                return true;
-            }
-            else if (ex is VssOAuthTokenRequestException && ex.Message.Contains("Current server time is"))
-            {
-                Trace.Info("Local clock might be skewed.");
-                _term.WriteError("The local machine's clock may be out of sync with the server time by more than five minutes. Please sync your clock with your domain or internet time and try again.");
-                if (_sessionCreationExceptionTracker.ContainsKey(nameof(VssOAuthTokenRequestException)))
-                {
-                    _sessionCreationExceptionTracker[nameof(VssOAuthTokenRequestException)]++;
-                    if (_sessionCreationExceptionTracker[nameof(VssOAuthTokenRequestException)] * _sessionCreationRetryInterval.TotalSeconds >= _clockSkewRetryLimit.TotalSeconds)
-                    {
-                        Trace.Info("The OAuth token request exception have reached retry limit.");
-                        _term.WriteError($"Stopped retrying OAuth token request exception after {_clockSkewRetryLimit.TotalSeconds} seconds.");
-                        return false;
-                    }
-                }
-                else
-                {
-                    _sessionCreationExceptionTracker[nameof(VssOAuthTokenRequestException)] = 1;
-                }
-
-                Trace.Info("The OAuth token request exception haven't reached retry limit.");
-                return true;
-            }
-            else if (ex is TaskAgentPoolNotFoundException ||
-                     ex is AccessDeniedException ||
-                     ex is VssUnauthorizedException)
-            {
-                Trace.Info($"Non-retriable exception: {ex.Message}");
-                return false;
-            }
-
-            else if (ex is InvalidOperationException)
-            {
-                Trace.Info($"Non-retriable exception: {ex.Message}");
-                return false;
-            }
-            else
-            {
-                Trace.Info($"Retriable exception: {ex.Message}");
-                return true;
-            }
-        }
-
-        private async Task RefreshBrokerConnectionAsync()
+        private async Task RefreshBrokerConnection()
        {
            var configManager = HostContext.GetService<IConfigurationManager>();
            _settings = configManager.LoadSettings();

-            if (string.IsNullOrEmpty(_settings.ServerUrlV2))
+            if (_settings.ServerUrlV2 == null)
            {
                throw new InvalidOperationException("ServerUrlV2 is not set");
            }
--- a/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs
+++ b/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs
@@ -1,5 +1,4 @@
 #if OS_WINDOWS
-#pragma warning disable CA1416
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
@@ -85,5 +84,4 @@ namespace GitHub.Runner.Listener.Configuration
        }
    }
 }
-#pragma warning restore CA1416
 #endif
--- a/src/Runner.Listener/ErrorThrottler.cs
+++ b/src/Runner.Listener/ErrorThrottler.cs
@@ -1,44 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Runner.Common;
-using GitHub.Services.Common;
-
-namespace GitHub.Runner.Listener
-{
-    [ServiceLocator(Default = typeof(ErrorThrottler))]
-    public interface IErrorThrottler : IRunnerService
-    {
-        void Reset();
-        Task IncrementAndWaitAsync(CancellationToken token);
-    }
-
-    public sealed class ErrorThrottler : RunnerService, IErrorThrottler
-    {
-        internal static readonly TimeSpan MinBackoff = TimeSpan.FromSeconds(1);
-        internal static readonly TimeSpan MaxBackoff = TimeSpan.FromMinutes(1);
-        internal static readonly TimeSpan BackoffCoefficient = TimeSpan.FromSeconds(1);
-        private int _count = 0;
-
-        public void Reset()
-        {
-            _count = 0;
-        }
-
-        public async Task IncrementAndWaitAsync(CancellationToken token)
-        {
-            if (++_count <= 1)
-            {
-                return;
-            }
-
-            TimeSpan backoff = BackoffTimerHelper.GetExponentialBackoff(
-                attempt: _count - 2, // 0-based attempt
-                minBackoff: MinBackoff,
-                maxBackoff: MaxBackoff,
-                deltaBackoff: BackoffCoefficient);
-            Trace.Warning($"Back off {backoff.TotalSeconds} seconds before next attempt. Current consecutive error count: {_count}");
-            await HostContext.Delay(backoff, token);
-        }
-    }
-}
--- a/src/Runner.Listener/JobDispatcher.cs
+++ b/src/Runner.Listener/JobDispatcher.cs
@@ -35,7 +35,7 @@ namespace GitHub.Runner.Listener
    // This implementation of IJobDispatcher is not thread safe.
    // It is based on the fact that the current design of the runner is a dequeue
    // and processes one message from the message queue at a time.
-    // In addition, it only executes one job every time,
+    // In addition, it only executes one job every time, 
    // and the server will not send another job while this one is still running.
    public sealed class JobDispatcher : RunnerService, IJobDispatcher
    {
@@ -546,27 +546,13 @@ namespace GitHub.Runner.Listener
                                    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);
-                                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
-                                    unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
-                                    switch (jobServer)
-                                    {
-                                        case IJobServer js:
-                                            {
-                                                await LogWorkerProcessUnhandledException(js, message, unhandledExceptionIssue);
-                                                // Go ahead to finish the job with result 'Failed' if the STDERR from worker is System.IO.IOException, since it typically means we are running out of disk space.
-                                                if (detailInfo.Contains(typeof(System.IO.IOException).ToString(), StringComparison.OrdinalIgnoreCase))
-                                                {
-                                                    Trace.Info($"Finish job with result 'Failed' due to IOException.");
-                                                    await ForceFailJob(js, message);
-                                                }
+                                    await LogWorkerProcessUnhandledException(jobServer, message, detailInfo);

-                                                break;
-                                            }
-                                        case IRunServer rs:
-                                            await ForceFailJob(rs, message, unhandledExceptionIssue);
-                                            break;
-                                        default:
-                                            throw new NotSupportedException($"JobServer type '{jobServer.GetType().Name}' is not supported.");
+                                    // Go ahead to finish the job with result 'Failed' if the STDERR from worker is System.IO.IOException, since it typically means we are running out of disk space.
+                                    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);
                                    }
                                }

@@ -643,22 +629,8 @@ namespace GitHub.Runner.Listener
                                    Trace.Info("worker process has been killed.");
                                }
                            }
-                            catch (Exception ex)
-                            {
-                                // message send failed, this might indicate worker process is already exited or stuck.
-                                Trace.Info($"Job cancel message sending for job {message.JobId} failed, kill running worker. {ex}");
-                                workerProcessCancelTokenSource.Cancel();
-                                try
-                                {
-                                    await workerProcessTask;
-                                }
-                                catch (OperationCanceledException)
-                                {
-                                    Trace.Info("worker process has been killed.");
-                                }
-                            }

-                            // wait worker to exit
+                            // wait worker to exit 
                            // if worker doesn't exit within timeout, then kill worker.
                            completedTask = await Task.WhenAny(workerProcessTask, Task.Delay(-1, workerCancelTimeoutKillToken));

@@ -1145,65 +1117,86 @@ namespace GitHub.Runner.Listener
        }

        // log an error issue to job level timeline record
-        private async Task LogWorkerProcessUnhandledException(IJobServer jobServer, Pipelines.AgentJobRequestMessage message, Issue issue)
+        private async Task LogWorkerProcessUnhandledException(IRunnerService server, Pipelines.AgentJobRequestMessage message, string detailInfo)
        {
-            try
+            if (server is IJobServer jobServer)
            {
-                var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
-                ArgUtil.NotNull(timeline, nameof(timeline));
+                try
+                {
+                    var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
+                    ArgUtil.NotNull(timeline, nameof(timeline));

-                TimelineRecord jobRecord = timeline.Records.FirstOrDefault(x => x.Id == message.JobId && x.RecordType == "Job");
-                ArgUtil.NotNull(jobRecord, nameof(jobRecord));
+                    TimelineRecord jobRecord = timeline.Records.FirstOrDefault(x => x.Id == message.JobId && x.RecordType == "Job");
+                    ArgUtil.NotNull(jobRecord, nameof(jobRecord));

-                jobRecord.ErrorCount++;
-                jobRecord.Issues.Add(issue);
+                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
+                    unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
+                    jobRecord.ErrorCount++;
+                    jobRecord.Issues.Add(unhandledExceptionIssue);

-                Trace.Info("Mark the job as failed since the worker crashed");
-                jobRecord.Result = TaskResult.Failed;
-                // mark the job as completed so service will pickup the result
-                jobRecord.State = TimelineRecordState.Completed;
+                    if (message.Variables.TryGetValue("DistributedTask.MarkJobAsFailedOnWorkerCrash", out var markJobAsFailedOnWorkerCrash) &&
+                        StringUtil.ConvertToBoolean(markJobAsFailedOnWorkerCrash?.Value))
+                    {
+                        Trace.Info("Mark the job as failed since the worker crashed");
+                        jobRecord.Result = TaskResult.Failed;
+                        // mark the job as completed so service will pickup the result
+                        jobRecord.State = TimelineRecordState.Completed;
+                    }

-                await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, new TimelineRecord[] { jobRecord }, CancellationToken.None);
+                    await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, new TimelineRecord[] { jobRecord }, CancellationToken.None);
+                }
+                catch (Exception ex)
+                {
+                    Trace.Error("Fail to report unhandled exception from Runner.Worker process");
+                    Trace.Error(ex);
+                }
            }
-            catch (Exception ex)
+            else
            {
-                Trace.Error("Fail to report unhandled exception from Runner.Worker process");
-                Trace.Error(ex);
+                Trace.Info("Job server does not support handling unhandled exception yet, error message: {0}", detailInfo);
+                return;
            }
        }

        // raise job completed event to fail the job.
-        private async Task ForceFailJob(IJobServer jobServer, Pipelines.AgentJobRequestMessage message)
+        private async Task ForceFailJob(IRunnerService server, Pipelines.AgentJobRequestMessage message, string detailInfo)
        {
-            try
+            if (server is IJobServer jobServer)
            {
-                var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, TaskResult.Failed);
-                await jobServer.RaisePlanEventAsync<JobCompletedEvent>(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, jobCompletedEvent, CancellationToken.None);
-            }
-            catch (Exception ex)
-            {
-                Trace.Error("Fail to raise JobCompletedEvent back to service.");
-                Trace.Error(ex);
-            }
-        }
-
-        private async Task ForceFailJob(IRunServer runServer, Pipelines.AgentJobRequestMessage message, Issue issue)
-        {
-            try
-            {
-                var annotation = issue.ToAnnotation();
-                var jobAnnotations = new List<Annotation>();
-                if (annotation.HasValue)
+                try
                {
-                    jobAnnotations.Add(annotation.Value);
+                    var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, TaskResult.Failed);
+                    await jobServer.RaisePlanEventAsync<JobCompletedEvent>(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, jobCompletedEvent, CancellationToken.None);
+                }
+                catch (Exception ex)
+                {
+                    Trace.Error("Fail to raise JobCompletedEvent back to service.");
+                    Trace.Error(ex);
                }
-
-                await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, environmentUrl: null, telemetry: null, CancellationToken.None);
            }
-            catch (Exception ex)
+            else if (server is IRunServer runServer)
            {
-                Trace.Error("Fail to raise job completion back to service.");
-                Trace.Error(ex);
+                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);
+                }
+                catch (Exception ex)
+                {
+                    Trace.Error("Fail to raise job completion back to service.");
+                    Trace.Error(ex);
+                }
+            }
+            else
+            {
+                throw new NotSupportedException($"Server type {server.GetType().FullName} is not supported.");
            }
        }

--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -14,26 +14,16 @@ using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.OAuth;
-using GitHub.Services.WebApi;

 namespace GitHub.Runner.Listener
 {
-    public enum CreateSessionResult
-    {
-        Success,
-        Failure,
-        SessionConflict
-    }
-
    [ServiceLocator(Default = typeof(MessageListener))]
    public interface IMessageListener : IRunnerService
    {
-        Task<CreateSessionResult> CreateSessionAsync(CancellationToken token);
+        Task<Boolean> CreateSessionAsync(CancellationToken token);
        Task DeleteSessionAsync();
        Task<TaskAgentMessage> GetNextMessageAsync(CancellationToken token);
        Task DeleteMessageAsync(TaskAgentMessage message);
-
-        Task RefreshListenerTokenAsync(CancellationToken token);
        void OnJobStatus(object sender, JobStatusEventArgs e);
    }

@@ -43,7 +33,6 @@ namespace GitHub.Runner.Listener
        private RunnerSettings _settings;
        private ITerminal _term;
        private IRunnerServer _runnerServer;
-        private IBrokerServer _brokerServer;
        private TaskAgentSession _session;
        private TimeSpan _getNextMessageRetryInterval;
        private bool _accessTokenRevoked = false;
@@ -53,9 +42,6 @@ namespace GitHub.Runner.Listener
        private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new();
        private TaskAgentStatus runnerStatus = TaskAgentStatus.Online;
        private CancellationTokenSource _getMessagesTokenSource;
-        private VssCredentials _creds;
-
-        private bool _isBrokerSession = false;

        public override void Initialize(IHostContext hostContext)
        {
@@ -63,10 +49,9 @@ namespace GitHub.Runner.Listener

            _term = HostContext.GetService<ITerminal>();
            _runnerServer = HostContext.GetService<IRunnerServer>();
-            _brokerServer = hostContext.GetService<IBrokerServer>();
        }

-        public async Task<CreateSessionResult> CreateSessionAsync(CancellationToken token)
+        public async Task<Boolean> CreateSessionAsync(CancellationToken token)
        {
            Trace.Entering();

@@ -79,7 +64,7 @@ namespace GitHub.Runner.Listener
            // Create connection.
            Trace.Info("Loading Credentials");
            var credMgr = HostContext.GetService<ICredentialManager>();
-            _creds = credMgr.LoadCredentials();
+            VssCredentials creds = credMgr.LoadCredentials();

            var agent = new TaskAgentReference
            {
@@ -88,8 +73,7 @@ namespace GitHub.Runner.Listener
                Version = BuildConstants.RunnerPackage.Version,
                OSDescription = RuntimeInformation.OSDescription,
            };
-            var currentProcess = Process.GetCurrentProcess();
-            string sessionName = $"{Environment.MachineName ?? "RUNNER"} (PID: {currentProcess.Id})";
+            string sessionName = $"{Environment.MachineName ?? "RUNNER"}";
            var taskAgentSession = new TaskAgentSession(sessionName, agent);

            string errorMessage = string.Empty;
@@ -102,7 +86,7 @@ namespace GitHub.Runner.Listener
                try
                {
                    Trace.Info("Connecting to the Runner Server...");
-                    await _runnerServer.ConnectAsync(new Uri(serverUrl), _creds);
+                    await _runnerServer.ConnectAsync(new Uri(serverUrl), creds);
                    Trace.Info("VssConnection created");

                    _term.WriteLine();
@@ -114,15 +98,6 @@ namespace GitHub.Runner.Listener
                                                        taskAgentSession,
                                                        token);

-                    if (_session.BrokerMigrationMessage != null)
-                    {
-                        Trace.Info("Runner session is in migration mode: Creating Broker session with BrokerBaseUrl: {0}", _session.BrokerMigrationMessage.BrokerBaseUrl);
-
-                        await _brokerServer.UpdateConnectionIfNeeded(_session.BrokerMigrationMessage.BrokerBaseUrl, _creds);
-                        _session = await _brokerServer.CreateSessionAsync(taskAgentSession, token);
-                        _isBrokerSession = true;
-                    }
-
                    Trace.Info($"Session created.");
                    if (encounteringError)
                    {
@@ -131,7 +106,7 @@ namespace GitHub.Runner.Listener
                        encounteringError = false;
                    }

-                    return CreateSessionResult.Success;
+                    return true;
                }
                catch (OperationCanceledException) when (token.IsCancellationRequested)
                {
@@ -149,13 +124,13 @@ 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 vssOAuthEx && 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. Runner registrations are automatically deleted for runners that have not connected to the service recently.");
-                            return CreateSessionResult.Failure;
+                            return false;
                        }

                        // Check whether we get 401 because the runner registration already removed by the service.
@@ -166,18 +141,14 @@ namespace GitHub.Runner.Listener
                        if (string.Equals(authError, "invalid_client", StringComparison.OrdinalIgnoreCase))
                        {
                            _term.WriteError("Failed to create a session. The runner registration has been deleted from the server, please re-configure. Runner registrations are automatically deleted for runners that have not connected to the service recently.");
-                            return CreateSessionResult.Failure;
+                            return false;
                        }
                    }

                    if (!IsSessionCreationExceptionRetriable(ex))
                    {
                        _term.WriteError($"Failed to create session. {ex.Message}");
-                        if (ex is TaskAgentSessionConflictException)
-                        {
-                            return CreateSessionResult.SessionConflict;
-                        }
-                        return CreateSessionResult.Failure;
+                        return false;
                    }

                    if (!encounteringError) //print the message only on the first error
@@ -201,11 +172,6 @@ namespace GitHub.Runner.Listener
                    using (var ts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
                    {
                        await _runnerServer.DeleteAgentSessionAsync(_settings.PoolId, _session.SessionId, ts.Token);
-
-                        if (_isBrokerSession)
-                        {
-                            await _brokerServer.DeleteSessionAsync(ts.Token);
-                        }
                    }
                }
                else
@@ -217,17 +183,19 @@ namespace GitHub.Runner.Listener

        public void OnJobStatus(object sender, JobStatusEventArgs e)
        {
-            Trace.Info("Received job status event. JobState: {0}", e.Status);
-            runnerStatus = e.Status;
-            try
+            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("USE_BROKER_FLOW")))
            {
-                _getMessagesTokenSource?.Cancel();
+                Trace.Info("Received job status event. JobState: {0}", e.Status);
+                runnerStatus = e.Status;
+                try
+                {
+                    _getMessagesTokenSource?.Cancel();
+                }
+                catch (ObjectDisposedException)
+                {
+                    Trace.Info("_getMessagesTokenSource is already disposed.");
+                }
            }
-            catch (ObjectDisposedException)
-            {
-                Trace.Info("_getMessagesTokenSource is already disposed.");
-            }
-
        }

        public async Task<TaskAgentMessage> GetNextMessageAsync(CancellationToken token)
@@ -237,7 +205,6 @@ namespace GitHub.Runner.Listener
            ArgUtil.NotNull(_settings, nameof(_settings));
            bool encounteringError = false;
            int continuousError = 0;
-            int continuousEmptyMessage = 0;
            string errorMessage = string.Empty;
            Stopwatch heartbeat = new();
            heartbeat.Restart();
@@ -261,21 +228,6 @@ namespace GitHub.Runner.Listener
                    // Decrypt the message body if the session is using encryption
                    message = DecryptMessage(message);

-
-                    if (message != null && message.MessageType == BrokerMigrationMessage.MessageType)
-                    {
-                        var migrationMessage = JsonUtility.FromString<BrokerMigrationMessage>(message.Body);
-
-                        await _brokerServer.UpdateConnectionIfNeeded(migrationMessage.BrokerBaseUrl, _creds);
-                        message = await _brokerServer.GetRunnerMessageAsync(_session.SessionId,
-                                                                        runnerStatus,
-                                                                        BuildConstants.RunnerPackage.Version,
-                                                                        VarUtil.OS,
-                                                                        VarUtil.OSArchitecture,
-                                                                        _settings.DisableUpdate,
-                                                                        token);
-                    }
-
                    if (message != null)
                    {
                        _lastMessageId = message.MessageId;
@@ -308,17 +260,13 @@ namespace GitHub.Runner.Listener
                {
                    throw;
                }
-                catch (RunnerNotFoundException)
-                {
-                    throw;
-                }
                catch (Exception ex)
                {
                    Trace.Error("Catch exception during get next message.");
                    Trace.Error(ex);

                    // don't retry if SkipSessionRecover = true, DT service will delete agent session to stop agent from taking more jobs.
-                    if (ex is TaskAgentSessionExpiredException && !_settings.SkipSessionRecover && (await CreateSessionAsync(token) == CreateSessionResult.Success))
+                    if (ex is TaskAgentSessionExpiredException && !_settings.SkipSessionRecover && await CreateSessionAsync(token))
                    {
                        Trace.Info($"{nameof(TaskAgentSessionExpiredException)} received, recovered by recreate session.");
                    }
@@ -363,27 +311,16 @@ namespace GitHub.Runner.Listener

                if (message == null)
                {
-                    continuousEmptyMessage++;
                    if (heartbeat.Elapsed > TimeSpan.FromMinutes(30))
                    {
                        Trace.Info($"No message retrieved from session '{_session.SessionId}' within last 30 minutes.");
                        heartbeat.Restart();
-                        continuousEmptyMessage = 0;
                    }
                    else
                    {
                        Trace.Verbose($"No message retrieved from session '{_session.SessionId}'.");
                    }

-                    if (continuousEmptyMessage > 50)
-                    {
-                        // retried more than 50 times in less than 30mins and still getting empty message
-                        // something is not right on the service side, backoff for 15-30s before retry
-                        _getNextMessageRetryInterval = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), _getNextMessageRetryInterval);
-                        Trace.Info("Sleeping for {0} seconds before retrying.", _getNextMessageRetryInterval.TotalSeconds);
-                        await HostContext.Delay(_getNextMessageRetryInterval, token);
-                    }
-
                    continue;
                }

@@ -406,12 +343,6 @@ namespace GitHub.Runner.Listener
            }
        }

-        public async Task RefreshListenerTokenAsync(CancellationToken cancellationToken)
-        {
-            await _runnerServer.RefreshConnectionAsync(RunnerConnectionType.MessageQueue, TimeSpan.FromSeconds(60));
-            await _brokerServer.ForceRefreshConnection(_creds);
-        }
-
        private TaskAgentMessage DecryptMessage(TaskAgentMessage message)
        {
            if (_session.EncryptionKey == null ||
@@ -461,7 +392,6 @@ namespace GitHub.Runner.Listener
                ex is TaskAgentPoolNotFoundException ||
                ex is TaskAgentSessionExpiredException ||
                ex is AccessDeniedException ||
-                ex is RunnerNotFoundException ||
                ex is VssUnauthorizedException)
            {
                Trace.Info($"Non-retriable exception: {ex.Message}");
--- a/src/Runner.Listener/Program.cs
+++ b/src/Runner.Listener/Program.cs
@@ -7,7 +7,6 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Services.WebApi;

 namespace GitHub.Runner.Listener
 {
@@ -145,12 +144,6 @@ namespace GitHub.Runner.Listener
                trace.Error(e);
                return Constants.Runner.ReturnCode.TerminatedError;
            }
-            catch (RunnerNotFoundException e)
-            {
-                terminal.WriteError($"An error occurred: {e.Message}");
-                trace.Error(e);
-                return Constants.Runner.ReturnCode.TerminatedError;
-            }
            catch (Exception e)
            {
                terminal.WriteError($"An error occurred: {e.Message}");
--- a/src/Runner.Listener/Runner.Listener.csproj
+++ b/src/Runner.Listener/Runner.Listener.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
@@ -19,11 +18,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
  </ItemGroup>

  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -32,25 +32,10 @@ namespace GitHub.Runner.Listener
        private bool _inConfigStage;
        private ManualResetEvent _completedCommand = new(false);

-        // <summary>
-        // Helps avoid excessive calls to Run Service when encountering non-retriable errors from /acquirejob.
-        // Normally we rely on the HTTP clients to back off between retry attempts. However, acquiring a job
-        // involves calls to both Run Serivce and Broker. And Run Service and Broker communicate with each other
-        // in an async fashion.
-        //
-        // When Run Service encounters a non-retriable error, it sends an async message to Broker. The runner will,
-        // however, immediately call Broker to get the next message. If the async event from Run Service to Broker
-        // has not yet been processed, the next message from Broker may be the same job message.
-        //
-        // The error throttler helps us back off when encountering successive, non-retriable errors from /acquirejob.
-        // </summary>
-        private IErrorThrottler _acquireJobThrottler;
-
        public override void Initialize(IHostContext hostContext)
        {
            base.Initialize(hostContext);
            _term = HostContext.GetService<ITerminal>();
-            _acquireJobThrottler = HostContext.CreateService<IErrorThrottler>();
        }

        public async Task<int> ExecuteCommand(CommandSettings command)
@@ -228,21 +213,15 @@ namespace GitHub.Runner.Listener
                            var configFile = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), config.Key);
                            var configContent = Convert.FromBase64String(config.Value);
 #if OS_WINDOWS
-#pragma warning disable CA1416
                            if (configFile == HostContext.GetConfigFile(WellKnownConfigFile.RSACredentials))
                            {
                                configContent = ProtectedData.Protect(configContent, null, DataProtectionScope.LocalMachine);
                            }
-#pragma warning restore CA1416
 #endif
                            File.WriteAllBytes(configFile, configContent);
                            File.SetAttributes(configFile, File.GetAttributes(configFile) | FileAttributes.Hidden);
                            Trace.Info($"Saved {configContent.Length} bytes to '{configFile}'.");
                        }
-
-                        // make sure we have the right user agent data added from the jitconfig
-                        HostContext.LoadDefaultUserAgents();
-                        VssUtil.InitializeVssClientSettings(HostContext.UserAgents, HostContext.WebProxy);
                    }
                    catch (Exception ex)
                    {
@@ -380,12 +359,7 @@ namespace GitHub.Runner.Listener
            {
                Trace.Info(nameof(RunAsync));
                _listener = GetMesageListener(settings);
-                CreateSessionResult createSessionResult = await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken);
-                if (createSessionResult == CreateSessionResult.SessionConflict)
-                {
-                    return Constants.Runner.ReturnCode.SessionConflict;
-                }
-                else if (createSessionResult == CreateSessionResult.Failure)
+                if (!await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken))
                {
                    return Constants.Runner.ReturnCode.TerminatedError;
                }
@@ -584,21 +558,13 @@ namespace GitHub.Runner.Listener
                                        await runServer.ConnectAsync(new Uri(messageRef.RunServiceUrl), creds);
                                        try
                                        {
-                                            jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
-                                            _acquireJobThrottler.Reset();
+                                            jobRequestMessage =
+                                            await runServer.GetJobMessageAsync(messageRef.RunnerRequestId,
+                                            messageQueueLoopTokenSource.Token);
                                        }
-                                        catch (Exception ex) when (
-                                            ex is TaskOrchestrationJobNotFoundException ||          // HTTP status 404
-                                            ex is TaskOrchestrationJobAlreadyAcquiredException ||   // HTTP status 409
-                                            ex is TaskOrchestrationJobUnprocessableException)       // HTTP status 422
+                                        catch (TaskOrchestrationJobAlreadyAcquiredException)
                                        {
-                                            Trace.Info($"Skipping message Job. {ex.Message}");
-                                            await _acquireJobThrottler.IncrementAndWaitAsync(messageQueueLoopTokenSource.Token);
-                                            continue;
-                                        }
-                                        catch (Exception ex)
-                                        {
-                                            Trace.Error($"Caught exception from acquiring job message: {ex}");
+                                            Trace.Info("Job is already acquired, skip this message.");
                                            continue;
                                        }
                                    }
@@ -630,11 +596,6 @@ namespace GitHub.Runner.Listener
                                Trace.Info($"Service requests the hosted runner to shutdown. Reason: '{HostedRunnerShutdownMessage.Reason}'.");
                                return Constants.Runner.ReturnCode.Success;
                            }
-                            else if (string.Equals(message.MessageType, TaskAgentMessageTypes.ForceTokenRefresh))
-                            {
-                                Trace.Info("Received ForceTokenRefreshMessage");
-                                await _listener.RefreshListenerTokenAsync(messageQueueLoopTokenSource.Token);
-                            }
                            else
                            {
                                Trace.Error($"Received message {message.MessageId} with unsupported message type {message.MessageType}.");
@@ -673,7 +634,6 @@ namespace GitHub.Runner.Listener
                    {
                        try
                        {
-                            Trace.Info("Deleting Runner Session...");
                            await _listener.DeleteSessionAsync();
                        }
                        catch (Exception ex) when (runOnce)
--- a/src/Runner.Listener/SelfUpdater.cs
+++ b/src/Runner.Listener/SelfUpdater.cs
@@ -34,7 +34,6 @@ namespace GitHub.Runner.Listener
        private IRunnerServer _runnerServer;
        private int _poolId;
        private ulong _agentId;
-        private const int _numberOfOldVersionsToKeep = 1;
        private readonly ConcurrentQueue<string> _updateTrace = new();
        public bool Busy { get; private set; }

@@ -510,9 +509,9 @@ namespace GitHub.Runner.Listener

            // delete old bin.2.99.0 folder, only leave the current version and the latest download version
            var allBinDirs = Directory.GetDirectories(HostContext.GetDirectory(WellKnownDirectory.Root), "bin.*");
-            if (allBinDirs.Length > _numberOfOldVersionsToKeep)
+            if (allBinDirs.Length > 2)
            {
-                // there are more than one bin.version folder.
+                // there are more than 2 bin.version folder.
                // delete older bin.version folders.
                foreach (var oldBinDir in allBinDirs)
                {
@@ -539,9 +538,9 @@ namespace GitHub.Runner.Listener

            // delete old externals.2.99.0 folder, only leave the current version and the latest download version
            var allExternalsDirs = Directory.GetDirectories(HostContext.GetDirectory(WellKnownDirectory.Root), "externals.*");
-            if (allExternalsDirs.Length > _numberOfOldVersionsToKeep)
+            if (allExternalsDirs.Length > 2)
            {
-                // there are more than one externals.version folder.
+                // there are more than 2 externals.version folder.
                // delete older externals.version folders.
                foreach (var oldExternalDir in allExternalsDirs)
                {
--- a/src/Runner.PluginHost/Runner.PluginHost.csproj
+++ b/src/Runner.PluginHost/Runner.PluginHost.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
--- a/src/Runner.Plugins/Runner.Plugins.csproj
+++ b/src/Runner.Plugins/Runner.Plugins.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
  </PropertyGroup>

--- a/src/Runner.Sdk/Runner.Sdk.csproj
+++ b/src/Runner.Sdk/Runner.Sdk.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
  </PropertyGroup>

@@ -15,9 +14,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
+    <PackageReference Include="System.Threading.Channels" Version="4.4.0" />
  </ItemGroup>

  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
--- a/src/Runner.Sdk/Util/IOUtil.cs
+++ b/src/Runner.Sdk/Util/IOUtil.cs
@@ -459,34 +459,6 @@ namespace GitHub.Runner.Sdk
            File.WriteAllText(path, null);
        }

-        /// <summary>
-        /// Replaces invalid file name characters with '_'
-        /// </summary>
-        public static string ReplaceInvalidFileNameChars(string fileName)
-        {
-            var result = new StringBuilder();
-            var invalidChars = Path.GetInvalidFileNameChars();
-
-            var current = 0; // Current index
-            while (current < fileName?.Length)
-            {
-                var next = fileName.IndexOfAny(invalidChars, current);
-                if (next >= 0)
-                {
-                    result.Append(fileName.Substring(current, next - current));
-                    result.Append('_');
-                    current = next + 1;
-                }
-                else
-                {
-                    result.Append(fileName.Substring(current));
-                    break;
-                }
-            }
-
-            return result.ToString();
-        }
-
        /// <summary>
        /// Recursively enumerates a directory without following directory reparse points.
        /// </summary>
--- a/src/Runner.Sdk/Util/UrlUtil.cs
+++ b/src/Runner.Sdk/Util/UrlUtil.cs
@@ -60,15 +60,5 @@ namespace GitHub.Runner.Sdk
            }
            return string.Empty;
        }
-
-        public static string GetVssRequestId(HttpResponseHeaders headers)
-        {
-            if (headers != null &&
-                headers.TryGetValues("x-vss-e2eid", out var headerValues))
-            {
-                return headerValues.FirstOrDefault();
-            }
-            return string.Empty;
-        }
    }
 }
--- a/src/Runner.Sdk/Util/VssUtil.cs
+++ b/src/Runner.Sdk/Util/VssUtil.cs
@@ -23,13 +23,7 @@ namespace GitHub.Runner.Sdk

            if (VssClientHttpRequestSettings.Default.UserAgent != null && VssClientHttpRequestSettings.Default.UserAgent.Count > 0)
            {
-                foreach (var headerVal in VssClientHttpRequestSettings.Default.UserAgent)
-                {
-                    if (!headerValues.Contains(headerVal))
-                    {
-                        headerValues.Add(headerVal);
-                    }
-                }
+                headerValues.AddRange(VssClientHttpRequestSettings.Default.UserAgent);
            }

            VssClientHttpRequestSettings.Default.UserAgent = headerValues;
@@ -39,23 +33,6 @@ namespace GitHub.Runner.Sdk
            {
                VssClientHttpRequestSettings.Default.ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
            }
-
-            var rawHeaderValues = new List<ProductInfoHeaderValue>();
-            rawHeaderValues.AddRange(additionalUserAgents);
-            rawHeaderValues.Add(new ProductInfoHeaderValue($"({StringUtil.SanitizeUserAgentHeader(RuntimeInformation.OSDescription)})"));
-
-            if (RawClientHttpRequestSettings.Default.UserAgent != null && RawClientHttpRequestSettings.Default.UserAgent.Count > 0)
-            {
-                foreach (var headerVal in RawClientHttpRequestSettings.Default.UserAgent)
-                {
-                    if (!rawHeaderValues.Contains(headerVal))
-                    {
-                        rawHeaderValues.Add(headerVal);
-                    }
-                }
-            }
-
-            RawClientHttpRequestSettings.Default.UserAgent = rawHeaderValues;
        }

        public static VssConnection CreateConnection(
@@ -85,6 +62,11 @@ namespace GitHub.Runner.Sdk
                settings.SendTimeout = TimeSpan.FromSeconds(Math.Min(Math.Max(httpRequestTimeoutSeconds, 100), 1200));
            }

+            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("USE_BROKER_FLOW")))
+            {
+                settings.AllowAutoRedirectForBroker = true;
+            }
+
            // Remove Invariant from the list of accepted languages.
            //
            // The constructor of VssHttpRequestSettings (base class of VssClientHttpRequestSettings) adds the current
--- a/src/Runner.Sdk/Util/WhichUtil.cs
+++ b/src/Runner.Sdk/Util/WhichUtil.cs
@@ -7,6 +7,129 @@ namespace GitHub.Runner.Sdk
    public static class WhichUtil
    {
        public static string Which(string command, bool require = false, ITraceWriter trace = null, string prependPath = null)
+        {
+            ArgUtil.NotNullOrEmpty(command, nameof(command));
+            trace?.Info($"Which: '{command}'");
+            if (Path.IsPathFullyQualified(command) && File.Exists(command))
+            {
+                trace?.Info($"Fully qualified path: '{command}'");
+                return command;
+            }
+            string path = Environment.GetEnvironmentVariable(PathUtil.PathVariable);
+            if (string.IsNullOrEmpty(path))
+            {
+                trace?.Info("PATH environment variable not defined.");
+                path = path ?? string.Empty;
+            }
+            if (!string.IsNullOrEmpty(prependPath))
+            {
+                path = PathUtil.PrependPath(prependPath, path);
+            }
+
+            string[] pathSegments = path.Split(new Char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries);
+            for (int i = 0; i < pathSegments.Length; i++)
+            {
+                pathSegments[i] = Environment.ExpandEnvironmentVariables(pathSegments[i]);
+            }
+
+            foreach (string pathSegment in pathSegments)
+            {
+                if (!string.IsNullOrEmpty(pathSegment) && Directory.Exists(pathSegment))
+                {
+                    string[] matches = null;
+#if OS_WINDOWS
+                    string pathExt = Environment.GetEnvironmentVariable("PATHEXT");
+                    if (string.IsNullOrEmpty(pathExt))
+                    {
+                        // XP's system default value for PATHEXT system variable
+                        pathExt = ".com;.exe;.bat;.cmd;.vbs;.vbe;.js;.jse;.wsf;.wsh";
+                    }
+
+                    string[] pathExtSegments = pathExt.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+
+                    // if command already has an extension.
+                    if (pathExtSegments.Any(ext => command.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        try
+                        {
+                            matches = Directory.GetFiles(pathSegment, command);
+                        }
+                        catch (UnauthorizedAccessException ex)
+                        {
+                            trace?.Info("Ignore UnauthorizedAccess exception during Which.");
+                            trace?.Verbose(ex.ToString());
+                        }
+
+                        if (matches != null && matches.Length > 0 && IsPathValid(matches.First(), trace))
+                        {
+                            trace?.Info($"Location: '{matches.First()}'");
+                            return matches.First();
+                        }
+                    }
+                    else
+                    {
+                        string searchPattern;
+                        searchPattern = StringUtil.Format($"{command}.*");
+                        try
+                        {
+                            matches = Directory.GetFiles(pathSegment, searchPattern);
+                        }
+                        catch (UnauthorizedAccessException ex)
+                        {
+                            trace?.Info("Ignore UnauthorizedAccess exception during Which.");
+                            trace?.Verbose(ex.ToString());
+                        }
+
+                        if (matches != null && matches.Length > 0)
+                        {
+                            // add extension.
+                            for (int i = 0; i < pathExtSegments.Length; i++)
+                            {
+                                string fullPath = Path.Combine(pathSegment, $"{command}{pathExtSegments[i]}");
+                                if (matches.Any(p => p.Equals(fullPath, StringComparison.OrdinalIgnoreCase)) && IsPathValid(fullPath, trace))
+                                {
+                                    trace?.Info($"Location: '{fullPath}'");
+                                    return fullPath;
+                                }
+                            }
+                        }
+                    }
+#else
+                    try
+                    {
+                        matches = Directory.GetFiles(pathSegment, command);
+                    }
+                    catch (UnauthorizedAccessException ex)
+                    {
+                        trace?.Info("Ignore UnauthorizedAccess exception during Which.");
+                        trace?.Verbose(ex.ToString());
+                    }
+
+                    if (matches != null && matches.Length > 0 && IsPathValid(matches.First(), trace))
+                    {
+                        trace?.Info($"Location: '{matches.First()}'");
+                        return matches.First();
+                    }
+#endif
+                }
+            }
+
+#if OS_WINDOWS
+            trace?.Info($"{command}: command not found. Make sure '{command}' is installed and its location included in the 'Path' environment variable.");
+#else
+            trace?.Info($"{command}: command not found. Make sure '{command}' is installed and its location included in the 'PATH' environment variable.");
+#endif
+            if (require)
+            {
+                throw new FileNotFoundException(
+                    message: $"{command}: command not found",
+                    fileName: command);
+            }
+
+            return null;
+        }
+
+        public static string Which2(string command, bool require = false, ITraceWriter trace = null, string prependPath = null)
        {
            ArgUtil.NotNullOrEmpty(command, nameof(command));
            trace?.Info($"Which2: '{command}'");
--- a/src/Runner.Worker/ActionManager.cs
+++ b/src/Runner.Worker/ActionManager.cs
@@ -483,6 +483,10 @@ namespace GitHub.Runner.Worker
                            {
                                // Load stored Ids for later load actions
                                compositeAction.Steps[i].Id = _cachedEmbeddedStepIds[action.Id][i];
+                                if (string.IsNullOrEmpty(executionContext.Global.Variables.Get("DistributedTask.EnableCompositeActions")) && compositeAction.Steps[i].Reference.Type != Pipelines.ActionSourceType.Script)
+                                {
+                                    throw new Exception("`uses:` keyword is not currently supported.");
+                                }
                            }
                        }
                        else
@@ -699,12 +703,11 @@ namespace GitHub.Runner.Worker
                catch (Exception ex) when (!executionContext.CancellationToken.IsCancellationRequested) // Do not retry if the run is cancelled.
                {
                    // UnresolvableActionDownloadInfoException is a 422 client error, don't retry
-                    // NonRetryableActionDownloadInfoException is an non-retryable exception from Actions
                    // Some possible cases are:
                    // * Repo is rate limited
                    // * Repo or tag doesn't exist, or isn't public
                    // * Policy validation failed
-                    if (attempt < 3 && !(ex is WebApi.UnresolvableActionDownloadInfoException) && !(ex is WebApi.NonRetryableActionDownloadInfoException))
+                    if (attempt < 3 && !(ex is WebApi.UnresolvableActionDownloadInfoException))
                    {
                        executionContext.Output($"Failed to resolve action download info. Error: {ex.Message}");
                        executionContext.Debug(ex.ToString());
@@ -793,39 +796,42 @@ namespace GitHub.Runner.Worker
            try
            {
                var useActionArchiveCache = false;
-                var hasActionArchiveCache = false;
-                var actionArchiveCacheDir = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ActionArchiveCacheDirectory);
-                if (!string.IsNullOrEmpty(actionArchiveCacheDir) &&
-                    Directory.Exists(actionArchiveCacheDir))
+                if (executionContext.Global.Variables.GetBoolean("DistributedTask.UseActionArchiveCache") == true)
                {
-                    hasActionArchiveCache = true;
-                    Trace.Info($"Check if action archive '{downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha}' already exists in cache directory '{actionArchiveCacheDir}'");
-#if OS_WINDOWS
-                    var cacheArchiveFile = Path.Combine(actionArchiveCacheDir, downloadInfo.ResolvedNameWithOwner.Replace(Path.DirectorySeparatorChar, '_').Replace(Path.AltDirectorySeparatorChar, '_'), $"{downloadInfo.ResolvedSha}.zip");
-#else
-                    var cacheArchiveFile = Path.Combine(actionArchiveCacheDir, downloadInfo.ResolvedNameWithOwner.Replace(Path.DirectorySeparatorChar, '_').Replace(Path.AltDirectorySeparatorChar, '_'), $"{downloadInfo.ResolvedSha}.tar.gz");
-#endif
-                    if (File.Exists(cacheArchiveFile))
+                    var hasActionArchiveCache = false;
+                    var actionArchiveCacheDir = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ActionArchiveCacheDirectory);
+                    if (!string.IsNullOrEmpty(actionArchiveCacheDir) &&
+                        Directory.Exists(actionArchiveCacheDir))
                    {
-                        try
+                        hasActionArchiveCache = true;
+                        Trace.Info($"Check if action archive '{downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha}' already exists in cache directory '{actionArchiveCacheDir}'");
+#if OS_WINDOWS
+                        var cacheArchiveFile = Path.Combine(actionArchiveCacheDir, downloadInfo.ResolvedNameWithOwner.Replace(Path.DirectorySeparatorChar, '_').Replace(Path.AltDirectorySeparatorChar, '_'), $"{downloadInfo.ResolvedSha}.zip");
+#else
+                        var cacheArchiveFile = Path.Combine(actionArchiveCacheDir, downloadInfo.ResolvedNameWithOwner.Replace(Path.DirectorySeparatorChar, '_').Replace(Path.AltDirectorySeparatorChar, '_'), $"{downloadInfo.ResolvedSha}.tar.gz");
+#endif
+                        if (File.Exists(cacheArchiveFile))
                        {
-                            Trace.Info($"Found action archive '{cacheArchiveFile}' in cache directory '{actionArchiveCacheDir}'");
-                            File.Copy(cacheArchiveFile, archiveFile);
-                            useActionArchiveCache = true;
-                            executionContext.Debug($"Copied action archive '{cacheArchiveFile}' to '{archiveFile}'");
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.Error($"Failed to copy action archive '{cacheArchiveFile}' to '{archiveFile}'. Error: {ex}");
+                            try
+                            {
+                                Trace.Info($"Found action archive '{cacheArchiveFile}' in cache directory '{actionArchiveCacheDir}'");
+                                File.Copy(cacheArchiveFile, archiveFile);
+                                useActionArchiveCache = true;
+                                executionContext.Debug($"Copied action archive '{cacheArchiveFile}' to '{archiveFile}'");
+                            }
+                            catch (Exception ex)
+                            {
+                                Trace.Error($"Failed to copy action archive '{cacheArchiveFile}' to '{archiveFile}'. Error: {ex}");
+                            }
                        }
                    }
-                }

-                executionContext.Global.JobTelemetry.Add(new JobTelemetry()
-                {
-                    Type = JobTelemetryType.General,
-                    Message = $"Action archive cache usage: {downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha} use cache {useActionArchiveCache} has cache {hasActionArchiveCache}"
-                });
+                    executionContext.Global.JobTelemetry.Add(new JobTelemetry()
+                    {
+                        Type = JobTelemetryType.General,
+                        Message = $"Action archive cache usage: {downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha} use cache {useActionArchiveCache} has cache {hasActionArchiveCache}"
+                    });
+                }

                if (!useActionArchiveCache)
                {
@@ -872,9 +878,16 @@ namespace GitHub.Runner.Worker
                    int exitCode = await processInvoker.ExecuteAsync(stagingDirectory, tar, $"-xzf \"{archiveFile}\"", null, executionContext.CancellationToken);
                    if (exitCode != 0)
                    {
-                        var fileInfo = new FileInfo(archiveFile);
-                        var sha256hash = await IOUtil.GetFileContentSha256HashAsync(archiveFile);
-                        throw new InvalidActionArchiveException($"Can't use 'tar -xzf' extract archive file: {archiveFile} (SHA256 '{sha256hash}', size '{fileInfo.Length}' bytes, tar outputs '{string.Join(' ', tarOutputs)}'). Action being checked out: {downloadInfo.NameWithOwner}@{downloadInfo.Ref}. return code: {exitCode}.");
+                        if (executionContext.Global.Variables.GetBoolean("DistributedTask.DetailUntarFailure") == true)
+                        {
+                            var fileInfo = new FileInfo(archiveFile);
+                            var sha256hash = await IOUtil.GetFileContentSha256HashAsync(archiveFile);
+                            throw new InvalidActionArchiveException($"Can't use 'tar -xzf' extract archive file: {archiveFile} (SHA256 '{sha256hash}', size '{fileInfo.Length}' bytes, tar outputs '{string.Join(' ', tarOutputs)}'). Action being checked out: {downloadInfo.NameWithOwner}@{downloadInfo.Ref}. return code: {exitCode}.");
+                        }
+                        else
+                        {
+                            throw new InvalidActionArchiveException($"Can't use 'tar -xzf' extract archive file: {archiveFile}. Action being checked out: {downloadInfo.NameWithOwner}@{downloadInfo.Ref}. return code: {exitCode}.");
+                        }
                    }
                }
 #endif
@@ -1018,6 +1031,13 @@ namespace GitHub.Runner.Worker
                        }
                    }

+                    foreach (var step in compositeAction.Steps)
+                    {
+                        if (string.IsNullOrEmpty(executionContext.Global.Variables.Get("DistributedTask.EnableCompositeActions")) && step.Reference.Type != Pipelines.ActionSourceType.Script)
+                        {
+                            throw new Exception("`uses:` keyword is not currently supported.");
+                        }
+                    }
                    return setupInfo;
                }
                else
@@ -1102,7 +1122,6 @@ namespace GitHub.Runner.Worker
            int timeoutSeconds = 20 * 60;
            while (retryCount < 3)
            {
-                string requestId = string.Empty;
                using (var actionDownloadTimeout = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutSeconds)))
                using (var actionDownloadCancellation = CancellationTokenSource.CreateLinkedTokenSource(actionDownloadTimeout.Token, executionContext.CancellationToken))
                {
@@ -1118,7 +1137,7 @@ namespace GitHub.Runner.Worker
                            httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
                            using (var response = await httpClient.GetAsync(downloadUrl))
                            {
-                                requestId = UrlUtil.GetGitHubRequestId(response.Headers);
+                                var requestId = UrlUtil.GetGitHubRequestId(response.Headers);
                                if (!string.IsNullOrEmpty(requestId))
                                {
                                    Trace.Info($"Request URL: {downloadUrl} X-GitHub-Request-Id: {requestId} Http Status: {response.StatusCode}");
@@ -1156,7 +1175,7 @@ namespace GitHub.Runner.Worker
                    catch (OperationCanceledException ex) when (!executionContext.CancellationToken.IsCancellationRequested && retryCount >= 2)
                    {
                        Trace.Info($"Action download final retry timeout after {timeoutSeconds} seconds.");
-                        throw new TimeoutException($"Action '{downloadUrl}' download has timed out. Error: {ex.Message} {requestId}");
+                        throw new TimeoutException($"Action '{downloadUrl}' download has timed out. Error: {ex.Message}");
                    }
                    catch (ActionNotFoundException)
                    {
@@ -1171,11 +1190,11 @@ namespace GitHub.Runner.Worker
                        if (actionDownloadTimeout.Token.IsCancellationRequested)
                        {
                            // action download didn't finish within timeout
-                            executionContext.Warning($"Action '{downloadUrl}' didn't finish download within {timeoutSeconds} seconds. {requestId}");
+                            executionContext.Warning($"Action '{downloadUrl}' didn't finish download within {timeoutSeconds} seconds.");
                        }
                        else
                        {
-                            executionContext.Warning($"Failed to download action '{downloadUrl}'. Error: {ex.Message} {requestId}");
+                            executionContext.Warning($"Failed to download action '{downloadUrl}'. Error: {ex.Message}");
                        }
                    }
                }
--- a/src/Runner.Worker/ActionManifestManager.cs
+++ b/src/Runner.Worker/ActionManifestManager.cs
@@ -144,7 +144,7 @@ namespace GitHub.Runner.Worker
                    executionContext.Error(error.Message);
                }

-                throw new ArgumentException($"Failed to load {fileRelativePath}");
+                throw new ArgumentException($"Fail to load {fileRelativePath}");
            }

            if (actionDefinition.Execution == null)
--- a/src/Runner.Worker/ContainerOperationProvider.cs
+++ b/src/Runner.Worker/ContainerOperationProvider.cs
@@ -466,39 +466,17 @@ namespace GitHub.Runner.Worker
            {
                throw new InvalidOperationException($"Failed to create directory to store registry client credentials: {e.Message}");
            }
+            var loginExitCode = await _dockerManager.DockerLogin(
+                executionContext,
+                configLocation,
+                container.RegistryServer,
+                container.RegistryAuthUsername,
+                container.RegistryAuthPassword);

-            // Login docker with retry up to 3 times
-            int retryCount = 0;
-            int loginExitCode = 0;
-            while (retryCount < 3)
-            {
-                loginExitCode = await _dockerManager.DockerLogin(
-                    executionContext,
-                    configLocation,
-                    container.RegistryServer,
-                    container.RegistryAuthUsername,
-                    container.RegistryAuthPassword);
-                if (loginExitCode == 0)
-                {
-                    break;
-                }
-                else
-                {
-                    retryCount++;
-                    if (retryCount < 3)
-                    {
-                        var backOff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(10));
-                        executionContext.Warning($"Docker login for '{container.RegistryServer}' failed with exit code {loginExitCode}, back off {backOff.TotalSeconds} seconds before retry.");
-                        await Task.Delay(backOff);
-                    }
-                }
-            }
-
-            if (retryCount == 3 && loginExitCode != 0)
+            if (loginExitCode != 0)
            {
                throw new InvalidOperationException($"Docker login for '{container.RegistryServer}' failed with exit code {loginExitCode}");
            }
-
            return configLocation;
        }

--- a/src/Runner.Worker/DiagnosticLogManager.cs
+++ b/src/Runner.Worker/DiagnosticLogManager.cs
@@ -91,13 +91,13 @@ namespace GitHub.Runner.Worker
            string phaseName = executionContext.Global.Variables.System_PhaseDisplayName ?? "UnknownPhaseName";

            // zip the files
-            string diagnosticsZipFileName = $"{buildName}-{IOUtil.ReplaceInvalidFileNameChars(phaseName)}.zip";
+            string diagnosticsZipFileName = $"{buildName}-{phaseName}.zip";
            string diagnosticsZipFilePath = Path.Combine(supportRootFolder, diagnosticsZipFileName);
            ZipFile.CreateFromDirectory(supportFilesFolder, diagnosticsZipFilePath);

            // upload the json metadata file
            executionContext.Debug("Uploading diagnostic metadata file.");
-            string metadataFileName = $"diagnostics-{buildName}-{IOUtil.ReplaceInvalidFileNameChars(phaseName)}.json";
+            string metadataFileName = $"diagnostics-{buildName}-{phaseName}.json";
            string metadataFilePath = Path.Combine(supportFilesFolder, metadataFileName);
            string phaseResult = GetTaskResultAsString(executionContext.Result);

@@ -108,8 +108,6 @@ namespace GitHub.Runner.Worker

            parentContext.QueueAttachFile(type: CoreAttachmentType.DiagnosticLog, name: diagnosticsZipFileName, filePath: diagnosticsZipFilePath);

-            parentContext.QueueDiagnosticLogFile(name: diagnosticsZipFileName, filePath: diagnosticsZipFilePath);
-
            executionContext.Debug("Diagnostic file upload complete.");
        }

--- a/src/Runner.Worker/ExecutionContext.cs
+++ b/src/Runner.Worker/ExecutionContext.cs
@@ -83,14 +83,13 @@ namespace GitHub.Runner.Worker
        // Initialize
        void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token);
        void CancelToken();
-        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, ActionRunStage stage, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isEmbedded = false, List<Issue> embeddedIssueCollector = null, CancellationTokenSource cancellationTokenSource = null, Guid embeddedId = default(Guid), string siblingScopeName = null, TimeSpan? timeout = null);
+        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, ActionRunStage stage, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isEmbedded = false, CancellationTokenSource cancellationTokenSource = null, Guid embeddedId = default(Guid), string siblingScopeName = null, TimeSpan? timeout = null);
        IExecutionContext CreateEmbeddedChild(string scopeName, string contextName, Guid embeddedId, ActionRunStage stage, Dictionary<string, string> intraActionState = null, string siblingScopeName = null);

        // logging
        long Write(string tag, string message);
        void QueueAttachFile(string type, string name, string filePath);
        void QueueSummaryFile(string name, string filePath, Guid stepRecordId);
-        void QueueDiagnosticLogFile(string name, string filePath);

        // timeline record update methods
        void Start(string currentOperation = null);
@@ -135,6 +134,7 @@ namespace GitHub.Runner.Worker

        private readonly TimelineRecord _record = new();
        private readonly Dictionary<Guid, TimelineRecord> _detailRecords = new();
+        private readonly List<Issue> _embeddedIssueCollector;
        private readonly object _loggerLock = new();
        private readonly object _matchersLock = new();
        private readonly ExecutionContext _parentExecutionContext;
@@ -153,7 +153,6 @@ namespace GitHub.Runner.Worker
        private CancellationTokenSource _cancellationTokenSource;
        private TaskCompletionSource<int> _forceCompleted = new();
        private bool _throttlingReported = false;
-        private List<Issue> _embeddedIssueCollector;

        // only job level ExecutionContext will track throttling delay.
        private long _totalThrottlingDelayInMilliseconds = 0;
@@ -356,7 +355,6 @@ namespace GitHub.Runner.Worker
            int? recordOrder = null,
            IPagingLogger logger = null,
            bool isEmbedded = false,
-            List<Issue> embeddedIssueCollector = null,
            CancellationTokenSource cancellationTokenSource = null,
            Guid embeddedId = default(Guid),
            string siblingScopeName = null,
@@ -366,10 +364,6 @@ namespace GitHub.Runner.Worker

            var child = new ExecutionContext(this, isEmbedded);
            child.Initialize(HostContext);
-            if ((Global.Variables.GetBoolean("RunService.FixEmbeddedIssues") ?? false) && embeddedIssueCollector != null)
-            {
-                child._embeddedIssueCollector = embeddedIssueCollector;
-            }
            child.Global = Global;
            child.ScopeName = scopeName;
            child.ContextName = contextName;
@@ -403,11 +397,11 @@ namespace GitHub.Runner.Worker

            if (recordOrder != null)
            {
-                child.InitializeTimelineRecord(_mainTimelineId, recordId, _record.Id, ExecutionContextType.Task, displayName, refName, recordOrder, embedded: isEmbedded);
+                child.InitializeTimelineRecord(_mainTimelineId, recordId, _record.Id, ExecutionContextType.Task, displayName, refName, recordOrder);
            }
            else
            {
-                child.InitializeTimelineRecord(_mainTimelineId, recordId, _record.Id, ExecutionContextType.Task, displayName, refName, ++_childTimelineRecordOrder, embedded: isEmbedded);
+                child.InitializeTimelineRecord(_mainTimelineId, recordId, _record.Id, ExecutionContextType.Task, displayName, refName, ++_childTimelineRecordOrder);
            }
            if (logger != null)
            {
@@ -438,7 +432,7 @@ namespace GitHub.Runner.Worker
            Dictionary<string, string> intraActionState = null,
            string siblingScopeName = null)
        {
-            return Root.CreateChild(_record.Id, _record.Name, _record.Id.ToString("N"), scopeName, contextName, stage, logger: _logger, isEmbedded: true, embeddedIssueCollector: _embeddedIssueCollector, cancellationTokenSource: null, intraActionState: intraActionState, embeddedId: embeddedId, siblingScopeName: siblingScopeName, timeout: GetRemainingTimeout(), recordOrder: _record.Order);
+            return Root.CreateChild(_record.Id, _record.Name, _record.Id.ToString("N"), scopeName, contextName, stage, logger: _logger, isEmbedded: true, cancellationTokenSource: null, intraActionState: intraActionState, embeddedId: embeddedId, siblingScopeName: siblingScopeName, timeout: GetRemainingTimeout());
        }

        public void Start(string currentOperation = null)
@@ -508,9 +502,6 @@ namespace GitHub.Runner.Worker
                    Status = _record.State,
                    Number = _record.Order,
                    Name = _record.Name,
-                    ActionName = StepTelemetry?.Action,
-                    Ref = StepTelemetry?.Ref,
-                    Type = StepTelemetry?.Type,
                    StartedAt = _record.StartTime,
                    CompletedAt = _record.FinishTime,
                    Annotations = new List<Annotation>()
@@ -528,6 +519,7 @@ namespace GitHub.Runner.Worker
                Global.StepsResult.Add(stepResult);
            }

+
            if (Root != this)
            {
                // only dispose TokenSource for step level ExecutionContext
@@ -815,6 +807,11 @@ namespace GitHub.Runner.Worker

            Global.Variables = new Variables(HostContext, variables);

+            if (Global.Variables.GetBoolean("DistributedTask.ForceInternalNodeVersionOnRunnerTo16") ?? false)
+            {
+                Environment.SetEnvironmentVariable(Constants.Variables.Agent.ForcedInternalNodeVersion, "node16");
+            }
+
            // Environment variables shared across all actions
            Global.EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer);

@@ -839,6 +836,7 @@ namespace GitHub.Runner.Worker
            // Actions environment
            ActionsEnvironment = message.ActionsEnvironment;

+
            // Service container info
            Global.ServiceContainers = new List<ContainerInfo>();

@@ -984,18 +982,6 @@ namespace GitHub.Runner.Worker
            _jobServerQueue.QueueResultsUpload(stepRecordId, name, filePath, ChecksAttachmentType.StepSummary, deleteSource: false, finalize: true, firstBlock: true, totalLines: 0);
        }

-        public void QueueDiagnosticLogFile(string name, string filePath)
-        {
-            ArgUtil.NotNullOrEmpty(name, nameof(name));
-            ArgUtil.NotNullOrEmpty(filePath, nameof(filePath));
-
-            if (!File.Exists(filePath))
-            {
-                throw new FileNotFoundException($"Can't upload diagnostic log file: {filePath}. File does not exist.");
-            }
-            _jobServerQueue.QueueResultsUpload(_record.Id, name, filePath, CoreAttachmentType.ResultsDiagnosticLog, deleteSource: false, finalize: true, firstBlock: true, totalLines: 0);
-        }
-
        // Add OnMatcherChanged
        public void Add(OnMatcherChanged handler)
        {
@@ -1174,7 +1160,7 @@ namespace GitHub.Runner.Worker
            }
        }

-        private void InitializeTimelineRecord(Guid timelineId, Guid timelineRecordId, Guid? parentTimelineRecordId, string recordType, string displayName, string refName, int? order, bool embedded = false)
+        private void InitializeTimelineRecord(Guid timelineId, Guid timelineRecordId, Guid? parentTimelineRecordId, string recordType, string displayName, string refName, int? order)
        {
            _mainTimelineId = timelineId;
            _record.Id = timelineRecordId;
@@ -1200,11 +1186,7 @@ namespace GitHub.Runner.Worker
            var configuration = HostContext.GetService<IConfigurationStore>();
            _record.WorkerName = configuration.GetSettings().AgentName;

-            // We don't want to update the timeline record for embedded steps since they are not really represented in the UI.
-            if (!embedded)
-            {
-                _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
-            }
+            _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
        }

        private void JobServerQueueThrottling_EventReceived(object sender, ThrottlingEventArgs data)
@@ -1419,7 +1401,7 @@ namespace GitHub.Runner.Worker
            {
                if (key == PipelineTemplateConstants.HostWorkspace)
                {
-                    // The HostWorkspace context var is excluded so that there is a var that always points to the host path.
+                    // The HostWorkspace context var is excluded so that there is a var that always points to the host path. 
                    // This var can be used to translate back from container paths, e.g. in HashFilesFunction, which always runs on the host machine
                    continue;
                }
--- a/src/Runner.Worker/FileCommandManager.cs
+++ b/src/Runner.Worker/FileCommandManager.cs
@@ -244,7 +244,7 @@ namespace GitHub.Runner.Worker
                if (resultsReceiverEndpoint != null)
                {
                    Trace.Info($"Queueing results file ({filePath}) for attachment upload ({attachmentName})");
-                    var stepId = context.IsEmbedded ? context.EmbeddedId : context.Id;
+                    var stepId = context.Id;
                    // Attachments must be added to the parent context (job), not the current context (step)
                    context.Root.QueueSummaryFile(attachmentName, scrubbedFilePath, stepId);
                }
--- a/src/Runner.Worker/Handlers/ContainerActionHandler.cs
+++ b/src/Runner.Worker/Handlers/ContainerActionHandler.cs
@@ -223,10 +223,6 @@ namespace GitHub.Runner.Worker.Handlers
            {
                Environment["ACTIONS_CACHE_URL"] = cacheUrl;
            }
-            if (systemConnection.Data.TryGetValue("PipelinesServiceUrl", out var pipelinesServiceUrl) && !string.IsNullOrEmpty(pipelinesServiceUrl))
-            {
-                Environment["ACTIONS_RUNTIME_URL"] = pipelinesServiceUrl;
-            }
            if (systemConnection.Data.TryGetValue("GenerateIdTokenUrl", out var generateIdTokenUrl) && !string.IsNullOrEmpty(generateIdTokenUrl))
            {
                Environment["ACTIONS_ID_TOKEN_REQUEST_URL"] = generateIdTokenUrl;
--- a/src/Runner.Worker/Handlers/HandlerFactory.cs
+++ b/src/Runner.Worker/Handlers/HandlerFactory.cs
@@ -57,13 +57,33 @@ namespace GitHub.Runner.Worker.Handlers
                handler = HostContext.CreateService<INodeScriptActionHandler>();
                var nodeData = data as NodeJSActionExecutionData;

-                // With node12 EoL in 04/2022 and node16 EoL in 09/23, we want to execute all JS actions using node20
-                if (string.Equals(nodeData.NodeVersion, "node12", StringComparison.InvariantCultureIgnoreCase) ||
-                    string.Equals(nodeData.NodeVersion, "node16", StringComparison.InvariantCultureIgnoreCase))
+                // With node12 EoL in 04/2022, we want to be able to uniformly upgrade all JS actions to node16 from the server
+                if (string.Equals(nodeData.NodeVersion, "node12", StringComparison.InvariantCultureIgnoreCase))
                {
-                    nodeData.NodeVersion = "node20";
-                }
+                    var repoAction = action as Pipelines.RepositoryPathReference;
+                    if (repoAction != null)
+                    {
+                        var warningActions = new HashSet<string>();
+                        if (executionContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
+                        {
+                            warningActions = StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings);
+                        }

+                        string repoActionFullName;
+                        if (string.IsNullOrEmpty(repoAction.Name))
+                        {
+                            repoActionFullName = repoAction.Path; // local actions don't have a 'Name'
+                        }
+                        else
+                        {
+                            repoActionFullName = $"{repoAction.Name}/{repoAction.Path ?? string.Empty}".TrimEnd('/') + $"@{repoAction.Ref}";
+                        }
+
+                        warningActions.Add(repoActionFullName);
+                        executionContext.Global.Variables.Set("Node16ForceActionsWarnings", StringUtil.ConvertToJson(warningActions));
+                    }
+                    nodeData.NodeVersion = "node16";
+                }
                (handler as INodeScriptActionHandler).Data = nodeData;
            }
            else if (data.ExecutionType == ActionExecutionType.Script)
--- a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
+++ b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
@@ -58,10 +58,6 @@ namespace GitHub.Runner.Worker.Handlers
            {
                Environment["ACTIONS_CACHE_URL"] = cacheUrl;
            }
-            if (systemConnection.Data.TryGetValue("PipelinesServiceUrl", out var pipelinesServiceUrl) && !string.IsNullOrEmpty(pipelinesServiceUrl))
-            {
-                Environment["ACTIONS_RUNTIME_URL"] = pipelinesServiceUrl;
-            }
            if (systemConnection.Data.TryGetValue("GenerateIdTokenUrl", out var generateIdTokenUrl) && !string.IsNullOrEmpty(generateIdTokenUrl))
            {
                Environment["ACTIONS_ID_TOKEN_REQUEST_URL"] = generateIdTokenUrl;
@@ -72,11 +68,6 @@ namespace GitHub.Runner.Worker.Handlers
                Environment["ACTIONS_RESULTS_URL"] = resultsUrl;
            }

-            if (ExecutionContext.Global.Variables.GetBoolean("actions_uses_cache_service_v2") ?? false)
-            {
-                Environment["ACTIONS_CACHE_SERVICE_V2"] = bool.TrueString;
-            }
-
            // Resolve the target script.
            string target = null;
            if (stage == ActionRunStage.Main)
@@ -98,6 +89,7 @@ namespace GitHub.Runner.Worker.Handlers
                ExecutionContext.StepTelemetry.HasPreStep = Data.HasPre;
                ExecutionContext.StepTelemetry.HasPostStep = Data.HasPost;
            }
+            ExecutionContext.StepTelemetry.Type = Data.NodeVersion;

            ArgUtil.NotNullOrEmpty(target, nameof(target));
            target = Path.Combine(ActionDirectory, target);
@@ -110,8 +102,19 @@ namespace GitHub.Runner.Worker.Handlers
                workingDirectory = HostContext.GetDirectory(WellKnownDirectory.Work);
            }

+            if (string.Equals(Data.NodeVersion, "node12", StringComparison.OrdinalIgnoreCase) &&
+                Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.Arm64))
+            {
+                ExecutionContext.Output($"The node12 is not supported. Use node16 instead.");
+                Data.NodeVersion = "node16";
+            }
+
+            string forcedNodeVersion = System.Environment.GetEnvironmentVariable(Constants.Variables.Agent.ForcedActionsNodeVersion);
+            if (forcedNodeVersion == "node16" && Data.NodeVersion != "node16")
+            {
+                Data.NodeVersion = "node16";
+            }
            var nodeRuntimeVersion = await StepHost.DetermineNodeRuntimeVersion(ExecutionContext, Data.NodeVersion);
-            ExecutionContext.StepTelemetry.Type = nodeRuntimeVersion;
            string file = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");

            // Format the arguments passed to node.
@@ -131,6 +134,28 @@ namespace GitHub.Runner.Worker.Handlers
            // Remove environment variable that may cause conflicts with the node within the runner.
            Environment.Remove("NODE_ICU_DATA"); // https://github.com/actions/runner/issues/795

+            if (string.Equals(Data.NodeVersion, Constants.Runner.DeprecatedNodeVersion, StringComparison.OrdinalIgnoreCase) && (ExecutionContext.Global.Variables.GetBoolean(Constants.Runner.Features.Node16Warning) ?? false))
+            {
+                var repoAction = Action as RepositoryPathReference;
+                var warningActions = new HashSet<string>();
+                if (ExecutionContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
+                {
+                    warningActions = StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings);
+                }
+
+                if (string.IsNullOrEmpty(repoAction.Name))
+                {
+                    // local actions don't have a 'Name'
+                    warningActions.Add(repoAction.Path);
+                }
+                else
+                {
+                    warningActions.Add($"{repoAction.Name}/{repoAction.Path ?? string.Empty}".TrimEnd('/') + $"@{repoAction.Ref}");
+                }
+
+                ExecutionContext.Global.Variables.Set(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, StringUtil.ConvertToJson(warningActions));
+            }
+
            using (var stdoutManager = new OutputManager(ExecutionContext, ActionCommandManager))
            using (var stderrManager = new OutputManager(ExecutionContext, ActionCommandManager))
            {
--- a/src/Runner.Worker/Handlers/ScriptHandler.cs
+++ b/src/Runner.Worker/Handlers/ScriptHandler.cs
@@ -83,19 +83,40 @@ namespace GitHub.Runner.Worker.Handlers
                shellCommand = "pwsh";
                if (validateShellOnHost)
                {
-                    shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
+                    if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                    {
+                        shellCommandPath = WhichUtil.Which2(shellCommand, require: false, Trace, prependPath);
+                    }
+                    else
+                    {
+                        shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
+                    }
                    if (string.IsNullOrEmpty(shellCommandPath))
                    {
                        shellCommand = "powershell";
-                        Trace.Info($"Defaulting to {shellCommand}");                        
-                        shellCommandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
+                        Trace.Info($"Defaulting to {shellCommand}");
+                        if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                        {
+                            shellCommandPath = WhichUtil.Which2(shellCommand, require: true, Trace, prependPath);
+                        }
+                        else
+                        {
+                            shellCommandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
+                        }
                    }
                }
 #else
                shellCommand = "sh";
                if (validateShellOnHost)
                {
-                    shellCommandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
+                    if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                    {
+                        shellCommandPath = WhichUtil.Which2("bash", false, Trace, prependPath) ?? WhichUtil.Which2("sh", true, Trace, prependPath);
+                    }
+                    else
+                    {
+                        shellCommandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
+                    }
                }
 #endif
                argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand);
@@ -106,7 +127,14 @@ namespace GitHub.Runner.Worker.Handlers
                shellCommand = parsed.shellCommand;
                if (validateShellOnHost)
                {
-                    shellCommandPath = WhichUtil.Which(parsed.shellCommand, true, Trace, prependPath);
+                    if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                    {
+                        shellCommandPath = WhichUtil.Which2(parsed.shellCommand, true, Trace, prependPath);
+                    }
+                    else
+                    {
+                        shellCommandPath = WhichUtil.Which(parsed.shellCommand, true, Trace, prependPath);
+                    }
                }

                argFormat = $"{parsed.shellArgs}".TrimStart();
@@ -188,17 +216,38 @@ namespace GitHub.Runner.Worker.Handlers
            {
 #if OS_WINDOWS
                shellCommand = "pwsh";
-                commandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
+                if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                {
+                    commandPath = WhichUtil.Which2(shellCommand, require: false, Trace, prependPath);
+                }
+                else
+                {
+                    commandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
+                }
                if (string.IsNullOrEmpty(commandPath))
                {
                    shellCommand = "powershell";
                    Trace.Info($"Defaulting to {shellCommand}");
-                    commandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
+                    if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                    {
+                        commandPath = WhichUtil.Which2(shellCommand, require: true, Trace, prependPath);
+                    }
+                    else
+                    {
+                        commandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
+                    }
                }
                ArgUtil.NotNullOrEmpty(commandPath, "Default Shell");
 #else
                shellCommand = "sh";
-                commandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
+                if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                {
+                    commandPath = WhichUtil.Which2("bash", false, Trace, prependPath) ?? WhichUtil.Which2("sh", true, Trace, prependPath);
+                }
+                else
+                {
+                    commandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
+                }
 #endif
                argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand);
            }
@@ -209,7 +258,14 @@ namespace GitHub.Runner.Worker.Handlers
                if (!IsActionStep && systemShells.Contains(shell))
                {
                    shellCommand = shell;
-                    commandPath = WhichUtil.Which(shell, !isContainerStepHost, Trace, prependPath);
+                    if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                    {
+                        commandPath = WhichUtil.Which2(shell, !isContainerStepHost, Trace, prependPath);
+                    }
+                    else
+                    {
+                        commandPath = WhichUtil.Which(shell, !isContainerStepHost, Trace, prependPath);
+                    }
                    if (shell == "bash")
                    {
                        argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat("sh");
@@ -224,7 +280,14 @@ namespace GitHub.Runner.Worker.Handlers
                    var parsed = ScriptHandlerHelpers.ParseShellOptionString(shell);
                    shellCommand = parsed.shellCommand;
                    // For non-ContainerStepHost, the command must be located on the host by Which
-                    commandPath = WhichUtil.Which(parsed.shellCommand, !isContainerStepHost, Trace, prependPath);
+                    if (ExecutionContext.Global.Variables.GetBoolean("DistributedTask.UseWhich2") == true)
+                    {
+                        commandPath = WhichUtil.Which2(parsed.shellCommand, !isContainerStepHost, Trace, prependPath);
+                    }
+                    else
+                    {
+                        commandPath = WhichUtil.Which(parsed.shellCommand, !isContainerStepHost, Trace, prependPath);
+                    }
                    argFormat = $"{parsed.shellArgs}".TrimStart();
                    if (string.IsNullOrEmpty(argFormat))
                    {
--- a/src/Runner.Worker/JobExtension.cs
+++ b/src/Runner.Worker/JobExtension.cs
@@ -17,7 +17,6 @@ using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
-using Newtonsoft.Json;
 using Pipelines = GitHub.DistributedTask.Pipelines;

 namespace GitHub.Runner.Worker
@@ -43,13 +42,11 @@ namespace GitHub.Runner.Worker
    public sealed class JobExtension : RunnerService, IJobExtension
    {
        private readonly HashSet<string> _existingProcesses = new(StringComparer.OrdinalIgnoreCase);
-        private readonly List<Task<CheckResult>> _connectivityCheckTasks = new();
+        private readonly List<Task<string>> _connectivityCheckTasks = new();
        private bool _processCleanup;
        private string _processLookupId = $"github_{Guid.NewGuid()}";
        private CancellationTokenSource _diskSpaceCheckToken = new();
        private Task _diskSpaceCheckTask = null;
-        private CancellationTokenSource _serviceConnectivityCheckToken = new();
-        private Task _serviceConnectivityCheckTask = null;

        // Download all required actions.
        // Make sure all condition inputs are valid.
@@ -395,18 +392,6 @@ namespace GitHub.Runner.Worker
                        }
                    }

-                    // Register custom image creation post-job step if the "snapshot" token is present in the message.
-                    var snapshotRequest = templateEvaluator.EvaluateJobSnapshotRequest(message.Snapshot, jobContext.ExpressionValues, jobContext.ExpressionFunctions);
-                    if (snapshotRequest != null)
-                    {
-                        var snapshotOperationProvider = HostContext.GetService<ISnapshotOperationProvider>();
-                        jobContext.RegisterPostJobStep(new JobExtensionRunner(
-                            runAsync: (executionContext, _) => snapshotOperationProvider.CreateSnapshotRequestAsync(executionContext, snapshotRequest),
-                            condition: snapshotRequest.Condition,
-                            displayName: $"Create custom image",
-                            data: null));
-                    }
-
                    // Register Job Completed hook if the variable is set
                    var completedHookPath = Environment.GetEnvironmentVariable("ACTIONS_RUNNER_HOOK_JOB_COMPLETED");
                    if (!string.IsNullOrEmpty(completedHookPath))
@@ -457,14 +442,11 @@ namespace GitHub.Runner.Worker
                        {
                            foreach (var checkUrl in checkUrls)
                            {
-                                _connectivityCheckTasks.Add(CheckConnectivity(checkUrl, accessToken: string.Empty, timeoutInSeconds: 5, token: CancellationToken.None));
+                                _connectivityCheckTasks.Add(CheckConnectivity(checkUrl));
                            }
                        }
                    }

-                    Trace.Info($"Start checking service connectivity in background.");
-                    _serviceConnectivityCheckTask = CheckServiceConnectivityAsync(context, _serviceConnectivityCheckToken.Token);
-
                    return steps;
                }
                catch (OperationCanceledException ex) when (jobContext.CancellationToken.IsCancellationRequested)
@@ -698,7 +680,7 @@ namespace GitHub.Runner.Worker
                            {
                                var result = await check;
                                Trace.Info($"Connectivity check result: {result}");
-                                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"{result.EndpointUrl}: {result.StatusCode}" });
+                                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = result });
                            }
                        }
                        catch (Exception ex)
@@ -708,22 +690,6 @@ namespace GitHub.Runner.Worker
                            context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"Fail to check server connectivity. {ex.Message}" });
                        }
                    }
-
-                    // Collect service connectivity check result
-                    if (_serviceConnectivityCheckTask != null)
-                    {
-                        _serviceConnectivityCheckToken.Cancel();
-                        try
-                        {
-                            await _serviceConnectivityCheckTask;
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.Error($"Fail to check service connectivity.");
-                            Trace.Error(ex);
-                            context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"Fail to check service connectivity. {ex.Message}" });
-                        }
-                    }
                }
                catch (Exception ex)
                {
@@ -739,13 +705,11 @@ namespace GitHub.Runner.Worker
            }
        }

-        private async Task<CheckResult> CheckConnectivity(string endpointUrl, string accessToken, int timeoutInSeconds, CancellationToken token)
+        private async Task<string> CheckConnectivity(string endpointUrl)
        {
            Trace.Info($"Check server connectivity for {endpointUrl}.");
-            CheckResult result = new CheckResult() { EndpointUrl = endpointUrl };
-            var stopwatch = Stopwatch.StartNew();
-            using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutInSeconds)))
-            using (var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token, timeoutTokenSource.Token))
+            string result = string.Empty;
+            using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
            {
                try
                {
@@ -753,44 +717,21 @@ namespace GitHub.Runner.Worker
                    using (var httpClient = new HttpClient(httpClientHandler))
                    {
                        httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
-                        if (!string.IsNullOrEmpty(accessToken))
-                        {
-                            httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {accessToken}");
-                        }
-
-                        var response = await httpClient.GetAsync(endpointUrl, linkedTokenSource.Token);
-                        result.StatusCode = $"{response.StatusCode}";
-
-                        var githubRequestId = UrlUtil.GetGitHubRequestId(response.Headers);
-                        var vssRequestId = UrlUtil.GetVssRequestId(response.Headers);
-                        if (!string.IsNullOrEmpty(githubRequestId))
-                        {
-                            result.RequestId = githubRequestId;
-                        }
-                        else if (!string.IsNullOrEmpty(vssRequestId))
-                        {
-                            result.RequestId = vssRequestId;
-                        }
+                        var response = await httpClient.GetAsync(endpointUrl, timeoutTokenSource.Token);
+                        result = $"{endpointUrl}: {response.StatusCode}";
                    }
                }
-                catch (Exception ex) when (ex is OperationCanceledException && token.IsCancellationRequested)
-                {
-                    Trace.Error($"Request canceled during connectivity check: {ex}");
-                    result.StatusCode = "canceled";
-                }
                catch (Exception ex) when (ex is OperationCanceledException && timeoutTokenSource.IsCancellationRequested)
                {
                    Trace.Error($"Request timeout during connectivity check: {ex}");
-                    result.StatusCode = "timeout";
+                    result = $"{endpointUrl}: timeout";
                }
                catch (Exception ex)
                {
                    Trace.Error($"Catch exception during connectivity check: {ex}");
-                    result.StatusCode = $"{ex.Message}";
+                    result = $"{endpointUrl}: {ex.Message}";
                }
            }
-            stopwatch.Stop();
-            result.DurationInMs = (int)stopwatch.ElapsedMilliseconds;

            return result;
        }
@@ -828,84 +769,6 @@ namespace GitHub.Runner.Worker
            }
        }

-        private async Task CheckServiceConnectivityAsync(IExecutionContext context, CancellationToken token)
-        {
-            var connectionTest = context.Global.Variables.Get(WellKnownDistributedTaskVariables.RunnerServiceConnectivityTest);
-            if (string.IsNullOrEmpty(connectionTest))
-            {
-                return;
-            }
-
-            ServiceConnectivityCheckInput checkConnectivityInfo;
-            try
-            {
-                checkConnectivityInfo = StringUtil.ConvertFromJson<ServiceConnectivityCheckInput>(connectionTest);
-            }
-            catch (Exception ex)
-            {
-                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.General, Message = $"Fail to parse JSON. {ex.Message}" });
-                return;
-            }
-
-            if (checkConnectivityInfo == null)
-            {
-                return;
-            }
-
-            // make sure interval is at least 10 seconds
-            checkConnectivityInfo.IntervalInSecond = Math.Max(10, checkConnectivityInfo.IntervalInSecond);
-
-            var systemConnection = context.Global.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
-            var accessToken = systemConnection.Authorization.Parameters[EndpointAuthorizationParameters.AccessToken];
-
-            var testResult = new ServiceConnectivityCheckResult();
-            while (!token.IsCancellationRequested)
-            {
-                foreach (var endpoint in checkConnectivityInfo.Endpoints)
-                {
-                    if (string.IsNullOrEmpty(endpoint.Key) || string.IsNullOrEmpty(endpoint.Value))
-                    {
-                        continue;
-                    }
-
-                    if (!testResult.EndpointsResult.ContainsKey(endpoint.Key))
-                    {
-                        testResult.EndpointsResult[endpoint.Key] = new List<string>();
-                    }
-
-                    try
-                    {
-                        var result = await CheckConnectivity(endpoint.Value, accessToken: accessToken, timeoutInSeconds: checkConnectivityInfo.RequestTimeoutInSecond, token);
-                        testResult.EndpointsResult[endpoint.Key].Add($"{result.StartTime:s}: {result.StatusCode} - {result.RequestId} - {result.DurationInMs}ms");
-                        if (!testResult.HasFailure &&
-                            result.StatusCode != "OK" &&
-                            result.StatusCode != "canceled")
-                        {
-                            // track if any endpoint is not reachable
-                            testResult.HasFailure = true;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        testResult.EndpointsResult[endpoint.Key].Add($"{DateTime.UtcNow:s}: {ex.Message}");
-                    }
-                }
-
-                try
-                {
-                    await Task.Delay(TimeSpan.FromSeconds(checkConnectivityInfo.IntervalInSecond), token);
-                }
-                catch (TaskCanceledException)
-                {
-                    // ignore
-                }
-            }
-
-            var telemetryData = StringUtil.ConvertToJson(testResult, Formatting.None);
-            Trace.Verbose($"Connectivity check result: {telemetryData}");
-            context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = telemetryData });
-        }
-
        private Dictionary<int, Process> SnapshotProcesses()
        {
            Dictionary<int, Process> snapshot = new();
@@ -937,23 +800,5 @@ namespace GitHub.Runner.Worker
                throw new ArgumentException("Jobs without a job container are forbidden on this runner, please add a 'container:' to your job or contact your self-hosted runner administrator.");
            }
        }
-
-        private class CheckResult
-        {
-            public CheckResult()
-            {
-                StartTime = DateTime.UtcNow;
-            }
-
-            public string EndpointUrl { get; set; }
-
-            public DateTime StartTime { get; set; }
-
-            public string StatusCode { get; set; }
-
-            public string RequestId { get; set; }
-
-            public int DurationInMs { get; set; }
-        }
    }
 }
--- a/src/Runner.Worker/JobRunner.cs
+++ b/src/Runner.Worker/JobRunner.cs
@@ -15,7 +15,6 @@ using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
-using Sdk.RSWebApi.Contracts;
 using Pipelines = GitHub.DistributedTask.Pipelines;

 namespace GitHub.Runner.Worker
@@ -43,18 +42,20 @@ namespace GitHub.Runner.Worker
            Trace.Info("Job ID {0}", message.JobId);

            DateTime jobStartTimeUtc = DateTime.UtcNow;
-            _runnerSettings = HostContext.GetService<IConfigurationStore>().GetSettings();
            IRunnerService server = null;

            // add orchestration id to useragent for better correlation.
            if (message.Variables.TryGetValue(Constants.Variables.System.OrchestrationId, out VariableValue orchestrationId) &&
                !string.IsNullOrEmpty(orchestrationId.Value))
            {
-                // make the orchestration id the first item in the user-agent header to avoid get truncated in server log.
-                HostContext.UserAgents.Insert(0, new ProductInfoHeaderValue("OrchestrationId", orchestrationId.Value));
+                HostContext.UserAgents.Add(new ProductInfoHeaderValue("OrchestrationId", orchestrationId.Value));
+            }

-                // make sure orchestration id is in the user-agent header.
-                VssUtil.InitializeVssClientSettings(HostContext.UserAgents, HostContext.WebProxy);
+            var jobServerQueueTelemetry = false;
+            if (message.Variables.TryGetValue("DistributedTask.EnableJobServerQueueTelemetry", out VariableValue enableJobServerQueueTelemetry) &&
+                !string.IsNullOrEmpty(enableJobServerQueueTelemetry?.Value))
+            {
+                jobServerQueueTelemetry = StringUtil.ConvertToBoolean(enableJobServerQueueTelemetry.Value);
            }

            ServiceEndpoint systemConnection = message.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
@@ -78,7 +79,7 @@ namespace GitHub.Runner.Worker
                    launchServer.InitializeLaunchClient(new Uri(launchReceiverEndpoint), accessToken);
                }
                _jobServerQueue = HostContext.GetService<IJobServerQueue>();
-                _jobServerQueue.Start(message, resultsServiceOnly: true);
+                _jobServerQueue.Start(message, resultsServiceOnly: true, enableTelemetry: jobServerQueueTelemetry);
            }
            else
            {
@@ -100,7 +101,7 @@ namespace GitHub.Runner.Worker
                VssConnection jobConnection = VssUtil.CreateConnection(jobServerUrl, jobServerCredential, delegatingHandlers);
                await jobServer.ConnectAsync(jobConnection);

-                _jobServerQueue.Start(message);
+                _jobServerQueue.Start(message, enableTelemetry: jobServerQueueTelemetry);
                server = jobServer;
            }

@@ -160,6 +161,8 @@ namespace GitHub.Runner.Worker

                jobContext.SetRunnerContext("os", VarUtil.OS);
                jobContext.SetRunnerContext("arch", VarUtil.OSArchitecture);
+
+                _runnerSettings = HostContext.GetService<IConfigurationStore>().GetSettings();
                jobContext.SetRunnerContext("name", _runnerSettings.AgentName);

                if (jobContext.Global.Variables.TryGetValue(WellKnownDistributedTaskVariables.RunnerEnvironment, out var runnerEnvironment))
@@ -280,12 +283,16 @@ namespace GitHub.Runner.Worker
        {
            jobContext.Debug($"Finishing: {message.JobDisplayName}");
            TaskResult result = jobContext.Complete(taskResult);
-
-            var jobQueueTelemetry = await ShutdownQueue(throwOnFailure: false);
-            // include any job telemetry from the background upload process.
-            if (jobQueueTelemetry?.Count > 0)
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
            {
-                jobContext.Global.JobTelemetry.AddRange(jobQueueTelemetry);
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.DetectedNodeAfterEndOfLifeMessage, actions));
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode12DetectedAfterEndOfLife, actions));
            }

            // Make sure to clean temp after file upload since they may be pending fileupload still use the TEMP dir.
@@ -304,13 +311,6 @@ namespace GitHub.Runner.Worker
                environmentUrl = urlStringToken.Value;
            }

-            // Get telemetry
-            IList<Telemetry> telemetry = null;
-            if (jobContext.Global.JobTelemetry.Count > 0)
-            {
-                telemetry = jobContext.Global.JobTelemetry.Select(x => new Telemetry { Type = x.Type.ToString(), Message = x.Message, }).ToList();
-            }
-
            Trace.Info($"Raising job completed against run service");
            var completeJobRetryLimit = 5;
            var exceptions = new List<Exception>();
@@ -318,7 +318,7 @@ namespace GitHub.Runner.Worker
            {
                try
                {
-                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, jobContext.Global.JobAnnotations, environmentUrl, telemetry, default);
+                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, jobContext.Global.JobAnnotations, environmentUrl, default);
                    return result;
                }
                catch (Exception ex)
@@ -343,14 +343,68 @@ namespace GitHub.Runner.Worker

            if (_runnerSettings.DisableUpdate == true)
            {
-                await WarningOutdatedRunnerAsync(jobContext, message, result);
+                try
+                {
+                    var currentVersion = new PackageVersion(BuildConstants.RunnerPackage.Version);
+                    ServiceEndpoint systemConnection = message.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
+                    VssCredentials serverCredential = VssUtil.GetVssCredential(systemConnection);
+
+                    var runnerServer = HostContext.GetService<IRunnerServer>();
+                    await runnerServer.ConnectAsync(systemConnection.Url, serverCredential);
+                    var serverPackages = await runnerServer.GetPackagesAsync("agent", BuildConstants.RunnerPackage.PackageName, 5, includeToken: false, cancellationToken: CancellationToken.None);
+                    if (serverPackages.Count > 0)
+                    {
+                        serverPackages = serverPackages.OrderByDescending(x => x.Version).ToList();
+                        Trace.Info($"Newer packages {StringUtil.ConvertToJson(serverPackages.Select(x => x.Version.ToString()))}");
+
+                        var warnOnFailedJob = false; // any minor/patch version behind.
+                        var warnOnOldRunnerVersion = false; // >= 2 minor version behind
+                        if (serverPackages.Any(x => x.Version.CompareTo(currentVersion) > 0))
+                        {
+                            Trace.Info($"Current runner version {currentVersion} is behind the latest runner version {serverPackages[0].Version}.");
+                            warnOnFailedJob = true;
+                        }
+
+                        if (serverPackages.Where(x => x.Version.Major == currentVersion.Major && x.Version.Minor > currentVersion.Minor).Count() > 1)
+                        {
+                            Trace.Info($"Current runner version {currentVersion} is way behind the latest runner version {serverPackages[0].Version}.");
+                            warnOnOldRunnerVersion = true;
+                        }
+
+                        if (result == TaskResult.Failed && warnOnFailedJob)
+                        {
+                            jobContext.Warning($"This job failure may be caused by using an out of date self-hosted runner. You are currently using runner version {currentVersion}. Please update to the latest version {serverPackages[0].Version}");
+                        }
+                        else if (warnOnOldRunnerVersion)
+                        {
+                            jobContext.Warning($"This self-hosted runner is currently using runner version {currentVersion}. This version is out of date. Please update to the latest version {serverPackages[0].Version}");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // Ignore any error since suggest runner update is best effort.
+                    Trace.Error($"Caught exception during runner version check: {ex}");
+                }
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.DetectedNodeAfterEndOfLifeMessage, actions));
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode12DetectedAfterEndOfLife, actions));
            }

            try
            {
                var jobQueueTelemetry = await ShutdownQueue(throwOnFailure: true);
                // include any job telemetry from the background upload process.
-                if (jobQueueTelemetry?.Count > 0)
+                if (jobQueueTelemetry.Count > 0)
                {
                    jobContext.Global.JobTelemetry.AddRange(jobQueueTelemetry);
                }
@@ -478,52 +532,5 @@ namespace GitHub.Runner.Worker

            return Array.Empty<JobTelemetry>();
        }
-
-        private async Task WarningOutdatedRunnerAsync(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, TaskResult result)
-        {
-            try
-            {
-                var currentVersion = new PackageVersion(BuildConstants.RunnerPackage.Version);
-                ServiceEndpoint systemConnection = message.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
-                VssCredentials serverCredential = VssUtil.GetVssCredential(systemConnection);
-
-                var runnerServer = HostContext.GetService<IRunnerServer>();
-                await runnerServer.ConnectAsync(systemConnection.Url, serverCredential);
-                var serverPackages = await runnerServer.GetPackagesAsync("agent", BuildConstants.RunnerPackage.PackageName, 5, includeToken: false, cancellationToken: CancellationToken.None);
-                if (serverPackages.Count > 0)
-                {
-                    serverPackages = serverPackages.OrderByDescending(x => x.Version).ToList();
-                    Trace.Info($"Newer packages {StringUtil.ConvertToJson(serverPackages.Select(x => x.Version.ToString()))}");
-
-                    var warnOnFailedJob = false; // any minor/patch version behind.
-                    var warnOnOldRunnerVersion = false; // >= 2 minor version behind
-                    if (serverPackages.Any(x => x.Version.CompareTo(currentVersion) > 0))
-                    {
-                        Trace.Info($"Current runner version {currentVersion} is behind the latest runner version {serverPackages[0].Version}.");
-                        warnOnFailedJob = true;
-                    }
-
-                    if (serverPackages.Where(x => x.Version.Major == currentVersion.Major && x.Version.Minor > currentVersion.Minor).Count() > 1)
-                    {
-                        Trace.Info($"Current runner version {currentVersion} is way behind the latest runner version {serverPackages[0].Version}.");
-                        warnOnOldRunnerVersion = true;
-                    }
-
-                    if (result == TaskResult.Failed && warnOnFailedJob)
-                    {
-                        jobContext.Warning($"This job failure may be caused by using an out of date self-hosted runner. You are currently using runner version {currentVersion}. Please update to the latest version {serverPackages[0].Version}");
-                    }
-                    else if (warnOnOldRunnerVersion)
-                    {
-                        jobContext.Warning($"This self-hosted runner is currently using runner version {currentVersion}. This version is out of date. Please update to the latest version {serverPackages[0].Version}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                // Ignore any error since suggest runner update is best effort.
-                Trace.Error($"Caught exception during runner version check: {ex}");
-            }
-        }
    }
 }
--- a/src/Runner.Worker/Runner.Worker.csproj
+++ b/src/Runner.Worker/Runner.Worker.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
    <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
@@ -19,9 +18,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
-    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
+    <PackageReference Include="System.Threading.Channels" Version="4.4.0" />
    <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
  </ItemGroup>

--- a/src/Runner.Worker/SnapshotOperationProvider.cs
+++ b/src/Runner.Worker/SnapshotOperationProvider.cs
@@ -1,32 +0,0 @@
-#nullable enable
-using System.IO;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.Pipelines;
-using GitHub.Runner.Common;
-using GitHub.Runner.Sdk;
-namespace GitHub.Runner.Worker;
-
-[ServiceLocator(Default = typeof(SnapshotOperationProvider))]
-public interface ISnapshotOperationProvider : IRunnerService
-{
-    Task CreateSnapshotRequestAsync(IExecutionContext executionContext, Snapshot snapshotRequest);
-}
-
-public class SnapshotOperationProvider : RunnerService, ISnapshotOperationProvider
-{
-    public Task CreateSnapshotRequestAsync(IExecutionContext executionContext, Snapshot snapshotRequest)
-    {
-        var snapshotRequestFilePath = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), ".snapshot", "request.json");
-        var snapshotRequestDirectoryPath = Path.GetDirectoryName(snapshotRequestFilePath);
-        if (snapshotRequestDirectoryPath != null)
-        {
-            Directory.CreateDirectory(snapshotRequestDirectoryPath);
-        }
-
-        IOUtil.SaveObject(snapshotRequest, snapshotRequestFilePath);
-        executionContext.Output($"Request written to: {snapshotRequestFilePath}");
-        executionContext.Output("This request will be processed after the job completes. You will not receive any feedback on the snapshot process within the workflow logs of this job.");
-        executionContext.Output("If the snapshot process is successful, you should see a new image with the requested name in the list of available custom images when creating a new GitHub-hosted Runner.");
-        return Task.CompletedTask;
-    }
-}
--- a/src/Runner.Worker/StepsRunner.cs
+++ b/src/Runner.Worker/StepsRunner.cs
@@ -295,7 +295,7 @@ namespace GitHub.Runner.Worker
                    !jobCancellationToken.IsCancellationRequested)
                {
                    Trace.Error($"Caught timeout exception from step: {ex.Message}");
-                    step.ExecutionContext.Error($"The action '{step.DisplayName}' has timed out after {timeoutMinutes} minutes.");
+                    step.ExecutionContext.Error("The action has timed out.");
                    step.ExecutionContext.Result = TaskResult.Failed;
                }
                else
--- a/src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs
+++ b/src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs
@@ -34,7 +34,6 @@ namespace GitHub.Services.Common

        public String PropertyName { get; set; }

-        [Obsolete]
        [SecurityCritical]
        public override void GetObjectData(SerializationInfo info, StreamingContext context)
        {
--- a/src/Sdk/Common/Common/RawHttpHeaders.cs
+++ b/src/Sdk/Common/Common/RawHttpHeaders.cs
@@ -1,11 +1,12 @@
 using System;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;

 namespace GitHub.Services.Common.Internal
 {
    [EditorBrowsable(EditorBrowsableState.Never)]
    public static class RawHttpHeaders
    {
-        public const String SessionHeader = "X-Actions-Session";
+        public const String SessionHeader = "X-Runner-Session";
    }
 }
--- a/src/Sdk/Common/Common/RawHttpMessageHandler.cs
+++ b/src/Sdk/Common/Common/RawHttpMessageHandler.cs
@@ -138,8 +138,6 @@ namespace GitHub.Services.Common
                        response.Dispose();
                    }

-                    this.Settings.ApplyTo(request);
-
                    // Let's start with sending a token
                    IssuedToken token = null;
                    if (m_tokenProvider != null)
--- a/src/Sdk/Common/Common/VssException.cs
+++ b/src/Sdk/Common/Common/VssException.cs
@@ -127,7 +127,6 @@ namespace GitHub.Services.Common
            EventId = (int)info.GetValue("m_eventId", typeof(int));
        }

-        [Obsolete]
        [SecurityCritical]
        public override void GetObjectData(SerializationInfo info, StreamingContext context)
        {
--- a/src/Sdk/Common/Common/VssHttpMessageHandler.cs
+++ b/src/Sdk/Common/Common/VssHttpMessageHandler.cs
@@ -214,7 +214,25 @@ namespace GitHub.Services.Common
                    // ConfigureAwait(false) enables the continuation to be run outside any captured
                    // SyncronizationContext (such as ASP.NET's) which keeps things from deadlocking...

-                    response = await m_messageInvoker.SendAsync(request, tokenSource.Token).ConfigureAwait(false);
+                    var tmpResponse = await m_messageInvoker.SendAsync(request, tokenSource.Token).ConfigureAwait(false);
+                    if (Settings.AllowAutoRedirectForBroker && tmpResponse.StatusCode == HttpStatusCode.Redirect)
+                    {
+                        //Dispose of the previous response
+                        tmpResponse?.Dispose();
+
+                        var location = tmpResponse.Headers.Location;
+                        request = new HttpRequestMessage(HttpMethod.Get, location);
+
+                        // Reapply the token to new redirected request
+                        ApplyToken(request, token, applyICredentialsToWebProxy: lastResponseDemandedProxyAuth);
+
+                        // Resend the request
+                        response = await m_messageInvoker.SendAsync(request, tokenSource.Token).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        response = tmpResponse;
+                    }

                    traceInfo?.TraceRequestSendTime();

--- a/src/Sdk/Common/Common/VssHttpRequestSettings.cs
+++ b/src/Sdk/Common/Common/VssHttpRequestSettings.cs
@@ -110,6 +110,16 @@ namespace GitHub.Services.Common
            set;
        }

+        /// <summary>
+        /// Gets or sets a value indicating whether or not HttpClientHandler should follow redirect on outgoing broker requests
+        /// This is special since this also sends token in the request, where as default AllowAutoRedirect does not
+        /// </summary>
+        public Boolean AllowAutoRedirectForBroker
+        {
+            get;
+            set;
+        }
+
        /// <summary>
        /// Gets or sets a value indicating whether or not compression should be used on outgoing requests.
        /// The default value is true.
--- a/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs
+++ b/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs
@@ -43,7 +43,6 @@ namespace GitHub.DistributedTask.Pipelines
            TemplateToken jobOutputs,
            IList<TemplateToken> defaults,
            ActionsEnvironmentReference actionsEnvironment,
-            TemplateToken snapshot,
            String messageType = JobRequestMessageTypes.PipelineAgentJobRequest)
        {
            this.MessageType = messageType;
@@ -58,7 +57,6 @@ namespace GitHub.DistributedTask.Pipelines
            this.Workspace = workspaceOptions;
            this.JobOutputs = jobOutputs;
            this.ActionsEnvironment = actionsEnvironment;
-            this.Snapshot = snapshot;
            m_variables = new Dictionary<String, VariableValue>(variables, StringComparer.OrdinalIgnoreCase);
            m_maskHints = new List<MaskHint>(maskHints);
            m_steps = new List<JobStep>(steps);
@@ -239,13 +237,6 @@ namespace GitHub.DistributedTask.Pipelines
            set;
        }

-        [DataMember(EmitDefaultValue = false)]
-        public TemplateToken Snapshot
-        {
-            get;
-            set;
-        }
-
        /// <summary>
        /// Gets the collection of variables associated with the current context.
        /// </summary>
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConstants.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConstants.cs
@@ -29,8 +29,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
        public const String Id = "id";
        public const String If = "if";
        public const String Image = "image";
-        public const String ImageName = "image-name";
-        public const String CustomImageVersion = "version";
        public const String Include = "include";
        public const String Inputs = "inputs";
        public const String Job = "job";
@@ -62,7 +60,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
        public const String Services = "services";
        public const String Shell = "shell";
        public const String Skipped = "skipped";
-        public const String Snapshot = "snapshot";
        public const String StepEnv = "step-env";
        public const String StepIfResult = "step-if-result";
        public const String StepWith = "step-with";
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Globalization;
 using System.Linq;
 using GitHub.DistributedTask.Expressions2;
 using GitHub.DistributedTask.Expressions2.Sdk;
@@ -347,70 +346,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
            return result;
        }

-        internal static Snapshot ConvertToJobSnapshotRequest(TemplateContext context, TemplateToken token)
-        {
-            string imageName = null;
-            string version = "1.*";
-            string versionString = string.Empty;
-            var condition = $"{PipelineTemplateConstants.Success}()";
-
-            if (token is StringToken snapshotStringLiteral)
-            {
-                imageName = snapshotStringLiteral.Value;
-            }
-            else
-            {
-                var snapshotMapping = token.AssertMapping($"{PipelineTemplateConstants.Snapshot}");
-                foreach (var snapshotPropertyPair in snapshotMapping)
-                {
-                    var propertyName = snapshotPropertyPair.Key.AssertString($"{PipelineTemplateConstants.Snapshot} key");
-                    var propertyValue = snapshotPropertyPair.Value;
-                    switch (propertyName.Value)
-                    {
-                        case PipelineTemplateConstants.ImageName:
-                            imageName = snapshotPropertyPair.Value.AssertString($"{PipelineTemplateConstants.Snapshot} {propertyName}").Value;
-                            break;
-                        case PipelineTemplateConstants.If:
-                            condition = ConvertToIfCondition(context, propertyValue, false);
-                            break;
-                        case PipelineTemplateConstants.CustomImageVersion:
-                            versionString = propertyValue.AssertString($"job {PipelineTemplateConstants.Snapshot} {PipelineTemplateConstants.CustomImageVersion}").Value;
-                            version = IsSnapshotImageVersionValid(versionString) ? versionString : null;
-                            break;
-                        default:
-                            propertyName.AssertUnexpectedValue($"{PipelineTemplateConstants.Snapshot} key");
-                            break;
-                    }
-                }
-            }
-
-            if (String.IsNullOrEmpty(imageName))
-            {
-                return null;
-            }
-
-            return new Snapshot(imageName)
-            {
-                Condition = condition,
-                Version = version
-            };
-        }
-
-        private static bool IsSnapshotImageVersionValid(string versionString)
-        {
-            var versionSegments = versionString.Split(".");
-
-            if (versionSegments.Length != 2 ||
-                !versionSegments[1].Equals("*") ||
-                !Int32.TryParse(versionSegments[0], NumberStyles.None, CultureInfo.InvariantCulture, result: out int parsedMajor) ||
-                parsedMajor < 0)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
        private static ActionStep ConvertToStep(
            TemplateContext context,
            TemplateToken stepsItem,
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs
@@ -370,32 +370,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
            return result;
        }

-        public Snapshot EvaluateJobSnapshotRequest(TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            var result = default(Snapshot);
-
-            if (token != null && token.Type != TokenType.Null)
-            {
-                var context = CreateContext(contextData, expressionFunctions);
-                try
-                {
-                    token = TemplateEvaluator.Evaluate(context, PipelineTemplateConstants.Snapshot, token, 0, null, omitHeader: true);
-                    context.Errors.Check();
-                    result = PipelineTemplateConverter.ConvertToJobSnapshotRequest(context, token);
-                }
-                catch (Exception ex) when (!(ex is TemplateValidationException))
-                {
-                    context.Errors.Add(ex);
-                }
-
-                context.Errors.Check();
-            }
-
-            return result;
-        }
-
        private TemplateContext CreateContext(
            DictionaryContextData contextData,
            IList<IFunctionInfo> expressionFunctions,
--- a/src/Sdk/DTPipelines/Pipelines/Snapshot.cs
+++ b/src/Sdk/DTPipelines/Pipelines/Snapshot.cs
@@ -1,27 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.Pipelines.ObjectTemplating;
-
-namespace GitHub.DistributedTask.Pipelines
-{
-    [DataContract]
-    public class Snapshot
-    {
-        public Snapshot(string imageName, string condition = null, string version = null)
-        {
-            ImageName = imageName;
-            Condition = condition ?? $"{PipelineTemplateConstants.Success}()";
-            Version = version ?? "1.*";
-        }
-
-        [DataMember(EmitDefaultValue = false)]
-        public String ImageName { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public String Condition { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public String Version { get; set; }
-    }
-}
--- a/src/Sdk/DTPipelines/workflow-v1.0.json
+++ b/src/Sdk/DTPipelines/workflow-v1.0.json
@@ -71,8 +71,7 @@
          "env": "job-env",
          "outputs": "job-outputs",
          "defaults": "job-defaults",
-          "steps": "steps",
-          "snapshot": "snapshot"
+          "steps": "steps"
        }
      }
    },
@@ -156,41 +155,6 @@
      }
    },

-    "snapshot": {
-      "one-of": [
-        "non-empty-string",
-        "snapshot-mapping"
-      ]
-    },
-
-    "snapshot-mapping": {
-      "mapping": {
-        "properties": {
-          "image-name": {
-            "type": "non-empty-string",
-            "required": true
-          },
-          "if": "snapshot-if",
-          "version": {
-            "type": "non-empty-string",
-            "required": false
-          }
-        }
-      }
-    },
-
-    "snapshot-if": {
-      "context": [
-        "github",
-        "inputs",
-        "vars",
-        "needs",
-        "strategy",
-        "matrix"
-      ],
-      "string": {}
-    },
-
    "runs-on": {
      "context": [
        "github",
--- a/src/Sdk/DTWebApi/WebApi/ActionsRunServerHttpClient.cs
+++ b/src/Sdk/DTWebApi/WebApi/ActionsRunServerHttpClient.cs
@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Services.Common;
-using GitHub.Services.Common.Diagnostics;
-using GitHub.Services.WebApi;
-using Newtonsoft.Json;
-
-namespace GitHub.DistributedTask.WebApi
-{
-    [ResourceArea(TaskResourceIds.AreaId)]
-    public class ActionsRunServerHttpClient : TaskAgentHttpClient
-    {
-        private static readonly JsonSerializerSettings s_serializerSettings;
-
-        static ActionsRunServerHttpClient()
-        {
-            s_serializerSettings = new VssJsonMediaTypeFormatter().SerializerSettings;
-            s_serializerSettings.DateParseHandling = DateParseHandling.None;
-            s_serializerSettings.FloatParseHandling = FloatParseHandling.Double;
-        }
-
-        public ActionsRunServerHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials)
-            : base(baseUrl, credentials)
-        {
-        }
-
-        public ActionsRunServerHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials,
-            VssHttpRequestSettings settings)
-            : base(baseUrl, credentials, settings)
-        {
-        }
-
-        public ActionsRunServerHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials,
-            params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, handlers)
-        {
-        }
-
-        public ActionsRunServerHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials,
-            VssHttpRequestSettings settings,
-            params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, settings, handlers)
-        {
-        }
-
-        public ActionsRunServerHttpClient(
-            Uri baseUrl,
-            HttpMessageHandler pipeline,
-            Boolean disposeHandler)
-            : base(baseUrl, pipeline, disposeHandler)
-        {
-        }
-
-        public Task<Pipelines.AgentJobRequestMessage> GetJobMessageAsync(
-            string messageId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("25adab70-1379-4186-be8e-b643061ebe3a");
-            object routeValues = new { messageId = messageId };
-
-            return SendAsync<Pipelines.AgentJobRequestMessage>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
-
-        protected override async Task<T> ReadJsonContentAsync<T>(HttpResponseMessage response, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var json = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            return JsonConvert.DeserializeObject<T>(json, s_serializerSettings);
-        }
-    }
-}
--- a/src/Sdk/DTWebApi/WebApi/BrokerMigrationMessage.cs
+++ b/src/Sdk/DTWebApi/WebApi/BrokerMigrationMessage.cs
@@ -1,38 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace GitHub.DistributedTask.WebApi
-{
-    /// <summary>
-    /// Message that tells the runner to redirect itself to BrokerListener for messages.
-    /// (Note that we use a special Message instead of a simple 302. This is because 
-    /// the runner will need to apply the runner's token to the request, and it is
-    /// a security best practice to *not* blindly add sensitive data to redirects
-    /// 302s.)
-    /// </summary>
-    [DataContract]
-    public class BrokerMigrationMessage
-    {
-        public static readonly string MessageType = "BrokerMigration";
-
-        public BrokerMigrationMessage()
-        {
-        }
-
-        public BrokerMigrationMessage(
-            Uri brokerUrl)
-        {
-            this.BrokerBaseUrl = brokerUrl;
-        }
-
-        /// <summary>
-        /// The base url for the broker listener
-        /// </summary>
-        [DataMember]
-        public Uri BrokerBaseUrl
-        {
-            get;
-            internal set;
-        }
-    }
-}
--- a/src/Sdk/DTWebApi/WebApi/Exceptions.cs
+++ b/src/Sdk/DTWebApi/WebApi/Exceptions.cs
@@ -1539,26 +1539,6 @@ namespace GitHub.DistributedTask.WebApi
        }
    }

-    [Serializable]
-    [ExceptionMapping("0.0", "3.0", "TaskOrchestrationJobUnprocessableException", "GitHub.DistributedTask.WebApi.TaskOrchestrationJobUnprocessableException, GitHub.DistributedTask.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-    public sealed class TaskOrchestrationJobUnprocessableException : DistributedTaskException
-    {
-        public TaskOrchestrationJobUnprocessableException(String message)
-            : base(message)
-        {
-        }
-
-        public TaskOrchestrationJobUnprocessableException(String message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        private TaskOrchestrationJobUnprocessableException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-
    [Serializable]
    [ExceptionMapping("0.0", "3.0", "TaskOrchestrationPlanSecurityException", "GitHub.DistributedTask.WebApi.TaskOrchestrationPlanSecurityException, GitHub.DistributedTask.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
    public sealed class TaskOrchestrationPlanSecurityException : DistributedTaskException
@@ -2518,25 +2498,6 @@ namespace GitHub.DistributedTask.WebApi
        }
    }

-    [Serializable]
-    public class NonRetryableActionDownloadInfoException : DistributedTaskException
-    {
-        public NonRetryableActionDownloadInfoException(String message)
-            : base(message)
-        {
-        }
-
-        public NonRetryableActionDownloadInfoException(String message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        protected NonRetryableActionDownloadInfoException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-
    [Serializable]
    public sealed class FailedToResolveActionDownloadInfoException : DistributedTaskException
    {
--- a/src/Sdk/DTWebApi/WebApi/ServiceConnectivityCheck.cs
+++ b/src/Sdk/DTWebApi/WebApi/ServiceConnectivityCheck.cs
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-
-namespace GitHub.DistributedTask.WebApi
-{
-    [DataContract]
-    public class ServiceConnectivityCheckInput
-    {
-        [JsonConstructor]
-        public ServiceConnectivityCheckInput()
-        {
-            Endpoints = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        }
-
-        [DataMember(EmitDefaultValue = false)]
-        public Dictionary<string, string> Endpoints { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public int IntervalInSecond { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public int RequestTimeoutInSecond { get; set; }
-    }
-
-    [DataContract]
-    public class ServiceConnectivityCheckResult
-    {
-        [JsonConstructor]
-        public ServiceConnectivityCheckResult()
-        {
-            EndpointsResult = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
-        }
-
-        [DataMember(Order = 1, EmitDefaultValue = true)]
-        public bool HasFailure { get; set; }
-
-        [DataMember(Order = 2, EmitDefaultValue = false)]
-        public Dictionary<string, List<string>> EndpointsResult { get; set; }
-    }
-}
--- a/src/Sdk/DTWebApi/WebApi/TaskAgentHttpClient.cs
+++ b/src/Sdk/DTWebApi/WebApi/TaskAgentHttpClient.cs
@@ -141,6 +141,24 @@ namespace GitHub.DistributedTask.WebApi
            return ReplaceAgentAsync(poolId, agent.Id, agent, userState, cancellationToken);
        }

+        public Task<Pipelines.AgentJobRequestMessage> GetJobMessageAsync(
+            string messageId,
+            object userState = null,
+            CancellationToken cancellationToken = default)
+        {
+            HttpMethod httpMethod = new HttpMethod("GET");
+            Guid locationId = new Guid("25adab70-1379-4186-be8e-b643061ebe3a");
+            object routeValues = new { messageId = messageId };
+
+            return SendAsync<Pipelines.AgentJobRequestMessage>(
+                httpMethod,
+                locationId,
+                routeValues: routeValues,
+                version: new ApiResourceVersion(6.0, 1),
+                userState: userState,
+                cancellationToken: cancellationToken);
+        }
+
        protected Task<T> SendAsync<T>(
            HttpMethod method,
            Guid locationId,
--- a/src/Sdk/DTWebApi/WebApi/TaskAgentMessageTypes.cs
+++ b/src/Sdk/DTWebApi/WebApi/TaskAgentMessageTypes.cs
@@ -1,10 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace GitHub.DistributedTask.WebApi
-{
-    public sealed class TaskAgentMessageTypes
-    {
-        public static readonly string ForceTokenRefresh = "ForceTokenRefresh";
-    }
-}
--- a/src/Sdk/DTWebApi/WebApi/TaskAgentSession.cs
+++ b/src/Sdk/DTWebApi/WebApi/TaskAgentSession.cs
@@ -75,12 +75,5 @@ namespace GitHub.DistributedTask.WebApi
            get;
            set;
        }
-
-        [DataMember(EmitDefaultValue = false, IsRequired = false)]
-        public BrokerMigrationMessage BrokerMigrationMessage
-        {
-            get;
-            set;
-        }
    }
 }
--- a/src/Sdk/DTWebApi/WebApi/TaskAttachment.cs
+++ b/src/Sdk/DTWebApi/WebApi/TaskAttachment.cs
@@ -101,7 +101,6 @@ namespace GitHub.DistributedTask.WebApi
        public static readonly String FileAttachment = "DistributedTask.Core.FileAttachment";
        public static readonly String DiagnosticLog = "DistributedTask.Core.DiagnosticLog";
        public static readonly String ResultsLog = "Results.Core.Log";
-        public static readonly String ResultsDiagnosticLog = "Results.Core.DiagnosticLog";
    }

    [GenerateAllConstants]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tingluo Huang	1615de2f78	Fix release workflow.	2024-01-16 22:54:01 -05:00
Tingluo Huang	839cb20c1e	Release 2.312.0 runner	2024-01-16 22:28:51 -05:00
@@ -1 +1 @@
 .321.0
 .312.0
				`@@ -0,0 +1 @@`
				`54d95a44d118dba852395991224a6b9c1abe916858c87138656f80c619e85331`
				`@@ -0,0 +1 @@`
				`68015af17f06a824fa478e62ae7393766ce627fd5599ab916432a14656a19a52`
				`@@ -0,0 +1 @@`
				`a2628119ca419cb54e279103ffae7986cdbd0814d57c73ff0dc74c38be08b9ae`
				`@@ -0,0 +1 @@`
				`de71ca09ead807e1a2ce9df0a5b23eb7690cb71fff51169a77e4c3992be53dda`
				`@@ -0,0 +1 @@`
				`d009e05e6b26d614d65be736a15d1bd151932121c16a9ff1b986deadecc982b9`
				`@@ -0,0 +1 @@`
				`f730db39c2305800b4653795360ba9c10c68f384a46b85d808f1f9f0ed3c42e4`
				`@@ -0,0 +1 @@`
				`a35b5722375490e9473cdcccb5e18b41eba3dbf4344fe31abc9821e21f18ea5a`
				`@@ -0,0 +1 @@`
				`4bf3e1af0d482af1b2eaf9f08250248a8c1aea8ec20a3c5be116d58cdd930009`