Update releaseVersion

M299/backport 5852 (#2405 )
* set env in ProcessInvoker sanitized (#2280) * set env in ProcessInvoker sanitized * Update runnerversion and rel notes and make it prerelase --------- Co-authored-by: Stefan Ruvceski <96768603+ruvceskistefan@users.noreply.github.com>
2025-12-10 12:36:23 +00:00 · 2023-01-30 17:03:37 +01:00 · 2023-01-30 16:59:05 +01:00 · 2022-11-02 19:59:20 -04:00 · 2022-11-02 19:58:07 -04:00 · 2022-11-02 14:56:56 -04:00
119 changed files with 4262 additions and 17594 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,10 +5,7 @@
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:1": {},
 		"ghcr.io/devcontainers/features/dotnet": {
-			"version": "6.0.405"
-		},
-		"ghcr.io/devcontainers/features/node:1": {
-			"version": "16"
+			"version": "6.0.300"
 		}
 	},
 	"customizations": {
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🛑 Request a feature in the runner application
-    url: https://github.com/orgs/community/discussions/categories/actions-and-packages
-    about: If you have feature requests for GitHub Actions, please use the Actions and Packages section on the Github Product Feedback page.
  - name: ✅ Support for GitHub Actions
    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.
--- a/.github/ISSUE_TEMPLATE/enhancement_request.md
+++ b/.github/ISSUE_TEMPLATE/enhancement_request.md
@@ -0,0 +1,32 @@
+---
+name: 🛑 Request a feature in the runner application 
+about: If you have feature requests for GitHub Actions, please use the "feedback and suggestions for GitHub Actions" link below.
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!--
+👋 You're opening a request for an enhancement in the GitHub Actions **runner application**.
+
+🛑 Please stop if you're not certain that the feature you want is in the runner application - if you have a suggestion for improving GitHub Actions, please see the [GitHub Actions Feedback](https://github.com/github/feedback/discussions/categories/actions-and-packages-feedback) discussion forum which is actively monitored.  Using the forum ensures that we route your problem to the correct team.  😃
+
+Some additional useful links:
+* If you have found a security issue [please submit it here](https://hackerone.com/github)
+* If you have questions or issues with the service, writing workflows or actions, then please [visit the GitHub Community Forum's Actions Board](https://github.community/t5/GitHub-Actions/bd-p/actions)
+* If you are having an issue or have a question about GitHub Actions then please [contact customer support](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-github-actions#contacting-support)
+
+If you have a feature request that is relevant to this repository, the runner, then please include the information below:
+-->
+
+**Describe the enhancement**
+A clear and concise description of what the features or enhancement you need.
+
+**Code Snippet**
+If applicable, add a code snippet.
+
+**Additional information**
+Add any other context about the feature here.
+
+NOTE: if the feature request has been agreed upon then the assignee will create an ADR.   See docs/adrs/README.md
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -27,7 +27,7 @@ jobs:

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
      # 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@v2
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,6 +18,7 @@ jobs:
        uses: github/super-linter@v4
        env:
          DEFAULT_BRANCH: ${{ github.base_ref }}
+          DISABLE_ERRORS: true
          EDITORCONFIG_FILE_NAME: .editorconfig
          LINTER_RULES_PATH: /src/
          VALIDATE_ALL_CODEBASE: false
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -1,65 +0,0 @@
-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
-        with:
-          script: |
-            const fs = require('fs');
-            const inputRunnerVersion = "${{ github.event.inputs.runnerVersion }}"
-            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
-          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
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -301,6 +301,7 @@ jobs:
        release_name: "v${{ steps.releaseNote.outputs.version }}"
        body: |
          ${{ steps.releaseNote.outputs.note }}
+        prerelease: true

    # Upload release assets (full runner packages)
    - name: Upload Release Asset (win-x64)
@@ -660,52 +661,3 @@ jobs:
        asset_path: ${{ github.workspace }}/linux-arm64-trimmedpackages.json
        asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}-trimmedpackages.json
        asset_content_type: application/octet-stream
-
-  publish-image:
-    needs: release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    env:
-      REGISTRY: ghcr.io
-      IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Compute image version
-        id: image
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const fs = require('fs');
-            const runnerVersion = fs.readFileSync('${{ github.workspace }}/releaseVersion', '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
-          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
--- a/README.md
+++ b/README.md
@@ -22,4 +22,4 @@ Runner releases:

 ## Contribute

-We accept contributions in the form of issues and pull requests. 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. [Read more about our guidelines here](docs/contribute.md) before contributing.
+We accept contributions in the form of issues and pull requests.  [Read more here](docs/contribute.md) before contributing.
--- a/docs/contribute.md
+++ b/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.

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

@@ -158,11 +158,3 @@ cat (Runner/Worker)_TIMESTAMP.log # view your log file

 We use the .NET Foundation and CoreCLR style guidelines [located here](
 https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md)
-
-### Format C# Code
-
-To format both staged and unstaged .cs files
-```
-cd ./src
-./dev.(cmd|sh) format
-```
--- a/docs/contribute/vscode.md
+++ b/docs/contribute/vscode.md
@@ -35,7 +35,7 @@ All the configs below can be found in `.vscode/launch.json`.
 If you launch `Run` or `Run [build]`, it starts a process called `Runner.Listener`.
 This process will receive any job queued on this repository if the job runs on matching labels (e.g `runs-on: self-hosted`).
 Once a job is received, a `Runner.Listener` starts a new process of `Runner.Worker`.
-Since this is a different process, you can't use the same debugger session debug it.
+Since this is a diferent process, you can't use the same debugger session debug it.
 Instead, a parallel debugging session has to be started, using a different launch config.
 Luckily, VS Code supports multiple parallel debugging sessions.

--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,49 +0,0 @@
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 as build
-
-ARG RUNNER_VERSION
-ARG RUNNER_ARCH="x64"
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0
-ARG DOCKER_VERSION=20.10.23
-
-RUN apt update -y && apt install curl unzip -y
-
-WORKDIR /actions-runner
-RUN curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \
-    && tar xzf ./runner.tar.gz \
-    && rm runner.tar.gz
-
-RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-container-hooks/releases/download/v${RUNNER_CONTAINER_HOOKS_VERSION}/actions-runner-hooks-k8s-${RUNNER_CONTAINER_HOOKS_VERSION}.zip \
-    && unzip ./runner-container-hooks.zip -d ./k8s \
-    && rm runner-container-hooks.zip
-
-RUN export DOCKER_ARCH=x86_64 \
-    && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
-    && curl -fLo docker.tgz https://download.docker.com/linux/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \
-    && tar zxvf docker.tgz \
-    && rm -rf docker.tgz
-
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV RUNNER_MANUALLY_TRAP_SIG=1
-ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1
-
-RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends \
-    sudo \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN adduser --disabled-password --gecos "" --uid 1001 runner \
-    && groupadd docker --gid 123 \
-    && usermod -aG sudo runner \
-    && usermod -aG docker runner \
-    && echo "%sudo   ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers \
-    && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers
-
-WORKDIR /home/runner
-
-COPY --chown=runner:docker --from=build /actions-runner .
-
-RUN install -o root -g root -m 755 docker/* /usr/bin/ && rm -rf docker
-
-USER runner
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,19 +1,19 @@
 ## Features
- Add support for ghe.com domain (#2420)
- Add docker cli to the runner image. (#2425)
+- Displays the error logs in dedicated sub-sections of the Initialize containers section (#2182)
+- Add generateServiceConfig option for configure command (#2226)
+- Setting debug using GitHub Action variables (#2234)
+- run.sh installs SIGINT and SIGTERM traps to gracefully stop runner (#2233, 2240)
+

 ## Bugs
- Fix URL construction bug for RunService (#2396)
- Defer evaluation of a step's DisplayName until its condition is evaluated. (#2313)
- Replace '(' and ')' with '[' and '] from OS.Description for fixing User-Agent header validation (#2288)
+- Use Global.Variables instead of JobContext and include action path/ref in the message. (#2214)
+- Sanitize Windows ENVs (#2280)

 ## Misc
- Bump dotnet sdk to latest version. (#2392)
- Start calling run service for job completion (#2412, #2423)
-
-_Note: Actions Runner follows a progressive release policy, so the latest release might not be available to your enterprise, organization, or repository yet. 
-To confirm which version of the Actions Runner you should expect, please view the download instructions for your enterprise, organization, or repository. 
-See https://docs.github.com/en/enterprise-cloud@latest/actions/hosting-your-own-runners/adding-self-hosted-runners_
+- Allow '--disableupdate' in create-latest-svc.sh (#2201)
+- Fix markup for support link (#2114)
+- Add runner devcontainer (#2187)
+- Setup linter for Runner (#2211, #2213, #2216)

 ## Windows x64
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.
--- a/2
+++ b/2
@@ -1 +1 @@
-<Update to ./src/runnerversion when creating release>
+2.299.2
--- a/scripts/create-latest-svc.sh
+++ b/scripts/create-latest-svc.sh
@@ -13,7 +13,7 @@ set -e

 flags_found=false

-while getopts 's:g:n:r:u:l:df' opt; do
+while getopts 's:g:n:r:u:l:d' opt; do
    flags_found=true

    case $opt in
@@ -35,9 +35,6 @@ while getopts 's:g:n:r:u:l:df' opt; do
    l)
        labels=$OPTARG
        ;;
-    f)
-        replace='true'
-        ;;
    d)
        disableupdate='true'
        ;;
@@ -56,8 +53,7 @@ Usage:
    -r          optional  name of the runner group to add the runner to, defaults to the Default group
    -u          optional  user svc will run as, defaults to current
    -l          optional  list of labels (split by comma) applied on the runner
-    -d          optional  allow runner to remain on the current version for one month after the release of a newer version
-    -f          optional  replace any existing runner with the same name"
+    -d          optional  allow runner to remain on the current version for one month after the release of a newer version"
        exit 0
        ;;
    esac
@@ -178,7 +174,7 @@ fi
 echo
 echo "Configuring ${runner_name} @ $runner_url"
 echo "./config.sh --unattended --url $runner_url --token *** --name $runner_name ${labels:+--labels $labels} ${runner_group:+--runnergroup \"$runner_group\"} ${disableupdate:+--disableupdate}"
-sudo -E -u ${svc_user} ./config.sh --unattended --url $runner_url --token $RUNNER_TOKEN ${replace:+--replace} --name $runner_name ${labels:+--labels $labels} ${runner_group:+--runnergroup "$runner_group"} ${disableupdate:+--disableupdate}
+sudo -E -u ${svc_user} ./config.sh --unattended --url $runner_url --token $RUNNER_TOKEN --name $runner_name ${labels:+--labels $labels} ${runner_group:+--runnergroup "$runner_group"} ${disableupdate:+--disableupdate}

 #---------------------------------------
 # Configuring as a service
--- a/scripts/delete.sh
+++ b/scripts/delete.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#/bin/bash

 set -e

@@ -12,7 +12,7 @@ set -e
 #
 # Usage:
 #     export RUNNER_CFG_PAT=<yourPAT>
-#     ./delete.sh <scope> [<name>]
+#     ./delete.sh scope name
 #
 #      scope required  repo (:owner/:repo) or org (:organization)
 #      name  optional  defaults to hostname.  name to delete
@@ -26,17 +26,17 @@ set -e
 runner_scope=${1}
 runner_name=${2}

-function fatal() 
+echo "Deleting runner ${runner_name} @ ${runner_scope}"
+
+function fatal()
 {
   echo "error: $1" >&2
   exit 1
 }

 if [ -z "${runner_scope}" ]; then fatal "supply scope as argument 1"; fi
+if [ -z "${runner_name}" ]; then fatal "supply name as argument 2"; fi
 if [ -z "${RUNNER_CFG_PAT}" ]; then fatal "RUNNER_CFG_PAT must be set before calling"; fi
-if [ -z "${runner_name}" ]; then runner_name=`hostname`; fi
-
-echo "Deleting runner ${runner_name} @ ${runner_scope}"

 which curl || fatal "curl required.  Please install in PATH with apt-get, brew, etc"
 which jq || fatal "jq required.  Please install in PATH with apt-get, brew, etc"
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm
@@ -1 +1 @@
-39f2a931565d6a10e695ac8ed14bb9dcbb568151410349b32dbf9c27bae29602
+1d709d93e5d3c6c6c656a61aa6c1781050224788a05b0e6ecc4c3c0408bdf89c
--- a/src/Misc/contentHash/dotnetRuntime/linux-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64
@@ -1 +1 @@
-29ffb303537d8ba674fbebc7729292c21c4ebd17b3198f91ed593ef4cbbb67b5
+b92a47cfeaad02255b1f7a377060651b73ae5e5db22a188dbbcb4183ab03a03d
--- a/src/Misc/contentHash/dotnetRuntime/linux-x64
+++ b/src/Misc/contentHash/dotnetRuntime/linux-x64
@@ -1 +1 @@
-de6868a836fa3cb9e5ddddbc079da1c25e819aa2d2fc193cc9931c353687c57c
+68a9a8ef0843a8bb74241894f6f63fd76241a82295c5337d3cc7a940a314c78e
--- a/src/Misc/contentHash/dotnetRuntime/osx-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64
@@ -1 +1 @@
-339d3e1a5fd28450c0fe6cb820cc7aae291f0f9e2d153ac34e1f7b080e35d30e
+02c7126ff4d63ee2a0ae390c81434c125630522aadf35903bbeebb1a99d8af99
--- a/src/Misc/contentHash/dotnetRuntime/osx-x64
+++ b/src/Misc/contentHash/dotnetRuntime/osx-x64
@@ -1 +1 @@
-dcb7f606c1d7d290381e5020ee73e7f16dcbd2f20ac9b431362ccbb5120d449c
+c9d5a542f8d765168855a89e83ae0a8970d00869041c4f9a766651c04c72b212
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -1 +1 @@
-1bbcb0e9a2cf4be4b1fce77458de139b70ac58efcbb415a6db028b9373ae1673
+39d0683f0f115a211cb10c473e9574c16549a19d4e9a6c637ded3d7022bf809f
--- a/src/Misc/contentHash/dotnetRuntime/win-x64
+++ b/src/Misc/contentHash/dotnetRuntime/win-x64
@@ -1 +1 @@
-44cd25f3c104d0abb44d262397a80e0b2c4f206465c5d899a22eec043dac0fb3
+d94f2fbaf210297162bc9f3add819d73682c3aa6899e321c3872412b924d5504
--- a/src/Misc/contentHash/externals/linux-arm
+++ b/src/Misc/contentHash/externals/linux-arm
@@ -1 +1 @@
-3807dcbf947e840c33535fb466b096d76bf09e5c0254af8fc8cbbb24c6388222
+6ed30a2c1ee403a610d63e82bb230b9ba846a9c25cec9e4ea8672fb6ed4e1a51
--- a/src/Misc/contentHash/externals/linux-arm64
+++ b/src/Misc/contentHash/externals/linux-arm64
@@ -1 +1 @@
-ee01eee80cd8a460a4b9780ee13fdd20f25c59e754b4ccd99df55fbba2a85634
+711c30c51ec52c9b7a9a2eb399d6ab2ab5ee1dc72de11879f2f36f919f163d78
--- a/src/Misc/contentHash/externals/linux-x64
+++ b/src/Misc/contentHash/externals/linux-x64
@@ -1 +1 @@
-a9fb9c14e24e79aec97d4da197dd7bfc6364297d6fce573afb2df48cc9a931f8
+a49479ca4b4988a06c097e8d22c51fd08a11c13f40807366236213d0e008cf6a
--- a/src/Misc/contentHash/externals/osx-arm64
+++ b/src/Misc/contentHash/externals/osx-arm64
@@ -1 +1 @@
-a4e0e8fc62eba0967a39c7d693dcd0aeb8b2bed0765f9c38df80d42884f65341
+cc4708962a80325de0baa5ae8484e0cb9ae976ac6a4178c1c0d448b8c52bd7f7
--- a/src/Misc/contentHash/externals/osx-x64
+++ b/src/Misc/contentHash/externals/osx-x64
@@ -1 +1 @@
-17ac17fbe785b3d6fa2868d8d17185ebfe0c90b4b0ddf6b67eac70e42bcd989b
+8e97df75230b843462a9b4c578ccec604ee4b4a1066120c85b04374317fa372b
--- a/src/Misc/contentHash/externals/win-arm64
+++ b/src/Misc/contentHash/externals/win-arm64
@@ -1 +1 @@
-89f24657a550f1e818b0e9975e5b80edcf4dd22b7d4bccbb9e48e37f45d30fb1
+e5dace2d41cc0682d096dcce4970079ad48ec7107e46195970eecfdb3df2acef
--- a/src/Misc/contentHash/externals/win-x64
+++ b/src/Misc/contentHash/externals/win-x64
@@ -1 +1 @@
-24fd131b5dce33ef16038b771407bc0507da8682a72fb3b7780607235f76db0b
+f75a671e5a188c76680739689aa75331a2c09d483dce9c80023518c48fd67a18
--- a/src/Misc/expressionFunc/hashFiles/package-lock.json
+++ b/src/Misc/expressionFunc/hashFiles/package-lock.json
@@ -14,7 +14,7 @@
      "devDependencies": {
        "@types/node": "^12.7.12",
        "@typescript-eslint/parser": "^5.15.0",
-        "@vercel/ncc": "^0.36.0",
+        "@zeit/ncc": "^0.20.5",
        "eslint": "^8.11.0",
        "eslint-plugin-github": "^4.3.5",
        "prettier": "^1.19.1",
@@ -346,10 +346,11 @@
        "url": "https://opencollective.com/typescript-eslint"
      }
    },
-    "node_modules/@vercel/ncc": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.0.tgz",
-      "integrity": "sha512-/ZTUJ/ZkRt694k7KJNimgmHjtQcRuVwsST2Z6XfYveQIuBbHR+EqkTc1jfgPkQmMyk/vtpxo3nVxe8CNuau86A==",
+    "node_modules/@zeit/ncc": {
+      "version": "0.20.5",
+      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.20.5.tgz",
+      "integrity": "sha512-XU6uzwvv95DqxciQx+aOLhbyBx/13ky+RK1y88Age9Du3BlA4mMPCy13BGjayOrrumOzlq1XV3SD/BWiZENXlw==",
+      "deprecated": "@zeit/ncc is no longer maintained. Please use @vercel/ncc instead.",
      "dev": true,
      "bin": {
        "ncc": "dist/ncc/cli.js"
@@ -1721,9 +1722,9 @@
      "dev": true
    },
    "node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
      "dev": true,
      "dependencies": {
        "minimist": "^1.2.0"
@@ -1823,9 +1824,9 @@
      }
    },
    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
      "dependencies": {
        "brace-expansion": "^1.1.7"
      },
@@ -2746,10 +2747,10 @@
        "eslint-visitor-keys": "^3.0.0"
      }
    },
-    "@vercel/ncc": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.0.tgz",
-      "integrity": "sha512-/ZTUJ/ZkRt694k7KJNimgmHjtQcRuVwsST2Z6XfYveQIuBbHR+EqkTc1jfgPkQmMyk/vtpxo3nVxe8CNuau86A==",
+    "@zeit/ncc": {
+      "version": "0.20.5",
+      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.20.5.tgz",
+      "integrity": "sha512-XU6uzwvv95DqxciQx+aOLhbyBx/13ky+RK1y88Age9Du3BlA4mMPCy13BGjayOrrumOzlq1XV3SD/BWiZENXlw==",
      "dev": true
    },
    "acorn": {
@@ -3755,9 +3756,9 @@
      "dev": true
    },
    "json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
      "dev": true,
      "requires": {
        "minimist": "^1.2.0"
@@ -3839,9 +3840,9 @@
      }
    },
    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
      "requires": {
        "brace-expansion": "^1.1.7"
      }
--- a/src/Misc/expressionFunc/hashFiles/package.json
+++ b/src/Misc/expressionFunc/hashFiles/package.json
@@ -26,7 +26,7 @@
  "devDependencies": {
    "@types/node": "^12.7.12",
    "@typescript-eslint/parser": "^5.15.0",
-    "@vercel/ncc": "^0.36.0",
+    "@zeit/ncc": "^0.20.5",
    "eslint": "^8.11.0",
    "eslint-plugin-github": "^4.3.5",
    "prettier": "^1.19.1",
--- a/src/Misc/expressionFunc/hashFilesV2/.eslintignore
+++ b/src/Misc/expressionFunc/hashFilesV2/.eslintignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/expressionFunc/hashFilesV2/.eslintrc.json
+++ b/src/Misc/expressionFunc/hashFilesV2/.eslintrc.json
@@ -1,61 +0,0 @@
-{
-    "plugins": ["@typescript-eslint"],
-    "extends": ["plugin:github/recommended"],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "ecmaVersion": 9,
-      "sourceType": "module",
-      "project": "./tsconfig.json"
-    },
-    "rules": {
-      "eslint-comments/no-use": "off",
-      "import/no-namespace": "off",
-      "no-console": "off",
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": "error",
-      "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
-      "@typescript-eslint/no-require-imports": "error",
-      "@typescript-eslint/array-type": "error",
-      "@typescript-eslint/await-thenable": "error",
-      "@typescript-eslint/naming-convention": [
-        "error",
-        {
-          "selector": "default",
-          "format": ["camelCase"]
-        }
-      ],
-      "camelcase": "off",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/no-array-constructor": "error",
-      "@typescript-eslint/no-empty-interface": "error",
-      "@typescript-eslint/no-explicit-any": "error",
-      "@typescript-eslint/no-extraneous-class": "error",
-      "@typescript-eslint/no-for-in-array": "error",
-      "@typescript-eslint/no-inferrable-types": "error",
-      "@typescript-eslint/no-misused-new": "error",
-      "@typescript-eslint/no-namespace": "error",
-      "@typescript-eslint/no-non-null-assertion": "warn",
-      "@typescript-eslint/no-unnecessary-qualifier": "error",
-      "@typescript-eslint/no-unnecessary-type-assertion": "error",
-      "@typescript-eslint/no-useless-constructor": "error",
-      "@typescript-eslint/no-var-requires": "error",
-      "@typescript-eslint/prefer-for-of": "warn",
-      "@typescript-eslint/prefer-function-type": "warn",
-      "@typescript-eslint/prefer-includes": "error",
-      "@typescript-eslint/prefer-string-starts-ends-with": "error",
-      "@typescript-eslint/promise-function-async": "error",
-      "@typescript-eslint/require-array-sort-compare": "error",
-      "@typescript-eslint/restrict-plus-operands": "error",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error",
-      "filenames/match-regex" : "off",
-      "github/no-then" : 1, // warning
-      "semi": "off"
-    },
-    "env": {
-      "node": true,
-      "es6": true
-    }
-  }
--- a/src/Misc/expressionFunc/hashFilesV2/.prettierignore
+++ b/src/Misc/expressionFunc/hashFilesV2/.prettierignore
@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/
--- a/src/Misc/expressionFunc/hashFilesV2/.prettierrc.json
+++ b/src/Misc/expressionFunc/hashFilesV2/.prettierrc.json
@@ -1,11 +0,0 @@
-{
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }
--- a/src/Misc/expressionFunc/hashFilesV2/README.md
+++ b/src/Misc/expressionFunc/hashFilesV2/README.md
@@ -1,4 +0,0 @@
-To compile this package (output will be stored in `Misc/layoutbin`) run `npm install && npm run all`.
-
-> Note: this package also needs to be recompiled for dependabot PRs updating one of
-> its dependencies.
--- a/src/Misc/expressionFunc/hashFilesV2/package-lock.json
+++ b/src/Misc/expressionFunc/hashFilesV2/package-lock.json
--- a/src/Misc/expressionFunc/hashFilesV2/package.json
+++ b/src/Misc/expressionFunc/hashFilesV2/package.json
@@ -1,36 +0,0 @@
-{
-    "name": "hashFiles",
-    "version": "1.0.0",
-    "description": "GitHub Actions HashFiles() expression function",
-    "main": "lib/hashFiles.js",
-    "scripts": {
-        "build": "tsc",
-        "format": "prettier --write **/*.ts",
-        "format-check": "prettier --check **/*.ts",
-        "lint": "eslint src/**/*.ts",
-        "pack": "ncc build -o ../../layoutbin/hashFilesV2",
-        "all": "npm run build && npm run format && npm run lint && npm run pack"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/actions/runner.git"
-    },
-    "keywords": [
-        "actions"
-    ],
-    "author": "GitHub Actions",
-    "license": "MIT",
-    "dependencies": {
-        "@actions/glob": "^0.4.0"
-    },
-    "devDependencies": {
-        "@types/node": "^12.7.12",
-        "@typescript-eslint/parser": "^5.15.0",
-        "@vercel/ncc": "^0.36.0",
-        "eslint": "^8.11.0",
-        "eslint-plugin-github": "^4.3.5",
-        "eslint-plugin-prettier": "^4.2.1",
-        "prettier": "^2.8.4",
-        "typescript": "^3.6.4"
-    }
-}
--- a/src/Misc/expressionFunc/hashFilesV2/src/hashFiles.ts
+++ b/src/Misc/expressionFunc/hashFilesV2/src/hashFiles.ts
@@ -1,31 +0,0 @@
-import * as glob from '@actions/glob'
-
-async function run(): Promise<void> {
-  // arg0 -> node
-  // arg1 -> hashFiles.js
-  // env[followSymbolicLinks] = true/null
-  // env[patterns] -> glob patterns
-  let followSymbolicLinks = false
-  const matchPatterns = process.env.patterns || ''
-  if (process.env.followSymbolicLinks === 'true') {
-    console.log('Follow symbolic links')
-    followSymbolicLinks = true
-  }
-  const githubWorkspace = process.cwd()
-  console.log(`Match Pattern: ${matchPatterns}`)
-  try {
-    const result = await glob.hashFiles(
-      matchPatterns,
-      githubWorkspace,
-      {followSymbolicLinks},
-      true
-    )
-    console.error(`__OUTPUT__${result}__OUTPUT__`)
-    process.exit(0)
-  } catch (error) {
-    console.log(error)
-    process.exit(1)
-  }
-}
-
-run()
--- a/src/Misc/expressionFunc/hashFilesV2/tsconfig.json
+++ b/src/Misc/expressionFunc/hashFilesV2/tsconfig.json
@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "outDir": "./lib",                        /* Redirect output structure to the directory. */
-    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    "noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-  },
-  "exclude": ["node_modules", "**/*.test.ts"]
-}
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -5,7 +5,7 @@ PRECACHE=$2
 NODE_URL=https://nodejs.org/dist
 UNOFFICIAL_NODE_URL=https://unofficial-builds.nodejs.org/download/release
 NODE12_VERSION="12.22.7"
-NODE16_VERSION="16.16.0"
+NODE16_VERSION="16.13.0"

 get_abs_path() {
  # exploits the fact that pwd will print abs path when no args
--- a/src/Misc/layoutbin/RunnerService.js
+++ b/src/Misc/layoutbin/RunnerService.js
@@ -24,8 +24,7 @@ if (exitServiceAfterNFailures <= 0) {
  exitServiceAfterNFailures = NaN;
 }

-var unknownFailureRetryCount = 0;
-var retriableFailureRetryCount = 0;
+var consecutiveFailureCount = 0;

 var gracefulShutdown = function () {
  console.log("Shutting down runner listener");
@@ -63,8 +62,7 @@ var runService = function () {

      listener.stdout.on("data", (data) => {
        if (data.toString("utf8").includes("Listening for Jobs")) {
-          unknownFailureRetryCount = 0;
-          retriableFailureRetryCount = 0;
+          consecutiveFailureCount = 0;
        }
        process.stdout.write(data.toString("utf8"));
      });
@@ -94,38 +92,24 @@ var runService = function () {
          console.log(
            "Runner listener exit with retryable error, re-launch runner in 5 seconds."
          );
-          unknownFailureRetryCount = 0;
-          retriableFailureRetryCount++;
-          if (retriableFailureRetryCount >= 10) {
-            console.error(
-              "Stopping the runner after 10 consecutive re-tryable failures"
-            );
-            stopping = true;
-          }
+          consecutiveFailureCount = 0;
        } else if (code === 3 || code === 4) {
          console.log(
            "Runner listener exit because of updating, re-launch runner in 5 seconds."
          );
-          unknownFailureRetryCount = 0;
-          retriableFailureRetryCount++;
-          if (retriableFailureRetryCount >= 10) {
-            console.error(
-              "Stopping the runner after 10 consecutive re-tryable failures"
-            );
-            stopping = true;
-          }
+          consecutiveFailureCount = 0;
        } else {
          var messagePrefix = "Runner listener exit with undefined return code";
-          unknownFailureRetryCount++;
-          retriableFailureRetryCount = 0;
+          consecutiveFailureCount++;
          if (
            !isNaN(exitServiceAfterNFailures) &&
-            unknownFailureRetryCount >= exitServiceAfterNFailures
+            consecutiveFailureCount >= exitServiceAfterNFailures
          ) {
            console.error(
-              `${messagePrefix}, exiting service after ${unknownFailureRetryCount} consecutive failures`
+              `${messagePrefix}, exiting service after ${consecutiveFailureCount} consecutive failures`
            );
-            stopping = true
+            gracefulShutdown();
+            return;
          } else {
            console.log(`${messagePrefix}, re-launch runner in 5 seconds.`);
          }
--- a/src/Misc/layoutbin/hashFiles/index.js
+++ b/src/Misc/layoutbin/hashFiles/index.js
--- a/src/Misc/layoutbin/hashFilesV2/index.js
+++ b/src/Misc/layoutbin/hashFilesV2/index.js
--- a/src/Misc/layoutroot/run-helper.sh.template
+++ b/src/Misc/layoutroot/run-helper.sh.template
@@ -18,20 +18,6 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"

-# Wait for docker to start
-if [ ! -z "$RUNNER_WAIT_FOR_DOCKER_IN_SECONDS" ]; then
-    if [ "$RUNNER_WAIT_FOR_DOCKER_IN_SECONDS" -gt 0 ]; then
-        echo "Waiting for docker to be ready."
-        for i in $(seq "$RUNNER_WAIT_FOR_DOCKER_IN_SECONDS"); do
-            if docker ps > /dev/null 2>&1; then
-                echo "Docker is ready."
-                break
-            fi
-            "$DIR"/safe_sleep.sh 1
-        done
-    fi
-fi
-
 updateFile="update.finished"
 "$DIR"/bin/Runner.Listener run $*

--- a/src/Misc/layoutroot/run.sh
+++ b/src/Misc/layoutroot/run.sh
@@ -48,7 +48,7 @@ runWithManualTrap() {
            trap - INT TERM
            # wait for last parts to be logged
            wait $PID
-            exit $returnCode
+            exit 0
        fi
    done
 }
--- a/src/Misc/runnercoreassets
+++ b/src/Misc/runnercoreassets
@@ -4,7 +4,6 @@ checkScripts/downloadCert.js
 checkScripts/makeWebRequest.js
 darwin.svc.sh.template
 hashFiles/index.js
-hashFilesV2/index.js
 installdependencies.sh
 macos-run-invoker.js
 Microsoft.IdentityModel.Logging.dll
--- a/src/Misc/runnerdotnetruntimeassets
+++ b/src/Misc/runnerdotnetruntimeassets
@@ -74,7 +74,6 @@ Microsoft.Win32.Registry.dll
 mscordaccore.dll
 mscordaccore_amd64_amd64_6.0.522.21309.dll
 mscordaccore_arm64_arm64_6.0.522.21309.dll
-mscordaccore_amd64_amd64_6.0.1322.58009.dll
 mscordbi.dll
 mscorlib.dll
 mscorrc.debug.dll
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace GitHub.Runner.Common
 {
@@ -90,6 +90,7 @@ namespace GitHub.Runner.Common
                public static class Args
                {
                    public static readonly string Auth = "auth";
+                    public static readonly string JitConfig = "jitconfig";
                    public static readonly string Labels = "labels";
                    public static readonly string MonitorSocketAddress = "monitorsocketaddress";
                    public static readonly string Name = "name";
@@ -104,13 +105,11 @@ namespace GitHub.Runner.Common
                    public static readonly string Token = "token";
                    public static readonly string PAT = "pat";
                    public static readonly string WindowsLogonPassword = "windowslogonpassword";
-                    public static readonly string JitConfig = "jitconfig";
                    public static string[] Secrets => new[]
                    {
                        PAT,
                        Token,
                        WindowsLogonPassword,
-                        JitConfig,
                    };
                }

@@ -131,7 +130,6 @@ namespace GitHub.Runner.Common
                    public static readonly string Ephemeral = "ephemeral";
                    public static readonly string GenerateServiceConfig = "generateServiceConfig";
                    public static readonly string Help = "help";
-                    public static readonly string Local = "local";
                    public static readonly string Replace = "replace";
                    public static readonly string DisableUpdate = "disableupdate";
                    public static readonly string Once = "once"; // Keep this around since customers still relies on it
@@ -156,21 +154,17 @@ namespace GitHub.Runner.Common
                public static readonly string Node12Warning = "DistributedTask.AddWarningToNode12Action";
                public static readonly string UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate";
                public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks";
-                public static readonly string UseGlobHashFiles = "DistributedTask.UseGlobHashFiles";
            }

            public static readonly string InternalTelemetryIssueDataKey = "_internal_telemetry";
-            public static readonly Guid TelemetryRecordId = new Guid("11111111-1111-1111-1111-111111111111");
            public static readonly string WorkerCrash = "WORKER_CRASH";
            public static readonly string LowDiskSpace = "LOW_DISK_SPACE";
            public static readonly string UnsupportedCommand = "UNSUPPORTED_COMMAND";
-            public static readonly string ResultsUploadFailure = "RESULTS_UPLOAD_FAILURE";
            public static readonly string UnsupportedCommandMessage = "The `{0}` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/";
            public static readonly string UnsupportedCommandMessageDisabled = "The `{0}` command is disabled. Please upgrade to using Environment Files or opt into unsecure command execution by setting the `ACTIONS_ALLOW_UNSECURE_COMMANDS` environment variable to `true`. For more information see: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/";
            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 Node12DetectedAfterEndOfLife = "Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: {0}. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/.";
+            public static readonly string Node12DetectedAfterEndOfLife = "Node.js 12 actions are deprecated. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/. Please update the following actions to use Node.js 16: {0}";
        }

        public static class RunnerEvent
@@ -251,7 +245,6 @@ namespace GitHub.Runner.Common
                // 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 class System
--- a/src/Runner.Common/HostContext.cs
+++ b/src/Runner.Common/HostContext.cs
@@ -94,13 +94,6 @@ namespace GitHub.Runner.Common
            this.SecretMasker.AddValueEncoder(ValueEncoders.PowerShellPreAmpersandEscape);
            this.SecretMasker.AddValueEncoder(ValueEncoders.PowerShellPostAmpersandEscape);

-            // Create StdoutTraceListener if ENV is set
-            StdoutTraceListener stdoutTraceListener = null;
-            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Agent.PrintLogToStdout)))
-            {
-                stdoutTraceListener = new StdoutTraceListener(hostType);
-            }
-
            // Create the trace manager.
            if (string.IsNullOrEmpty(logFile))
            {
@@ -120,11 +113,11 @@ namespace GitHub.Runner.Common

                // this should give us _diag folder under runner root directory
                string diagLogDirectory = Path.Combine(new DirectoryInfo(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)).Parent.FullName, Constants.Path.DiagDirectory);
-                _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), stdoutTraceListener, this.SecretMasker);
+                _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), this.SecretMasker);
            }
            else
            {
-                _traceManager = new TraceManager(new HostTraceListener(logFile), stdoutTraceListener, this.SecretMasker);
+                _traceManager = new TraceManager(new HostTraceListener(logFile), this.SecretMasker);
            }

            _trace = GetTrace(nameof(HostContext));
