Update releaseVersion to 2.318.0

.devcontainer/devcontainer.json

@@ -4,10 +4,10 @@
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:1": {},
     "ghcr.io/devcontainers/features/dotnet": {
-      "version": "8.0.407"
+      "version": "8.0.303"
     },
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
+      "version": "16"
     },
     "ghcr.io/devcontainers/features/sshd:1": {
       "version": "latest"

.github/ISSUE_TEMPLATE/config.yml

@@ -7,7 +7,7 @@ contact_links:
     url: https://github.community/c/code-to-cloud/52
     about: If you have questions about GitHub Actions or need support writing workflows, please ask in the GitHub Community Support forum.
   - name: ✅ Feedback and suggestions for GitHub Actions
-    url: https://github.com/github/feedback/discussions/categories/actions
+    url: https://github.com/github/feedback/discussions/categories/actions-and-packages-feedback
     about: If you have feedback or suggestions about GitHub Actions, please open a discussion (or add to an existing one) in the GitHub Actions Feedback.  GitHub Actions Product Managers and Engineers monitor the feedback forum.
   - name: ‼️ GitHub Security Bug Bounty
     url: https://bounty.github.com/

.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:

.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
@@ -69,13 +69,13 @@ jobs:
     - name: Package Release
       if: github.event_name != 'pull_request'
       run: |
-        ${{ matrix.devScript }} package Release ${{ matrix.runtime }}
+        ${{ matrix.devScript }} package Release
       working-directory: src
 
     # 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: |

.github/workflows/close-bugs-bot.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
         with:
           close-issue-message: "This issue does not seem to be a problem with the runner application, it concerns the GitHub actions platform more generally. Could you please post your feedback on the [GitHub Community Support Forum](https://github.com/orgs/community/discussions/categories/actions) which is actively monitored. Using the forum ensures that we route your problem to the correct team. 😃"
           exempt-issue-labels: "keep"

.github/workflows/close-features-bot.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
         with:
           close-issue-message: "Thank you for your interest in the runner application and taking the time to provide your valuable feedback. We kindly ask you to redirect this feedback to the [GitHub Community Support Forum](https://github.com/orgs/community/discussions/categories/actions-and-packages) which our team actively monitors and would be a better place to start a discussion for new feature requests in GitHub Actions. For more information on this policy please [read our contribution guidelines](https://github.com/actions/runner#contribute). 😃"
           exempt-issue-labels: "keep"

.github/workflows/codeql.yml

@@ -23,11 +23,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
@@ -38,4 +38,4 @@ jobs:
       working-directory: src
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2

.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

.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

.github/workflows/publish-image.yml

@@ -0,0 +1,70 @@
+name: Publish Runner Image
+
+on:
+  workflow_dispatch:
+    inputs:
+      runnerVersion:
+        type: string
+        description: Version of the runner being installed
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        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;
+            if (inputRunnerVersion) {
+              console.log(`Using input runner version ${inputRunnerVersion}`)
+              core.setOutput('version', inputRunnerVersion);
+              return
+            }
+            const runnerVersion = fs.readFileSync('${{ github.workspace }}/src/runnerversion', 'utf8').replace(/\n$/g, '')
+            console.log(`Using runner version ${runnerVersion}`)
+            core.setOutput('version', runnerVersion);
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v3
+        with:
+          context: ./images
+          platforms: |
+            linux/amd64
+            linux/arm64
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.version }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          build-args: |
+            RUNNER_VERSION=${{ steps.image.outputs.version }}
+          push: true
+          labels: |
+            org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}
+            org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }}
+            org.opencontainers.image.licenses=MIT

.github/workflows/release.yml

@@ -11,12 +11,12 @@ 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
     - name: Check version
-      uses: actions/github-script@v7.0.1
+      uses: actions/github-script@0.3.0
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -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,49 +131,19 @@ 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
     - name: Create ReleaseNote
       id: releaseNote
-      uses: actions/github-script@v7.0.1
+      uses: actions/github-script@0.3.0
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -291,18 +262,16 @@ jobs:
     permissions:
       contents: read
       packages: write
-      id-token: write
-      attestations: write
     env:
       REGISTRY: ghcr.io
       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
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v6
         with:
           script: |
             const fs = require('fs');
@@ -311,10 +280,10 @@ jobs:
             core.setOutput('version', runnerVersion);
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -322,7 +291,7 @@ jobs:
 
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v3
         with:
           context: ./images
           platforms: |
@@ -338,10 +307,3 @@ jobs:
             org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}
             org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }}
             org.opencontainers.image.licenses=MIT
-
-      - name: Generate attestation
-        uses: actions/attest-build-provenance@v2
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          subject-digest: ${{ steps.build-and-push.outputs.digest }}
-          push-to-registry: true

.github/workflows/stale-bot.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
         with:
           stale-issue-message: "This issue is stale because it has been open 365 days with no activity. Remove stale label or comment or this will be closed in 15 days."
           close-issue-message: "This issue was closed because it has been stalled for 15 days with no activity."

docs/adrs/1751-runner-job-hooks.md

@@ -23,7 +23,7 @@ This feature is mainly intended for self hosted runner administrators.
   - `ACTIONS_RUNNER_HOOK_JOB_STARTED`
   - `ACTIONS_RUNNER_HOOK_JOB_COMPLETED`
 