@@ -226,20 +219,6 @@ namespace GitHub.Runner.Common
            }

            _userAgents.Add(new ProductInfoHeaderValue("CommitSHA", BuildConstants.Source.CommitHash));
-
-            var extraUserAgent = Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT");
-            if (!string.IsNullOrEmpty(extraUserAgent))
-            {
-                var extraUserAgentSplit = extraUserAgent.Split('/', StringSplitOptions.RemoveEmptyEntries);
-                if (extraUserAgentSplit.Length != 2)
-                {
-                    _trace.Error($"GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT is not in the format of 'name/version'.");
-                }
-
-                var extraUserAgentHeader = new ProductInfoHeaderValue(extraUserAgentSplit[0], extraUserAgentSplit[1]);
-                _trace.Info($"Adding extra user agent '{extraUserAgentHeader}' to all HTTP requests.");
-                _userAgents.Add(extraUserAgentHeader);
-            }
        }

        public string GetDirectory(WellKnownDirectory directory)
--- a/src/Runner.Common/JobServer.cs
+++ b/src/Runner.Common/JobServer.cs
@@ -13,8 +13,6 @@ using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using GitHub.Services.WebApi.Utilities.Internal;
-using GitHub.Services.Results.Client;
-using GitHub.Services.OAuth;

 namespace GitHub.Runner.Common
 {
@@ -24,15 +22,11 @@ namespace GitHub.Runner.Common
        Task ConnectAsync(VssConnection jobConnection);

        void InitializeWebsocketClient(ServiceEndpoint serviceEndpoint);
-        void InitializeResultsClient(Uri uri, string token);

        // logging and console
        Task<TaskLog> AppendLogContentAsync(Guid scopeIdentifier, string hubName, Guid planId, int logId, Stream uploadStream, CancellationToken cancellationToken);
        Task AppendTimelineRecordFeedAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, Guid stepId, IList<string> lines, long? startLine, CancellationToken cancellationToken);
        Task<TaskAttachment> CreateAttachmentAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, String type, String name, Stream uploadStream, CancellationToken cancellationToken);
-        Task CreateStepSummaryAsync(string planId, string jobId, Guid stepId, string file, CancellationToken cancellationToken);
-        Task CreateResultsStepLogAsync(string planId, string jobId, Guid stepId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken);
-        Task CreateResultsJobLogAsync(string planId, string jobId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken);
        Task<TaskLog> CreateLogAsync(Guid scopeIdentifier, string hubName, Guid planId, TaskLog log, CancellationToken cancellationToken);
        Task<Timeline> CreateTimelineAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, CancellationToken cancellationToken);
        Task<List<TimelineRecord>> UpdateTimelineRecordsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, IEnumerable<TimelineRecord> records, CancellationToken cancellationToken);
@@ -46,7 +40,6 @@ namespace GitHub.Runner.Common
        private bool _hasConnection;
        private VssConnection _connection;
        private TaskHttpClient _taskClient;
-        private ResultsHttpClient _resultsClient;
        private ClientWebSocket _websocketClient;

        private ServiceEndpoint _serviceEndpoint;
@@ -150,12 +143,6 @@ namespace GitHub.Runner.Common
            InitializeWebsocketClient(TimeSpan.Zero);
        }

-        public void InitializeResultsClient(Uri uri, string token)
-        {
-            var httpMessageHandler = HostContext.CreateHttpClientHandler();
-            this._resultsClient = new ResultsHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
-        }
-
        public ValueTask DisposeAsync()
        {
            CloseWebSocket(WebSocketCloseStatus.NormalClosure, CancellationToken.None);
@@ -318,33 +305,6 @@ namespace GitHub.Runner.Common
            return _taskClient.CreateAttachmentAsync(scopeIdentifier, hubName, planId, timelineId, timelineRecordId, type, name, uploadStream, cancellationToken: cancellationToken);
        }

-        public Task CreateStepSummaryAsync(string planId, string jobId, Guid stepId, string file, CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                return _resultsClient.UploadStepSummaryAsync(planId, jobId, stepId, file, cancellationToken: cancellationToken);
-            }
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
-        public Task CreateResultsStepLogAsync(string planId, string jobId, Guid stepId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                return _resultsClient.UploadResultsStepLogAsync(planId, jobId, stepId, file, finalize, firstBlock, lineCount, cancellationToken: cancellationToken);
-            }
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
-        public Task CreateResultsJobLogAsync(string planId, string jobId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                return _resultsClient.UploadResultsJobLogAsync(planId, jobId, file, finalize, firstBlock, lineCount, cancellationToken: cancellationToken);
-            }
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
        public Task<TaskLog> CreateLogAsync(Guid scopeIdentifier, string hubName, Guid planId, TaskLog log, CancellationToken cancellationToken)
        {
            CheckConnection();
--- a/src/Runner.Common/JobServerQueue.cs
+++ b/src/Runner.Common/JobServerQueue.cs
@@ -20,7 +20,6 @@ namespace GitHub.Runner.Common
        void Start(Pipelines.AgentJobRequestMessage jobRequest);
        void QueueWebConsoleLine(Guid stepRecordId, string line, long? lineNumber = null);
        void QueueFileUpload(Guid timelineId, Guid timelineRecordId, string type, string name, string path, bool deleteSource);
-        void QueueResultsUpload(Guid timelineRecordId, string name, string path, string type, bool deleteSource, bool finalize, bool firstBlock, long totalLines);
        void QueueTimelineRecordUpdate(Guid timelineId, TimelineRecord timelineRecord);
    }

@@ -31,7 +30,6 @@ namespace GitHub.Runner.Common
        private static readonly TimeSpan _delayForWebConsoleLineDequeue = TimeSpan.FromMilliseconds(500);
        private static readonly TimeSpan _delayForTimelineUpdateDequeue = TimeSpan.FromMilliseconds(500);
        private static readonly TimeSpan _delayForFileUploadDequeue = TimeSpan.FromMilliseconds(1000);
-        private static readonly TimeSpan _delayForResultsUploadDequeue = TimeSpan.FromMilliseconds(1000);

        // Job message information
        private Guid _scopeIdentifier;
@@ -46,8 +44,6 @@ namespace GitHub.Runner.Common
        // queue for file upload (log file or attachment)
        private readonly ConcurrentQueue<UploadFileInfo> _fileUploadQueue = new();

-        private readonly ConcurrentQueue<ResultsUploadFileInfo> _resultsFileUploadQueue = new();
-
        // queue for timeline or timeline record update (one queue per timeline)
        private readonly ConcurrentDictionary<Guid, ConcurrentQueue<TimelineRecord>> _timelineUpdateQueue = new();

@@ -60,7 +56,6 @@ namespace GitHub.Runner.Common
        // Task for each queue's dequeue process
        private Task _webConsoleLineDequeueTask;
        private Task _fileUploadDequeueTask;
-        private Task _resultsUploadDequeueTask;
        private Task _timelineUpdateDequeueTask;

        // common
@@ -84,9 +79,6 @@ namespace GitHub.Runner.Common
        private bool _webConsoleLineAggressiveDequeue = true;
        private bool _firstConsoleOutputs = true;

-        private bool _resultsClientInitiated = false;
-        private delegate Task ResultsFileUploadHandler(ResultsUploadFileInfo file);
-
        public override void Initialize(IHostContext hostContext)
        {
            base.Initialize(hostContext);
@@ -101,20 +93,6 @@ namespace GitHub.Runner.Common

            _jobServer.InitializeWebsocketClient(serviceEndPoint);

-            // This code is usually wrapped by an instance of IExecutionContext which isn't available here.
-            jobRequest.Variables.TryGetValue("system.github.results_endpoint", out VariableValue resultsEndpointVariable);
-            var resultsReceiverEndpoint = resultsEndpointVariable?.Value;
-
-            if (serviceEndPoint?.Authorization != null &&
-                serviceEndPoint.Authorization.Parameters.TryGetValue("AccessToken", out var accessToken) &&
-                !string.IsNullOrEmpty(accessToken) &&
-                !string.IsNullOrEmpty(resultsReceiverEndpoint))
-            {
-                Trace.Info("Initializing results client");
-                _jobServer.InitializeResultsClient(new Uri(resultsReceiverEndpoint), accessToken);
-                _resultsClientInitiated = true;
-            }
-
            if (_queueInProcess)
            {
                Trace.Info("No-opt, all queue process tasks are running.");
@@ -142,13 +120,10 @@ namespace GitHub.Runner.Common
            Trace.Info("Start process file upload queue.");
            _fileUploadDequeueTask = ProcessFilesUploadQueueAsync();

-            Trace.Info("Start results file upload queue.");
-            _resultsUploadDequeueTask = ProcessResultsUploadQueueAsync();
-
            Trace.Info("Start process timeline update queue.");
            _timelineUpdateDequeueTask = ProcessTimelinesUpdateQueueAsync();

-            _allDequeueTasks = new Task[] { _webConsoleLineDequeueTask, _fileUploadDequeueTask, _timelineUpdateDequeueTask, _resultsUploadDequeueTask };
+            _allDequeueTasks = new Task[] { _webConsoleLineDequeueTask, _fileUploadDequeueTask, _timelineUpdateDequeueTask };
            _queueInProcess = true;
        }

@@ -179,10 +154,6 @@ namespace GitHub.Runner.Common
            await ProcessFilesUploadQueueAsync(runOnce: true);
            Trace.Info("File upload queue drained.");

-            Trace.Verbose("Draining results upload queue.");
-            await ProcessResultsUploadQueueAsync(runOnce: true);
-            Trace.Info("Results upload queue drained.");
-
            // ProcessTimelinesUpdateQueueAsync() will throw exception during shutdown
            // if there is any timeline records that failed to update contains output variabls.
            Trace.Verbose("Draining timeline update queue.");
@@ -233,45 +204,6 @@ namespace GitHub.Runner.Common
            _fileUploadQueue.Enqueue(newFile);
        }

-        public void QueueResultsUpload(Guid timelineRecordId, string name, string path, string type, bool deleteSource, bool finalize, bool firstBlock, long totalLines)
-        {
-            if (!_resultsClientInitiated)
-            {
-                Trace.Verbose("Skipping results upload");
-                try
-                {
-                    if (deleteSource)
-                    {
-                        File.Delete(path);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Trace.Info("Catch exception during delete skipped results upload file.");
-                    Trace.Error(ex);
-                }
-                return;
-            }
-
-            // all parameter not null, file path exist.
-            var newFile = new ResultsUploadFileInfo()
-            {
-                Name = name,
-                Path = path,
-                Type = type,
-                PlanId = _planId.ToString(),
-                JobId = _jobTimelineRecordId.ToString(),
-                RecordId = timelineRecordId,
-                DeleteSource = deleteSource,
-                Finalize = finalize,
-                FirstBlock = firstBlock,
-                TotalLines = totalLines,
-            };
-
-            Trace.Verbose("Enqueue results file upload queue: file '{0}' attach to job {1} step {2}", newFile.Path, _jobTimelineRecordId, timelineRecordId);
-            _resultsFileUploadQueue.Enqueue(newFile);
-        }
-
        public void QueueTimelineRecordUpdate(Guid timelineId, TimelineRecord timelineRecord)
        {
            ArgUtil.NotEmpty(timelineId, nameof(timelineId));
@@ -367,7 +299,7 @@ namespace GitHub.Runner.Common
                        {
                            try
                            {
-                                // Give at most 60s for each request.
+                                // Give at most 60s for each request. 
                                using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(60)))
                                {
                                    await _jobServer.AppendTimelineRecordFeedAsync(_scopeIdentifier, _hubName, _planId, _jobTimelineId, _jobTimelineRecordId, stepRecordId, batch.Select(logLine => logLine.Line).ToList(), batch[0].LineNumber, timeoutTokenSource.Token);
@@ -462,86 +394,6 @@ namespace GitHub.Runner.Common
            }
        }

-        private async Task ProcessResultsUploadQueueAsync(bool runOnce = false)
-        {
-            Trace.Info("Starting results-based upload queue...");
-
-            while (!_jobCompletionSource.Task.IsCompleted || runOnce)
-            {
-                List<ResultsUploadFileInfo> filesToUpload = new();
-                ResultsUploadFileInfo dequeueFile;
-                while (_resultsFileUploadQueue.TryDequeue(out dequeueFile))
-                {
-                    filesToUpload.Add(dequeueFile);
-                    // process at most 10 file uploads.
-                    if (!runOnce && filesToUpload.Count > 10)
-                    {
-                        break;
-                    }
-                }
-
-                if (filesToUpload.Count > 0)
-                {
-                    if (runOnce)
-                    {
-                        Trace.Info($"Uploading {filesToUpload.Count} file(s) in one shot through results service.");
-                    }
-
-                    int errorCount = 0;
-                    foreach (var file in filesToUpload)
-                    {
-                        try
-                        {
-                            if (String.Equals(file.Type, ChecksAttachmentType.StepSummary, StringComparison.OrdinalIgnoreCase))
-                            {
-                                await UploadSummaryFile(file);
-                            }
-                            else if (String.Equals(file.Type, CoreAttachmentType.ResultsLog, StringComparison.OrdinalIgnoreCase))
-                            {
-                                if (file.RecordId != _jobTimelineRecordId)
-                                {
-                                    Trace.Info($"Got a step log file to send to results service.");
-                                    await UploadResultsStepLogFile(file);
-                                }
-                                else if (file.RecordId == _jobTimelineRecordId)
-                                {
-                                    Trace.Info($"Got a job log file to send to results service.");
-                                    await UploadResultsJobLogFile(file);
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            var issue = new Issue() { Type = IssueType.Warning, Message = $"Caught exception during file upload to results. {ex.Message}" };
-                            issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.ResultsUploadFailure;
-
-                            var telemetryRecord = new TimelineRecord()
-                            {
-                                Id = Constants.Runner.TelemetryRecordId,
-                            };
-                            telemetryRecord.Issues.Add(issue);
-                            QueueTimelineRecordUpdate(_jobTimelineId, telemetryRecord);
-
-                            Trace.Info("Catch exception during file upload to results, keep going since the process is best effort.");
-                            Trace.Error(ex);
-                            errorCount++;
-                        }
-                    }
-
-                    Trace.Info("Tried to upload {0} file(s) to results, success rate: {1}/{0}.", filesToUpload.Count, filesToUpload.Count - errorCount);
-                }
-
-                if (runOnce)
-                {
-                    break;
-                }
-                else
-                {
-                    await Task.Delay(_delayForResultsUploadDequeue);
-                }
-            }
-        }
-
        private async Task ProcessTimelinesUpdateQueueAsync(bool runOnce = false)
        {
            while (!_jobCompletionSource.Task.IsCompleted || runOnce)
@@ -813,64 +665,6 @@ namespace GitHub.Runner.Common
                }
            }
        }
-
-        private async Task UploadSummaryFile(ResultsUploadFileInfo file)
-        {
-            Trace.Info($"Starting to upload summary file to results service {file.Name}, {file.Path}");
-            ResultsFileUploadHandler summaryHandler = async (file) =>
-            {
-                await _jobServer.CreateStepSummaryAsync(file.PlanId, file.JobId, file.RecordId, file.Path, CancellationToken.None);
-            };
-
-            await UploadResultsFile(file, summaryHandler);
-        }
-
-        private async Task UploadResultsStepLogFile(ResultsUploadFileInfo file)
-        {
-            Trace.Info($"Starting upload of step log file to results service {file.Name}, {file.Path}");
-            ResultsFileUploadHandler stepLogHandler = async (file) =>
-            {
-                await _jobServer.CreateResultsStepLogAsync(file.PlanId, file.JobId, file.RecordId, file.Path, file.Finalize, file.FirstBlock, file.TotalLines, CancellationToken.None);
-            };
-
-            await UploadResultsFile(file, stepLogHandler);
-        }
-
-        private async Task UploadResultsJobLogFile(ResultsUploadFileInfo file)
-        {
-            Trace.Info($"Starting upload of job log file to results service {file.Name}, {file.Path}");
-            ResultsFileUploadHandler jobLogHandler = async (file) =>
-            {
-                await _jobServer.CreateResultsJobLogAsync(file.PlanId, file.JobId, file.Path, file.Finalize, file.FirstBlock, file.TotalLines, CancellationToken.None);
-            };
-
-            await UploadResultsFile(file, jobLogHandler);
-        }
-
-        private async Task UploadResultsFile(ResultsUploadFileInfo file, ResultsFileUploadHandler uploadHandler)
-        {
-            bool uploadSucceed = false;
-            try
-            {
-                await uploadHandler(file);
-                uploadSucceed = true;
-            }
-            finally
-            {
-                if (uploadSucceed && file.DeleteSource)
-                {
-                    try
-                    {
-                        File.Delete(file.Path);
-                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Info("Exception encountered during deletion of a temporary file that was already successfully uploaded to results.");
-                        Trace.Error(ex);
-                    }
-                }
-            }
-        }
    }

    internal class PendingTimelineRecord
@@ -889,21 +683,6 @@ namespace GitHub.Runner.Common
        public bool DeleteSource { get; set; }
    }

-    internal class ResultsUploadFileInfo
-    {
-        public string Name { get; set; }
-        public string Type { get; set; }
-        public string Path { get; set; }
-        public string PlanId { get; set; }
-        public string JobId { get; set; }
-        public Guid RecordId { get; set; }
-        public bool DeleteSource { get; set; }
-        public bool Finalize { get; set; }
-        public bool FirstBlock { get; set; }
-        public long TotalLines { get; set; }
-    }
-
-

    internal class ConsoleLineInfo
    {
--- a/src/Runner.Common/Logging.cs
+++ b/src/Runner.Common/Logging.cs
@@ -21,12 +21,6 @@ namespace GitHub.Runner.Common
        // 8 MB
        public const int PageSize = 8 * 1024 * 1024;

-        // For Results
-        public static string BlocksFolder = "blocks";
-
-        // 2 MB
-        public const int BlockSize = 2 * 1024 * 1024;
-
        private Guid _timelineId;
        private Guid _timelineRecordId;
        private FileStream _pageData;
@@ -38,13 +32,6 @@ namespace GitHub.Runner.Common
        private string _pagesFolder;
        private IJobServerQueue _jobServerQueue;

-        private string _resultsDataFileName;
-        private FileStream _resultsBlockData;
-        private StreamWriter _resultsBlockWriter;
-        private string _resultsBlockFolder;
-        private int _blockByteCount;
-        private int _blockCount;
-
        public long TotalLines => _totalLines;

        public override void Initialize(IHostContext hostContext)
@@ -52,10 +39,8 @@ namespace GitHub.Runner.Common
            base.Initialize(hostContext);
            _totalLines = 0;
            _pagesFolder = Path.Combine(hostContext.GetDirectory(WellKnownDirectory.Diag), PagingFolder);
-            Directory.CreateDirectory(_pagesFolder);
-            _resultsBlockFolder = Path.Combine(hostContext.GetDirectory(WellKnownDirectory.Diag), BlocksFolder);
-            Directory.CreateDirectory(_resultsBlockFolder);
            _jobServerQueue = HostContext.GetService<IJobServerQueue>();
+            Directory.CreateDirectory(_pagesFolder);
        }

        public void Setup(Guid timelineId, Guid timelineRecordId)
@@ -75,17 +60,11 @@ namespace GitHub.Runner.Common
            // lazy creation on write
            if (_pageWriter == null)
            {
-                NewPage();
-            }
-
-            if (_resultsBlockWriter == null)
-            {
-                NewBlock();
+                Create();
            }

            string line = $"{DateTime.UtcNow.ToString("O")} {message}";
            _pageWriter.WriteLine(line);
-            _resultsBlockWriter.WriteLine(line);

            _totalLines++;
            if (line.IndexOf('\n') != -1)
@@ -99,25 +78,21 @@ namespace GitHub.Runner.Common
                }
            }

-            var bytes = System.Text.Encoding.UTF8.GetByteCount(line);
-            _byteCount += bytes;
-            _blockByteCount += bytes;
+            _byteCount += System.Text.Encoding.UTF8.GetByteCount(line);
            if (_byteCount >= PageSize)
            {
                NewPage();
            }
-
-            if (_blockByteCount >= BlockSize)
-            {
-                NewBlock();
-            }
-
        }

        public void End()
        {
            EndPage();
-            EndBlock(true);
+        }
+
+        private void Create()
+        {
+            NewPage();
        }

        private void NewPage()