-You can set these variables to the **absolute** path of a `.sh` or `.ps1` file.
+You can set these variables to the **absolute** path of a a `.sh` or `.ps1` file.
 
 We will execute `pwsh` (fallback to `powershell`) or `bash` (fallback to `sh`) as appropriate.
 - `.sh` files will execute with the args `-e {pathtofile}`

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`
 

docs/contribute.md

@@ -1,6 +1,6 @@
 # Contributions
 
-We welcome contributions in the form of issues and pull requests. We view the contributions and the process as the same for github and external contributors. Please note the runner typically requires changes across the entire system and we aim for issues in the runner to be entirely self contained and fixable here. Therefore, we will primarily handle bug issues opened in this repo and we kindly request you to create all feature and enhancement requests on the [GitHub Feedback](https://github.com/community/community/discussions/categories/actions-and-packages) page. 
+We welcome contributions in the form of issues and pull requests. We view the contributions and the process as the same for github and external contributors.Please note the runner typically requires changes across the entire system and we aim for issues in the runner to be entirely self contained and fixable here. Therefore, we will primarily handle bug issues opened in this repo and we kindly request you to create all feature and enhancement requests on the [GitHub Feedback](https://github.com/community/community/discussions/categories/actions-and-packages) page. 
 
 > IMPORTANT: Building your own runner is critical for the dev inner loop process when contributing changes.  However, only runners built and distributed by GitHub (releases) are supported in production.  Be aware that workflows and orchestrations run service side with the runner being a remote process to run steps.  For that reason, the service can pull the runner forward so customizations can be lost.
 

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=28.0.1
-ARG BUILDX_VERSION=0.21.2
+ARG DOCKER_VERSION=27.1.1
+ARG BUILDX_VERSION=0.16.2
 
 RUN apt update -y && apt install curl unzip -y
 
@@ -32,7 +32,7 @@ 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
@@ -41,14 +41,12 @@ 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 \
+    && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common \
     && rm -rf /var/lib/apt/lists/*
 
 # Configure git-core/ppa based on guidance here:  https://git-scm.com/download/linux
 RUN add-apt-repository ppa:git-core/ppa \
-    && apt update -y \
-    && apt install -y git \
-    && rm -rf /var/lib/apt/lists/*
+    && apt update -y
 
 RUN adduser --disabled-password --gecos "" --uid 1001 runner \
     && groupadd docker --gid 123 \

releaseNote.md

@@ -1,36 +1,18 @@
 ## What's Changed
-* Bump docker/login-action from 2 to 3 by @dependabot in https://github.com/actions/runner/pull/3673
-* Bump actions/stale from 8 to 9 by @dependabot in https://github.com/actions/runner/pull/3554
-* Bump docker/build-push-action from 3 to 6 by @dependabot in https://github.com/actions/runner/pull/3674
-* update node version from 20.18.0 -> 20.18.2 by @aiqiaoy in https://github.com/actions/runner/pull/3682
-* Pass BillingOwnerId through Acquire/Complete calls by @luketomlinson in https://github.com/actions/runner/pull/3689
-* Do not retry CompleteJobAsync for known non-retryable errors by @ericsciple in https://github.com/actions/runner/pull/3696
-* Update dotnet sdk to latest version @8.0.406 by @github-actions in https://github.com/actions/runner/pull/3712
-* Update Dockerfile with new docker and buildx versions by @thboop in https://github.com/actions/runner/pull/3680
-* chore: remove redundant words by @finaltrip in https://github.com/actions/runner/pull/3705
-* fix: actions feedback link is incorrect by @Yaminyam in https://github.com/actions/runner/pull/3165
-* Bump actions/github-script from 0.3.0 to 7.0.1 by @dependabot in https://github.com/actions/runner/pull/3557
-* Docker container provenance by @paveliak in https://github.com/actions/runner/pull/3736
-* Add request-id to http eventsource trace. by @TingluoHuang in https://github.com/actions/runner/pull/3740
-* Update Bocker and Buildx version to mitigate images scanners alerts by @Blizter in https://github.com/actions/runner/pull/3750
-* Fix typo, add invariant culture to timestamp for workflow log reporting by @GhadimiR in https://github.com/actions/runner/pull/3749
-* Create vssconnection to actions service when URL provided. by @TingluoHuang in https://github.com/actions/runner/pull/3751
-* Housekeeping: Update npm packages and node version by @thboop in https://github.com/actions/runner/pull/3752
-* Improve the out-of-date warning message. by @tecimovic in https://github.com/actions/runner/pull/3595
-* Update dotnet sdk to latest version @8.0.407 by @github-actions in https://github.com/actions/runner/pull/3753
-* Exit hosted runner cleanly during deprovisioning. by @TingluoHuang in https://github.com/actions/runner/pull/3755
-* Send annotation title to run-service. by @TingluoHuang in https://github.com/actions/runner/pull/3757
-* Allow server enforce runner settings. by @TingluoHuang in https://github.com/actions/runner/pull/3758
-* Support refresh runner configs with pipelines service. by @TingluoHuang in https://github.com/actions/runner/pull/3706
 
-## New Contributors
-* @finaltrip made their first contribution in https://github.com/actions/runner/pull/3705
-* @Yaminyam made their first contribution in https://github.com/actions/runner/pull/3165
-* @Blizter made their first contribution in https://github.com/actions/runner/pull/3750
-* @GhadimiR made their first contribution in https://github.com/actions/runner/pull/3749
-* @tecimovic made their first contribution in https://github.com/actions/runner/pull/3595
+- Update Docker to v27.1.1 by @TingluoHuang in https://github.com/actions/runner/pull/3401
+- Upgrade dotnet sdk to v8.0.303 in https://github.com/actions/runner/pull/3388
+- Rephrase node20 warning by @rentziass in https://github.com/actions/runner/pull/3376
+- Bump hook version to 0.6.1 by @nikola-jokic in https://github.com/actions/runner/pull/3350
+- Backoff to avoid excessive retries to Run Service in a duration by @ericsciple in https://github.com/actions/runner/pull/3354
+- Bump System.Security.Cryptography.Pkcs from 5.0.0 to 8.0.0 in /src in https://github.com/actions/runner/pull/3347
+- Upgrade dotnet sdk to v8.0.302 in https://github.com/actions/runner/pull/3346
+- Bump runner to dotnet 8 by @TingluoHuang in https://github.com/actions/runner/pull/3345
+- Pass runner version as environment variable in workflow by @joshmgross in https://github.com/actions/runner/pull/3318
+- Make sure we mask secrets when reporting telemetry by @TingluoHuang in https://github.com/actions/runner/pull/3315
+- Bump docker version and docker buildx version by @int128 in https://github.com/actions/runner/pull/3277
 
-**Full Changelog**: https://github.com/actions/runner/compare/v2.322.0...v2.323.0
+**Full Changelog**: https://github.com/actions/runner/compare/v2.317.0...v2.318.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.
@@ -52,7 +34,9 @@ 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.
 

releaseVersion

@@ -1 +1 @@
-<Update to ./src/runnerversion when creating release>
+2.318.0

src/Directory.Build.props

@@ -57,13 +57,4 @@
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Enable NuGet package auditing -->
-    <NuGetAudit>true</NuGetAudit>
-    <!-- Audit direct and transitive packages -->
-    <NuGetAuditMode>all</NuGetAuditMode>
-    <!-- Report low, moderate, high and critical advisories -->
-    <NuGetAuditLevel>moderate</NuGetAuditLevel>
-  </PropertyGroup>
 </Project>

src/Misc/expressionFunc/hashFiles/package.json

@@ -11,6 +11,7 @@
     "pack": "ncc build -o ../../layoutbin/hashFiles",
     "all": "npm run format && npm run lint && npm run build && npm run pack",
     "prepare": "cd ../../../../ && husky install"
+
   },
   "repository": {
     "type": "git",
@@ -42,9 +43,9 @@
     "eslint": "^8.47.0",
     "eslint-plugin-github": "^4.10.0",
     "eslint-plugin-prettier": "^5.0.0",
-    "husky": "^8.0.3",
-    "lint-staged": "^15.5.0",
     "prettier": "^3.0.3",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.0"
   }
-}
+}

src/Misc/externals.sh

@@ -3,10 +3,13 @@ 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.19.0"
+NODE16_VERSION="16.20.2"
+NODE20_VERSION="20.13.1"
+NODE16_UNOFFICIAL_VERSION="16.20.0" # used only for win-arm64, remove node16 unofficial version when official version is available
 
 get_abs_path() {
   # exploits the fact that pwd will print abs path when no args
@@ -137,6 +140,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 +152,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 +163,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

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

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

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;
 
@@ -93,7 +92,7 @@ namespace GitHub.Runner.Common
 
         public bool ShouldRetryException(Exception ex)
         {
-            if (ex is AccessDeniedException || ex is RunnerNotFoundException || ex is HostedRunnerDeprovisionedException)
+            if (ex is AccessDeniedException ade && ade.ErrorCode == 1)
             {
                 return false;
             }

src/Runner.Common/ConfigurationStore.cs

@@ -119,11 +119,8 @@ namespace GitHub.Runner.Common
         CredentialData GetCredentials();
         CredentialData GetMigratedCredentials();
         RunnerSettings GetSettings();
-        RunnerSettings GetMigratedSettings();
         void SaveCredential(CredentialData credential);
-        void SaveMigratedCredential(CredentialData credential);
         void SaveSettings(RunnerSettings settings);
-        void SaveMigratedSettings(RunnerSettings settings);
         void DeleteCredential();
         void DeleteMigratedCredential();
         void DeleteSettings();
@@ -133,7 +130,6 @@ namespace GitHub.Runner.Common
     {
         private string _binPath;
         private string _configFilePath;
-        private string _migratedConfigFilePath;
         private string _credFilePath;
         private string _migratedCredFilePath;
         private string _serviceConfigFilePath;
@@ -141,7 +137,6 @@ namespace GitHub.Runner.Common
         private CredentialData _creds;
         private CredentialData _migratedCreds;
         private RunnerSettings _settings;
-        private RunnerSettings _migratedSettings;
 
         public override void Initialize(IHostContext hostContext)
         {
@@ -159,9 +154,6 @@ namespace GitHub.Runner.Common
             _configFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Runner);
             Trace.Info("ConfigFilePath: {0}", _configFilePath);
 
-            _migratedConfigFilePath = hostContext.GetConfigFile(WellKnownConfigFile.MigratedRunner);
-            Trace.Info("MigratedConfigFilePath: {0}", _migratedConfigFilePath);
-
             _credFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Credentials);
             Trace.Info("CredFilePath: {0}", _credFilePath);
 
@@ -177,7 +169,7 @@ namespace GitHub.Runner.Common
         public bool HasCredentials()
         {
             Trace.Info("HasCredentials()");
-            bool credsStored = new FileInfo(_credFilePath).Exists || new FileInfo(_migratedCredFilePath).Exists;
+            bool credsStored = (new FileInfo(_credFilePath)).Exists || (new FileInfo(_migratedCredFilePath)).Exists;
             Trace.Info("stored {0}", credsStored);
             return credsStored;
         }
@@ -185,7 +177,7 @@ namespace GitHub.Runner.Common
         public bool IsConfigured()
         {
             Trace.Info("IsConfigured()");
-            bool configured = new FileInfo(_configFilePath).Exists || new FileInfo(_migratedConfigFilePath).Exists;
+            bool configured = new FileInfo(_configFilePath).Exists;
             Trace.Info("IsConfigured: {0}", configured);
             return configured;
         }
@@ -193,7 +185,7 @@ namespace GitHub.Runner.Common
         public bool IsServiceConfigured()
         {
             Trace.Info("IsServiceConfigured()");
-            bool serviceConfigured = new FileInfo(_serviceConfigFilePath).Exists;
+            bool serviceConfigured = (new FileInfo(_serviceConfigFilePath)).Exists;
             Trace.Info($"IsServiceConfigured: {serviceConfigured}");
             return serviceConfigured;
         }
@@ -237,25 +229,6 @@ namespace GitHub.Runner.Common
             return _settings;
         }
 
-        public RunnerSettings GetMigratedSettings()
-        {
-            if (_migratedSettings == null)
-            {
-                RunnerSettings configuredSettings = null;
-                if (File.Exists(_migratedConfigFilePath))
-                {
-                    string json = File.ReadAllText(_migratedConfigFilePath, Encoding.UTF8);
-                    Trace.Info($"Read migrated setting file: {json.Length} chars");
-                    configuredSettings = StringUtil.ConvertFromJson<RunnerSettings>(json);
-                }
-
-                ArgUtil.NotNull(configuredSettings, nameof(configuredSettings));
-                _migratedSettings = configuredSettings;
-            }
-
-            return _migratedSettings;
-        }
-
         public void SaveCredential(CredentialData credential)
         {
             Trace.Info("Saving {0} credential @ {1}", credential.Scheme, _credFilePath);
@@ -271,21 +244,6 @@ namespace GitHub.Runner.Common
             File.SetAttributes(_credFilePath, File.GetAttributes(_credFilePath) | FileAttributes.Hidden);
         }
 
-        public void SaveMigratedCredential(CredentialData credential)
-        {
-            Trace.Info("Saving {0} migrated credential @ {1}", credential.Scheme, _migratedCredFilePath);
-            if (File.Exists(_migratedCredFilePath))
-            {
-                // Delete existing credential file first, since the file is hidden and not able to overwrite.
-                Trace.Info("Delete exist runner migrated credential file.");
-                IOUtil.DeleteFile(_migratedCredFilePath);
-            }
-
-            IOUtil.SaveObject(credential, _migratedCredFilePath);
-            Trace.Info("Migrated Credentials Saved.");
-            File.SetAttributes(_migratedCredFilePath, File.GetAttributes(_migratedCredFilePath) | FileAttributes.Hidden);
-        }
-
         public void SaveSettings(RunnerSettings settings)
         {
             Trace.Info("Saving runner settings.");
@@ -301,21 +259,6 @@ namespace GitHub.Runner.Common
             File.SetAttributes(_configFilePath, File.GetAttributes(_configFilePath) | FileAttributes.Hidden);
         }
 
-        public void SaveMigratedSettings(RunnerSettings settings)
-        {
-            Trace.Info("Saving runner migrated settings");
-            if (File.Exists(_migratedConfigFilePath))
-            {
-                // Delete existing settings file first, since the file is hidden and not able to overwrite.
-                Trace.Info("Delete exist runner migrated settings file.");
-                IOUtil.DeleteFile(_migratedConfigFilePath);
-            }
-
-            IOUtil.SaveObject(settings, _migratedConfigFilePath);
-            Trace.Info("Migrated Settings Saved.");
-            File.SetAttributes(_migratedConfigFilePath, File.GetAttributes(_migratedConfigFilePath) | FileAttributes.Hidden);
-        }
-
         public void DeleteCredential()
         {
             IOUtil.Delete(_credFilePath, default(CancellationToken));
@@ -330,12 +273,6 @@ namespace GitHub.Runner.Common
         public void DeleteSettings()
         {
             IOUtil.Delete(_configFilePath, default(CancellationToken));
-            IOUtil.Delete(_migratedConfigFilePath, default(CancellationToken));
-        }
-
-        public void DeleteMigratedSettings()
-        {
-            IOUtil.Delete(_migratedConfigFilePath, default(CancellationToken));
         }
     }
 }

src/Runner.Common/Constants.cs

@@ -18,7 +18,6 @@ namespace GitHub.Runner.Common
     public enum WellKnownConfigFile
     {
         Runner,
-        MigratedRunner,
         Credentials,
         MigratedCredentials,
         RSACredentials,
@@ -160,8 +159,8 @@ namespace GitHub.Runner.Common
             public static class Features
             {
                 public static readonly string DiskSpaceWarning = "runner.diskspace.warning";
+                public static readonly string Node16Warning = "DistributedTask.AddWarningToNode16Action";
                 public static readonly string LogTemplateErrorsAsDebugMessages = "DistributedTask.LogTemplateErrorsAsDebugMessages";
-                public static readonly string SkipRetryCompleteJobUponKnownErrors = "actions_skip_retry_complete_job_upon_known_errors";
                 public static readonly string UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate";
                 public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks";
             }
@@ -177,6 +176,14 @@ 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 readonly string EnforcedNode16DetectedAfterEndOfLife = "The following actions use a deprecated Node.js version and will be forced to run on node20: {0}. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/";
+            public static readonly string EnforcedNode16DetectedAfterEndOfLifeEnvVariable = "Node20ForceActionsWarnings";
+
         }
 
         public static class RunnerEvent
@@ -247,17 +254,20 @@ 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 readonly string ManualForceActionsToNode20 = "FORCE_JAVASCRIPT_ACTIONS_TO_NODE20";
             }
 
             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";
                 public static readonly string ActionArchiveCacheDirectory = "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE";
+                public static readonly string ManualForceActionsToNode20 = "FORCE_JAVASCRIPT_ACTIONS_TO_NODE20";
             }
 
             public static class System

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)
@@ -343,12 +330,6 @@ namespace GitHub.Runner.Common
                         ".runner");
                     break;
 
-                case WellKnownConfigFile.MigratedRunner:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Root),
-                        ".runner_migrated");
-                    break;
-
                 case WellKnownConfigFile.Credentials:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Root),
@@ -635,7 +616,7 @@ namespace GitHub.Runner.Common
                     payload[0] = Enum.Parse(typeof(GitHub.Services.Common.VssCredentialsType), ((int)payload[0]).ToString());
                 }
 
-                if (payload.Length > 0 && !string.IsNullOrEmpty(eventData.Message))
+                if (payload.Length > 0)
                 {
                     message = String.Format(eventData.Message.Replace("%n", Environment.NewLine), payload);
                 }

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);
                 }

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,

src/Runner.Common/RunServer.cs

@@ -18,7 +18,7 @@ namespace GitHub.Runner.Common
     {
         Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
 
-        Task<AgentJobRequestMessage> GetJobMessageAsync(string id, string billingOwnerId, CancellationToken token);
+        Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken token);
 
         Task CompleteJobAsync(
             Guid planId,
@@ -28,20 +28,6 @@ namespace GitHub.Runner.Common
             IList<StepResult> stepResults,
             IList<Annotation> jobAnnotations,
             string environmentUrl,
-            IList<Telemetry> telemetry,
-            string billingOwnerId,
-            CancellationToken token);
-
-        Task CompleteJob2Async(
-            Guid planId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            IList<StepResult> stepResults,
-            IList<Annotation> jobAnnotations,
-            string environmentUrl,
-            IList<Telemetry> telemetry,
-            string billingOwnerId,
             CancellationToken token);
 
         Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken token);
@@ -71,18 +57,17 @@ namespace GitHub.Runner.Common
             }
         }
 
-        public Task<AgentJobRequestMessage> GetJobMessageAsync(string id, string billingOwnerId, CancellationToken cancellationToken)
+        public Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken cancellationToken)
         {
             CheckConnection();
             return RetryRequest<AgentJobRequestMessage>(
-                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, VarUtil.OS, billingOwnerId, cancellationToken), cancellationToken,
+                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
         }
 
-        // Legacy will be deleted when SkipRetryCompleteJobUponKnownErrors is cleaned up
         public Task CompleteJobAsync(
             Guid planId,
             Guid jobId,
@@ -91,33 +76,11 @@ namespace GitHub.Runner.Common
             IList<StepResult> stepResults,
             IList<Annotation> jobAnnotations,
             string environmentUrl,
-            IList<Telemetry> telemetry,
-            string billingOwnerId,
             CancellationToken cancellationToken)
         {
             CheckConnection();
             return RetryRequest(
-                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, telemetry, billingOwnerId, cancellationToken), cancellationToken);
-        }
-
-        public Task CompleteJob2Async(
-            Guid planId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            IList<StepResult> stepResults,
-            IList<Annotation> jobAnnotations,
-            string environmentUrl,
-            IList<Telemetry> telemetry,
-            string billingOwnerId,
-            CancellationToken cancellationToken)
-        {
-            CheckConnection();
-            return RetryRequest(
-                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, telemetry, billingOwnerId, cancellationToken), cancellationToken,
-                shouldRetry: ex =>
-                    ex is not VssUnauthorizedException &&               // HTTP status 401
-                    ex is not TaskOrchestrationJobNotFoundException);   // HTTP status 404
+                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, cancellationToken), cancellationToken);
         }
 
         public Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken cancellationToken)

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

src/Runner.Common/RunnerServer.cs

@@ -1,11 +1,11 @@
-using System;
+using GitHub.DistributedTask.WebApi;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
 using GitHub.Services.WebApi;
+using GitHub.Services.Common;
+using GitHub.Runner.Sdk;
 
 namespace GitHub.Runner.Common
 {
@@ -50,10 +50,7 @@ namespace GitHub.Runner.Common
         Task<PackageMetadata> GetPackageAsync(string packageType, string platform, string version, bool includeToken, CancellationToken cancellationToken);
 
         // agent update
-        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState, string trace, CancellationToken cancellationToken = default);
-
-        // runner config refresh
-        Task<string> RefreshRunnerConfigAsync(int agentId, string configType, string encodedRunnerConfig, CancellationToken cancellationToken);
+        Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState, string trace);
     }
 
     public sealed class RunnerServer : RunnerService, IRunnerServer
@@ -318,17 +315,10 @@ namespace GitHub.Runner.Common
             return _genericTaskAgentClient.GetPackageAsync(packageType, platform, version, includeToken, cancellationToken: cancellationToken);
         }
 
-        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState, string trace, CancellationToken cancellationToken = default)
+        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, ulong agentId, string currentState, string trace)
         {
             CheckConnection(RunnerConnectionType.Generic);
-            return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState, trace, cancellationToken: cancellationToken);
-        }
-
-        // runner config refresh
-        public Task<string> RefreshRunnerConfigAsync(int agentId, string configType, string encodedRunnerConfig, CancellationToken cancellationToken)
-        {
-            CheckConnection(RunnerConnectionType.Generic);
-            return _genericTaskAgentClient.RefreshRunnerConfigAsync(agentId, configType, encodedRunnerConfig, cancellationToken: cancellationToken);
+            return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState, trace);
         }
     }
 }

src/Runner.Common/RunnerService.cs

@@ -70,8 +70,7 @@ namespace GitHub.Runner.Common
 
         protected async Task RetryRequest(Func<Task> func,
             CancellationToken cancellationToken,
-            int maxRetryAttemptsCount = 5,
-            Func<Exception, bool> shouldRetry = null
+            int maxRetryAttemptsCount = 5
         )
         {
             async Task<Unit> wrappedFunc()
@@ -79,7 +78,7 @@ namespace GitHub.Runner.Common
                 await func();
                 return Unit.Value;
             }
-            await RetryRequest<Unit>(wrappedFunc, cancellationToken, maxRetryAttemptsCount, shouldRetry);
+            await RetryRequest<Unit>(wrappedFunc, cancellationToken, maxRetryAttemptsCount);
         }
 
         protected async Task<T> RetryRequest<T>(Func<Task<T>> func,

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);

src/Runner.Listener/BrokerMessageListener.cs

@@ -9,12 +9,11 @@ using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
+using GitHub.Runner.Common.Util;
 using GitHub.Services.OAuth;
-using GitHub.Services.WebApi;
 
 namespace GitHub.Runner.Listener
 {
@@ -27,7 +26,6 @@ namespace GitHub.Runner.Listener
         private CancellationTokenSource _getMessagesTokenSource;
         private VssCredentials _creds;
         private TaskAgentSession _session;
-        private IRunnerServer _runnerServer;
         private IBrokerServer _brokerServer;
         private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new();
         private bool _accessTokenRevoked = false;
@@ -41,7 +39,6 @@ namespace GitHub.Runner.Listener
             base.Initialize(hostContext);
 
             _term = HostContext.GetService<ITerminal>();
-            _runnerServer = HostContext.GetService<IRunnerServer>();
             _brokerServer = HostContext.GetService<IBrokerServer>();
         }
 
@@ -52,8 +49,7 @@ namespace GitHub.Runner.Listener
             // Settings
             var configManager = HostContext.GetService<IConfigurationManager>();
             _settings = configManager.LoadSettings();
-            var serverUrlV2 = _settings.ServerUrlV2;
-            var serverUrl = _settings.ServerUrl;
+            var serverUrl = _settings.ServerUrlV2;
             Trace.Info(_settings);
 
             if (string.IsNullOrEmpty(_settings.ServerUrlV2))
@@ -73,8 +69,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;
@@ -87,17 +82,9 @@ namespace GitHub.Runner.Listener
                 try
                 {
                     Trace.Info("Connecting to the Broker Server...");
-                    await _brokerServer.ConnectAsync(new Uri(serverUrlV2), _creds);
+                    await _brokerServer.ConnectAsync(new Uri(serverUrl), _creds);
                     Trace.Info("VssConnection created");
 
-                    if (!string.IsNullOrEmpty(serverUrl) &&
-                        !string.Equals(serverUrl, serverUrlV2, StringComparison.OrdinalIgnoreCase))
-                    {
-                        Trace.Info("Connecting to the Runner server...");
-                        await _runnerServer.ConnectAsync(new Uri(serverUrl), _creds);
-                        Trace.Info("VssConnection created");
-                    }
-
                     _term.WriteLine();
                     _term.WriteSuccessMessage("Connected to GitHub");
                     _term.WriteLine();
@@ -142,7 +129,7 @@ namespace GitHub.Runner.Listener
                         // 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(serverUrlV2));
+                        var oauthTokenProvider = new VssOAuthTokenProvider(vssOAuthCred, new Uri(serverUrl));
                         var authError = await oauthTokenProvider.ValidateCredentialAsync(token);
                         if (string.Equals(authError, "invalid_client", StringComparison.OrdinalIgnoreCase))
                         {
@@ -249,19 +236,10 @@ namespace GitHub.Runner.Listener
                     Trace.Info("Runner OAuth token has been revoked. Unable to pull message.");
                     throw;
                 }
-                catch (HostedRunnerDeprovisionedException)
-                {
-                    Trace.Info("Hosted runner has been deprovisioned.");
-                    throw;
-                }
                 catch (AccessDeniedException e) when (e.ErrorCode == 1)
                 {
                     throw;
                 }
-                catch (RunnerNotFoundException)
-                {
-                    throw;
-                }
                 catch (Exception ex)
                 {
                     Trace.Error("Catch exception during get next message.");
@@ -345,7 +323,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}");

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -135,8 +135,7 @@ namespace GitHub.Runner.Listener.Configuration
                     runnerSettings.GitHubUrl = inputUrl;
                     registerToken = await GetRunnerTokenAsync(command, inputUrl, "registration");
                     GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
-                    var hasLegacyUrl = !string.IsNullOrEmpty(authResult.LegacyUrl);
-                    runnerSettings.ServerUrl = hasLegacyUrl ? authResult.LegacyUrl : authResult.TenantUrl;
+                    runnerSettings.ServerUrl = authResult.TenantUrl;
                     runnerSettings.UseV2Flow = authResult.UseV2Flow;
                     Trace.Info($"Using V2 flow: {runnerSettings.UseV2Flow}");
                     creds = authResult.ToVssCredentials();
@@ -405,20 +404,6 @@ namespace GitHub.Runner.Listener.Configuration
                 }
             }
 
-            // allow the server to override the serverUrlV2 and useV2Flow
-            if (agent.Properties.TryGetValue("ServerUrlV2", out string serverUrlV2) &&
-                !string.IsNullOrEmpty(serverUrlV2))
-            {
-                Trace.Info($"Service enforced serverUrlV2: {serverUrlV2}");
-                runnerSettings.ServerUrlV2 = serverUrlV2;
-            }
-
-            if (agent.Properties.TryGetValue("UseV2Flow", out bool useV2Flow) && useV2Flow)
-            {
-                Trace.Info($"Service enforced useV2Flow: {useV2Flow}");
-                runnerSettings.UseV2Flow = useV2Flow;
-            }
-
             _term.WriteSection("Runner settings");
 
             // We will Combine() what's stored with root.  Defaults to string a relative path

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -96,23 +96,14 @@ namespace GitHub.Runner.Listener.Configuration
         [DataMember(Name = "use_v2_flow")]
         public bool UseV2Flow { get; set; }
 
-        [DataMember(Name = "legacy_url")]
-        public string LegacyUrl { get; set; }
-
-        [DataMember(Name = "legacy_token")]
-        public string LegacyToken { get; set; }
-
         public VssCredentials ToVssCredentials()
         {
             ArgUtil.NotNullOrEmpty(TokenSchema, nameof(TokenSchema));
             ArgUtil.NotNullOrEmpty(Token, nameof(Token));
 
-            var hasLegacyToken = !string.IsNullOrEmpty(LegacyToken);
-            var token = hasLegacyToken ? LegacyToken : Token;
-
             if (string.Equals(TokenSchema, "OAuthAccessToken", StringComparison.OrdinalIgnoreCase))
             {
-                return new VssCredentials(new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
+                return new VssCredentials(new VssOAuthAccessTokenCredential(Token), CredentialPromptType.DoNotPrompt);
             }
             else
             {

src/Runner.Listener/JobDispatcher.cs

@@ -545,36 +545,28 @@ namespace GitHub.Runner.Listener
                                     detailInfo = string.Join(Environment.NewLine, workerOutput);
                                     Trace.Info($"Return code {returnCode} indicate worker encounter an unhandled exception or app crash, attach worker stdout/stderr to JobRequest result.");
 
-                                    try
+                                    var jobServer = await InitializeJobServerAsync(systemConnection);
+                                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
+                                    unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
+                                    switch (jobServer)
                                     {
-                                        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:
+                                        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))
                                                 {
-                                                    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);
-                                                    }
-
-                                                    break;
+                                                    Trace.Info($"Finish job with result 'Failed' due to IOException.");
+                                                    await ForceFailJob(js, message);
                                                 }
-                                            case IRunServer rs:
-                                                await ForceFailJob(rs, message, unhandledExceptionIssue);
+
                                                 break;
-                                            default:
-                                                throw new NotSupportedException($"JobServer type '{jobServer.GetType().Name}' is not supported.");
-                                        }
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        Trace.Error($"Catch exception during log worker process unhandled exception.");
-                                        Trace.Error(ex);
+                                            }
+                                        case IRunServer rs:
+                                            await ForceFailJob(rs, message, unhandledExceptionIssue);
+                                            break;
+                                        default:
+                                            throw new NotSupportedException($"JobServer type '{jobServer.GetType().Name}' is not supported.");
                                     }
                                 }
 
@@ -1206,7 +1198,7 @@ namespace GitHub.Runner.Listener
                     jobAnnotations.Add(annotation.Value);
                 }
 
-                await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, environmentUrl: null, telemetry: null, billingOwnerId: message.BillingOwnerId, CancellationToken.None);
+                await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, environmentUrl: null, CancellationToken.None);
             }
             catch (Exception ex)
             {

src/Runner.Listener/MessageListener.cs

@@ -88,8 +88,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;
@@ -264,6 +263,8 @@ namespace GitHub.Runner.Listener
 
                     if (message != null && message.MessageType == BrokerMigrationMessage.MessageType)
                     {
+                        Trace.Info("BrokerMigration message received. Polling Broker for messages...");
+
                         var migrationMessage = JsonUtility.FromString<BrokerMigrationMessage>(message.Body);
 
                         await _brokerServer.UpdateConnectionIfNeeded(migrationMessage.BrokerBaseUrl, _creds);
@@ -304,19 +305,10 @@ namespace GitHub.Runner.Listener
                     _accessTokenRevoked = true;
                     throw;
                 }
-                catch (HostedRunnerDeprovisionedException)
-                {
-                    Trace.Info("Hosted runner has been deprovisioned.");
-                    throw;
-                }
                 catch (AccessDeniedException e) when (e.ErrorCode == 1)
                 {
                     throw;
                 }
-                catch (RunnerNotFoundException)
-                {
-                    throw;
-                }
                 catch (Exception ex)
                 {
                     Trace.Error("Catch exception during get next message.");
@@ -466,7 +458,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}");
@@ -533,8 +524,7 @@ namespace GitHub.Runner.Listener
             }
             else if (ex is TaskAgentPoolNotFoundException ||
                      ex is AccessDeniedException ||
-                     ex is VssUnauthorizedException ||
-                     (ex is VssOAuthTokenRequestException oauthEx && oauthEx.Error != "server_error"))
+                     ex is VssUnauthorizedException)
             {
                 Trace.Info($"Non-retriable exception: {ex.Message}");
                 return false;

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}");

src/Runner.Listener/Runner.cs

@@ -239,10 +239,6 @@ namespace GitHub.Runner.Listener
                             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)
                     {
@@ -360,7 +356,7 @@ namespace GitHub.Runner.Listener
             }
         }
 
-        private IMessageListener GetMessageListener(RunnerSettings settings)
+        private IMessageListener GetMesageListener(RunnerSettings settings)
         {
             if (settings.UseV2Flow)
             {
@@ -379,7 +375,7 @@ namespace GitHub.Runner.Listener
             try
             {
                 Trace.Info(nameof(RunAsync));
-                _listener = GetMessageListener(settings);
+                _listener = GetMesageListener(settings);
                 CreateSessionResult createSessionResult = await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken);
                 if (createSessionResult == CreateSessionResult.SessionConflict)
                 {
@@ -584,7 +580,7 @@ namespace GitHub.Runner.Listener
                                         await runServer.ConnectAsync(new Uri(messageRef.RunServiceUrl), creds);
                                         try
                                         {
-                                            jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageRef.BillingOwnerId, messageQueueLoopTokenSource.Token);
+                                            jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
                                             _acquireJobThrottler.Reset();
                                         }
                                         catch (Exception ex) when (
@@ -635,17 +631,6 @@ namespace GitHub.Runner.Listener
                                 Trace.Info("Received ForceTokenRefreshMessage");
                                 await _listener.RefreshListenerTokenAsync(messageQueueLoopTokenSource.Token);
                             }
-                            else if (string.Equals(message.MessageType, RunnerRefreshConfigMessage.MessageType))
-                            {
-                                var runnerRefreshConfigMessage = JsonUtility.FromString<RunnerRefreshConfigMessage>(message.Body);
-                                Trace.Info($"Received RunnerRefreshConfigMessage for '{runnerRefreshConfigMessage.ConfigType}' config file");
-                                var configUpdater = HostContext.GetService<IRunnerConfigUpdater>();
-                                await configUpdater.UpdateRunnerConfigAsync(
-                                    runnerQualifiedId: runnerRefreshConfigMessage.RunnerQualifiedId,
-                                    configType: runnerRefreshConfigMessage.ConfigType,
-                                    serviceType: runnerRefreshConfigMessage.ServiceType,
-                                    configRefreshUrl: runnerRefreshConfigMessage.ConfigRefreshUrl);
-                            }
                             else
                             {
                                 Trace.Error($"Received message {message.MessageId} with unsupported message type {message.MessageType}.");
@@ -708,10 +693,6 @@ namespace GitHub.Runner.Listener
             {
                 Trace.Info("Runner OAuth token has been revoked. Shutting down.");
             }
-            catch (HostedRunnerDeprovisionedException)
-            {
-                Trace.Info("Hosted runner has been deprovisioned. Shutting down.");
-            }
 
             return Constants.Runner.ReturnCode.Success;
         }

src/Runner.Listener/RunnerConfigUpdater.cs

@@ -1,267 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Runner.Common;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-
-namespace GitHub.Runner.Listener
-{
-    [ServiceLocator(Default = typeof(RunnerConfigUpdater))]
-    public interface IRunnerConfigUpdater : IRunnerService
-    {
-        Task UpdateRunnerConfigAsync(string runnerQualifiedId, string configType, string serviceType, string configRefreshUrl);
-    }
-
-    public sealed class RunnerConfigUpdater : RunnerService, IRunnerConfigUpdater
-    {
-        private RunnerSettings _settings;
-        private CredentialData _credData;
-        private IRunnerServer _runnerServer;
-        private IConfigurationStore _store;
-
-        public override void Initialize(IHostContext hostContext)
-        {
-            base.Initialize(hostContext);
-            _store = hostContext.GetService<IConfigurationStore>();
-            _settings = _store.GetSettings();
-            _credData = _store.GetCredentials();
-            _runnerServer = HostContext.GetService<IRunnerServer>();
-        }
-
-        public async Task UpdateRunnerConfigAsync(string runnerQualifiedId, string configType, string serviceType, string configRefreshUrl)
-        {
-            Trace.Entering();
-            try
-            {
-                ArgUtil.NotNullOrEmpty(runnerQualifiedId, nameof(runnerQualifiedId));
-                ArgUtil.NotNullOrEmpty(configType, nameof(configType));
-                ArgUtil.NotNullOrEmpty(serviceType, nameof(serviceType));
-                ArgUtil.NotNullOrEmpty(configRefreshUrl, nameof(configRefreshUrl));
-
-                // make sure the runner qualified id matches the current runner
-                if (!await VerifyRunnerQualifiedId(runnerQualifiedId))
-                {
-                    return;
-                }
-
-                // keep the timeout short to avoid blocking the main thread
-                using (var tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
-                {
-                    switch (configType.ToLowerInvariant())
-                    {
-                        case "runner":
-                            await UpdateRunnerSettingsAsync(serviceType, configRefreshUrl, tokenSource.Token);
-                            break;
-                        case "credentials":
-                            await UpdateRunnerCredentialsAsync(serviceType, configRefreshUrl, tokenSource.Token);
-                            break;
-                        default:
-                            Trace.Error($"Invalid config type '{configType}'.");
-                            await ReportTelemetryAsync($"Invalid config type '{configType}'.");
-                            return;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Trace.Error($"Failed to update runner '{configType}' config.");
-                Trace.Error(ex);
-                await ReportTelemetryAsync($"Failed to update runner '{configType}' config: {ex}");
-            }
-        }
-
-        private async Task UpdateRunnerSettingsAsync(string serviceType, string configRefreshUrl, CancellationToken token)
-        {
-            Trace.Entering();
-            // read the current runner settings and encode with base64
-            var runnerConfig = HostContext.GetConfigFile(WellKnownConfigFile.Runner);
-            string runnerConfigContent = File.ReadAllText(runnerConfig, Encoding.UTF8);
-            var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(runnerConfigContent));
-            if (string.IsNullOrEmpty(encodedConfig))
-            {
-                await ReportTelemetryAsync("Failed to get encoded runner settings.");
-                return;
-            }
-
-            // exchange the encoded runner settings with the service
-            string refreshedEncodedConfig = await RefreshRunnerConfigAsync(encodedConfig, serviceType, "runner", configRefreshUrl, token);
-            if (string.IsNullOrEmpty(refreshedEncodedConfig))
-            {
-                // service will return empty string if there is no change in the config
-                return;
-            }
-
-            var decodedConfig = Encoding.UTF8.GetString(Convert.FromBase64String(refreshedEncodedConfig));
-            RunnerSettings refreshedRunnerConfig;
-            try
-            {
-                refreshedRunnerConfig = StringUtil.ConvertFromJson<RunnerSettings>(decodedConfig);
-            }
-            catch (Exception ex)
-            {
-                Trace.Error($"Failed to convert runner config from json '{decodedConfig}'.");
-                Trace.Error(ex);
-                await ReportTelemetryAsync($"Failed to convert runner config '{decodedConfig}' from json: {ex}");
-                return;
-            }
-
-            // make sure the runner id and name in the refreshed config match the current runner
-            if (refreshedRunnerConfig?.AgentId != _settings.AgentId)
-            {
-                Trace.Error($"Runner id in refreshed config '{refreshedRunnerConfig?.AgentId.ToString() ?? "Empty"}' does not match the current runner '{_settings.AgentId}'.");
-                await ReportTelemetryAsync($"Runner id in refreshed config '{refreshedRunnerConfig?.AgentId.ToString() ?? "Empty"}' does not match the current runner '{_settings.AgentId}'.");
-                return;
-            }
-
-            if (refreshedRunnerConfig?.AgentName != _settings.AgentName)
-            {
-                Trace.Error($"Runner name in refreshed config '{refreshedRunnerConfig?.AgentName ?? "Empty"}' does not match the current runner '{_settings.AgentName}'.");
-                await ReportTelemetryAsync($"Runner name in refreshed config '{refreshedRunnerConfig?.AgentName ?? "Empty"}' does not match the current runner '{_settings.AgentName}'.");
-                return;
-            }
-
-            // save the refreshed runner settings as a separate file
-            _store.SaveMigratedSettings(refreshedRunnerConfig);
-            await ReportTelemetryAsync("Runner settings updated successfully.");
-        }
-
-        private async Task UpdateRunnerCredentialsAsync(string serviceType, string configRefreshUrl, CancellationToken token)
-        {
-            Trace.Entering();
-            // read the current runner credentials and encode with base64
-            var credConfig = HostContext.GetConfigFile(WellKnownConfigFile.Credentials);
-            string credConfigContent = File.ReadAllText(credConfig, Encoding.UTF8);
-            var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(credConfigContent));
-            if (string.IsNullOrEmpty(encodedConfig))
-            {
-                await ReportTelemetryAsync("Failed to get encoded credentials.");
-                return;
-            }
-
-            CredentialData currentCred = _store.GetCredentials();
-            if (currentCred == null)
-            {
-                await ReportTelemetryAsync("Failed to get current credentials.");
-                return;
-            }
-
-            // we only support refreshing OAuth credentials which is used by self-hosted runners.
-            if (currentCred.Scheme != Constants.Configuration.OAuth)
-            {
-                await ReportTelemetryAsync($"Not supported credential scheme '{currentCred.Scheme}'.");
-                return;
-            }
-
-            // exchange the encoded runner credentials with the service
-            string refreshedEncodedConfig = await RefreshRunnerConfigAsync(encodedConfig, serviceType, "credentials", configRefreshUrl, token);
-            if (string.IsNullOrEmpty(refreshedEncodedConfig))
-            {
-                // service will return empty string if there is no change in the config
-                return;
-            }
-
-            var decodedConfig = Encoding.UTF8.GetString(Convert.FromBase64String(refreshedEncodedConfig));
-            CredentialData refreshedCredConfig;
-            try
-            {
-                refreshedCredConfig = StringUtil.ConvertFromJson<CredentialData>(decodedConfig);
-            }
-            catch (Exception ex)
-            {
-                Trace.Error($"Failed to convert credentials config from json '{decodedConfig}'.");
-                Trace.Error(ex);
-                await ReportTelemetryAsync($"Failed to convert credentials config '{decodedConfig}' from json: {ex}");
-                return;
-            }
-
-            // make sure the credential scheme in the refreshed config match the current credential scheme
-            if (refreshedCredConfig?.Scheme != _credData.Scheme)
-            {
-                Trace.Error($"Credential scheme in refreshed config '{refreshedCredConfig?.Scheme ?? "Empty"}' does not match the current credential scheme '{_credData.Scheme}'.");
-                await ReportTelemetryAsync($"Credential scheme in refreshed config '{refreshedCredConfig?.Scheme ?? "Empty"}' does not match the current credential scheme '{_credData.Scheme}'.");
-                return;
-            }
-
-            if (_credData.Scheme == Constants.Configuration.OAuth)
-            {
-                // make sure the credential clientId in the refreshed config match the current credential clientId for OAuth auth scheme
-                var clientId = _credData.Data.GetValueOrDefault("clientId", null);
-                var refreshedClientId = refreshedCredConfig.Data.GetValueOrDefault("clientId", null);
-                if (clientId != refreshedClientId)
-                {
-                    Trace.Error($"Credential clientId in refreshed config '{refreshedClientId ?? "Empty"}' does not match the current credential clientId '{clientId}'.");
-                    await ReportTelemetryAsync($"Credential clientId in refreshed config '{refreshedClientId ?? "Empty"}' does not match the current credential clientId '{clientId}'.");
-                    return;
-                }
-            }
-
-            // save the refreshed runner credentials as a separate file
-            _store.SaveMigratedCredential(refreshedCredConfig);
-            await ReportTelemetryAsync("Runner credentials updated successfully.");
-        }
-
-        private async Task<bool> VerifyRunnerQualifiedId(string runnerQualifiedId)
-        {
-            Trace.Entering();
-            Trace.Info($"Verifying runner qualified id: {runnerQualifiedId}");
-            var idParts = runnerQualifiedId.Split("/", StringSplitOptions.RemoveEmptyEntries);
-            if (idParts.Length != 4 || idParts[3] != _settings.AgentId.ToString())
-            {
-                Trace.Error($"Runner qualified id '{runnerQualifiedId}' does not match the current runner '{_settings.AgentId}'.");
-                await ReportTelemetryAsync($"Runner qualified id '{runnerQualifiedId}' does not match the current runner '{_settings.AgentId}'.");
-                return false;
-            }
-            return true;
-        }
-
-        private async Task<string> RefreshRunnerConfigAsync(string encodedConfig, string serviceType, string configType, string configRefreshUrl, CancellationToken token)
-        {
-            string refreshedEncodedConfig;
-            switch (serviceType.ToLowerInvariant())
-            {
-                case "pipelines":
-                    try
-                    {
-                        refreshedEncodedConfig = await _runnerServer.RefreshRunnerConfigAsync((int)_settings.AgentId, configType, encodedConfig, token);
-                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Error($"Failed to refresh runner {configType} config with service.");
-                        Trace.Error(ex);
-                        await ReportTelemetryAsync($"Failed to refresh {configType} config: {ex}");
-                        return null;
-                    }
-                    break;
-                case "runner-admin":
-                    throw new NotSupportedException("Runner admin service is not supported.");
-                default:
-                    Trace.Error($"Invalid service type '{serviceType}'.");
-                    await ReportTelemetryAsync($"Invalid service type '{serviceType}'.");
-                    return null;
-            }
-
-            return refreshedEncodedConfig;
-        }
-
-        private async Task ReportTelemetryAsync(string telemetry)
-        {
-            Trace.Entering();
-            try
-            {
-                using (var tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
-                {
-                    await _runnerServer.UpdateAgentUpdateStateAsync(_settings.PoolId, _settings.AgentId, "RefreshConfig", telemetry, tokenSource.Token);
-                }
-            }
-            catch (Exception ex)
-            {
-                Trace.Error("Failed to report telemetry.");
-                Trace.Error(ex);
-            }
-        }
-    }
-}

src/Runner.Listener/RunnerJobRequestRef.cs

@@ -7,14 +7,9 @@ namespace GitHub.Runner.Listener
     {
         [DataMember(Name = "id")]
         public string Id { get; set; }
-        
         [DataMember(Name = "runner_request_id")]
         public string RunnerRequestId { get; set; }
-        
         [DataMember(Name = "run_service_url")]
         public string RunServiceUrl { get; set; }
-        
-        [DataMember(Name = "billing_owner_id")]
-        public string BillingOwnerId { get; set; }
     }
 }

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;
-        }
     }
 }

src/Runner.Worker/ActionManager.cs

@@ -775,19 +775,7 @@ namespace GitHub.Runner.Worker
                 // make sure we get a clean folder ready to use.
                 IOUtil.DeleteDirectory(destDirectory, executionContext.CancellationToken);
                 Directory.CreateDirectory(destDirectory);
-
-                if (downloadInfo.PackageDetails != null) 
-                {
-                    executionContext.Output($"##[group]Download immutable action package '{downloadInfo.NameWithOwner}@{downloadInfo.Ref}'");
-                    executionContext.Output($"Version: {downloadInfo.PackageDetails.Version}");
-                    executionContext.Output($"Digest: {downloadInfo.PackageDetails.ManifestDigest}");
-                    executionContext.Output($"Source commit SHA: {downloadInfo.ResolvedSha}");
-                    executionContext.Output("##[endgroup]");
-                } 
-                else 
-                {
-                    executionContext.Output($"Download action repository '{downloadInfo.NameWithOwner}@{downloadInfo.Ref}' (SHA:{downloadInfo.ResolvedSha})");
-                }
+                executionContext.Output($"Download action repository '{downloadInfo.NameWithOwner}@{downloadInfo.Ref}' (SHA:{downloadInfo.ResolvedSha})");
             }
 
             //download and extract action in a temp folder and rename it on success
@@ -1114,7 +1102,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))
                 {
@@ -1130,7 +1117,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}");
@@ -1168,7 +1155,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)
                     {
@@ -1183,11 +1170,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}");
                         }
                     }
                 }

src/Runner.Worker/ExecutionContext.cs

@@ -83,7 +83,7 @@ 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
@@ -135,6 +135,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 +154,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 +356,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 +365,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;
@@ -438,7 +433,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(), recordOrder: _record.Order);
         }
 
         public void Start(string currentOperation = null)
@@ -508,9 +503,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 +520,7 @@ namespace GitHub.Runner.Worker
                 Global.StepsResult.Add(stepResult);
             }
 
+
             if (Root != this)
             {
                 // only dispose TokenSource for step level ExecutionContext
@@ -815,6 +808,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 +837,7 @@ namespace GitHub.Runner.Worker
             // Actions environment
             ActionsEnvironment = message.ActionsEnvironment;
 
+
             // Service container info
             Global.ServiceContainers = new List<ContainerInfo>();
 
@@ -1419,7 +1418,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;
                 }

src/Runner.Worker/Handlers/HandlerFactory.cs

@@ -57,13 +57,72 @@ 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";
                 }
 
+                var localForceActionsToNode20 = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Agent.ManualForceActionsToNode20));
+                executionContext.Global.EnvironmentVariables.TryGetValue(Constants.Variables.Actions.ManualForceActionsToNode20, out var workflowForceActionsToNode20);
+                var enforceNode20Locally = !string.IsNullOrWhiteSpace(workflowForceActionsToNode20) ? StringUtil.ConvertToBoolean(workflowForceActionsToNode20) : localForceActionsToNode20;
+                if (string.Equals(nodeData.NodeVersion, "node16")
+                && ((executionContext.Global.Variables.GetBoolean("DistributedTask.ForceGithubJavascriptActionsToNode20") ?? false) || enforceNode20Locally))
+                {
+                    executionContext.Global.EnvironmentVariables.TryGetValue(Constants.Variables.Actions.AllowActionsUseUnsecureNodeVersion, out var workflowOptOut);
+                    var isWorkflowOptOutSet = !string.IsNullOrWhiteSpace(workflowOptOut);
+                    var isLocalOptOut = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Actions.AllowActionsUseUnsecureNodeVersion));
+                    bool isOptOut = isWorkflowOptOutSet ? StringUtil.ConvertToBoolean(workflowOptOut) : isLocalOptOut;
+
+                    if (!isOptOut)
+                    {
+                        var repoAction = action as Pipelines.RepositoryPathReference;
+                        if (repoAction != null)
+                        {
+                            var warningActions = new HashSet<string>();
+                            if (executionContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, out var node20ForceWarnings))
+                            {
+                                warningActions = StringUtil.ConvertFromJson<HashSet<string>>(node20ForceWarnings);
+                            }
+
+                            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(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, StringUtil.ConvertToJson(warningActions));
+                        }
+                        nodeData.NodeVersion = "node20";
+                    }
+                }
                 (handler as INodeScriptActionHandler).Data = nodeData;
             }
             else if (data.ExecutionType == ActionExecutionType.Script)

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -72,11 +72,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 +93,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 +106,24 @@ 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";
+            }
+
+            if (forcedNodeVersion == "node20" && Data.NodeVersion != "node20")
+            {
+                Data.NodeVersion = "node20";
+            }
             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 +143,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))
             {

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.
@@ -402,7 +399,7 @@ namespace GitHub.Runner.Worker
                         var snapshotOperationProvider = HostContext.GetService<ISnapshotOperationProvider>();
                         jobContext.RegisterPostJobStep(new JobExtensionRunner(
                             runAsync: (executionContext, _) => snapshotOperationProvider.CreateSnapshotRequestAsync(executionContext, snapshotRequest),
-                            condition: snapshotRequest.Condition,
+                            condition: $"{PipelineTemplateConstants.Success}()",
                             displayName: $"Create custom image",
                             data: null));
                     }
@@ -457,14 +454,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 +692,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 +702,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 +717,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 +729,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 +781,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 +812,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; }
-        }
     }
 }

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
@@ -50,8 +49,7 @@ namespace GitHub.Runner.Worker
             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);
@@ -280,14 +278,26 @@ 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));
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, out var node20ForceWarnings) && (jobContext.Global.Variables.GetBoolean("DistributedTask.ForceGithubJavascriptActionsToNode20") ?? false))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node20ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode16DetectedAfterEndOfLife, actions));
+            }
+
+            await ShutdownQueue(throwOnFailure: false);
+
             // Make sure to clean temp after file upload since they may be pending fileupload still use the TEMP dir.
             _tempDirectoryManager?.CleanupTempDirectory();
 
@@ -304,13 +314,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,30 +321,9 @@ namespace GitHub.Runner.Worker
             {
                 try
                 {
-                    if (jobContext.Global.Variables.GetBoolean(Constants.Runner.Features.SkipRetryCompleteJobUponKnownErrors) ?? false)
-                    {
-                        await runServer.CompleteJob2Async(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, jobContext.Global.JobAnnotations, environmentUrl, telemetry, billingOwnerId: message.BillingOwnerId, default);
-                    }
-                    else
-                    {
-                        await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, jobContext.Global.JobAnnotations, environmentUrl, telemetry, billingOwnerId: message.BillingOwnerId, default);
-                    }
+                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, jobContext.Global.JobAnnotations, environmentUrl, default);
                     return result;
                 }
-                catch (VssUnauthorizedException ex) when (jobContext.Global.Variables.GetBoolean(Constants.Runner.Features.SkipRetryCompleteJobUponKnownErrors) ?? false)
-                {
-                    Trace.Error($"Catch exception while attempting to complete job {message.JobId}, job request {message.RequestId}.");
-                    Trace.Error(ex);
-                    exceptions.Add(ex);
-                    break;
-                }
-                catch (TaskOrchestrationJobNotFoundException ex) when (jobContext.Global.Variables.GetBoolean(Constants.Runner.Features.SkipRetryCompleteJobUponKnownErrors) ?? false)
-                {
-                    Trace.Error($"Catch exception while attempting to complete job {message.JobId}, job request {message.RequestId}.");
-                    Trace.Error(ex);
-                    exceptions.Add(ex);
-                    break;
-                }
                 catch (Exception ex)
                 {
                     Trace.Error($"Catch exception while attempting to complete job {message.JobId}, job request {message.RequestId}.");
@@ -364,14 +346,74 @@ 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));
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, out var node20ForceWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node20ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode16DetectedAfterEndOfLife, 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);
                 }
@@ -499,52 +541,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 version of GitHub runner on your self-hosted runner. You are currently using GitHub 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}");
-            }
-        }
     }
 }

src/Sdk/Common/Common/Diagnostics/VssHttpEventSource.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Globalization;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Sockets;
@@ -336,25 +335,7 @@ namespace GitHub.Services.Common.Diagnostics
             if (IsEnabled())
             {
                 SetActivityId(activity);
-                var requestId = "NoExpectedHeader";
-                if (response.Headers != null)
-                {
-                    if (response.Headers.TryGetValues("x-github-request-id", out var headerValues) && headerValues != null)
-                    {
-                        requestId = headerValues.FirstOrDefault();
-                    }
-                    else if (response.Headers.TryGetValues("x-vss-e2eid", out headerValues) && headerValues != null)
-                    {
-                        requestId = headerValues.FirstOrDefault();
-                    }
-
-                    if (string.IsNullOrEmpty(requestId))
-                    {
-                        requestId = "NoExpectedHeader";
-                    }
-                }
-
-                HttpRequestStop(response.RequestMessage.GetHttpMethod(), response.RequestMessage.RequestUri.AbsoluteUri, (Int32)response.StatusCode, requestId);
+                HttpRequestStop(response.RequestMessage.GetHttpMethod(), response.RequestMessage.RequestUri.AbsoluteUri, (Int32)response.StatusCode);
             }
         }
 
@@ -766,16 +747,15 @@ namespace GitHub.Services.Common.Diagnostics
             }
         }
 
-        [Event(24, Level = EventLevel.Verbose, Task = Tasks.HttpRequest, Opcode = EventOpcode.Stop, Message = "Finished {0} request to {1} with status code {2} ({3})")]
+        [Event(24, Level = EventLevel.Verbose, Task = Tasks.HttpRequest, Opcode = EventOpcode.Stop, Message = "Finished {0} request to {1} with status code {2}")]
         private void HttpRequestStop(
             VssHttpMethod method,
             String url,
-            Int32 statusCode,
-            String requestId)
+            Int32 statusCode)
         {
             if (IsEnabled())
             {
-                WriteEvent(24, (Int32)method, url, statusCode, requestId);
+                WriteEvent(24, (Int32)method, url, statusCode);
             }
         }
 

src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs

@@ -23,8 +23,8 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Formatting;
 using System.Net.Http.Headers;
+using System.Net.Http.Formatting;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Services.Common;
@@ -827,36 +827,5 @@ namespace GitHub.DistributedTask.WebApi
                 userState: userState,
                 cancellationToken: cancellationToken);
         }
-
-        /// <summary>
-        /// [Preview API]
-        /// </summary>
-        /// <param name="agentId"></param>
-        /// <param name="configType"></param>
-        /// <param name="encodedRunnerConfig"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public virtual Task<string> RefreshRunnerConfigAsync(
-            int agentId,
-            string configType,
-            string encodedRunnerConfig,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            Guid locationId = new Guid("13b5d709-74aa-470b-a8e9-bf9f3ded3f18");
-            object routeValues = new { agentId = agentId, configType = configType };
-            HttpContent content = new ObjectContent<string>(encodedRunnerConfig, new VssJsonMediaTypeFormatter(true));
-
-            return SendAsync<string>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken,
-                content: content);
-        }
     }
 }

src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs

@@ -246,13 +246,6 @@ namespace GitHub.DistributedTask.Pipelines
             set;
         }
 
-        [DataMember(EmitDefaultValue = false)]
-        public String BillingOwnerId
-        {
-            get;
-            set;
-        }
-
         /// <summary>
         /// Gets the collection of variables associated with the current context.
         /// </summary>

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConstants.cs

@@ -30,7 +30,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
         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";

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;
@@ -350,10 +349,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
         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;
@@ -364,19 +359,11 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
                 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;
@@ -389,26 +376,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
                 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;
+            return new Snapshot(imageName);
         }
 
         private static ActionStep ConvertToStep(

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/ReferenceNameBuilder.cs

@@ -99,7 +99,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
         {
             if (!NameValidation.IsValid(value, allowHyphens: true) && value.Length < PipelineConstants.MaxNodeNameLength)
             {
-                error = $"The identifier '{value}' is invalid. IDs may only contain alphanumeric characters, '_', and '-'. IDs must start with a letter or '_' and must be less than {PipelineConstants.MaxNodeNameLength} characters.";
+                error = $"The identifier '{value}' is invalid. IDs may only contain alphanumeric characters, '_', and '-'. IDs must start with a letter or '_' and and must be less than {PipelineConstants.MaxNodeNameLength} characters.";
                 return false;
             }
             else if (!m_distinctNames.Add(value))

src/Sdk/DTPipelines/Pipelines/Snapshot.cs

@@ -1,27 +1,17 @@
 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)
+        public Snapshot(string imageName)
         {
             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; }
     }
 }

src/Sdk/DTPipelines/workflow-v1.0.json

@@ -169,28 +169,11 @@
           "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",

src/Sdk/DTWebApi/WebApi/ActionDownloadInfo.cs

@@ -9,9 +9,6 @@ namespace GitHub.DistributedTask.WebApi
         [DataMember(EmitDefaultValue = false)]
         public ActionDownloadAuthentication Authentication { get; set; }
 
-        [DataMember(EmitDefaultValue = false)]
-        public ActionDownloadPackageDetails PackageDetails { get; set; }
-
         [DataMember(EmitDefaultValue = false)]
         public string NameWithOwner { get; set; }
 
@@ -40,14 +37,4 @@ namespace GitHub.DistributedTask.WebApi
         [DataMember(EmitDefaultValue = false)]
         public string Token { get; set; }
     }
-
-    [DataContract]
-    public class ActionDownloadPackageDetails 
-    {
-        [DataMember(EmitDefaultValue = false)]
-        public string Version { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public string ManifestDigest { get; set; }
-    }
 }

src/Sdk/DTWebApi/WebApi/Runner.cs

@@ -19,7 +19,7 @@ namespace GitHub.DistributedTask.WebApi
             }
 
             /// <summary>
-            /// The url to connect to poll for messages
+            /// The url to connect to to poll for messages
             /// </summary> 
             [JsonProperty("server_url")]
             public string ServerUrl

src/Sdk/DTWebApi/WebApi/RunnerRefreshConfigMessage.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using GitHub.Services.WebApi;
-using Newtonsoft.Json;
-
-namespace GitHub.DistributedTask.WebApi
-{
-    [DataContract]
-    public sealed class RunnerRefreshConfigMessage
-    {
-        public static readonly String MessageType = "RunnerRefreshConfig";
-
-        [JsonConstructor]
-        internal RunnerRefreshConfigMessage()
-        {
-        }
-
-        public RunnerRefreshConfigMessage(
-            string runnerQualifiedId,
-            string configType,
-            string serviceType,
-            string configRefreshUrl)
-        {
-            this.RunnerQualifiedId = runnerQualifiedId;
-            this.ConfigType = configType;
-            this.ServiceType = serviceType;
-            this.ConfigRefreshUrl = configRefreshUrl;
-        }
-
-        [DataMember(Name = "runnerQualifiedId")]
-        public String RunnerQualifiedId
-        {
-            get;
-            private set;
-        }
-
-        [DataMember(Name = "configType")]
-        public String ConfigType
-        {
-            get;
-            private set;
-        }
-
-        [DataMember(Name = "serviceType")]
-        public String ServiceType
-        {
-            get;
-            private set;
-        }
-
-        [DataMember(Name = "configRefreshURL")]
-        public String ConfigRefreshUrl
-        {
-            get;
-            private set;
-        }
-    }
-}

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; }
-    }
-}

src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs

@@ -7,6 +7,5 @@ namespace GitHub.DistributedTask.WebApi
         public static readonly String JobId = "system.jobId";
         public static readonly String RunnerLowDiskspaceThreshold = "system.runner.lowdiskspacethreshold";
         public static readonly String RunnerEnvironment = "system.runnerEnvironment";
-        public static readonly String RunnerServiceConnectivityTest = "system.runner.serviceconnectivitycheckinput";
     }
 }

src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs

@@ -10,8 +10,5 @@ namespace GitHub.Actions.RunService.WebApi
 
         [DataMember(Name = "runnerOS", EmitDefaultValue = false)]
         public string RunnerOS { get; set; }
-
-        [DataMember(Name = "billingOwnerId", EmitDefaultValue = false)]
-        public string BillingOwnerId { get; set; }
     }
 }

src/Sdk/RSWebApi/Contracts/Annotation.cs

@@ -11,9 +11,6 @@ namespace Sdk.RSWebApi.Contracts
         [DataMember(Name = "message", EmitDefaultValue = false)]
         public string Message;
 
-        [DataMember(Name = "title", EmitDefaultValue = false)]
-        public string Title;
-
         [DataMember(Name = "rawDetails", EmitDefaultValue = false)]
         public string RawDetails;
 
@@ -34,8 +31,5 @@ namespace Sdk.RSWebApi.Contracts
 
         [DataMember(Name = "endColumn", EmitDefaultValue = false)]
         public long EndColumn;
-
-        [DataMember(Name = "stepNumber", EmitDefaultValue = false)]
-        public long StepNumber;
     }
 }

src/Sdk/RSWebApi/Contracts/BrokerError.cs

@@ -1,20 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class BrokerError
-    {
-        [DataMember(Name = "source", EmitDefaultValue = false)]
-        public string Source { get; set; }
-
-        [DataMember(Name = "errorKind", EmitDefaultValue = false)]
-        public string ErrorKind { get; set; }
-
-        [DataMember(Name = "statusCode", EmitDefaultValue = false)]
-        public int StatusCode { get; set; }
-
-        [DataMember(Name = "errorMessage", EmitDefaultValue = false)]
-        public string Message { get; set; }
-    }
-}

src/Sdk/RSWebApi/Contracts/BrokerErrorKind.cs

@@ -1,12 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class BrokerErrorKind
-    {
-        public const string RunnerNotFound = "RunnerNotFound";
-        public const string RunnerVersionTooOld = "RunnerVersionTooOld";
-        public const string HostedRunnerDeprovisioned = "HostedRunnerDeprovisioned";
-    }
-}

src/Sdk/RSWebApi/Contracts/CompleteJobRequest.cs

@@ -27,13 +27,7 @@ namespace GitHub.Actions.RunService.WebApi
         [DataMember(Name = "annotations", EmitDefaultValue = false)]
         public IList<Annotation> Annotations { get; set; }
 
-        [DataMember(Name = "telemetry", EmitDefaultValue = false)]
-        public IList<Telemetry> Telemetry { get; set; }
-
         [DataMember(Name = "environmentUrl", EmitDefaultValue = false)]
         public string EnvironmentUrl { get; set; }
-
-        [DataMember(Name = "billingOwnerId", EmitDefaultValue = false)]
-        public string BillingOwnerId { get; set; }
     }
 }

src/Sdk/RSWebApi/Contracts/IssueExtensions.cs

@@ -22,8 +22,6 @@ namespace Sdk.RSWebApi.Contracts
             var columnNumber = GetAnnotationNumber(issue, RunIssueKeys.Col) ?? 0;
             var endColumnNumber = GetAnnotationNumber(issue, RunIssueKeys.EndColumn) ?? columnNumber;
             var logLineNumber = GetAnnotationNumber(issue, RunIssueKeys.LogLineNumber) ?? 0;
-            var stepNumber = GetAnnotationNumber(issue, RunIssueKeys.StepNumber) ?? 0;
-            var title = GetAnnotationField(issue, RunIssueKeys.Title);
 
             if (path == null && lineNumber == 0 && logLineNumber != 0)
             {
@@ -35,13 +33,11 @@ namespace Sdk.RSWebApi.Contracts
             {
                 Level = annotationLevel,
                 Message = issueMessage,
-                Title = title,
                 Path = path,
                 StartLine = lineNumber,
                 EndLine = endLineNumber,
                 StartColumn = columnNumber,
                 EndColumn = endColumnNumber,
-                StepNumber = stepNumber,
             };
         }
 

src/Sdk/RSWebApi/Contracts/IssueKeys.cs

@@ -9,7 +9,5 @@
         public const string EndLine = "endLine";
         public const string EndColumn = "endColumn";
         public const string LogLineNumber = "logFileLineNumber";
-        public const string StepNumber = "stepNumber";
-        public const string Title = "title";
     }
 }

src/Sdk/RSWebApi/Contracts/StepResult.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
@@ -16,20 +16,9 @@ namespace GitHub.Actions.RunService.WebApi
         [DataMember(Name = "number", EmitDefaultValue = false)]
         public int? Number { get; set; }
 
-        // Example: "Run actions/checkout@v3"
         [DataMember(Name = "name", EmitDefaultValue = false)]
         public string Name { get; set; }
 
-        // Example: "actions/checkout"
-        [DataMember(Name = "action_name", EmitDefaultValue = false)]
-        public string ActionName { get; set; }
-
-        [DataMember(Name = "ref", EmitDefaultValue = false)]
-        public string Ref { get; set; }
-
-        [DataMember(Name = "type", EmitDefaultValue = false)]
-        public string Type { get; set; }
-
         [DataMember(Name = "status")]
         public TimelineRecordState? Status { get; set; }
 

src/Sdk/RSWebApi/Contracts/Telemetry.cs

@@ -1,20 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace Sdk.RSWebApi.Contracts
-{
-    [DataContract]
-    public struct Telemetry
-    {
-        public Telemetry(string message, string type)
-        {
-            Message = message;
-            Type = type;
-        }
-
-        [DataMember(Name = "message", EmitDefaultValue = false)]
-        public string Message { get; set; }
-
-        [DataMember(Name = "type", EmitDefaultValue = false)]
-        public string Type { get; set; }
-    }
-}

src/Sdk/RSWebApi/RunServiceHttpClient.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
@@ -71,15 +70,13 @@ namespace GitHub.Actions.RunService.WebApi
             Uri requestUri,
             string messageId,
             string runnerOS,
-            string billingOwnerId,
             CancellationToken cancellationToken = default)
         {
             HttpMethod httpMethod = new HttpMethod("POST");
             var payload = new AcquireJobRequest
             {
                 JobMessageId = messageId,
-                RunnerOS = runnerOS,
-                BillingOwnerId = billingOwnerId,
+                RunnerOS = runnerOS
             };
 
             requestUri = new Uri(requestUri, "acquirejob");
@@ -110,6 +107,15 @@ namespace GitHub.Actions.RunService.WebApi
                 }
             }
 
+            // Temporary back compat
+            switch (result.StatusCode)
+            {
+                case HttpStatusCode.NotFound:
+                    throw new TaskOrchestrationJobNotFoundException($"Job message not found: {messageId}");
+                case HttpStatusCode.Conflict:
+                    throw new TaskOrchestrationJobAlreadyAcquiredException($"Job message already acquired: {messageId}");
+            }
+
             if (!string.IsNullOrEmpty(result.ErrorBody))
             {
                 throw new Exception($"Failed to get job message: {result.Error}. {Truncate(result.ErrorBody)}");
@@ -129,8 +135,6 @@ namespace GitHub.Actions.RunService.WebApi
             IList<StepResult> stepResults,
             IList<Annotation> jobAnnotations,
             string environmentUrl,
-            IList<Telemetry> telemetry,
-            string billingOwnerId,
             CancellationToken cancellationToken = default)
         {
             HttpMethod httpMethod = new HttpMethod("POST");
@@ -143,8 +147,6 @@ namespace GitHub.Actions.RunService.WebApi
                 StepResults = stepResults,
                 Annotations = jobAnnotations,
                 EnvironmentUrl = environmentUrl,
-                Telemetry = telemetry,
-                BillingOwnerId = billingOwnerId,
             };
 
             requestUri = new Uri(requestUri, "completejob");
@@ -169,6 +171,13 @@ namespace GitHub.Actions.RunService.WebApi
                 }
             }
 
+            // Temporary back compat
+            switch (result.StatusCode)
+            {
+                case HttpStatusCode.NotFound:
+                    throw new TaskOrchestrationJobNotFoundException($"Job not found: {jobId}");
+            }
+
             if (!string.IsNullOrEmpty(result.ErrorBody))
             {
                 throw new Exception($"Failed to complete job: {result.Error}. {Truncate(result.ErrorBody)}");
@@ -216,6 +225,13 @@ namespace GitHub.Actions.RunService.WebApi
                 }
             }
 
+            // Temporary back compat
+            switch (result.StatusCode)
+            {
+                case HttpStatusCode.NotFound:
+                    throw new TaskOrchestrationJobNotFoundException($"Job not found: {jobId}");
+            }
+
             if (!string.IsNullOrEmpty(result.ErrorBody))
             {
                 throw new Exception($"Failed to renew job: {result.Error}. {Truncate(result.ErrorBody)}");

src/Sdk/Sdk.csproj

@@ -14,10 +14,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
+        <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
         <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
         <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
         <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
         <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
@@ -25,8 +26,6 @@
         <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
         <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-        <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-        <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>

src/Sdk/WebApi/WebApi/BrokerHttpClient.cs

@@ -103,7 +103,6 @@ namespace GitHub.Actions.RunService.WebApi
                 new HttpMethod("GET"),
                 requestUri: requestUri,
                 queryParameters: queryParams,
-                readErrorBody: true,
                 cancellationToken: cancellationToken);
 
             if (result.IsSuccess)
@@ -111,25 +110,8 @@ namespace GitHub.Actions.RunService.WebApi
                 return result.Value;
             }
 
-            if (TryParseErrorBody(result.ErrorBody, out BrokerError brokerError))
-            {
-                switch (brokerError.ErrorKind)
-                {
-                    case BrokerErrorKind.RunnerNotFound:
-                        throw new RunnerNotFoundException(brokerError.Message);
-                    case BrokerErrorKind.RunnerVersionTooOld:
-                        throw new AccessDeniedException(brokerError.Message)
-                        {
-                            ErrorCode = 1
-                        };
-                    case BrokerErrorKind.HostedRunnerDeprovisioned:
-                        throw new HostedRunnerDeprovisionedException(brokerError.Message);
-                    default:
-                        break;
-                }
-            }
-
-            // temporary back compat
+            // the only time we throw a `Forbidden` exception from Listener /messages is when the runner is
+            // disable_update and is too old to poll
             if (result.StatusCode == HttpStatusCode.Forbidden)
             {
                 throw new AccessDeniedException($"{result.Error} Runner version v{runnerVersion} is deprecated and cannot receive messages.")
@@ -138,7 +120,7 @@ namespace GitHub.Actions.RunService.WebApi
                 };
             }
 
-            throw new Exception($"Failed to get job message. Request to {requestUri} failed with status: {result.StatusCode}. Error message {result.Error}");
+            throw new Exception($"Failed to get job message: {result.Error}");
         }
 
         public async Task<TaskAgentSession> CreateSessionAsync(
@@ -190,26 +172,5 @@ namespace GitHub.Actions.RunService.WebApi
 
             throw new Exception($"Failed to delete broker session: {result.Error}");
         }
-
-        private static bool TryParseErrorBody(string errorBody, out BrokerError error)
-        {
-            if (!string.IsNullOrEmpty(errorBody))
-            {
-                try
-                {
-                    error = JsonUtility.FromString<BrokerError>(errorBody);
-                    if (error?.Source == "actions-broker-listener")
-                    {
-                        return true;
-                    }
-                }
-                catch (Exception)
-                {
-                }
-            }
-
-            error = null;
-            return false;
-        }
     }
 }

src/Sdk/WebApi/WebApi/Exceptions/HostedRunnerDeprovisionedException.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace GitHub.Services.WebApi
-{
-    [Serializable]
-    public sealed class HostedRunnerDeprovisionedException : Exception
-    {
-        public HostedRunnerDeprovisionedException()
-            : base()
-        {
-        }
-
-        public HostedRunnerDeprovisionedException(String message)
-            : base(message)
-        {
-        }
-
-        public HostedRunnerDeprovisionedException(String message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-    }
-}

src/Sdk/WebApi/WebApi/Exceptions/RunnerNotFoundException.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Services.WebApi
-{
-    [Serializable]
-    public sealed class RunnerNotFoundException : Exception
-    {
-        public RunnerNotFoundException()
-            : base()
-        {
-        }
-
-        public RunnerNotFoundException(String message)
-            : base(message)
-        {
-        }
-
-        public RunnerNotFoundException(String message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-    }
-}

src/Sdk/WebApi/WebApi/LaunchContracts.cs

@@ -29,9 +29,6 @@ namespace GitHub.Services.Launch.Contracts
     {
         [DataMember(EmitDefaultValue = false, Name = "authentication")]
         public ActionDownloadAuthenticationResponse Authentication { get; set; }
-        
-        [DataMember(EmitDefaultValue = false, Name = "package_details")]
-        public ActionDownloadPackageDetailsResponse PackageDetails { get; set; }
 
         [DataMember(EmitDefaultValue = false, Name = "name")]
         public string Name { get; set; }
@@ -62,17 +59,6 @@ namespace GitHub.Services.Launch.Contracts
         public string Token { get; set; }
     }
 
-
-    [DataContract]
-    public class ActionDownloadPackageDetailsResponse 
-    {
-        [DataMember(EmitDefaultValue = false, Name = "version")]
-        public string Version { get; set; }
-
-        [DataMember(EmitDefaultValue = false, Name = "manifest_digest")]
-        public string ManifestDigest { get; set; }
-    }
-
     [DataContract]
     public class ActionDownloadInfoResponseCollection
     {

src/Sdk/WebApi/WebApi/LaunchHttpClient.cs

@@ -91,7 +91,6 @@ namespace GitHub.Services.Launch.Client
                 TarballUrl = actionDownloadInfoResponse.TarUrl,
                 Ref = actionDownloadInfoResponse.Version,
                 ZipballUrl = actionDownloadInfoResponse.ZipUrl,
-                PackageDetails = ToServerData(actionDownloadInfoResponse.PackageDetails)
             };
         }
 
@@ -109,21 +108,6 @@ namespace GitHub.Services.Launch.Client
             };
         }
 
-
-        private static ActionDownloadPackageDetails? ToServerData(ActionDownloadPackageDetailsResponse? actionDownloadPackageDetails)
-        {
-            if (actionDownloadPackageDetails == null)
-            {
-                return null;
-            }
-
-            return new ActionDownloadPackageDetails
-            {
-                Version = actionDownloadPackageDetails.Version,
-                ManifestDigest = actionDownloadPackageDetails.ManifestDigest
-            };
-        }
-
         private MediaTypeFormatter m_formatter;
         private Uri m_launchServiceUrl;
         private string m_token;

src/Sdk/WebApi/WebApi/Location/ServerDataProvider.cs

@@ -677,7 +677,7 @@ namespace GitHub.Services.WebApi.Location
             Int32 lastChangeId = m_locationDataCacheManager.GetLastChangeId();
 
             // If we have -1 then that means we have no disk cache yet or it means that we recently hit an exception trying to reload
-            // the cache from disk (see Exception catch block in EnsureDiskCacheLoaded).
+            // the the cache from disk (see Exception catch block in EnsureDiskCacheLoaded).
             // Either way, we cannot make a call to the server with -1 and pass None.
             // If we do, the resulting payload (which would have ClientCacheFresh=false but include no ServiceDefinitions)
             // would leave the in-memory cache in an inconsistent state

src/Sdk/WebApi/WebApi/ResultsHttpClient.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -133,7 +132,7 @@ namespace GitHub.Services.Results.Client
 
         private async Task StepSummaryUploadCompleteAsync(string planId, string jobId, Guid stepId, long size, CancellationToken cancellationToken)
         {
-            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat, CultureInfo.InvariantCulture);
+            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat);
             var request = new StepSummaryMetadataCreate()
             {
                 WorkflowJobRunBackendId = jobId,
@@ -149,7 +148,7 @@ namespace GitHub.Services.Results.Client
 
         private async Task StepLogUploadCompleteAsync(string planId, string jobId, Guid stepId, long lineCount, CancellationToken cancellationToken)
         {
-            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat, CultureInfo.InvariantCulture);
+            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat);
             var request = new StepLogsMetadataCreate()
             {
                 WorkflowJobRunBackendId = jobId,
@@ -165,7 +164,7 @@ namespace GitHub.Services.Results.Client
 
         private async Task JobLogUploadCompleteAsync(string planId, string jobId, long lineCount, CancellationToken cancellationToken)
         {
-            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat, CultureInfo.InvariantCulture);
+            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat);
             var request = new JobLogsMetadataCreate()
             {
                 WorkflowJobRunBackendId = jobId,
@@ -566,7 +565,7 @@ namespace GitHub.Services.Results.Client
 
         public async Task UpdateWorkflowStepsAsync(Guid planId, IEnumerable<TimelineRecord> records, CancellationToken cancellationToken)
         {
-            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat, CultureInfo.InvariantCulture);
+            var timestamp = DateTime.UtcNow.ToString(Constants.TimestampFormat);
             var stepRecords = records.Where(r => String.Equals(r.RecordType, "Task", StringComparison.Ordinal));
             var stepUpdateRequests = stepRecords.GroupBy(r => r.ParentId).Select(sg => new StepsUpdateRequest()
             {

src/Test/L0/Listener/BrokerMessageListenerL0.cs

@@ -16,7 +16,6 @@ namespace GitHub.Runner.Common.Tests.Listener
         private readonly RunnerSettings _settings;
         private readonly Mock<IConfigurationManager> _config;
         private readonly Mock<IBrokerServer> _brokerServer;
-        private readonly Mock<IRunnerServer> _runnerServer;
         private readonly Mock<ICredentialManager> _credMgr;
         private Mock<IConfigurationStore> _store;
 
@@ -29,7 +28,6 @@ namespace GitHub.Runner.Common.Tests.Listener
             _credMgr = new Mock<ICredentialManager>();
             _store = new Mock<IConfigurationStore>();
             _brokerServer = new Mock<IBrokerServer>();
-            _runnerServer = new Mock<IRunnerServer>();
         }
 
         [Fact]
@@ -77,7 +75,6 @@ namespace GitHub.Runner.Common.Tests.Listener
             tc.SetSingleton<ICredentialManager>(_credMgr.Object);
             tc.SetSingleton<IConfigurationStore>(_store.Object);
             tc.SetSingleton<IBrokerServer>(_brokerServer.Object);
-            tc.SetSingleton<IRunnerServer>(_runnerServer.Object);
             return tc;
         }
     }

src/Test/L0/Listener/JobDispatcherL0.cs

@@ -36,23 +36,20 @@ namespace GitHub.Runner.Common.Tests.Listener
             _configurationStore = new Mock<IConfigurationStore>();
         }
 
-        private Pipelines.AgentJobRequestMessage CreateJobRequestMessage(string billingOwnerId = null)
+        private Pipelines.AgentJobRequestMessage CreateJobRequestMessage()
         {
             TaskOrchestrationPlanReference plan = new();
             TimelineReference timeline = null;
             Guid jobId = Guid.NewGuid();
             var result = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "someJob", "someJob", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null, null);
             result.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
-            result.BillingOwnerId = billingOwnerId;
             return result;
         }
 
-        [Theory]
+        [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        [InlineData(null)]
-        [InlineData("billingOwnerId")]
-        public async void DispatchesJobRequest(string billingOwnerId)
+        public async void DispatchesJobRequest()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -68,7 +65,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 jobDispatcher.Initialize(hc);
 
                 var ts = new CancellationTokenSource();
-                Pipelines.AgentJobRequestMessage message = CreateJobRequestMessage(billingOwnerId);
+                Pipelines.AgentJobRequestMessage message = CreateJobRequestMessage();
                 string strMessage = JsonUtility.ToString(message);
 
                 _processInvoker.Setup(x => x.ExecuteAsync(It.IsAny<String>(), It.IsAny<String>(), "spawnclient 1 2", null, It.IsAny<CancellationToken>()))

src/Test/L0/Listener/RunnerConfigUpdaterTests.cs

@@ -1,579 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using GitHub.Runner.Listener;
-using GitHub.Runner.Common;
-using GitHub.Runner.Sdk;
-using Moq;
-using Xunit;
-using System.Threading;
-using GitHub.Runner.Common.Tests;
-using System.Text;
-
-namespace GitHub.Runner.Tests.Listener
-{
-    public class RunnerConfigUpdaterL0
-    {
-        private Mock<IConfigurationStore> _configurationStore;
-        private Mock<IRunnerServer> _runnerServer;
-
-        public RunnerConfigUpdaterL0()
-        {
-            _configurationStore = new Mock<IConfigurationStore>();
-            _runnerServer = new Mock<IRunnerServer>();
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_InvalidRunnerQualifiedId_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var invalidRunnerQualifiedId = "invalid/runner/qualified/id";
-                var configType = "runner";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(invalidRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>((s) => s.Contains("Runner qualified id")), It.IsAny<CancellationToken>()), Times.Once);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_ValidRunnerQualifiedId_ShouldNotReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>((s) => s.Contains("Runner qualified id")), It.IsAny<CancellationToken>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_InvalidConfigType_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var invalidConfigType = "invalidConfigType";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, invalidConfigType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>((s) => s.Contains("Invalid config type")), It.IsAny<CancellationToken>()), Times.Once);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_UpdateRunnerSettings_ShouldSucceed()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(StringUtil.ConvertToJson(setting)));
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "runner"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(encodedConfig);
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.RefreshRunnerConfigAsync(1, "runner", It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Runner settings updated successfully")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Once);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_UpdateRunnerSettings_IgnoredEmptyRefreshResult()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.RefreshRunnerConfigAsync(1, "runner", It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Runner settings updated successfully")), It.IsAny<CancellationToken>()), Times.Never);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_UpdateRunnerCredentials_ShouldSucceed()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                var credData = new CredentialData
-                {
-                    Scheme = "OAuth"
-                };
-                credData.Data.Add("ClientId", "12345");
-                _configurationStore.Setup(x => x.GetCredentials()).Returns(credData);
-
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-                IOUtil.SaveObject(credData, hc.GetConfigFile(WellKnownConfigFile.Credentials));
-
-                var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(StringUtil.ConvertToJson(credData)));
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "credentials"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(encodedConfig);
-
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "credentials";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.RefreshRunnerConfigAsync(1, "credentials", It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Runner credentials updated successfully")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedCredential(It.IsAny<CredentialData>()), Times.Once);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_UpdateRunnerCredentials_IgnoredEmptyRefreshResult()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                var credData = new CredentialData
-                {
-                    Scheme = "OAuth"
-                };
-                credData.Data.Add("ClientId", "12345");
-                _configurationStore.Setup(x => x.GetCredentials()).Returns(credData);
-
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-                IOUtil.SaveObject(credData, hc.GetConfigFile(WellKnownConfigFile.Credentials));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "credentials";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.RefreshRunnerConfigAsync(1, "credentials", It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Runner credentials updated successfully")), It.IsAny<CancellationToken>()), Times.Never);
-                _configurationStore.Verify(x => x.SaveMigratedCredential(It.IsAny<CredentialData>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_RefreshRunnerSettingsFailure_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "runner"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ThrowsAsync(new Exception("Refresh failed"));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>((s) => s.Contains("Failed to refresh")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_RefreshRunnerCredetialsFailure_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                var credData = new CredentialData
-                {
-                    Scheme = "OAuth"
-                };
-                credData.Data.Add("ClientId", "12345");
-                _configurationStore.Setup(x => x.GetCredentials()).Returns(credData);
-
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "credentials"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ThrowsAsync(new Exception("Refresh failed"));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "credentials";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>((s) => s.Contains("Failed to refresh")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_RefreshRunnerSettingsWithDifferentRunnerId_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var differentRunnerSetting = new RunnerSettings { AgentId = 2, AgentName = "agent1" };
-                var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(StringUtil.ConvertToJson(differentRunnerSetting)));
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "runner"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(encodedConfig);
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Runner id in refreshed config")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_RefreshRunnerSettingsWithDifferentRunnerName_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var differentRunnerSetting = new RunnerSettings { AgentId = 1, AgentName = "agent2" };
-                var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(StringUtil.ConvertToJson(differentRunnerSetting)));
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "runner"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(encodedConfig);
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Runner name in refreshed config")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_RefreshCredentialsWithDifferentScheme_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                var credData = new CredentialData
-                {
-                    Scheme = "OAuth"
-                };
-                credData.Data.Add("ClientId", "12345");
-                _configurationStore.Setup(x => x.GetCredentials()).Returns(credData);
-
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-                IOUtil.SaveObject(credData, hc.GetConfigFile(WellKnownConfigFile.Credentials));
-
-                var differentCredData = new CredentialData
-                {
-                    Scheme = "PAT"
-                };
-                differentCredData.Data.Add("ClientId", "12345");
-                var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(StringUtil.ConvertToJson(differentCredData)));
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "credentials"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(encodedConfig);
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "credentials";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Credential scheme in refreshed config")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedCredential(It.IsAny<CredentialData>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_RefreshOAuthCredentialsWithDifferentClientId_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                var credData = new CredentialData
-                {
-                    Scheme = "OAuth"
-                };
-                credData.Data.Add("clientId", "12345");
-                _configurationStore.Setup(x => x.GetCredentials()).Returns(credData);
-
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-                IOUtil.SaveObject(credData, hc.GetConfigFile(WellKnownConfigFile.Credentials));
-
-                var differentCredData = new CredentialData
-                {
-                    Scheme = "OAuth"
-                };
-                differentCredData.Data.Add("clientId", "67890");
-                var encodedConfig = Convert.ToBase64String(Encoding.UTF8.GetBytes(StringUtil.ConvertToJson(differentCredData)));
-                _runnerServer.Setup(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.Is<string>(s => s == "credentials"), It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(encodedConfig);
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "credentials";
-                var serviceType = "pipelines";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>(s => s.Contains("Credential clientId in refreshed config")), It.IsAny<CancellationToken>()), Times.Once);
-                _configurationStore.Verify(x => x.SaveMigratedCredential(It.IsAny<CredentialData>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_UnsupportedServiceType_ShouldReportTelemetry()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "unsupported-service";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>((s) => s.Contains("Invalid service type")), It.IsAny<CancellationToken>()), Times.Once);
-                _runnerServer.Verify(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task UpdateRunnerConfigAsync_RunnerAdminService_ShouldThrowNotSupported()
-        {
-            using (var hc = new TestHostContext(this))
-            {
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-
-                // Arrange
-                var setting = new RunnerSettings { AgentId = 1, AgentName = "agent1" };
-                _configurationStore.Setup(x => x.GetSettings()).Returns(setting);
-                IOUtil.SaveObject(setting, hc.GetConfigFile(WellKnownConfigFile.Runner));
-
-                var _runnerConfigUpdater = new RunnerConfigUpdater();
-                _runnerConfigUpdater.Initialize(hc);
-
-                var validRunnerQualifiedId = "valid/runner/qualifiedid/1";
-                var configType = "runner";
-                var serviceType = "runner-admin";
-                var configRefreshUrl = "http://example.com";
-
-                // Act
-                await _runnerConfigUpdater.UpdateRunnerConfigAsync(validRunnerQualifiedId, configType, serviceType, configRefreshUrl);
-
-                // Assert
-                _runnerServer.Verify(x => x.UpdateAgentUpdateStateAsync(It.IsAny<int>(), It.IsAny<ulong>(), It.IsAny<string>(), It.Is<string>((s) => s.Contains("Runner admin service is not supported")), It.IsAny<CancellationToken>()), Times.Once);
-                _runnerServer.Verify(x => x.RefreshRunnerConfigAsync(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
-                _configurationStore.Verify(x => x.SaveMigratedSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-    }
-}

src/Test/L0/Listener/SelfUpdaterL0.cs

@@ -107,8 +107,8 @@ namespace GitHub.Runner.Common.Tests.Listener
                     hc.EnqueueInstance<IProcessInvoker>(p3);
                     updater.Initialize(hc);
 
-                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
-                                 .Callback((int p, ulong a, string s, string t, CancellationToken token) =>
+                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>()))
+                                 .Callback((int p, ulong a, string s, string t) =>
                                  {
                                      hc.GetTrace().Info(t);
                                  })
@@ -168,8 +168,8 @@ namespace GitHub.Runner.Common.Tests.Listener
                     _runnerServer.Setup(x => x.GetPackageAsync("agent", BuildConstants.RunnerPackage.PackageName, "2.200.0", true, It.IsAny<CancellationToken>()))
                              .Returns(Task.FromResult(new PackageMetadata() { Platform = BuildConstants.RunnerPackage.PackageName, Version = new PackageVersion("2.200.0"), DownloadUrl = _packageUrl }));
 
-                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
-                                 .Callback((int p, ulong a, string s, string t, CancellationToken token) =>
+                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>()))
+                                 .Callback((int p, ulong a, string s, string t) =>
                                  {
                                      hc.GetTrace().Info(t);
                                  })
@@ -220,8 +220,8 @@ namespace GitHub.Runner.Common.Tests.Listener
                     hc.EnqueueInstance<IProcessInvoker>(p3);
                     updater.Initialize(hc);
 
-                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
-                                 .Callback((int p, ulong a, string s, string t, CancellationToken token) =>
+                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>()))
+                                 .Callback((int p, ulong a, string s, string t) =>
                                  {
                                      hc.GetTrace().Info(t);
                                  })
@@ -273,8 +273,8 @@ namespace GitHub.Runner.Common.Tests.Listener
                     hc.EnqueueInstance<IProcessInvoker>(p3);
                     updater.Initialize(hc);
 
-                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
-                                 .Callback((int p, ulong a, string s, string t, CancellationToken token) =>
+                    _runnerServer.Setup(x => x.UpdateAgentUpdateStateAsync(1, 1, It.IsAny<string>(), It.IsAny<string>()))
+                                 .Callback((int p, ulong a, string s, string t) =>
                                  {
                                      hc.GetTrace().Info(t);
                                  })

src/Test/L0/ProcessExtensionL0.cs

@@ -27,9 +27,9 @@ namespace GitHub.Runner.Common.Tests
                 try
                 {
 #if OS_WINDOWS
-                    string node = Path.Combine(TestUtil.GetSrcPath(), @"..\_layout\externals\node20\bin\node");
+                    string node = Path.Combine(TestUtil.GetSrcPath(), @"..\_layout\externals\node16\bin\node");
 #else
-                    string node = Path.Combine(TestUtil.GetSrcPath(), @"../_layout/externals/node20/bin/node");
+                    string node = Path.Combine(TestUtil.GetSrcPath(), @"../_layout/externals/node16/bin/node");
                     hc.EnqueueInstance<IProcessInvoker>(new ProcessInvokerWrapper());
 #endif
                     var startInfo = new ProcessStartInfo(node, "-e \"setTimeout(function(){{}}, 15 * 1000);\"");

src/Test/L0/TestHostContext.cs

@@ -256,24 +256,12 @@ namespace GitHub.Runner.Common.Tests
                         ".agent");
                     break;
 
-                case WellKnownConfigFile.MigratedRunner:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Root),
-                        ".agent_migrated");
-                    break;
-
                 case WellKnownConfigFile.Credentials:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Root),
                         ".credentials");
                     break;
 
-                case WellKnownConfigFile.MigratedCredentials:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Root),
-                        ".credentials_migrated");
-                    break;
-
                 case WellKnownConfigFile.RSACredentials:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Root),
@@ -382,11 +370,6 @@ namespace GitHub.Runner.Common.Tests
                 Unloading(this, null);
             }
         }
-
-        public void LoadDefaultUserAgents()
-        {
-            return;
-        }
     }
 
     public class DelayEventArgs : EventArgs

src/Test/L0/Worker/ExecutionContextL0.cs

@@ -677,7 +677,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 ec.InitializeJob(jobRequest, CancellationToken.None);
                 ec.Start();
 
-                ec.StepTelemetry.Type = "node20";
+                ec.StepTelemetry.Type = "node16";
                 ec.StepTelemetry.Action = "actions/checkout";
                 ec.StepTelemetry.Ref = "v2";
                 ec.StepTelemetry.IsEmbedded = false;
@@ -695,7 +695,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 // Assert.
                 Assert.Equal(1, ec.Global.StepsTelemetry.Count);
-                Assert.Equal("node20", ec.Global.StepsTelemetry.Single().Type);
+                Assert.Equal("node16", ec.Global.StepsTelemetry.Single().Type);
                 Assert.Equal("actions/checkout", ec.Global.StepsTelemetry.Single().Action);
                 Assert.Equal("v2", ec.Global.StepsTelemetry.Single().Ref);
                 Assert.Equal(TaskResult.Succeeded, ec.Global.StepsTelemetry.Single().Result);
@@ -746,7 +746,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var embeddedStep = ec.CreateChild(Guid.NewGuid(), "action_1_pre", "action_1_pre", null, null, ActionRunStage.Main, isEmbedded: true);
                 embeddedStep.Start();
 
-                embeddedStep.StepTelemetry.Type = "node20";
+                embeddedStep.StepTelemetry.Type = "node16";
                 embeddedStep.StepTelemetry.Action = "actions/checkout";
                 embeddedStep.StepTelemetry.Ref = "v2";
 
@@ -758,7 +758,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 // Assert.
                 Assert.Equal(1, ec.Global.StepsTelemetry.Count);
-                Assert.Equal("node20", ec.Global.StepsTelemetry.Single().Type);
+                Assert.Equal("node16", ec.Global.StepsTelemetry.Single().Type);
                 Assert.Equal("actions/checkout", ec.Global.StepsTelemetry.Single().Action);
                 Assert.Equal("v2", ec.Global.StepsTelemetry.Single().Ref);
                 Assert.Equal(ActionRunStage.Main.ToString(), ec.Global.StepsTelemetry.Single().Stage);
@@ -773,82 +773,6 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void PublishStepResult_EmbeddedStep()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Job request
-                TaskOrchestrationPlanReference plan = new();
-                TimelineReference timeline = new();
-                Guid jobId = Guid.NewGuid();
-                string jobName = "some job name";
-                var variables = new Dictionary<string, VariableValue>()
-                {
-                    ["RunService.FixEmbeddedIssues"] = new VariableValue("true"),
-                };
-                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, variables, new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null, null);
-                jobRequest.Resources.Repositories.Add(new Pipelines.RepositoryResource()
-                {
-                    Alias = Pipelines.PipelineConstants.SelfAlias,
-                    Id = "github",
-                    Version = "sha1"
-                });
-                jobRequest.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
-
-                // Mocks
-                var pagingLogger = new Mock<IPagingLogger>();
-                var pagingLogger2 = new Mock<IPagingLogger>();
-                var jobServerQueue = new Mock<IJobServerQueue>();
-                jobServerQueue.Setup(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.IsAny<TimelineRecord>()));
-                hc.EnqueueInstance(pagingLogger.Object);
-                hc.EnqueueInstance(pagingLogger2.Object);
-                hc.SetSingleton(jobServerQueue.Object);
-
-                // Job context
-                var jobContext = new Runner.Worker.ExecutionContext();
-                jobContext.Initialize(hc);
-                jobContext.InitializeJob(jobRequest, CancellationToken.None);
-                jobContext.Start();
-
-                // Step 1 context
-                var step1 = jobContext.CreateChild(Guid.NewGuid(), "my_step", "my_step", null, null, ActionRunStage.Main);
-                step1.Start();
-
-                // Embedded step 1a context
-                var embeddedStep1a = step1.CreateEmbeddedChild(null, null, Guid.NewGuid(), ActionRunStage.Main);
-                embeddedStep1a.Start();
-                embeddedStep1a.StepTelemetry.Type = "node20";
-                embeddedStep1a.StepTelemetry.Action = "actions/checkout";
-                embeddedStep1a.StepTelemetry.Ref = "v2";
-                embeddedStep1a.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" }, ExecutionContextLogOptions.Default);
-                embeddedStep1a.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" }, ExecutionContextLogOptions.Default);
-                embeddedStep1a.AddIssue(new Issue() { Type = IssueType.Notice, Message = "notice" }, ExecutionContextLogOptions.Default);
-                embeddedStep1a.Complete();
-
-                // Embedded step 1b context
-                var embeddedStep1b = step1.CreateEmbeddedChild(null, null, Guid.NewGuid(), ActionRunStage.Main);
-                embeddedStep1b.Start();
-                embeddedStep1b.StepTelemetry.Type = "node20";
-                embeddedStep1b.StepTelemetry.Action = "actions/checkout";
-                embeddedStep1b.StepTelemetry.Ref = "v2";
-                embeddedStep1b.AddIssue(new Issue() { Type = IssueType.Error, Message = "error 2" }, ExecutionContextLogOptions.Default);
-                embeddedStep1b.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning 2" }, ExecutionContextLogOptions.Default);
-                embeddedStep1b.AddIssue(new Issue() { Type = IssueType.Notice, Message = "notice 2" }, ExecutionContextLogOptions.Default);
-                embeddedStep1b.Complete();
-
-                step1.Complete();
-
-                // Assert
-                Assert.Equal(3, jobContext.Global.StepsResult.Count);
-                Assert.Equal(0, jobContext.Global.StepsResult[0].Annotations.Count);
-                Assert.Equal(0, jobContext.Global.StepsResult[1].Annotations.Count);
-                Assert.Equal(6, jobContext.Global.StepsResult[2].Annotations.Count);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void PublishStepResult_EmbeddedStep_Legacy()
         {
             using (TestHostContext hc = CreateTestContext())
             {
@@ -883,10 +807,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                 ec.InitializeJob(jobRequest, CancellationToken.None);
                 ec.Start();
 
-                var embeddedStep = ec.CreateEmbeddedChild(null, null, Guid.NewGuid(), ActionRunStage.Main);
+                var embeddedStep = ec.CreateChild(Guid.NewGuid(), "action_1_pre", "action_1_pre", null, null, ActionRunStage.Main, isEmbedded: true);
                 embeddedStep.Start();
 
-                embeddedStep.StepTelemetry.Type = "node20";
+                embeddedStep.StepTelemetry.Type = "node16";
                 embeddedStep.StepTelemetry.Action = "actions/checkout";
                 embeddedStep.StepTelemetry.Ref = "v2";
 

src/Test/L0/Worker/HandlerFactoryL0.cs

@@ -30,8 +30,8 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Theory]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        [InlineData("node12", "node20")]
-        [InlineData("node16", "node20")]
+        [InlineData("node12", "node16")]
+        [InlineData("node16", "node16")]
         [InlineData("node20", "node20")]
         public void IsNodeVersionUpgraded(string inputVersion, string expectedVersion)
         {
@@ -70,6 +70,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 // Assert.
                 Assert.Equal(expectedVersion, handler.Data.NodeVersion);
+                Environment.SetEnvironmentVariable(Constants.Variables.Actions.AllowActionsUseUnsecureNodeVersion, null);
             }
         }
     }

src/Test/L0/Worker/JobExtensionL0.cs

@@ -505,27 +505,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             return EnsureSnapshotPostJobStepForToken(mappingToken, snapshot);
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public Task EnsureSnapshotPostJobStepForMappingToken_WithIf_Is_False()
-        {
-            var snapshot = new Pipelines.Snapshot("TestImageNameFromMappingToken", condition: $"{PipelineTemplateConstants.Success}() && 1==0", version: "2.*");
-            var imageNameValueStringToken = new StringToken(null, null, null, snapshot.ImageName);
-            var condition = new StringToken(null, null, null, snapshot.Condition);
-            var version = new StringToken(null, null, null, snapshot.Version);
-
-            var mappingToken = new MappingToken(null, null, null)
-            {
-                { new StringToken(null,null,null, PipelineTemplateConstants.ImageName), imageNameValueStringToken },
-                { new StringToken(null,null,null, PipelineTemplateConstants.If), condition },
-                { new StringToken(null,null,null, PipelineTemplateConstants.CustomImageVersion), version }
-            };
-
-            return EnsureSnapshotPostJobStepForToken(mappingToken, snapshot, skipSnapshotStep: true);
-        }
-
-        private async Task EnsureSnapshotPostJobStepForToken(TemplateToken snapshotToken, Pipelines.Snapshot expectedSnapshot, bool skipSnapshotStep = false)
+        private async Task EnsureSnapshotPostJobStepForToken(TemplateToken snapshotToken, Pipelines.Snapshot expectedSnapshot)
         {
             using (TestHostContext hc = CreateTestContext())
             {
@@ -543,28 +523,14 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 Assert.Equal(1, postJobSteps.Count);
                 var snapshotStep = postJobSteps.First();
-                _jobEc.JobSteps.Enqueue(snapshotStep);
-
-                var _stepsRunner = new StepsRunner();
-                _stepsRunner.Initialize(hc);
-                await _stepsRunner.RunAsync(_jobEc);
-
                 Assert.Equal("Create custom image", snapshotStep.DisplayName);
-                Assert.Equal(expectedSnapshot.Condition ?? $"{PipelineTemplateConstants.Success}()", snapshotStep.Condition);
+                Assert.Equal($"{PipelineTemplateConstants.Success}()", snapshotStep.Condition);
 
                 // Run the mock snapshot step, so we can verify it was executed with the expected snapshot object.
-                // await snapshotStep.RunAsync();
-                if (skipSnapshotStep)
-                {
-                    Assert.Null(_requestedSnapshot);
-                }
-                else
-                {
-                    Assert.NotNull(_requestedSnapshot);
-                    Assert.Equal(expectedSnapshot.ImageName, _requestedSnapshot.ImageName);
-                    Assert.Equal(expectedSnapshot.Condition ?? $"{PipelineTemplateConstants.Success}()", _requestedSnapshot.Condition);
-                    Assert.Equal(expectedSnapshot.Version ?? "1.*", _requestedSnapshot.Version);
-                }
+                await snapshotStep.RunAsync();
+
+                Assert.NotNull(_requestedSnapshot);
+                Assert.Equal(expectedSnapshot.ImageName, _requestedSnapshot.ImageName);
             }
         }
     }

src/Test/L0/Worker/StepHostL0.cs

@@ -75,10 +75,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                     .ReturnsAsync(0);
 
                 // Act.
-                var nodeVersion = await sh.DetermineNodeRuntimeVersion(_ec.Object, "node20");
+                var nodeVersion = await sh.DetermineNodeRuntimeVersion(_ec.Object, "node16");
 
                 // Assert.
-                Assert.Equal("node20_alpine", nodeVersion);
+                Assert.Equal("node16_alpine", nodeVersion);
             }
         }
 
@@ -129,10 +129,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                     .ReturnsAsync(0);
 
                 // Act.
-                var nodeVersion = await sh.DetermineNodeRuntimeVersion(_ec.Object, "node20");
+                var nodeVersion = await sh.DetermineNodeRuntimeVersion(_ec.Object, "node16");
 
                 // Assert.
-                Assert.Equal("node20", nodeVersion);
+                Assert.Equal("node16", nodeVersion);
             }
         }
 

src/Test/Test.csproj

@@ -15,12 +15,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="xunit" Version="2.7.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
+        <PackageReference Include="System.Buffers" Version="4.5.1" />
         <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
         <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
-        <PackageReference Include="Moq" Version="4.20.72" />
+        <PackageReference Include="Moq" Version="4.20.70" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/dev.sh

@@ -17,7 +17,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
 DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
 PACKAGE_DIR="$SCRIPT_DIR/../_package"
 DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="8.0.407"
+DOTNETSDK_VERSION="8.0.303"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)
 
@@ -199,7 +199,6 @@ function package ()
     popd > /dev/null
 }
 
-# Install .NET SDK
 if [[ (! -d "${DOTNETSDK_INSTALLDIR}") || (! -e "${DOTNETSDK_INSTALLDIR}/.${DOTNETSDK_VERSION}") || (! -e "${DOTNETSDK_INSTALLDIR}/dotnet") ]]; then
 
     # Download dotnet SDK to ../_dotnetsdk directory

src/global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.407"
+    "version": "8.0.303"
   }
 }

src/runnerversion

@@ -1 +1 @@
-2.323.0
+2.318.0