@@ -142,27 +117,5 @@ namespace GitHub.Runner.Common
                _jobServerQueue.QueueFileUpload(_timelineId, _timelineRecordId, "DistributedTask.Core.Log", "CustomToolLog", _dataFileName, true);
            }
        }
-
-        private void NewBlock()
-        {
-            EndBlock(false);
-            _blockByteCount = 0;
-            _resultsDataFileName = Path.Combine(_resultsBlockFolder, $"{_timelineId}_{_timelineRecordId}.{++_blockCount}");
-            _resultsBlockData = new FileStream(_resultsDataFileName, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
-            _resultsBlockWriter = new StreamWriter(_resultsBlockData, System.Text.Encoding.UTF8);
-        }
-
-        private void EndBlock(bool finalize)
-        {
-            if (_resultsBlockWriter != null)
-            {
-                _resultsBlockWriter.Flush();
-                _resultsBlockData.Flush();
-                _resultsBlockWriter.Dispose();
-                _resultsBlockWriter = null;
-                _resultsBlockData = null;
-                _jobServerQueue.QueueResultsUpload(_timelineRecordId, "ResultsLog", _resultsDataFileName, "Results.Core.Log", deleteSource: true, finalize, firstBlock: _resultsDataFileName.EndsWith(".1"), totalLines: _totalLines);
-            }
-        }
    }
 }
--- a/src/Runner.Common/RunServer.cs
+++ b/src/Runner.Common/RunServer.cs
@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
-using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
-using Sdk.RSWebApi.Contracts;
+using GitHub.Services.WebApi;
 using Sdk.WebApi.WebApi.RawClient;

 namespace GitHub.Runner.Common
@@ -18,10 +16,6 @@ namespace GitHub.Runner.Common
        Task ConnectAsync(Uri serverUrl, VssCredentials credentials);

        Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken token);
-
-        Task CompleteJobAsync(Guid planId, Guid jobId, TaskResult result, Dictionary<String, VariableValue> outputs, IList<StepResult> stepResults, CancellationToken token);
-
-        Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken token);
    }

    public sealed class RunServer : RunnerService, IRunServer
@@ -35,7 +29,7 @@ namespace GitHub.Runner.Common
        {
            requestUri = serverUri;

-            _connection = VssUtil.CreateRawConnection(serverUri, credentials);
+            _connection = VssUtil.CreateRawConnection(new Uri(serverUri.Authority), credentials);
            _runServiceHttpClient = await _connection.GetClientAsync<RunServiceHttpClient>();
            _hasConnection = true;
        }
@@ -61,24 +55,5 @@ namespace GitHub.Runner.Common
            return jobMessage;
        }

-        public Task CompleteJobAsync(Guid planId, Guid jobId, TaskResult result, Dictionary<String, VariableValue> outputs, IList<StepResult> stepResults, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-            return RetryRequest(
-                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, cancellationToken), cancellationToken);
-        }
-
-        public Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-            var renewJobResponse = RetryRequest<RenewJobResponse>(
-                async () => await _runServiceHttpClient.RenewJobAsync(requestUri, planId, jobId, cancellationToken), cancellationToken);
-            if (renewJobResponse == null)
-            {
-                throw new TaskOrchestrationJobNotFoundException(jobId.ToString());
-            }
-
-            return renewJobResponse;
-        }
    }
 }
--- a/src/Runner.Common/RunnerServer.cs
+++ b/src/Runner.Common/RunnerServer.cs
@@ -38,7 +38,7 @@ namespace GitHub.Runner.Common
        Task<TaskAgentSession> CreateAgentSessionAsync(Int32 poolId, TaskAgentSession session, CancellationToken cancellationToken);
        Task DeleteAgentMessageAsync(Int32 poolId, Int64 messageId, Guid sessionId, CancellationToken cancellationToken);
        Task DeleteAgentSessionAsync(Int32 poolId, Guid sessionId, CancellationToken cancellationToken);
-        Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, CancellationToken cancellationToken);
+        Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, CancellationToken cancellationToken);

        // job request
        Task<TaskAgentJobRequest> GetAgentRequestAsync(int poolId, long requestId, CancellationToken cancellationToken);
@@ -272,10 +272,10 @@ namespace GitHub.Runner.Common
            return _messageTaskAgentClient.DeleteAgentSessionAsync(poolId, sessionId, cancellationToken: cancellationToken);
        }

-        public Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, CancellationToken cancellationToken)
+        public Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, CancellationToken cancellationToken)
        {
            CheckConnection(RunnerConnectionType.MessageQueue);
-            return _messageTaskAgentClient.GetMessageAsync(poolId, sessionId, lastMessageId, status, runnerVersion, cancellationToken: cancellationToken);
+            return _messageTaskAgentClient.GetMessageAsync(poolId, sessionId, lastMessageId, status, cancellationToken: cancellationToken);
        }

        //-----------------------------------------------------------------
--- a/src/Runner.Common/RunnerService.cs
+++ b/src/Runner.Common/RunnerService.cs
@@ -68,19 +68,6 @@ namespace GitHub.Runner.Common
            throw new InvalidOperationException(nameof(EstablishVssConnection));
        }

-        protected async Task RetryRequest(Func<Task> func,
-            CancellationToken cancellationToken,
-            int maxRetryAttemptsCount = 5
-        )
-        {
-            async Task<Unit> wrappedFunc()
-            {
-                await func();
-                return Unit.Value;
-            }
-            await RetryRequest<Unit>(wrappedFunc, cancellationToken, maxRetryAttemptsCount);
-        }
-        
        protected async Task<T> RetryRequest<T>(Func<Task<T>> func,
            CancellationToken cancellationToken,
            int maxRetryAttemptsCount = 5
@@ -98,7 +85,7 @@ namespace GitHub.Runner.Common
                // TODO: Add handling of non-retriable exceptions: https://github.com/github/actions-broker/issues/122
                catch (Exception ex) when (retryCount < maxRetryAttemptsCount)
                {
-                    Trace.Error("Catch exception during request");
+                    Trace.Error("Catch exception during get full job message");
                    Trace.Error(ex);
                    var backOff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(15));
                    Trace.Warning($"Back off {backOff.TotalSeconds} seconds before next retry. {maxRetryAttemptsCount - retryCount} attempt left.");
--- a/src/Runner.Common/StdoutTraceListener.cs
+++ b/src/Runner.Common/StdoutTraceListener.cs
@@ -1,96 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using GitHub.Runner.Sdk;
-
-namespace GitHub.Runner.Common
-{
-    public sealed class StdoutTraceListener : ConsoleTraceListener
-    {
-        private readonly string _hostType;
-
-        public StdoutTraceListener(string hostType)
-        {
-            this._hostType = hostType;
-        }
-
-        // Copied and modified slightly from .Net Core source code. Modification was required to make it compile.
-        // There must be some TraceFilter extension class that is missing in this source code.
-        public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id, string message)
-        {
-            if (Filter != null && !Filter.ShouldTrace(eventCache, source, eventType, id, message, null, null, null))
-            {
-                return;
-            }
-
-            if (!string.IsNullOrEmpty(message))
-            {
-                var messageLines = message.Split(Environment.NewLine);
-                foreach (var messageLine in messageLines)
-                {
-                    WriteHeader(source, eventType, id);
-                    WriteLine(messageLine);
-                    WriteFooter(eventCache);
-                }
-            }
-        }
-
-        internal bool IsEnabled(TraceOptions opts)
-        {
-            return (opts & TraceOutputOptions) != 0;
-        }
-
-        // Altered from the original .Net Core implementation.
-        private void WriteHeader(string source, TraceEventType eventType, int id)
-        {
-            string type = null;
-            switch (eventType)
-            {
-                case TraceEventType.Critical:
-                    type = "CRIT";
-                    break;
-                case TraceEventType.Error:
-                    type = "ERR ";
-                    break;
-                case TraceEventType.Warning:
-                    type = "WARN";
-                    break;
-                case TraceEventType.Information:
-                    type = "INFO";
-                    break;
-                case TraceEventType.Verbose:
-                    type = "VERB";
-                    break;
-                default:
-                    type = eventType.ToString();
-                    break;
-            }
-
-            Write(StringUtil.Format("[{0} {1:u} {2} {3}] ", _hostType.ToUpperInvariant(), DateTime.UtcNow, type, source));
-        }
-
-        // Copied and modified slightly from .Net Core source code to make it compile. The original code
-        // accesses a private indentLevel field. In this code it has been modified to use the getter/setter.
-        private void WriteFooter(TraceEventCache eventCache)
-        {
-            if (eventCache == null)
-                return;
-
-            IndentLevel++;
-            if (IsEnabled(TraceOptions.ProcessId))
-                WriteLine("ProcessId=" + eventCache.ProcessId);
-
-            if (IsEnabled(TraceOptions.ThreadId))
-                WriteLine("ThreadId=" + eventCache.ThreadId);
-
-            if (IsEnabled(TraceOptions.DateTime))
-                WriteLine("DateTime=" + eventCache.DateTime.ToString("o", CultureInfo.InvariantCulture));
-
-            if (IsEnabled(TraceOptions.Timestamp))
-                WriteLine("Timestamp=" + eventCache.Timestamp);
-
-            IndentLevel--;
-        }
-    }
-}
--- a/src/Runner.Common/Terminal.cs
+++ b/src/Runner.Common/Terminal.cs
@@ -18,7 +18,7 @@ namespace GitHub.Runner.Common
        string ReadSecret();
        void Write(string message, ConsoleColor? colorCode = null);
        void WriteLine();
-        void WriteLine(string line, ConsoleColor? colorCode = null, bool skipTracing = false);
+        void WriteLine(string line, ConsoleColor? colorCode = null);
        void WriteError(Exception ex);
        void WriteError(string line);
        void WriteSection(string message);
@@ -116,12 +116,9 @@ namespace GitHub.Runner.Common

        // Do not add a format string overload. Terminal messages are user facing and therefore
        // should be localized. Use the Loc method in the StringUtil class.
-        public void WriteLine(string line, ConsoleColor? colorCode = null, bool skipTracing = false)
+        public void WriteLine(string line, ConsoleColor? colorCode = null)
        {
-            if (!skipTracing)
-            {
-                Trace.Info($"WRITE LINE: {line}");
-            }
+            Trace.Info($"WRITE LINE: {line}");
            if (!Silent)
            {
                if (colorCode != null)
--- a/src/Runner.Common/TraceManager.cs
+++ b/src/Runner.Common/TraceManager.cs
@@ -16,23 +16,21 @@ namespace GitHub.Runner.Common
    {
        private readonly ConcurrentDictionary<string, Tracing> _sources = new(StringComparer.OrdinalIgnoreCase);
        private readonly HostTraceListener _hostTraceListener;
-        private readonly StdoutTraceListener _stdoutTraceListener;
        private TraceSetting _traceSetting;
        private ISecretMasker _secretMasker;

-        public TraceManager(HostTraceListener traceListener, StdoutTraceListener stdoutTraceListener, ISecretMasker secretMasker)
-            : this(traceListener, stdoutTraceListener, new TraceSetting(), secretMasker)
+        public TraceManager(HostTraceListener traceListener, ISecretMasker secretMasker)
+            : this(traceListener, new TraceSetting(), secretMasker)
        {
        }

-        public TraceManager(HostTraceListener traceListener, StdoutTraceListener stdoutTraceListener, TraceSetting traceSetting, ISecretMasker secretMasker)
+        public TraceManager(HostTraceListener traceListener, TraceSetting traceSetting, ISecretMasker secretMasker)
        {
            // Validate and store params.
            ArgUtil.NotNull(traceListener, nameof(traceListener));
            ArgUtil.NotNull(traceSetting, nameof(traceSetting));
            ArgUtil.NotNull(secretMasker, nameof(secretMasker));
            _hostTraceListener = traceListener;
-            _stdoutTraceListener = stdoutTraceListener;
            _traceSetting = traceSetting;
            _secretMasker = secretMasker;

@@ -83,7 +81,7 @@ namespace GitHub.Runner.Common
                    Level = sourceTraceLevel.ToSourceLevels()
                };
            }
-            return new Tracing(name, _secretMasker, sourceSwitch, _hostTraceListener, _stdoutTraceListener);
+            return new Tracing(name, _secretMasker, sourceSwitch, _hostTraceListener);
        }
    }
 }
--- a/src/Runner.Common/Tracing.cs
+++ b/src/Runner.Common/Tracing.cs
@@ -12,7 +12,7 @@ namespace GitHub.Runner.Common
        private ISecretMasker _secretMasker;
        private TraceSource _traceSource;

-        public Tracing(string name, ISecretMasker secretMasker, SourceSwitch sourceSwitch, HostTraceListener traceListener, StdoutTraceListener stdoutTraceListener = null)
+        public Tracing(string name, ISecretMasker secretMasker, SourceSwitch sourceSwitch, HostTraceListener traceListener)
        {
            ArgUtil.NotNull(secretMasker, nameof(secretMasker));
            _secretMasker = secretMasker;
@@ -27,10 +27,6 @@ namespace GitHub.Runner.Common
            }

            _traceSource.Listeners.Add(traceListener);
-            if (stdoutTraceListener != null)
-            {
-                _traceSource.Listeners.Add(stdoutTraceListener);
-            }
        }

        public void Info(string message)
--- a/src/Runner.Common/Unit.cs
+++ b/src/Runner.Common/Unit.cs
@@ -1,8 +0,0 @@
-// Represents absence of value.
-namespace GitHub.Runner.Common
-{
-    public readonly struct Unit
-    {
-        public static readonly Unit Value = default;
-    }
-}
--- a/src/Runner.Common/Util/MessageUtil.cs
+++ b/src/Runner.Common/Util/MessageUtil.cs
@@ -1,14 +0,0 @@
-namespace GitHub.Runner.Common.Util
-{
-    using System;
-    using GitHub.DistributedTask.WebApi;
-
-    public static class MessageUtil
-    {
-        public static bool IsRunServiceJob(string messageType)
-        {
-            return string.Equals(messageType, JobRequestMessageTypes.RunnerJobRequest, StringComparison.OrdinalIgnoreCase);
-        }
-    }
-}
-
--- a/src/Runner.Listener/CommandSettings.cs
+++ b/src/Runner.Listener/CommandSettings.cs
@@ -56,8 +56,7 @@ namespace GitHub.Runner.Listener
                new string[]
                {
                    Constants.Runner.CommandLine.Args.Token,
-                    Constants.Runner.CommandLine.Args.PAT,
-                    Constants.Runner.CommandLine.Flags.Local
+                    Constants.Runner.CommandLine.Args.PAT
                },
            // Valid run flags and args
            [Constants.Runner.CommandLine.Commands.Run] =
@@ -87,7 +86,6 @@ namespace GitHub.Runner.Listener
        public bool Help => TestFlag(Constants.Runner.CommandLine.Flags.Help);
        public bool Unattended => TestFlag(Constants.Runner.CommandLine.Flags.Unattended);
        public bool Version => TestFlag(Constants.Runner.CommandLine.Flags.Version);
-        public bool RemoveLocalConfig => TestFlag(Constants.Runner.CommandLine.Flags.Local);

        // Keep this around since customers still relies on it
        public bool RunOnce => TestFlag(Constants.Runner.CommandLine.Flags.Once);
--- a/src/Runner.Listener/Configuration/ConfigurationManager.cs
+++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs
@@ -1,3 +1,10 @@
+using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Common;
+using GitHub.Runner.Common.Util;
+using GitHub.Runner.Sdk;
+using GitHub.Services.Common;
+using GitHub.Services.Common.Internal;
+using GitHub.Services.OAuth;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,13 +14,6 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-using GitHub.Services.Common.Internal;
-using GitHub.Services.OAuth;

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

            int retryCount = 0;
-            while (retryCount < 3)
+            while(retryCount < 3)
            {
                using (var httpClientHandler = HostContext.CreateHttpClientHandler())
                using (var httpClient = new HttpClient(httpClientHandler))
@@ -646,29 +646,28 @@ namespace GitHub.Runner.Listener.Configuration
                    httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("basic", base64EncodingToken);
                    httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
                    httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/vnd.github.v3+json");
-
+                    
                    var responseStatus = System.Net.HttpStatusCode.OK;
                    try
                    {
                        var response = await httpClient.PostAsync(githubApiUrl, new StringContent(string.Empty));
                        responseStatus = response.StatusCode;
-                        var githubRequestId = GetGitHubRequestId(response.Headers);

                        if (response.IsSuccessStatusCode)
                        {
-                            Trace.Info($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}' ({githubRequestId})");
+                            Trace.Info($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}'");
                            var jsonResponse = await response.Content.ReadAsStringAsync();
                            return StringUtil.ConvertFromJson<GitHubRunnerRegisterToken>(jsonResponse);
                        }
                        else
                        {
-                            _term.WriteError($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}' (Request Id: {githubRequestId})");
+                            _term.WriteError($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}'");
                            var errorResponse = await response.Content.ReadAsStringAsync();
                            _term.WriteError(errorResponse);
                            response.EnsureSuccessStatusCode();
                        }
                    }
-                    catch (Exception ex) when (retryCount < 2 && responseStatus != System.Net.HttpStatusCode.NotFound)
+                    catch(Exception ex) when (retryCount < 2 && responseStatus != System.Net.HttpStatusCode.NotFound)
                    {
                        retryCount++;
                        Trace.Error($"Failed to get JIT runner token -- Atempt: {retryCount}");
@@ -715,23 +714,22 @@ namespace GitHub.Runner.Listener.Configuration
                    {
                        var response = await httpClient.PostAsync(githubApiUrl, new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json"));
                        responseStatus = response.StatusCode;
-                        var githubRequestId = GetGitHubRequestId(response.Headers);

-                        if (response.IsSuccessStatusCode)
+                        if(response.IsSuccessStatusCode)
                        {
-                            Trace.Info($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}' ({githubRequestId})");
+                            Trace.Info($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}'");
                            var jsonResponse = await response.Content.ReadAsStringAsync();
                            return StringUtil.ConvertFromJson<GitHubAuthResult>(jsonResponse);
                        }
                        else
                        {
-                            _term.WriteError($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}' (Request Id: {githubRequestId})");
+                            _term.WriteError($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}'");
                            var errorResponse = await response.Content.ReadAsStringAsync();
                            _term.WriteError(errorResponse);
                            response.EnsureSuccessStatusCode();
                        }
                    }
-                    catch (Exception ex) when (retryCount < 2 && responseStatus != System.Net.HttpStatusCode.NotFound)
+                    catch(Exception ex) when (retryCount < 2 && responseStatus != System.Net.HttpStatusCode.NotFound)
                    {
                        retryCount++;
                        Trace.Error($"Failed to get tenant credentials -- Atempt: {retryCount}");
@@ -744,14 +742,5 @@ namespace GitHub.Runner.Listener.Configuration
            }
            return null;
        }
-
-        private string GetGitHubRequestId(HttpResponseHeaders headers)
-        {
-            if (headers.TryGetValues("x-github-request-id", out var headerValues))
-            {
-                return headerValues.FirstOrDefault();
-            }
-            return string.Empty;
-        }
    }
 }
--- a/src/Runner.Listener/InternalsVisibleTo.cs
+++ b/src/Runner.Listener/InternalsVisibleTo.cs
@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Test")]
--- a/src/Runner.Listener/JobDispatcher.cs
+++ b/src/Runner.Listener/JobDispatcher.cs
@@ -7,7 +7,6 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
@@ -59,8 +58,6 @@ namespace GitHub.Runner.Listener

        public event EventHandler<JobStatusEventArgs> JobStatus;

-        private bool _isRunServiceJob;
-
        public override void Initialize(IHostContext hostContext)
        {
            base.Initialize(hostContext);
@@ -89,8 +86,6 @@ namespace GitHub.Runner.Listener
        {
            Trace.Info($"Job request {jobRequestMessage.RequestId} for plan {jobRequestMessage.Plan.PlanId} job {jobRequestMessage.JobId} received.");

-            _isRunServiceJob = MessageUtil.IsRunServiceJob(jobRequestMessage.MessageType);
-
            WorkerDispatcher currentDispatch = null;
            if (_jobDispatchedQueue.Count > 0)
            {
@@ -244,13 +239,6 @@ namespace GitHub.Runner.Listener
                    return;
                }

-                if (this._isRunServiceJob)
-                {
-                    Trace.Error($"We are not yet checking the state of jobrequest {jobDispatch.JobId} status. Cancel running worker right away.");
-                    jobDispatch.WorkerCancellationTokenSource.Cancel();
-                    return;
-                }
-
                // based on the current design, server will only send one job for a given runner at a time.
                // if the runner received a new job request while a previous job request is still running, this typically indicates two situations
                // 1. a runner bug caused a server and runner mismatch on the state of the job request, e.g. the runner didn't renew the jobrequest
@@ -379,11 +367,9 @@ namespace GitHub.Runner.Listener
                    long requestId = message.RequestId;
                    Guid lockToken = Guid.Empty; // lockToken has never been used, keep this here of compat

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

                    // wait till first renew succeed or job request is cancelled
                    // not even start worker if the first renew fail
@@ -414,7 +400,6 @@ namespace GitHub.Runner.Listener
                    Task<int> workerProcessTask = null;
                    object _outputLock = new();
                    List<string> workerOutput = new();
-                    bool printToStdout = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Agent.PrintLogToStdout));
                    using (var processChannel = HostContext.CreateService<IProcessChannel>())
                    using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
                    {
@@ -436,15 +421,7 @@ namespace GitHub.Runner.Listener
                                        {
                                            lock (_outputLock)
                                            {
-                                                if (!stdout.Data.StartsWith("[WORKER"))
-                                                {
-                                                    workerOutput.Add(stdout.Data);
-                                                }
-
-                                                if (printToStdout)
-                                                {
-                                                    term.WriteLine(stdout.Data, skipTracing: true);
-                                                }
+                                                workerOutput.Add(stdout.Data);
                                            }
                                        }
                                    };
@@ -522,6 +499,7 @@ namespace GitHub.Runner.Listener

                        // we get first jobrequest renew succeed and start the worker process with the job message.
                        // send notification to machine provisioner.
+                        var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
                        var accessToken = systemConnection?.Authorization?.Parameters["AccessToken"];
                        notification.JobStarted(message.JobId, accessToken, systemConnection.Url);

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

+                                    var jobServer = HostContext.GetService<IJobServer>();
+                                    VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
+                                    VssConnection jobConnection = VssUtil.CreateConnection(systemConnection.Url, jobServerCredential);
+                                    await jobServer.ConnectAsync(jobConnection);

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

                                    // 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.
@@ -677,7 +658,7 @@ namespace GitHub.Runner.Listener
            finally
            {
                Busy = false;
-
+                
                if (JobStatus != null)
                {
                    JobStatus(this, new JobStatusEventArgs(TaskAgentStatus.Online));
@@ -685,128 +666,9 @@ namespace GitHub.Runner.Listener
            }
        }

-        internal async Task RenewJobRequestAsync(Pipelines.AgentJobRequestMessage message, ServiceEndpoint systemConnection, int poolId, long requestId, Guid lockToken, string orchestrationId, TaskCompletionSource<int> firstJobRequestRenewed, CancellationToken token)
-        {
-            if (this._isRunServiceJob)
-            {
-                var runServer = await GetRunServerAsync(systemConnection);
-                await RenewJobRequestAsync(runServer, message.Plan.PlanId, message.JobId, firstJobRequestRenewed, token);
-            }
-            else
-            {
-                var runnerServer = HostContext.GetService<IRunnerServer>();
-                await RenewJobRequestAsync(runnerServer, poolId, requestId, lockToken, orchestrationId, firstJobRequestRenewed, token);
-            }
-        }
-
-        private async Task RenewJobRequestAsync(IRunServer runServer, Guid planId, Guid jobId, TaskCompletionSource<int> firstJobRequestRenewed, CancellationToken token)
-        {
-            TaskAgentJobRequest request = null;
-            int firstRenewRetryLimit = 5;
-            int encounteringError = 0;
-
-            // renew lock during job running.
-            // stop renew only if cancellation token for lock renew task been signal or exception still happen after retry.
-            while (!token.IsCancellationRequested)
-            {
-                try
-                {
-                    var renewResponse = await runServer.RenewJobAsync(planId, jobId, token);
-                    Trace.Info($"Successfully renew job {jobId}, job is valid till {renewResponse.LockedUntil}");
-
-                    if (!firstJobRequestRenewed.Task.IsCompleted)
-                    {
-                        // fire first renew succeed event.
-                        firstJobRequestRenewed.TrySetResult(0);
-                    }
-
-                    if (encounteringError > 0)
-                    {
-                        encounteringError = 0;
-                        HostContext.WritePerfCounter("JobRenewRecovered");
-                    }
-
-                    // renew again after 60 sec delay
-                    await HostContext.Delay(TimeSpan.FromSeconds(60), token);
-                }
-                catch (TaskOrchestrationJobNotFoundException)
-                {
-                    // no need for retry. the job is not valid anymore.
-                    Trace.Info($"TaskAgentJobNotFoundException received when renew job {jobId}, job is no longer valid, stop renew job request.");
-                    return;
-                }
-                catch (OperationCanceledException) when (token.IsCancellationRequested)
-                {
-                    // OperationCanceledException may caused by http timeout or _lockRenewalTokenSource.Cance();
-                    // Stop renew only on cancellation token fired.
-                    Trace.Info($"job renew has been cancelled, stop renew job {jobId}.");
-                    return;
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error($"Catch exception during renew runner job {jobId}.");
-                    Trace.Error(ex);
-                    encounteringError++;
-
-                    // retry
-                    TimeSpan remainingTime = TimeSpan.Zero;
-                    if (!firstJobRequestRenewed.Task.IsCompleted)
-                    {
-                        // retry 5 times every 10 sec for the first renew
-                        if (firstRenewRetryLimit-- > 0)
-                        {
-                            remainingTime = TimeSpan.FromSeconds(10);
-                        }
-                    }
-                    else
-                    {
-                        // retry till reach lockeduntil + 5 mins extra buffer.
-                        remainingTime = request.LockedUntil.Value + TimeSpan.FromMinutes(5) - DateTime.UtcNow;
-                    }
-
-                    if (remainingTime > TimeSpan.Zero)
-                    {
-                        TimeSpan delayTime;
-                        if (!firstJobRequestRenewed.Task.IsCompleted)
-                        {
-                            Trace.Info($"Retrying lock renewal for job {jobId}. The first job renew request has failed.");
-                            delayTime = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(10));
-                        }
-                        else
-                        {
-                            Trace.Info($"Retrying lock renewal for job {jobId}. Job is valid until {request.LockedUntil.Value}.");
-                            if (encounteringError > 5)
-                            {
-                                delayTime = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30));
-                            }
-                            else
-                            {
-                                delayTime = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(15));
-                            }
-                        }
-
-                        try
-                        {
-                            // back-off before next retry.
-                            await HostContext.Delay(delayTime, token);
-                        }
-                        catch (OperationCanceledException) when (token.IsCancellationRequested)
-                        {
-                            Trace.Info($"job renew has been cancelled, stop renew job {jobId}.");
-                        }
-                    }
-                    else
-                    {
-                        Trace.Info($"Lock renewal has run out of retry, stop renew lock for job {jobId}.");
-                        HostContext.WritePerfCounter("JobRenewReachLimit");
-                        return;
-                    }
-                }
-            }
-        }
-
-        private async Task RenewJobRequestAsync(IRunnerServer runnerServer, int poolId, long requestId, Guid lockToken, string orchestrationId, TaskCompletionSource<int> firstJobRequestRenewed, CancellationToken token)
+        public async Task RenewJobRequestAsync(int poolId, long requestId, Guid lockToken, string orchestrationId, TaskCompletionSource<int> firstJobRequestRenewed, CancellationToken token)
        {
+            var runnerServer = HostContext.GetService<IRunnerServer>();
            TaskAgentJobRequest request = null;
            int firstRenewRetryLimit = 5;
            int encounteringError = 0;
@@ -969,93 +831,90 @@ namespace GitHub.Runner.Listener
                var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection));
                ArgUtil.NotNull(systemConnection, nameof(systemConnection));

-                var server = await InitializeJobServerAsync(systemConnection);
+                var jobServer = HostContext.GetService<IJobServer>();
+                VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
+                VssConnection jobConnection = VssUtil.CreateConnection(systemConnection.Url, jobServerCredential);

-                if (server is IJobServer jobServer)
+                await jobServer.ConnectAsync(jobConnection);
+
+                var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
+
+                var updatedRecords = new List<TimelineRecord>();
+                var logPages = new Dictionary<Guid, Dictionary<int, string>>();
+                var logRecords = new Dictionary<Guid, TimelineRecord>();
+                foreach (var log in logs)
                {
-                    var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
-
-                    var updatedRecords = new List<TimelineRecord>();
-                    var logPages = new Dictionary<Guid, Dictionary<int, string>>();
-                    var logRecords = new Dictionary<Guid, TimelineRecord>();
-                    foreach (var log in logs)
+                    var logName = Path.GetFileNameWithoutExtension(log);
+                    var logNameParts = logName.Split('_', StringSplitOptions.RemoveEmptyEntries);
+                    if (logNameParts.Length != 3)
                    {
-                        var logName = Path.GetFileNameWithoutExtension(log);
-                        var logNameParts = logName.Split('_', StringSplitOptions.RemoveEmptyEntries);
-                        if (logNameParts.Length != 3)
-                        {
-                            Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
-                            continue;
-                        }
-                        var logPageSeperator = logName.IndexOf('_');
-                        var logRecordId = Guid.Empty;
-                        var pageNumber = 0;
+                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
+                        continue;
+                    }
+                    var logPageSeperator = logName.IndexOf('_');
+                    var logRecordId = Guid.Empty;
+                    var pageNumber = 0;

-                        if (!Guid.TryParse(logNameParts[0], out Guid timelineId) || timelineId != timeline.Id)
-                        {
-                            Trace.Warning($"log file '{log}' is not belongs to current job");
-                            continue;
-                        }
-
-                        if (!Guid.TryParse(logNameParts[1], out logRecordId))
-                        {
-                            Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
-                            continue;
-                        }
-
-                        if (!int.TryParse(logNameParts[2], out pageNumber))
-                        {
-                            Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
-                            continue;
-                        }
-
-                        var record = timeline.Records.FirstOrDefault(x => x.Id == logRecordId);
-                        if (record != null)
-                        {
-                            if (!logPages.ContainsKey(record.Id))
-                            {
-                                logPages[record.Id] = new Dictionary<int, string>();
-                                logRecords[record.Id] = record;
-                            }
-
-                            logPages[record.Id][pageNumber] = log;
-                        }
+                    if (!Guid.TryParse(logNameParts[0], out Guid timelineId) || timelineId != timeline.Id)
+                    {
+                        Trace.Warning($"log file '{log}' is not belongs to current job");
+                        continue;
                    }

-                    foreach (var pages in logPages)
+                    if (!Guid.TryParse(logNameParts[1], out logRecordId))
                    {
-                        var record = logRecords[pages.Key];
-                        if (record.Log == null)
-                        {
-                            // Create the log
-                            record.Log = await jobServer.CreateLogAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, new TaskLog(String.Format(@"logs\{0:D}", record.Id)), default(CancellationToken));
-
-                            // Need to post timeline record updates to reflect the log creation
-                            updatedRecords.Add(record.Clone());
-                        }
-
-                        for (var i = 1; i <= pages.Value.Count; i++)
-                        {
-                            var logFile = pages.Value[i];
-                            // Upload the contents
-                            using (FileStream fs = File.Open(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                            {
-                                var logUploaded = await jobServer.AppendLogContentAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, record.Log.Id, fs, default(CancellationToken));
-                            }
-
-                            Trace.Info($"Uploaded unfinished log '{logFile}' for current job.");
-                            IOUtil.DeleteFile(logFile);
-                        }
+                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
+                        continue;
                    }

-                    if (updatedRecords.Count > 0)
+                    if (!int.TryParse(logNameParts[2], out pageNumber))
                    {
-                        await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, updatedRecords, CancellationToken.None);
+                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
+                        continue;
+                    }
+
+                    var record = timeline.Records.FirstOrDefault(x => x.Id == logRecordId);
+                    if (record != null)
+                    {
+                        if (!logPages.ContainsKey(record.Id))
+                        {
+                            logPages[record.Id] = new Dictionary<int, string>();
+                            logRecords[record.Id] = record;
+                        }
+
+                        logPages[record.Id][pageNumber] = log;
                    }
                }
-                else
+
+                foreach (var pages in logPages)
                {
-                    Trace.Info("Job server does not support log upload yet.");
+                    var record = logRecords[pages.Key];
+                    if (record.Log == null)
+                    {
+                        // Create the log
+                        record.Log = await jobServer.CreateLogAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, new TaskLog(String.Format(@"logs\{0:D}", record.Id)), default(CancellationToken));
+
+                        // Need to post timeline record updates to reflect the log creation
+                        updatedRecords.Add(record.Clone());
+                    }
+
+                    for (var i = 1; i <= pages.Value.Count; i++)
+                    {
+                        var logFile = pages.Value[i];
+                        // Upload the contents
+                        using (FileStream fs = File.Open(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                        {
+                            var logUploaded = await jobServer.AppendLogContentAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, record.Log.Id, fs, default(CancellationToken));
+                        }
+
+                        Trace.Info($"Uploaded unfinished log '{logFile}' for current job.");
+                        IOUtil.DeleteFile(logFile);
+                    }
+                }
+
+                if (updatedRecords.Count > 0)
+                {
+                    await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, updatedRecords, CancellationToken.None);
                }
            }
            catch (Exception ex)
@@ -1075,12 +934,6 @@ namespace GitHub.Runner.Listener
                return;
            }

-            if (this._isRunServiceJob)
-            {
-                Trace.Verbose($"Skip FinishAgentRequest call from Listener because MessageType is {message.MessageType}");
-                return;
-            }
-
            var runnerServer = HostContext.GetService<IRunnerServer>();
            int completeJobRequestRetryLimit = 5;
            List<Exception> exceptions = new();
@@ -1117,117 +970,66 @@ namespace GitHub.Runner.Listener
        }

        // log an error issue to job level timeline record
-        private async Task LogWorkerProcessUnhandledException(IRunnerService server, Pipelines.AgentJobRequestMessage message, string errorMessage)
+        private async Task LogWorkerProcessUnhandledException(IJobServer jobServer, Pipelines.AgentJobRequestMessage message, string errorMessage)
        {
-            if (server is IJobServer jobServer)
+            try
            {
+                var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
+                ArgUtil.NotNull(timeline, nameof(timeline));
+
+                TimelineRecord jobRecord = timeline.Records.FirstOrDefault(x => x.Id == message.JobId && x.RecordType == "Job");
+                ArgUtil.NotNull(jobRecord, nameof(jobRecord));
+
                try
                {
-                    var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
-                    ArgUtil.NotNull(timeline, nameof(timeline));
-
-                    TimelineRecord jobRecord = timeline.Records.FirstOrDefault(x => x.Id == message.JobId && x.RecordType == "Job");
-                    ArgUtil.NotNull(jobRecord, nameof(jobRecord));
-
-                    try
+                    if (!string.IsNullOrEmpty(errorMessage) &&
+                        message.Variables.TryGetValue("DistributedTask.EnableRunnerIPCDebug", out var enableRunnerIPCDebug) &&
+                        StringUtil.ConvertToBoolean(enableRunnerIPCDebug.Value))
                    {
-                        if (!string.IsNullOrEmpty(errorMessage) &&
-                            message.Variables.TryGetValue("DistributedTask.EnableRunnerIPCDebug", out var enableRunnerIPCDebug) &&
-                            StringUtil.ConvertToBoolean(enableRunnerIPCDebug.Value))
+                        // the trace should be best effort and not affect any job result
+                        var match = _invalidJsonRegex.Match(errorMessage);
+                        if (match.Success &&
+                            match.Groups.Count == 2)
                        {
-                            // the trace should be best effort and not affect any job result
-                            var match = _invalidJsonRegex.Match(errorMessage);
-                            if (match.Success &&
-                                match.Groups.Count == 2)
-                            {
-                                var jsonPosition = int.Parse(match.Groups[1].Value);
-                                var serializedJobMessage = JsonUtility.ToString(message);
-                                var originalJson = serializedJobMessage.Substring(jsonPosition - 10, 20);
-                                errorMessage = $"Runner sent Json at position '{jsonPosition}': {originalJson} ({Convert.ToBase64String(Encoding.UTF8.GetBytes(originalJson))})\n{errorMessage}";
-                            }
+                            var jsonPosition = int.Parse(match.Groups[1].Value);
+                            var serializedJobMessage = JsonUtility.ToString(message);
+                            var originalJson = serializedJobMessage.Substring(jsonPosition - 10, 20);
+                            errorMessage = $"Runner sent Json at position '{jsonPosition}': {originalJson} ({Convert.ToBase64String(Encoding.UTF8.GetBytes(originalJson))})\n{errorMessage}";
                        }
                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Error(ex);
-                        errorMessage = $"Fail to check json IPC error: {ex.Message}\n{errorMessage}";
-                    }
-
-                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = errorMessage };
-                    unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
-                    jobRecord.ErrorCount++;
-                    jobRecord.Issues.Add(unhandledExceptionIssue);
-                    await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, new TimelineRecord[] { jobRecord }, CancellationToken.None);
                }
                catch (Exception ex)
                {
-                    Trace.Error("Fail to report unhandled exception from Runner.Worker process");
                    Trace.Error(ex);
+                    errorMessage = $"Fail to check json IPC error: {ex.Message}\n{errorMessage}";
                }
+
+                var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = errorMessage };
+                unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
+                jobRecord.ErrorCount++;
+                jobRecord.Issues.Add(unhandledExceptionIssue);
+                await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, new TimelineRecord[] { jobRecord }, CancellationToken.None);
            }
-            else
+            catch (Exception ex)
            {
-                Trace.Info("Job server does not support handling unhandled exception yet, error message: {0}", errorMessage);
-                return;
+                Trace.Error("Fail to report unhandled exception from Runner.Worker process");
+                Trace.Error(ex);
            }
        }

        // raise job completed event to fail the job.
-        private async Task ForceFailJob(IRunnerService server, Pipelines.AgentJobRequestMessage message)
+        private async Task ForceFailJob(IJobServer jobServer, Pipelines.AgentJobRequestMessage message)
        {
-            if (server is IJobServer jobServer)
+            try
            {
-                try
-                {
-                    var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, TaskResult.Failed);
-                    await jobServer.RaisePlanEventAsync<JobCompletedEvent>(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, jobCompletedEvent, CancellationToken.None);
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error("Fail to raise JobCompletedEvent back to service.");
-                    Trace.Error(ex);
-                }
+                var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, TaskResult.Failed);
+                await jobServer.RaisePlanEventAsync<JobCompletedEvent>(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, jobCompletedEvent, CancellationToken.None);
            }
-            else if (server is IRunServer runServer)
+            catch (Exception ex)
            {
-                try
-                {
-                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, CancellationToken.None);
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error("Fail to raise job completion back to service.");
-                    Trace.Error(ex);
-                }
+                Trace.Error("Fail to raise JobCompletedEvent back to service.");
+                Trace.Error(ex);
            }
-            else
-            {
-                throw new NotSupportedException($"Server type {server.GetType().FullName} is not supported.");
-            }
-        }
-
-        private async Task<IRunnerService> InitializeJobServerAsync(ServiceEndpoint systemConnection)
-        {
-            if (this._isRunServiceJob)
-            {
-                return await GetRunServerAsync(systemConnection);
-            }
-            else
-            {
-                var jobServer = HostContext.GetService<IJobServer>();
-                VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
-                VssConnection jobConnection = VssUtil.CreateConnection(systemConnection.Url, jobServerCredential);
-                await jobServer.ConnectAsync(jobConnection);
-                return jobServer;
-            }
-        }
-
-        private async Task<IRunServer> GetRunServerAsync(ServiceEndpoint systemConnection)
-        {
-            var runServer = HostContext.GetService<IRunServer>();
-            VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
-            await runServer.ConnectAsync(systemConnection.Url, jobServerCredential);
-            return runServer;
        }

        private class WorkerDispatcher : IDisposable
--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -211,7 +211,6 @@ namespace GitHub.Runner.Listener
                                                                _session.SessionId,
                                                                _lastMessageId,
                                                                runnerStatus,
-                                                                BuildConstants.RunnerPackage.Version,
                                                                _getMessagesTokenSource.Token);

                    // Decrypt the message body if the session is using encryption
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Listener.Check;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
@@ -136,12 +135,6 @@ namespace GitHub.Runner.Listener
                // remove config files, remove service, and exit
                if (command.Remove)
                {
-                    // only remove local config files and exit
-                    if (command.RemoveLocalConfig)
-                    {
-                        configManager.DeleteLocalRunnerConfig();
-                        return Constants.Runner.ReturnCode.Success;
-                    }
                    try
                    {
                        await configManager.UnconfigureAsync(command);
@@ -437,22 +430,12 @@ namespace GitHub.Runner.Listener

                            message = await getNextMessage; //get next message
                            HostContext.WritePerfCounter($"MessageReceived_{message.MessageType}");
-                            if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase) ||
-                                string.Equals(message.MessageType, RunnerRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
                            {
                                if (autoUpdateInProgress == false)
                                {
                                    autoUpdateInProgress = true;
-                                    AgentRefreshMessage runnerUpdateMessage = null;
-                                    if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        runnerUpdateMessage = JsonUtility.FromString<AgentRefreshMessage>(message.Body);
-                                    }
-                                    else
-                                    {
-                                        var brokerRunnerUpdateMessage = JsonUtility.FromString<RunnerRefreshMessage>(message.Body);
-                                        runnerUpdateMessage = new AgentRefreshMessage(brokerRunnerUpdateMessage.RunnerId, brokerRunnerUpdateMessage.TargetVersion, TimeSpan.FromSeconds(brokerRunnerUpdateMessage.TimeoutInSeconds));
-                                    }
+                                    var runnerUpdateMessage = JsonUtility.FromString<AgentRefreshMessage>(message.Body);
 #if DEBUG
                                    // Can mock the update for testing
                                    if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_IS_MOCK_UPDATE")))
@@ -503,7 +486,7 @@ namespace GitHub.Runner.Listener
                                }
                            }
                            // Broker flow
-                            else if (MessageUtil.IsRunServiceJob(message.MessageType))
+                            else if (string.Equals(message.MessageType, JobRequestMessageTypes.RunnerJobRequest, StringComparison.OrdinalIgnoreCase))
                            {
                                if (autoUpdateInProgress || runOnceJobReceived)
                                {
@@ -654,7 +637,6 @@ Config Options:
 --name string          Name of the runner to configure (default {Environment.MachineName ?? "myrunner"})
 --runnergroup string   Name of the runner group to add this runner to (defaults to the default runner group)
 --labels string        Extra labels in addition to the default: 'self-hosted,{Constants.Runner.Platform},{Constants.Runner.PlatformArchitecture}'
- --local                Removes the runner config files from your local machine. Used as an option to the remove command
 --work string          Relative runner work directory (default {Constants.Path.WorkDirectory})
 --replace              Replace any existing runner with the same name (default false)
 --pat                  GitHub personal access token with repo scope. Used for checking network connectivity when executing `.{separator}run.{ext} --check`
--- a/src/Runner.Sdk/ActionPlugin.cs
+++ b/src/Runner.Sdk/ActionPlugin.cs
@@ -73,7 +73,7 @@ namespace GitHub.Runner.Sdk
        {
            var headerValues = new List<ProductInfoHeaderValue>();
            headerValues.Add(new ProductInfoHeaderValue($"GitHubActionsRunner-Plugin", BuildConstants.RunnerPackage.Version));
-            headerValues.Add(new ProductInfoHeaderValue($"({StringUtil.SanitizeUserAgentHeader(RuntimeInformation.OSDescription)})"));
+            headerValues.Add(new ProductInfoHeaderValue($"({RuntimeInformation.OSDescription.Trim()})"));

            if (VssClientHttpRequestSettings.Default.UserAgent != null && VssClientHttpRequestSettings.Default.UserAgent.Count > 0)
            {
--- a/src/Runner.Sdk/RunnerWebProxy.cs
+++ b/src/Runner.Sdk/RunnerWebProxy.cs
@@ -164,6 +164,7 @@ namespace GitHub.Runner.Sdk
                        {
                            continue;
                        }
+
                        _noProxyList.Add(noProxyInfo);
                    }
                }
@@ -206,11 +207,6 @@ namespace GitHub.Runner.Sdk
        {
            foreach (var noProxy in _noProxyList)
            {
-                // bypass on wildcard no_proxy
-                if (string.Equals(noProxy.Host, "*", StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
                var matchHost = false;
                var matchPort = false;

--- a/src/Runner.Sdk/Util/StringUtil.cs
+++ b/src/Runner.Sdk/Util/StringUtil.cs
@@ -123,12 +123,5 @@ namespace GitHub.Runner.Sdk
        {
            return value?.Substring(0, Math.Min(value.Length, count));
        }
-
-        // Fixes format violations e.g. https://github.com/actions/runner/issues/2165
-        public static string SanitizeUserAgentHeader(string header)
-        {
-            return header.Replace("(", "[").Replace(")", "]").Trim();
-        }
-
    }
 }
--- a/src/Runner.Sdk/Util/UrlUtil.cs
+++ b/src/Runner.Sdk/Util/UrlUtil.cs
@@ -6,16 +6,9 @@ namespace GitHub.Runner.Sdk
    {
        public static bool IsHostedServer(UriBuilder gitHubUrl)
        {
-            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_FORCE_GHES")))
-            {
-                return false;
-            }
-
-            return 
-                string.Equals(gitHubUrl.Host, "github.com", StringComparison.OrdinalIgnoreCase) ||
+            return string.Equals(gitHubUrl.Host, "github.com", StringComparison.OrdinalIgnoreCase) ||
                string.Equals(gitHubUrl.Host, "www.github.com", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(gitHubUrl.Host, "github.localhost", StringComparison.OrdinalIgnoreCase) ||
-                gitHubUrl.Host.EndsWith(".ghe.com", StringComparison.OrdinalIgnoreCase);
+                string.Equals(gitHubUrl.Host, "github.localhost", StringComparison.OrdinalIgnoreCase);
        }

        public static Uri GetCredentialEmbeddedUrl(Uri baseUrl, string username, string password)
--- a/src/Runner.Sdk/Util/VssUtil.cs
+++ b/src/Runner.Sdk/Util/VssUtil.cs
@@ -19,7 +19,7 @@ namespace GitHub.Runner.Sdk
        {
            var headerValues = new List<ProductInfoHeaderValue>();
            headerValues.AddRange(additionalUserAgents);
-            headerValues.Add(new ProductInfoHeaderValue($"({StringUtil.SanitizeUserAgentHeader(RuntimeInformation.OSDescription)})"));
+            headerValues.Add(new ProductInfoHeaderValue($"({RuntimeInformation.OSDescription.Trim()})"));

            if (VssClientHttpRequestSettings.Default.UserAgent != null && VssClientHttpRequestSettings.Default.UserAgent.Count > 0)
            {
@@ -116,7 +116,7 @@ namespace GitHub.Runner.Sdk
            // settings are applied to an HttpRequestMessage.
            settings.AcceptLanguages.Remove(CultureInfo.InvariantCulture);

-            RawConnection connection = new(serverUri, new RawHttpMessageHandler(credentials.Federated, settings), additionalDelegatingHandler);
+            RawConnection connection = new(serverUri, new RawHttpMessageHandler(credentials.ToOAuthCredentials(), settings), additionalDelegatingHandler);
            return connection;
        }

--- a/src/Runner.Worker/ActionRunner.cs
+++ b/src/Runner.Worker/ActionRunner.cs
@@ -25,6 +25,7 @@ namespace GitHub.Runner.Worker
    public interface IActionRunner : IStep, IRunnerService
    {
        ActionRunStage Stage { get; set; }
+        bool TryEvaluateDisplayName(DictionaryContextData contextData, IExecutionContext context);
        Pipelines.ActionStep Action { get; set; }
    }

@@ -181,7 +182,7 @@ namespace GitHub.Runner.Worker
            else
            {
                var templateEvaluator = ExecutionContext.ToPipelineTemplateEvaluator();
-                inputs = templateEvaluator.EvaluateStepInputs(Action.Inputs, ExecutionContext.ExpressionValues, ExecutionContext.ExpressionFunctions, ExecutionContext.ToExpressionState());
+                inputs = templateEvaluator.EvaluateStepInputs(Action.Inputs, ExecutionContext.ExpressionValues, ExecutionContext.ExpressionFunctions);
            }

            var userInputs = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
@@ -284,67 +285,25 @@ namespace GitHub.Runner.Worker

        }

-        /// <summary>
-        /// Attempts to update the DisplayName.
-        /// As the "Try..." name implies, this method should never throw an exception.
-        /// Returns true if the DisplayName is already present or it was successfully updated.
-        /// </summary>
-        public bool TryUpdateDisplayName(out bool updated)
-        {
-            updated = false;
-
-            // REVIEW:  This try/catch can be removed if some future implementation of EvaluateDisplayName and UpdateTimelineRecordDisplayName
-            // can make reasonable guarantees that they won't throw an exception.
-            try
-            {
-                // This attempt is only worthwhile at the "Main" stage.
-                //    When the job starts, there's an initial attempt to evaluate the DisplayName.  (see JobExtension::InitializeJob)
-                //    During the "Pre" stage, we expect that no contexts will have changed since the initial evaluation.
-                //    "Main" stage is handled here.
-                //    During the "Post" stage, it no longer matters.
-                if (this.Stage == ActionRunStage.Main && EvaluateDisplayName(this.ExecutionContext.ExpressionValues, this.ExecutionContext, out updated))
-                {
-                    if (updated)
-                    {
-                        this.ExecutionContext.UpdateTimelineRecordDisplayName(this.DisplayName);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Trace.Warning("Caught exception while attempting to evaulate/update the step's DisplayName.  Exception Details:  {0}", ex);
-            }
-
-            // For consistency with other implementations of TryUpdateDisplayName we use !string.IsNullOrEmpty below,
-            // but note that (at the time of this writing) ActionRunner::DisplayName::get always returns a non-empty string due to its fallback logic.
-            // In other words, the net effect is that this particular implementation of TryUpdateDisplayName will always return true.
-            return !string.IsNullOrEmpty(this.DisplayName);
-        }
-
-
-        /// <summary>
-        /// Attempts to evaluate the DisplayName of this IActionRunner.
-        /// Returns true if the DisplayName is already present or it was successfully evaluated.
-        /// </summary>
-        public bool EvaluateDisplayName(DictionaryContextData contextData, IExecutionContext context, out bool updated)
+        public bool TryEvaluateDisplayName(DictionaryContextData contextData, IExecutionContext context)
        {
            ArgUtil.NotNull(context, nameof(context));
            ArgUtil.NotNull(Action, nameof(Action));

-            updated = false;
-            // If we have already expanded the display name, don't bother attempting [re-]expansion.
+            // If we have already expanded the display name, there is no need to expand it again
+            // TODO: Remove the ShouldEvaluateDisplayName check and field post m158 deploy, we should do it by default once the server is updated
            if (_didFullyEvaluateDisplayName || !string.IsNullOrEmpty(Action.DisplayName))
            {
-                return true;
+                return false;
            }

-            _displayName = GenerateDisplayName(Action, contextData, context, out bool didFullyEvaluate);
+            bool didFullyEvaluate;
+            _displayName = GenerateDisplayName(Action, contextData, context, out didFullyEvaluate);

-            // If we evaluated, fully mask any secrets
+            // If we evaluated fully mask any secrets
            if (didFullyEvaluate)
            {
                _displayName = HostContext.SecretMasker.MaskSecrets(_displayName);
-                updated = true;
            }
            context.Debug($"Set step '{Action.Name}' display name to: '{_displayName}'");
            _didFullyEvaluateDisplayName = didFullyEvaluate;
@@ -355,7 +314,7 @@ namespace GitHub.Runner.Worker
        {
            DictionaryContextData expressionValues = ExecutionContext.GetExpressionValues(stepHost);
            var templateEvaluator = ExecutionContext.ToPipelineTemplateEvaluator();
-            var inputs = templateEvaluator.EvaluateStepInputs(Action.Inputs, expressionValues, ExecutionContext.ExpressionFunctions, ExecutionContext.ToExpressionState());
+            var inputs = templateEvaluator.EvaluateStepInputs(Action.Inputs, expressionValues, ExecutionContext.ExpressionFunctions);

            return inputs;
        }
--- a/src/Runner.Worker/ContainerOperationProvider.cs
+++ b/src/Runner.Worker/ContainerOperationProvider.cs
@@ -33,14 +33,8 @@ namespace GitHub.Runner.Worker
        public override void Initialize(IHostContext hostContext)
        {
            base.Initialize(hostContext);
-            if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable(Constants.Hooks.ContainerHooksPath)))
-            {
-                _dockerManager = HostContext.GetService<IDockerCommandManager>();
-            }
-            else
-            {
-                _containerHookManager = HostContext.GetService<IContainerHookManager>();
-            }
+            _dockerManager = HostContext.GetService<IDockerCommandManager>();
+            _containerHookManager = HostContext.GetService<IContainerHookManager>();
        }

        public async Task StartContainersAsync(IExecutionContext executionContext, object data)
--- a/src/Runner.Worker/ExecutionContext.cs
+++ b/src/Runner.Worker/ExecutionContext.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.Expressions2;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using GitHub.DistributedTask.Pipelines.ContextData;
@@ -81,7 +80,6 @@ namespace GitHub.Runner.Worker
        // logging
        long Write(string tag, string message);
        void QueueAttachFile(string type, string name, string filePath);
-        void QueueSummaryFile(string name, string filePath, Guid stepRecordId);

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

            PublishStepTelemetry();

-            var stepResult = new StepResult();
-            stepResult.ExternalID = _record.Id;
-            stepResult.Conclusion = _record.Result ?? TaskResult.Succeeded;
-            stepResult.Status = _record.State;
-            stepResult.Number = _record.Order;
-            stepResult.Name = _record.Name;
-            stepResult.StartedAt = _record.StartTime;
-            stepResult.CompletedAt = _record.FinishTime;
-
-            Global.StepsResult.Add(stepResult);
-
            if (Root != this)
            {
                // only dispose TokenSource for step level ExecutionContext
@@ -722,9 +709,6 @@ namespace GitHub.Runner.Worker
            // ActionsStepTelemetry for entire job
            Global.StepsTelemetry = new List<ActionsStepTelemetry>();

-            // Steps results for entire job
-            Global.StepsResult = new List<StepResult>();
-
            // Job Outputs
            JobOutputs = new Dictionary<string, VariableValue>(StringComparer.OrdinalIgnoreCase);

@@ -862,18 +846,6 @@ namespace GitHub.Runner.Worker
            _jobServerQueue.QueueFileUpload(_mainTimelineId, _record.Id, type, name, filePath, deleteSource: false);
        }

-        public void QueueSummaryFile(string name, string filePath, Guid stepRecordId)
-        {
-            ArgUtil.NotNullOrEmpty(name, nameof(name));
-            ArgUtil.NotNullOrEmpty(filePath, nameof(filePath));
-
-            if (!File.Exists(filePath))
-            {
-                throw new FileNotFoundException($"Can't upload (name:{name}) file: {filePath}. File does not exist.");
-            }
-            _jobServerQueue.QueueResultsUpload(stepRecordId, name, filePath, ChecksAttachmentType.StepSummary, deleteSource: false, finalize: true, firstBlock: true, totalLines: 0);
-        }
-
        // Add OnMatcherChanged
        public void Add(OnMatcherChanged handler)
        {
@@ -1113,7 +1085,7 @@ namespace GitHub.Runner.Worker
        {
            if (contextData != null &&
                contextData.TryGetValue(PipelineTemplateConstants.Vars, out var varsPipelineContextData) &&
-                varsPipelineContextData != null &&
+                varsPipelineContextData != null && 
                varsPipelineContextData is DictionaryContextData varsContextData)
            {
                // Set debug variables only when StepDebug/RunnerDebug variables are not present.
--- a/src/Runner.Worker/Expressions/HashFilesFunction.cs
+++ b/src/Runner.Worker/Expressions/HashFilesFunction.cs
@@ -29,8 +29,6 @@ namespace GitHub.Runner.Worker.Expressions
            githubContext.TryGetValue(PipelineTemplateConstants.Workspace, out var workspace);
            var workspaceData = workspace as StringContextData;
            ArgUtil.NotNull(workspaceData, nameof(workspaceData));
-            var executionContext = templateContext.State[nameof(IExecutionContext)] as IExecutionContext;
-            ArgUtil.NotNull(executionContext, nameof(executionContext));

            string githubWorkspace = workspaceData.Value;
            bool followSymlink = false;
@@ -66,15 +64,7 @@ namespace GitHub.Runner.Worker.Expressions
            string runnerRoot = new DirectoryInfo(binDir).Parent.FullName;

            string node = Path.Combine(runnerRoot, "externals", NodeUtil.GetInternalNodeVersion(), "bin", $"node{IOUtil.ExeExtension}");
-            //Feature flag to fetch a new version of hashFiles script
-            string hashFilesScript = string.Empty;
-            var isGlobHashFilesEnabled = executionContext.Global.Variables.GetBoolean("DistributedTask.UseGlobHashFiles") ?? false;
-            if (isGlobHashFilesEnabled)
-            {
-                hashFilesScript = Path.Combine(binDir, "hashFilesV2");
-            }
-            hashFilesScript = Path.Combine(binDir, "hashFiles");
-
+            string hashFilesScript = Path.Combine(binDir, "hashFiles");
            var hashResult = string.Empty;
            var p = new ProcessInvoker(new HashFilesTrace(context.Trace));
            p.ErrorDataReceived += ((_, data) =>
@@ -146,4 +136,4 @@ namespace GitHub.Runner.Worker.Expressions
            }
        }
    }
-}
+}
--- a/src/Runner.Worker/FileCommandManager.cs
+++ b/src/Runner.Worker/FileCommandManager.cs
@@ -204,23 +204,13 @@ namespace GitHub.Runner.Worker
                    }
                }

-                var attachmentName = !context.IsEmbedded
-                    ? context.Id.ToString()
+                var attachmentName = !context.IsEmbedded 
+                    ? context.Id.ToString() 
                    : context.EmbeddedId.ToString();

                Trace.Info($"Queueing file ({filePath}) for attachment upload ({attachmentName})");
                // Attachments must be added to the parent context (job), not the current context (step)
                context.Root.QueueAttachFile(ChecksAttachmentType.StepSummary, attachmentName, scrubbedFilePath);
-
-                // Dual upload the same files to Results Service
-                context.Global.Variables.TryGetValue("system.github.results_endpoint", out string resultsReceiverEndpoint);
-                if (resultsReceiverEndpoint != null)
-                {
-                    Trace.Info($"Queueing results file ({filePath}) for attachment upload ({attachmentName})");
-                    var stepId = context.Id;
-                    // Attachments must be added to the parent context (job), not the current context (step)
-                    context.Root.QueueSummaryFile(attachmentName, scrubbedFilePath, stepId);
-                }
            }
            catch (Exception e)
            {
--- a/src/Runner.Worker/GitHubContext.cs
+++ b/src/Runner.Worker/GitHubContext.cs
@@ -13,7 +13,6 @@ namespace GitHub.Runner.Worker
            "action_repository",
            "action",
            "actor",
-            "actor_id",
            "api_url",
            "base_ref",
            "env",
@@ -28,10 +27,8 @@ namespace GitHub.Runner.Worker
            "ref_protected",
            "ref_type",
            "ref",
-            "repository",
-            "repository_id",
            "repository_owner",
-            "repository_owner_id",
+            "repository",
            "retention_days",
            "run_attempt",
            "run_id",
@@ -42,9 +39,7 @@ namespace GitHub.Runner.Worker
            "step_summary",
            "triggering_actor",
            "workflow",
-            "workflow_ref",
-            "workflow_sha",
-            "workspace"
+            "workspace",
        };

        public IEnumerable<KeyValuePair<string, string>> GetRuntimeEnvironmentVariables()
--- a/src/Runner.Worker/GlobalContext.cs
+++ b/src/Runner.Worker/GlobalContext.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Worker.Container;
@@ -17,7 +16,6 @@ namespace GitHub.Runner.Worker
        public IList<String> FileTable { get; set; }
        public IDictionary<String, IDictionary<String, String>> JobDefaults { get; set; }
        public List<ActionsStepTelemetry> StepsTelemetry { get; set; }
-        public List<StepResult> StepsResult { get; set; }
        public List<JobTelemetry> JobTelemetry { get; set; }
        public TaskOrchestrationPlanReference Plan { get; set; }
        public List<string> PrependPath { get; set; }
--- a/src/Runner.Worker/Handlers/CompositeActionHandler.cs
+++ b/src/Runner.Worker/Handlers/CompositeActionHandler.cs
@@ -239,7 +239,7 @@ namespace GitHub.Runner.Worker.Handlers

                // Set action_status to the success of the current composite action
                var actionResult = ExecutionContext.Result?.ToActionResult() ?? ActionResult.Success;
-                step.ExecutionContext.SetGitHubContext("action_status", actionResult.ToString().ToLowerInvariant());
+                step.ExecutionContext.SetGitHubContext("action_status", actionResult.ToString());

                // Initialize env context
                Trace.Info("Initialize Env context for embedded step");
--- a/src/Runner.Worker/Handlers/ContainerActionHandler.cs
+++ b/src/Runner.Worker/Handlers/ContainerActionHandler.cs
@@ -38,17 +38,8 @@ namespace GitHub.Runner.Worker.Handlers
            // Update the env dictionary.
            AddInputsToEnvironment();

-            IDockerCommandManager dockerManager = null;
-            IContainerHookManager containerHookManager = null;
-            if (FeatureManager.IsContainerHooksEnabled(ExecutionContext.Global.Variables))
-            {
-                containerHookManager = HostContext.GetService<IContainerHookManager>();
-            }
-            else
-            {
-                dockerManager = HostContext.GetService<IDockerCommandManager>();
-            }
-
+            var dockerManager = HostContext.GetService<IDockerCommandManager>();
+            var containerHookManager = HostContext.GetService<IContainerHookManager>();
            string dockerFile = null;

            // container image haven't built/pull
--- a/src/Runner.Worker/JobExtension.cs
+++ b/src/Runner.Worker/JobExtension.cs
@@ -306,13 +306,13 @@ namespace GitHub.Runner.Worker
                                }
                            }

-                            actionRunner.EvaluateDisplayName(contextData, context, out _);
+                            actionRunner.TryEvaluateDisplayName(contextData, context);
                            jobSteps.Add(actionRunner);

                            if (prepareResult.PreStepTracker.TryGetValue(step.Id, out var preStep))
                            {
                                Trace.Info($"Adding pre-{action.DisplayName}.");
-                                preStep.EvaluateDisplayName(contextData, context, out _);
+                                preStep.TryEvaluateDisplayName(contextData, context);
                                preStep.DisplayName = $"Pre {preStep.DisplayName}";
                                preJobSteps.Add(preStep);
                            }
@@ -321,28 +321,25 @@ namespace GitHub.Runner.Worker

                    if (message.Variables.TryGetValue("system.workflowFileFullPath", out VariableValue workflowFileFullPath))
                    {
-                        var usesLogText = $"Uses: {workflowFileFullPath.Value}";
-                        var reference = GetWorkflowReference(message.Variables);
-                        context.Output(usesLogText + reference);
-
+                        context.Output($"Uses: {workflowFileFullPath.Value}");
                        if (message.ContextData.TryGetValue("inputs", out var pipelineContextData))
                        {
                            var inputs = pipelineContextData.AssertDictionary("inputs");
-                            if (inputs.Any())
+                            if (inputs.Any()) 
                            {
                                context.Output($"##[group] Inputs");
-                                foreach (var input in inputs)
+                                foreach (var input in inputs) 
                                {
                                    context.Output($"  {input.Key}: {input.Value}");
                                }
                                context.Output("##[endgroup]");
                            }
                        }
-                    }

-                    if (!string.IsNullOrWhiteSpace(message.JobDisplayName))
-                    {
-                        context.Output($"Complete job name: {message.JobDisplayName}");
+                        if (!string.IsNullOrWhiteSpace(message.JobDisplayName)) 
+                        {
+                            context.Output($"Complete job name: {message.JobDisplayName}");
+                        }
                    }

                    var intraActionStates = new Dictionary<Guid, Dictionary<string, string>>();
@@ -455,24 +452,6 @@ namespace GitHub.Runner.Worker
            }
        }

-        private string GetWorkflowReference(IDictionary<string, VariableValue> variables)
-        {
-            var reference = "";
-            if (variables.TryGetValue("system.workflowFileSha", out VariableValue workflowFileSha))
-            {
-                if (variables.TryGetValue("system.workflowFileRef", out VariableValue workflowFileRef)
-                    && !string.IsNullOrEmpty(workflowFileRef.Value))
-                {
-                    reference += $"@{workflowFileRef.Value} ({workflowFileSha.Value})";
-                }
-                else
-                {
-                    reference += $"@{workflowFileSha.Value}";
-                }
-            }
-            return reference;
-        }
-
        public void FinalizeJob(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, DateTime jobStartTimeUtc)
        {
            Trace.Entering();
--- a/src/Runner.Worker/JobExtensionRunner.cs
+++ b/src/Runner.Worker/JobExtensionRunner.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.Pipelines.ContextData;

 namespace GitHub.Runner.Worker
 {
@@ -33,18 +32,5 @@ namespace GitHub.Runner.Worker
        {
            await _runAsync(ExecutionContext, _data);
        }
-
-        public bool TryUpdateDisplayName(out bool updated)
-        {
-            updated = false;
-            return !string.IsNullOrEmpty(this.DisplayName);
-        }
-
-        public bool EvaluateDisplayName(DictionaryContextData contextData, IExecutionContext context, out bool updated)
-        {
-            updated = false;
-            return !string.IsNullOrEmpty(this.DisplayName);
-        }
-
    }
 }
--- a/src/Runner.Worker/JobRunner.cs
+++ b/src/Runner.Worker/JobRunner.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using GitHub.DistributedTask.Pipelines;
+using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
@@ -20,7 +20,7 @@ namespace GitHub.Runner.Worker
    [ServiceLocator(Default = typeof(JobRunner))]
    public interface IJobRunner : IRunnerService
    {
-        Task<TaskResult> RunAsync(AgentJobRequestMessage message, CancellationToken jobRequestCancellationToken);
+        Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message, CancellationToken jobRequestCancellationToken);
    }

    public sealed class JobRunner : RunnerService, IJobRunner
@@ -29,7 +29,7 @@ namespace GitHub.Runner.Worker
        private RunnerSettings _runnerSettings;
        private ITempDirectoryManager _tempDirectoryManager;

-        public async Task<TaskResult> RunAsync(AgentJobRequestMessage message, CancellationToken jobRequestCancellationToken)
+        public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message, CancellationToken jobRequestCancellationToken)
        {
            // Validate parameters.
            Trace.Entering();
@@ -40,34 +40,21 @@ namespace GitHub.Runner.Worker
            Trace.Info("Job ID {0}", message.JobId);

            DateTime jobStartTimeUtc = DateTime.UtcNow;
-            IRunnerService server = null;

            ServiceEndpoint systemConnection = message.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
-            if (MessageUtil.IsRunServiceJob(message.MessageType))
-            {
-                var runServer = HostContext.GetService<IRunServer>();
-                VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
-                await runServer.ConnectAsync(systemConnection.Url, jobServerCredential);
-                server = runServer;
-            }
-            else
-            {
-                // Setup the job server and job server queue.
-                var jobServer = HostContext.GetService<IJobServer>();
-                VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
-                Uri jobServerUrl = systemConnection.Url;

-                Trace.Info($"Creating job server with URL: {jobServerUrl}");
-                // jobServerQueue is the throttling reporter.
-                _jobServerQueue = HostContext.GetService<IJobServerQueue>();
-                VssConnection jobConnection = VssUtil.CreateConnection(jobServerUrl, jobServerCredential, new DelegatingHandler[] { new ThrottlingReportHandler(_jobServerQueue) });
-                await jobServer.ConnectAsync(jobConnection);
-
-                _jobServerQueue.Start(message);
-                server = jobServer;
-            }
+            // Setup the job server and job server queue.
+            var jobServer = HostContext.GetService<IJobServer>();
+            VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
+            Uri jobServerUrl = systemConnection.Url;

+            Trace.Info($"Creating job server with URL: {jobServerUrl}");
+            // jobServerQueue is the throttling reporter.
+            _jobServerQueue = HostContext.GetService<IJobServerQueue>();
+            VssConnection jobConnection = VssUtil.CreateConnection(jobServerUrl, jobServerCredential, new DelegatingHandler[] { new ThrottlingReportHandler(_jobServerQueue) });
+            await jobServer.ConnectAsync(jobConnection);

+            _jobServerQueue.Start(message);
            HostContext.WritePerfCounter($"WorkerJobServerQueueStarted_{message.RequestId.ToString()}");

            IExecutionContext jobContext = null;
@@ -112,7 +99,7 @@ namespace GitHub.Runner.Worker
                {
                    Trace.Error(ex);
                    jobContext.Error(ex);
-                    return await CompleteJobAsync(server, jobContext, message, TaskResult.Failed);
+                    return await CompleteJobAsync(jobServer, jobContext, message, TaskResult.Failed);
                }

                if (jobContext.Global.WriteDebug)
@@ -149,7 +136,7 @@ namespace GitHub.Runner.Worker
                    // don't log error issue to job ExecutionContext, since server owns the job level issue
                    Trace.Error($"Job is cancelled during initialize.");
                    Trace.Error($"Caught exception: {ex}");
-                    return await CompleteJobAsync(server, jobContext, message, TaskResult.Canceled);
+                    return await CompleteJobAsync(jobServer, jobContext, message, TaskResult.Canceled);
                }
                catch (Exception ex)
                {
@@ -157,7 +144,7 @@ namespace GitHub.Runner.Worker
                    // don't log error issue to job ExecutionContext, since server owns the job level issue
                    Trace.Error($"Job initialize failed.");
                    Trace.Error($"Caught exception from {nameof(jobExtension.InitializeJob)}: {ex}");
-                    return await CompleteJobAsync(server, jobContext, message, TaskResult.Failed);
+                    return await CompleteJobAsync(jobServer, jobContext, message, TaskResult.Failed);
                }

                // trace out all steps
@@ -194,7 +181,7 @@ namespace GitHub.Runner.Worker
                    // Log the error and fail the job.
                    Trace.Error($"Caught exception from job steps {nameof(StepsRunner)}: {ex}");
                    jobContext.Error(ex);
-                    return await CompleteJobAsync(server, jobContext, message, TaskResult.Failed);
+                    return await CompleteJobAsync(jobServer, jobContext, message, TaskResult.Failed);
                }
                finally
                {
@@ -205,7 +192,7 @@ namespace GitHub.Runner.Worker
                Trace.Info($"Job result after all job steps finish: {jobContext.Result ?? TaskResult.Succeeded}");

                Trace.Info("Completing the job execution context.");
-                return await CompleteJobAsync(server, jobContext, message);
+                return await CompleteJobAsync(jobServer, jobContext, message);
            }
            finally
            {
@@ -219,66 +206,6 @@ namespace GitHub.Runner.Worker
            }
        }

-        private async Task<TaskResult> CompleteJobAsync(IRunnerService server, IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, TaskResult? taskResult = null)
-        {
-            if (server is IRunServer runServer)
-            {
-                return await CompleteJobAsync(runServer, jobContext, message, taskResult);
-            }
-            else if (server is IJobServer jobServer)
-            {
-                return await CompleteJobAsync(jobServer, jobContext, message, taskResult);
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private async Task<TaskResult> CompleteJobAsync(IRunServer runServer, IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, TaskResult? taskResult = null)
-        {
-            jobContext.Debug($"Finishing: {message.JobDisplayName}");
-            TaskResult result = jobContext.Complete(taskResult);
-            if (jobContext.Global.Variables.TryGetValue("Node12ActionsWarnings", out var node12Warnings))
-            {
-                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node12Warnings));
-                jobContext.Warning(string.Format(Constants.Runner.Node12DetectedAfterEndOfLife, actions));
-            }
-
-            // Make sure to clean temp after file upload since they may be pending fileupload still use the TEMP dir.
-            _tempDirectoryManager?.CleanupTempDirectory();
-
-            // Load any upgrade telemetry
-            LoadFromTelemetryFile(jobContext.Global.JobTelemetry);
-
-            // Make sure we don't submit secrets as telemetry
-            MaskTelemetrySecrets(jobContext.Global.JobTelemetry);
-
-            Trace.Info($"Raising job completed against run service");
-            var completeJobRetryLimit = 5;
-            var exceptions = new List<Exception>();
-            while (completeJobRetryLimit-- > 0)
-            {
-                try
-                {
-                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, default);
-                    return result;
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error($"Catch exception while attempting to complete job {message.JobId}, job request {message.RequestId}.");
-                    Trace.Error(ex);
-                    exceptions.Add(ex);
-                }
-
-                // delay 5 seconds before next retry.
-                await Task.Delay(TimeSpan.FromSeconds(5));
-            }
-
-            // rethrow exceptions from all attempts.
-            throw new AggregateException(exceptions);
-        }
-
        private async Task<TaskResult> CompleteJobAsync(IJobServer jobServer, IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, TaskResult? taskResult = null)
        {
            jobContext.Debug($"Finishing: {message.JobDisplayName}");
--- a/src/Runner.Worker/StepsRunner.cs
+++ b/src/Runner.Worker/StepsRunner.cs
@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.Expressions2;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
+using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.Pipelines.ObjectTemplating;
 using GitHub.DistributedTask.WebApi;
@@ -11,6 +14,8 @@ using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker.Expressions;
+using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
+using Pipelines = GitHub.DistributedTask.Pipelines;

 namespace GitHub.Runner.Worker
 {
@@ -21,8 +26,6 @@ namespace GitHub.Runner.Worker
        string DisplayName { get; set; }
        IExecutionContext ExecutionContext { get; set; }
        TemplateToken Timeout { get; }
-        bool TryUpdateDisplayName(out bool updated);
-        bool EvaluateDisplayName(DictionaryContextData contextData, IExecutionContext context, out bool updated);
        Task RunAsync();
    }

@@ -192,12 +195,6 @@ namespace GitHub.Runner.Worker
                        }
                        else
                        {
-                            // This is our last, best chance to expand the display name.  (At this point, all the requirements for successful expansion should be met.)
-                            // That being said, evaluating the display name should still be considered as a "best effort" exercise.  (It's not critical or paramount.)
-                            // For that reason, we call a safe "Try..." wrapper method to ensure that any potential problems we encounter in evaluating the display name
-                            // don't interfere with our ultimate goal within this code block:  evaluation of the condition.
-                            step.TryUpdateDisplayName(out _);
-
                            try
                            {
                                var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator(conditionTraceWriter);
@@ -259,6 +256,14 @@ namespace GitHub.Runner.Worker

        private async Task RunStepAsync(IStep step, CancellationToken jobCancellationToken)
        {
+            // Check to see if we can expand the display name
+            if (step is IActionRunner actionRunner &&
+                actionRunner.Stage == ActionRunStage.Main &&
+                actionRunner.TryEvaluateDisplayName(step.ExecutionContext.ExpressionValues, step.ExecutionContext))
+            {
+                step.ExecutionContext.UpdateTimelineRecordDisplayName(actionRunner.DisplayName);
+            }
+
            // Start the step
            Trace.Info("Starting the step.");
            step.ExecutionContext.Debug($"Starting: {step.DisplayName}");
--- a/src/Sdk/Common/Common/Authentication/VssCredentialsExtension.cs
+++ b/src/Sdk/Common/Common/Authentication/VssCredentialsExtension.cs
@@ -0,0 +1,20 @@
+using GitHub.Services.OAuth;
+
+namespace GitHub.Services.Common
+{
+    public static class VssCredentialsExtension
+    {
+        public static VssOAuthCredential ToOAuthCredentials(
+            this VssCredentials credentials)
+        {
+            if (credentials.Federated.CredentialType == VssCredentialsType.OAuth)
+            {
+                return credentials.Federated as VssOAuthCredential;
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+}
--- a/src/Sdk/Common/Common/RawHttpMessageHandler.cs
+++ b/src/Sdk/Common/Common/RawHttpMessageHandler.cs
@@ -12,20 +12,20 @@ namespace GitHub.Services.Common
    public class RawHttpMessageHandler: HttpMessageHandler
    {
        public RawHttpMessageHandler(
-            FederatedCredential credentials)
+            VssOAuthCredential credentials)
            : this(credentials, new RawClientHttpRequestSettings())
        {
        }

        public RawHttpMessageHandler(
-            FederatedCredential credentials,
+            VssOAuthCredential credentials,
            RawClientHttpRequestSettings settings)
            : this(credentials, settings, new HttpClientHandler())
        {
        }

        public RawHttpMessageHandler(
-            FederatedCredential credentials,
+            VssOAuthCredential credentials,
            RawClientHttpRequestSettings settings,
            HttpMessageHandler innerHandler)
        {
@@ -56,7 +56,7 @@ namespace GitHub.Services.Common
        /// <summary>
        /// Gets the credentials associated with this handler.
        /// </summary>
-        public FederatedCredential Credentials
+        public VssOAuthCredential Credentials
        {
            get;
            private set;
@@ -111,7 +111,7 @@ namespace GitHub.Services.Common
                // Ensure that we attempt to use the most appropriate authentication mechanism by default.
                if (m_tokenProvider == null)
                {
-                    m_tokenProvider = this.Credentials.CreateTokenProvider(request.RequestUri, null, null);
+                    m_tokenProvider = this.Credentials.GetTokenProvider(request.RequestUri);
                }
            }

@@ -254,7 +254,7 @@ namespace GitHub.Services.Common
        private CredentialWrapper m_credentialWrapper;
        private object m_thisLock;
        private const Int32 m_maxAuthRetries = 3;
-        private IssuedTokenProvider m_tokenProvider;
+        private VssOAuthTokenProvider m_tokenProvider;

        //.Net Core does not attempt NTLM schema on Linux, unless ICredentials is a CredentialCache instance
        //This workaround may not be needed after this corefx fix is consumed: https://github.com/dotnet/corefx/pull/7923
--- a/src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs
+++ b/src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs
@@ -450,8 +450,6 @@ namespace GitHub.DistributedTask.WebApi
        /// <param name="poolId"></param>
        /// <param name="sessionId"></param>
        /// <param name="lastMessageId"></param>
-        /// <param name="status"></param>
-        /// <param name="runnerVersion"></param>
        /// <param name="userState"></param>
        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
        [EditorBrowsable(EditorBrowsableState.Never)]
@@ -460,7 +458,6 @@ namespace GitHub.DistributedTask.WebApi
            Guid sessionId,
            long? lastMessageId = null,
            TaskAgentStatus? status = null,
-            string runnerVersion = null,
            object userState = null,
            CancellationToken cancellationToken = default)
        {
@@ -478,16 +475,12 @@ namespace GitHub.DistributedTask.WebApi
            {
                queryParams.Add("status", status.Value.ToString());
            }
-            if (runnerVersion != null)
-            {
-                queryParams.Add("runnerVersion", runnerVersion);
-            }

            return SendAsync<TaskAgentMessage>(
                httpMethod,
                locationId,
                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
+                version: new ApiResourceVersion(5.1, 1),
                queryParameters: queryParams,
                userState: userState,
                cancellationToken: cancellationToken);
--- a/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs
+++ b/src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs
@@ -42,10 +42,9 @@ namespace GitHub.DistributedTask.Pipelines
            IList<String> fileTable,
            TemplateToken jobOutputs,
            IList<TemplateToken> defaults,
-            ActionsEnvironmentReference actionsEnvironment,
-            String messageType = JobRequestMessageTypes.PipelineAgentJobRequest)
+            ActionsEnvironmentReference actionsEnvironment)
        {
-            this.MessageType = messageType;
+            this.MessageType = JobRequestMessageTypes.PipelineAgentJobRequest;
            this.Plan = plan;
            this.JobId = jobId;
            this.JobDisplayName = jobDisplayName;
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -164,14 +164,13 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
        public Dictionary<String, String> EvaluateStepInputs(
            TemplateToken token,
            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions,
-            IEnumerable<KeyValuePair<String, Object>> expressionState = null)
+            IList<IFunctionInfo> expressionFunctions)
        {
            var result = default(Dictionary<String, String>);

            if (token != null && token.Type != TokenType.Null)
            {
-                var context = CreateContext(contextData, expressionFunctions, expressionState);
+                var context = CreateContext(contextData, expressionFunctions);
                try
                {
                    token = TemplateEvaluator.Evaluate(context, PipelineTemplateConstants.StepWith, token, 0, null, omitHeader: true);
@@ -456,6 +455,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
        private readonly String[] s_expressionValueNames = new[]
        {
            PipelineTemplateConstants.GitHub,
+            PipelineTemplateConstants.Needs,
            PipelineTemplateConstants.Strategy,
            PipelineTemplateConstants.Matrix,
            PipelineTemplateConstants.Needs,
--- a/src/Sdk/DTWebApi/WebApi/RunServiceHttpClient.cs
+++ b/src/Sdk/DTWebApi/WebApi/RunServiceHttpClient.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.Services.Common;
+using GitHub.Services.OAuth;
+using GitHub.Services.WebApi;
+using Sdk.WebApi.WebApi;
+
+namespace GitHub.DistributedTask.WebApi
+{
+    [ResourceArea(TaskResourceIds.AreaId)]
+    public class RunServiceHttpClient : RawHttpClientBase
+    {
+        public RunServiceHttpClient(
+            Uri baseUrl,
+            VssOAuthCredential credentials)
+            : base(baseUrl, credentials)
+        {
+        }
+
+        public RunServiceHttpClient(
+            Uri baseUrl,
+            VssOAuthCredential credentials,
+            RawClientHttpRequestSettings settings)
+            : base(baseUrl, credentials, settings)
+        {
+        }
+
+        public RunServiceHttpClient(
+            Uri baseUrl,
+            VssOAuthCredential credentials,
+            params DelegatingHandler[] handlers)
+            : base(baseUrl, credentials, handlers)
+        {
+        }
+
+        public RunServiceHttpClient(
+            Uri baseUrl,
+            VssOAuthCredential credentials,
+            RawClientHttpRequestSettings settings,
+            params DelegatingHandler[] handlers)
+            : base(baseUrl, credentials, settings, handlers)
+        {
+        }
+
+        public RunServiceHttpClient(
+            Uri baseUrl,
+            HttpMessageHandler pipeline,
+            Boolean disposeHandler)
+            : base(baseUrl, pipeline, disposeHandler)
+        {
+        }
+
+        public Task<Pipelines.AgentJobRequestMessage> GetJobMessageAsync(
+            Uri requestUri,
+            string messageId,
+            CancellationToken cancellationToken = default)
+        {
+            HttpMethod httpMethod = new HttpMethod("POST");
+            var payload = new {
+                StreamID = messageId
+            };
+
+            var payloadJson = JsonUtility.ToString(payload);
+            var requestContent = new StringContent(payloadJson, System.Text.Encoding.UTF8, "application/json");
+            return SendAsync<Pipelines.AgentJobRequestMessage>(
+                httpMethod,
+                additionalHeaders: null,
+                requestUri: requestUri,
+                content: requestContent,
+                cancellationToken: cancellationToken);
+        }
+    }
+}
--- a/src/Sdk/DTWebApi/WebApi/RunnerRefreshMessage.cs
+++ b/src/Sdk/DTWebApi/WebApi/RunnerRefreshMessage.cs
@@ -1,49 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Runtime.Serialization;
-
-
-namespace GitHub.DistributedTask.WebApi
-{
-    [DataContract]
-    public sealed class RunnerRefreshMessage
-    {
-        public static readonly String MessageType = "RunnerRefresh";
-
-        [JsonConstructor]
-        internal RunnerRefreshMessage()
-        {
-        }
-
-        public RunnerRefreshMessage(
-            Int32 runnerId,
-            String targetVersion,
-            int? timeoutInSeconds = null)
-        {
-            this.RunnerId = runnerId;
-            this.TimeoutInSeconds = timeoutInSeconds ?? TimeSpan.FromMinutes(60).Seconds;
-            this.TargetVersion = targetVersion;
-        }
-
-        [DataMember]
-        public Int32 RunnerId
-        {
-            get;
-            private set;
-        }
-
-        [DataMember]
-        public int TimeoutInSeconds
-        {
-            get;
-            private set;
-        }
-
-        [DataMember]
-        public String TargetVersion
-        {
-            get;
-            private set;
-        }
-    }
-}
--- a/src/Sdk/DTWebApi/WebApi/TaskAttachment.cs
+++ b/src/Sdk/DTWebApi/WebApi/TaskAttachment.cs
@@ -1,4 +1,4 @@
-using GitHub.Services.Common;
+using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using System;
 using System.Runtime.Serialization;
@@ -27,6 +27,7 @@ namespace GitHub.DistributedTask.WebApi
            this.Type = type;
            this.Name = name;
        }
+        

        [DataMember]
        public String Type
@@ -100,7 +101,6 @@ namespace GitHub.DistributedTask.WebApi
        public static readonly String Summary = "DistributedTask.Core.Summary";
        public static readonly String FileAttachment = "DistributedTask.Core.FileAttachment";
        public static readonly String DiagnosticLog = "DistributedTask.Core.DiagnosticLog";
-        public static readonly String ResultsLog = "Results.Core.Log";
    }

    [GenerateAllConstants]
--- a/src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs
+++ b/src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using GitHub.DistributedTask.WebApi;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class AcquireJobRequest
-    {
-        [DataMember(Name = "streamId", EmitDefaultValue = false)]
-        public string StreamID { get; set; }
-    }
-}
--- a/src/Sdk/RSWebApi/Contracts/CompleteJobRequest.cs
+++ b/src/Sdk/RSWebApi/Contracts/CompleteJobRequest.cs
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using GitHub.DistributedTask.WebApi;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class CompleteJobRequest
-    {
-        [DataMember(Name = "planId", EmitDefaultValue = false)]
-        public Guid PlanID { get; set; }
-        
-        [DataMember(Name = "jobId", EmitDefaultValue = false)]
-        public Guid JobID { get; set; }
-        
-        [DataMember(Name = "conclusion")]
-        public TaskResult Conclusion { get; set; }
-        
-        [DataMember(Name = "outputs", EmitDefaultValue = false)]
-        public Dictionary<string, VariableValue> Outputs { get; set; }   
-        
-        [DataMember(Name = "stepResults", EmitDefaultValue = false)]
-        public IList<StepResult> StepResults { get; set; }
-    }
-}
--- a/src/Sdk/RSWebApi/Contracts/RenewJobRequest.cs
+++ b/src/Sdk/RSWebApi/Contracts/RenewJobRequest.cs
@@ -1,15 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class RenewJobRequest
-    {
-        [DataMember(Name = "planId", EmitDefaultValue = false)]
-        public Guid PlanID { get; set; }
-
-        [DataMember(Name = "jobId", EmitDefaultValue = false)]
-        public Guid JobID { get; set; }
-    }
-}
--- a/src/Sdk/RSWebApi/Contracts/RenewJobResponse.cs
+++ b/src/Sdk/RSWebApi/Contracts/RenewJobResponse.cs
@@ -1,16 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Sdk.RSWebApi.Contracts
-{
-    [DataContract]
-    public class RenewJobResponse
-    {
-        [DataMember]
-        public DateTime LockedUntil
-        {
-            get;
-            internal set;
-        }
-    }
-}
--- a/src/Sdk/RSWebApi/Contracts/StepResult.cs
+++ b/src/Sdk/RSWebApi/Contracts/StepResult.cs
@@ -1,38 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class StepResult
-    {
-        [DataMember(Name = "external_id", EmitDefaultValue = false)]
-        public Guid ExternalID { get; set; }
-
-        [DataMember(Name = "number", EmitDefaultValue = false)]
-        public int? Number { get; set; }
-
-        [DataMember(Name = "name", EmitDefaultValue = false)]
-        public string Name { get; set; }
-
-        [DataMember(Name = "status")]
-        public TimelineRecordState? Status { get; set; }
-
-        [DataMember(Name = "conclusion")]
-        public TaskResult? Conclusion { get; set; }
-
-        [DataMember(Name = "started_at", EmitDefaultValue = false)]
-        public DateTime? StartedAt { get; set; }
-
-        [DataMember(Name = "completed_at", EmitDefaultValue = false)]
-        public DateTime? CompletedAt { get; set; }
-
-        [DataMember(Name = "completed_log_url", EmitDefaultValue = false)]
-        public string CompletedLogURL { get; set; }
-
-        [DataMember(Name = "completed_log_lines", EmitDefaultValue = false)]
-        public long? CompletedLogLines { get; set; }
-    }
-}
--- a/src/Sdk/RSWebApi/RunServiceHttpClient.cs
+++ b/src/Sdk/RSWebApi/RunServiceHttpClient.cs
@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.Pipelines;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Services.Common;
-using GitHub.Services.OAuth;
-using GitHub.Services.WebApi;
-using Sdk.RSWebApi.Contracts;
-using Sdk.WebApi.WebApi;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    public class RunServiceHttpClient : RawHttpClientBase
-    {
-        public RunServiceHttpClient(
-            Uri baseUrl,
-            VssOAuthCredential credentials)
-            : base(baseUrl, credentials)
-        {
-        }
-
-        public RunServiceHttpClient(
-            Uri baseUrl,
-            VssOAuthCredential credentials,
-            RawClientHttpRequestSettings settings)
-            : base(baseUrl, credentials, settings)
-        {
-        }
-
-        public RunServiceHttpClient(
-            Uri baseUrl,
-            VssOAuthCredential credentials,
-            params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, handlers)
-        {
-        }
-
-        public RunServiceHttpClient(
-            Uri baseUrl,
-            VssOAuthCredential credentials,
-            RawClientHttpRequestSettings settings,
-            params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, settings, handlers)
-        {
-        }
-
-        public RunServiceHttpClient(
-            Uri baseUrl,
-            HttpMessageHandler pipeline,
-            Boolean disposeHandler)
-            : base(baseUrl, pipeline, disposeHandler)
-        {
-        }
-
-        public Task<AgentJobRequestMessage> GetJobMessageAsync(
-            Uri requestUri,
-            string messageId,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            var payload = new AcquireJobRequest
-            {
-                StreamID = messageId
-            };
-
-            requestUri = new Uri(requestUri, "acquirejob");
-
-            var requestContent = new ObjectContent<AcquireJobRequest>(payload, new VssJsonMediaTypeFormatter(true));
-            return SendAsync<AgentJobRequestMessage>(
-                httpMethod,
-                requestUri: requestUri,
-                content: requestContent,
-                cancellationToken: cancellationToken);
-        }
-
-        public Task CompleteJobAsync(
-            Uri requestUri,
-            Guid planId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            IList<StepResult> stepResults,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            var payload = new CompleteJobRequest()
-            {
-                PlanID = planId,
-                JobID = jobId,
-                Conclusion = result,
-                Outputs = outputs,
-                StepResults = stepResults
-            };
-
-            requestUri = new Uri(requestUri, "completejob");
-
-            var requestContent = new ObjectContent<CompleteJobRequest>(payload, new VssJsonMediaTypeFormatter(true));
-            return SendAsync(
-                    httpMethod,
-                    requestUri,
-                    content: requestContent,
-                    cancellationToken: cancellationToken);
-        }
-
-        public Task<RenewJobResponse> RenewJobAsync(
-            Uri requestUri,
-            Guid planId,
-            Guid jobId,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            var payload = new RenewJobRequest()
-            {
-                PlanID = planId,
-                JobID = jobId
-            };
-
-            requestUri = new Uri(requestUri, "renewjob");
-
-            var requestContent = new ObjectContent<RenewJobRequest>(payload, new VssJsonMediaTypeFormatter(true));
-            return SendAsync<RenewJobResponse>(
-                httpMethod,
-                requestUri,
-                content: requestContent,
-                cancellationToken: cancellationToken);
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ferenc Hammerl	d84b751b33	Update releaseVersion	2023-01-30 17:03:37 +01:00
Ferenc Hammerl	e0a3781062	M299/backport 5852 (#2405 ) * set env in ProcessInvoker sanitized (#2280) * set env in ProcessInvoker sanitized * Update runnerversion and rel notes and make it prerelase --------- Co-authored-by: Stefan Ruvceski <96768603+ruvceskistefan@users.noreply.github.com>	2023-01-30 16:59:05 +01:00
TingluoHuang	2e44f985bd	Release 2.299.1 runner.	2022-11-02 19:59:20 -04:00
Tingluo Huang	c638ccf940	Forward parameters into run() func in run.sh. (#2240 )	2022-11-02 19:58:07 -04:00
Cory Miller	c0d21101a3	Release 2.299.0 runner	2022-11-02 14:56:56 -04:00