fix composite annotations not appearing as expected

2025-12-10 12:36:23 +00:00 · 2022-09-09 09:46:07 -04:00
191 changed files with 1076 additions and 7136 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,24 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-{
-	"name": "Actions Runner Devcontainer",
-	"image": "mcr.microsoft.com/devcontainers/base:focal",
-	"features": {
-		"ghcr.io/devcontainers/features/docker-in-docker:1": {},
-		"ghcr.io/devcontainers/features/dotnet": {
-			"version": "6.0.300"
-		}
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-azuretools.vscode-docker",
-				"ms-dotnettools.csharp",
-				"eamodio.gitlens"
-			]
-		}
-	},
-	// dotnet restore to install dependencies so OmniSharp works out of the box
-	// src/Test restores all other projects it references, src/Runner.PluginHost is not one of them
-	"postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
-	"remoteUser": "vscode"
-}
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,6 @@
 # https://editorconfig.org/

 [*]
-charset = utf-8 # Set default charset to utf-8
 insert_final_newline = true # ensure all files end with a single newline
 trim_trailing_whitespace = true # attempt to remove trailing whitespace on save

--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
    - '**.md'
  pull_request:
    branches:
-    - '**'
+    - '*'
    paths-ignore:
    - '**.md'

@@ -18,7 +18,7 @@ jobs:
  build:
    strategy:
      matrix:
-        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, win-arm64, osx-x64, osx-arm64 ]
+        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, osx-x64, osx-arm64 ]
        include:
        - runtime: linux-x64
          os: ubuntu-latest
@@ -44,10 +44,6 @@ jobs:
          os: windows-2019
          devScript: ./dev

-        - runtime: win-arm64
-          os: windows-latest
-          devScript: ./dev
-
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v3
@@ -86,7 +82,7 @@ jobs:
      run: |
        ${{ matrix.devScript }} test
      working-directory: src
-      if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm' && matrix.runtime != 'osx-arm64' && matrix.runtime != 'win-arm64'
+      if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm' && matrix.runtime != 'osx-arm64'

    # Create runner package tar.gz/zip
    - name: Package Release
@@ -101,7 +97,7 @@ jobs:
      uses: actions/upload-artifact@v2
      with:
        name: runner-package-${{ matrix.runtime }}
-        path: |
+        path: | 
          _package
          _package_trims/trim_externals
          _package_trims/trim_runtime
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,25 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          # Ensure full list of changed files within `super-linter`
-          fetch-depth: 0
-      - name: Run linters
-        uses: github/super-linter@v4
-        env:
-          DEFAULT_BRANCH: ${{ github.base_ref }}
-          DISABLE_ERRORS: true
-          EDITORCONFIG_FILE_NAME: .editorconfig
-          LINTER_RULES_PATH: /src/
-          VALIDATE_ALL_CODEBASE: false
-          VALIDATE_CSHARP: true
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -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
@@ -50,33 +50,29 @@ jobs:
      linux-arm64-sha: ${{ steps.sha.outputs.linux-arm64-sha256 }}
      linux-arm-sha: ${{ steps.sha.outputs.linux-arm-sha256 }}
      win-x64-sha: ${{ steps.sha.outputs.win-x64-sha256 }}
-      win-arm64-sha: ${{ steps.sha.outputs.win-arm64-sha256 }}
      osx-x64-sha: ${{ steps.sha.outputs.osx-x64-sha256 }}
      osx-arm64-sha: ${{ steps.sha.outputs.osx-arm64-sha256 }}
      linux-x64-sha-noexternals: ${{ steps.sha_noexternals.outputs.linux-x64-sha256 }}
      linux-arm64-sha-noexternals: ${{ steps.sha_noexternals.outputs.linux-arm64-sha256 }}
      linux-arm-sha-noexternals: ${{ steps.sha_noexternals.outputs.linux-arm-sha256 }}
      win-x64-sha-noexternals: ${{ steps.sha_noexternals.outputs.win-x64-sha256 }}
-      win-arm64-sha-noexternals: ${{ steps.sha_noexternals.outputs.win-arm64-sha256 }}
      osx-x64-sha-noexternals: ${{ steps.sha_noexternals.outputs.osx-x64-sha256 }}
      osx-arm64-sha-noexternals: ${{ steps.sha_noexternals.outputs.osx-arm64-sha256 }}
      linux-x64-sha-noruntime: ${{ steps.sha_noruntime.outputs.linux-x64-sha256 }}
      linux-arm64-sha-noruntime: ${{ steps.sha_noruntime.outputs.linux-arm64-sha256 }}
      linux-arm-sha-noruntime: ${{ steps.sha_noruntime.outputs.linux-arm-sha256 }}
      win-x64-sha-noruntime: ${{ steps.sha_noruntime.outputs.win-x64-sha256 }}
-      win-arm64-sha-noruntime: ${{ steps.sha_noruntime.outputs.win-arm64-sha256 }}
      osx-x64-sha-noruntime: ${{ steps.sha_noruntime.outputs.osx-x64-sha256 }}
      osx-arm64-sha-noruntime: ${{ steps.sha_noruntime.outputs.osx-arm64-sha256 }}
      linux-x64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.linux-x64-sha256 }}
      linux-arm64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.linux-arm64-sha256 }}
      linux-arm-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.linux-arm-sha256 }}
      win-x64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.win-x64-sha256 }}
-      win-arm64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.win-arm64-sha256 }}
      osx-x64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.osx-x64-sha256 }}
      osx-arm64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.osx-arm64-sha256 }}
    strategy:
      matrix:
-        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, osx-x64, osx-arm64, win-arm64 ]
+        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, osx-x64, osx-arm64 ]
        include:
        - runtime: linux-x64
          os: ubuntu-latest
@@ -93,7 +89,7 @@ jobs:
        - runtime: osx-x64
          os: macOS-latest
          devScript: ./dev.sh
-
+        
        - runtime: osx-arm64
          os: macOS-latest
          devScript: ./dev.sh
@@ -102,10 +98,6 @@ jobs:
          os: windows-2019
          devScript: ./dev

-        - runtime: win-arm64
-          os: windows-latest
-          devScript: ./dev
-
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v3
@@ -166,9 +158,9 @@ jobs:
      id: sha_noruntime_noexternals
      name: Compute SHA256
      working-directory: _package_trims/trim_runtime_externals
-
+    
    - name: Create trimmedpackages.json for ${{ matrix.runtime }}
-      if: matrix.runtime == 'win-x64' || matrix.runtime == 'win-arm64'
+      if: matrix.runtime == 'win-x64'
      uses: actions/github-script@0.3.0
      with:
        github-token: ${{secrets.GITHUB_TOKEN}}
@@ -188,7 +180,7 @@ jobs:
          fs.writeFileSync('${{ matrix.runtime }}-trimmedpackages.json', trimmedPackages)

    - name: Create trimmedpackages.json for ${{ matrix.runtime }}
-      if: matrix.runtime != 'win-x64' && matrix.runtime != 'win-arm64'
+      if: matrix.runtime != 'win-x64'
      uses: actions/github-script@0.3.0
      with:
        github-token: ${{secrets.GITHUB_TOKEN}}
@@ -247,28 +239,24 @@ jobs:
          const runnerVersion = fs.readFileSync('${{ github.workspace }}/src/runnerversion', 'utf8').replace(/\n$/g, '')
          var releaseNote = fs.readFileSync('${{ github.workspace }}/releaseNote.md', 'utf8').replace(/<RUNNER_VERSION>/g, runnerVersion)
          releaseNote = releaseNote.replace(/<WIN_X64_SHA>/g, '${{needs.build.outputs.win-x64-sha}}')
-          releaseNote = releaseNote.replace(/<WIN_ARM64_SHA>/g, '${{needs.build.outputs.win-arm64-sha}}')
          releaseNote = releaseNote.replace(/<OSX_X64_SHA>/g, '${{needs.build.outputs.osx-x64-sha}}')
          releaseNote = releaseNote.replace(/<OSX_ARM64_SHA>/g, '${{needs.build.outputs.osx-arm64-sha}}')
          releaseNote = releaseNote.replace(/<LINUX_X64_SHA>/g, '${{needs.build.outputs.linux-x64-sha}}')
          releaseNote = releaseNote.replace(/<LINUX_ARM_SHA>/g, '${{needs.build.outputs.linux-arm-sha}}')
          releaseNote = releaseNote.replace(/<LINUX_ARM64_SHA>/g, '${{needs.build.outputs.linux-arm64-sha}}')
          releaseNote = releaseNote.replace(/<WIN_X64_SHA_NOEXTERNALS>/g, '${{needs.build.outputs.win-x64-sha-noexternals}}')
-          releaseNote = releaseNote.replace(/<WIN_ARM64_SHA_NOEXTERNALS>/g, '${{needs.build.outputs.win-arm64-sha-noexternals}}')
          releaseNote = releaseNote.replace(/<OSX_X64_SHA_NOEXTERNALS>/g, '${{needs.build.outputs.osx-x64-sha-noexternals}}')
          releaseNote = releaseNote.replace(/<OSX_ARM64_SHA_NOEXTERNALS>/g, '${{needs.build.outputs.osx-arm64-sha-noexternals}}')
          releaseNote = releaseNote.replace(/<LINUX_X64_SHA_NOEXTERNALS>/g, '${{needs.build.outputs.linux-x64-sha-noexternals}}')
          releaseNote = releaseNote.replace(/<LINUX_ARM_SHA_NOEXTERNALS>/g, '${{needs.build.outputs.linux-arm-sha-noexternals}}')
          releaseNote = releaseNote.replace(/<LINUX_ARM64_SHA_NOEXTERNALS>/g, '${{needs.build.outputs.linux-arm64-sha-noexternals}}')
          releaseNote = releaseNote.replace(/<WIN_X64_SHA_NORUNTIME>/g, '${{needs.build.outputs.win-x64-sha-noruntime}}')
-          releaseNote = releaseNote.replace(/<WIN_ARM64_SHA_NORUNTIME>/g, '${{needs.build.outputs.win-arm64-sha-noruntime}}')
          releaseNote = releaseNote.replace(/<OSX_X64_SHA_NORUNTIME>/g, '${{needs.build.outputs.osx-x64-sha-noruntime}}')
          releaseNote = releaseNote.replace(/<OSX_ARM64_SHA_NORUNTIME>/g, '${{needs.build.outputs.osx-arm64-sha-noruntime}}')
          releaseNote = releaseNote.replace(/<LINUX_X64_SHA_NORUNTIME>/g, '${{needs.build.outputs.linux-x64-sha-noruntime}}')
          releaseNote = releaseNote.replace(/<LINUX_ARM_SHA_NORUNTIME>/g, '${{needs.build.outputs.linux-arm-sha-noruntime}}')
          releaseNote = releaseNote.replace(/<LINUX_ARM64_SHA_NORUNTIME>/g, '${{needs.build.outputs.linux-arm64-sha-noruntime}}')
          releaseNote = releaseNote.replace(/<WIN_X64_SHA_NORUNTIME_NOEXTERNALS>/g, '${{needs.build.outputs.win-x64-sha-noruntime-noexternals}}')
-          releaseNote = releaseNote.replace(/<WIN_ARM64_SHA_NORUNTIME_NOEXTERNALS>/g, '${{needs.build.outputs.win-arm64-sha-noruntime-noexternals}}')
          releaseNote = releaseNote.replace(/<OSX_X64_SHA_NORUNTIME_NOEXTERNALS>/g, '${{needs.build.outputs.osx-x64-sha-noruntime-noexternals}}')
          releaseNote = releaseNote.replace(/<OSX_ARM64_SHA_NORUNTIME_NOEXTERNALS>/g, '${{needs.build.outputs.osx-arm64-sha-noruntime-noexternals}}')
          releaseNote = releaseNote.replace(/<LINUX_X64_SHA_NORUNTIME_NOEXTERNALS>/g, '${{needs.build.outputs.linux-x64-sha-noruntime-noexternals}}')
@@ -283,7 +271,6 @@ jobs:
      run: |
        ls -l
        echo "${{needs.build.outputs.win-x64-sha}}  actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip" | shasum -a 256 -c
-        echo "${{needs.build.outputs.win-arm64-sha}}  actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}.zip" | shasum -a 256 -c
        echo "${{needs.build.outputs.osx-x64-sha}}  actions-runner-osx-x64-${{ steps.releaseNote.outputs.version }}.tar.gz" | shasum -a 256 -c
        echo "${{needs.build.outputs.osx-arm64-sha}}  actions-runner-osx-arm64-${{ steps.releaseNote.outputs.version }}.tar.gz" | shasum -a 256 -c
        echo "${{needs.build.outputs.linux-x64-sha}}  actions-runner-linux-x64-${{ steps.releaseNote.outputs.version }}.tar.gz" | shasum -a 256 -c
@@ -313,16 +300,6 @@ jobs:
        asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip
        asset_content_type: application/octet-stream

-    - name: Upload Release Asset (win-arm64)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/_package/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}.zip
-        asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}.zip
-        asset_content_type: application/octet-stream
-
    - name: Upload Release Asset (linux-x64)
      uses: actions/upload-release-asset@v1.0.1
      env:
@@ -384,17 +361,6 @@ jobs:
        asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noexternals.zip
        asset_content_type: application/octet-stream

-    # Upload release assets (trim externals)
-    - name: Upload Release Asset (win-arm64-noexternals)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/_package_trims/trim_externals/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noexternals.zip
-        asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noexternals.zip
-        asset_content_type: application/octet-stream
-
    - name: Upload Release Asset (linux-x64-noexternals)
      uses: actions/upload-release-asset@v1.0.1
      env:
@@ -456,17 +422,6 @@ jobs:
        asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noruntime.zip
        asset_content_type: application/octet-stream

-    # Upload release assets (trim runtime)
-    - name: Upload Release Asset (win-arm64-noruntime)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/_package_trims/trim_runtime/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime.zip
-        asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime.zip
-        asset_content_type: application/octet-stream
-
    - name: Upload Release Asset (linux-x64-noruntime)
      uses: actions/upload-release-asset@v1.0.1
      env:
@@ -528,17 +483,6 @@ jobs:
        asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.zip
        asset_content_type: application/octet-stream

-    # Upload release assets (trim runtime and externals)
-    - name: Upload Release Asset (win-arm64-noruntime-noexternals)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/_package_trims/trim_runtime_externals/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.zip
-        asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.zip
-        asset_content_type: application/octet-stream
-
    - name: Upload Release Asset (linux-x64-noruntime-noexternals)
      uses: actions/upload-release-asset@v1.0.1
      env:
@@ -600,17 +544,6 @@ jobs:
        asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-trimmedpackages.json
        asset_content_type: application/octet-stream

-    # Upload release assets (trimmedpackages.json)
-    - name: Upload Release Asset (win-arm64-trimmedpackages.json)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/win-arm64-trimmedpackages.json
-        asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-trimmedpackages.json
-        asset_content_type: application/octet-stream
-
    - name: Upload Release Asset (linux-x64-trimmedpackages.json)
      uses: actions/upload-release-asset@v1.0.1
      env:
@@ -660,52 +593,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/checks/actions.md
+++ b/docs/checks/actions.md
@@ -64,4 +64,4 @@ Make sure the runner has access to actions service for GitHub.com or GitHub Ente
  
 ## Still not working?

-Contact [GitHub Support](https://support.github.com) if you have further questuons, or log an issue at https://github.com/actions/runner if you think it's a runner issue.
+Contact [GitHub Support](https://support.github.com] if you have further questuons, or log an issue at https://github.com/actions/runner if you think it's a runner issue.
--- 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.

@@ -27,8 +27,6 @@ An ADR is an Architectural Decision Record.  This allows consensus on the direct

 ![Win](res/win_sm.png) Visual Studio 2017 or newer [Install here](https://visualstudio.microsoft.com) (needed for dev sh script)

-![Win-arm](res/win_sm.png) Visual Studio 2022 17.3 Preview or later. [Install here](https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-preview)
-
 ## Quickstart: Run a job from a real repository

 If you just want to get from building the sourcecode to using it to execute an action, you will need:
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,24 +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.1.3
-
-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
-
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0
-
-ENV RUNNER_ALLOW_RUNASROOT=1
-ENV RUNNER_MANUALLY_TRAP_SIG=1
-
-WORKDIR /actions-runner
-COPY --from=build /actions-runner .
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,17 +1,6 @@
-## Features
- Expose github.actor_id, github.workflow_ref & github.workflow_sha as environment variable (#2249)
- Added worker and listener logs to stdout (#2291, #2307)
-
 ## Bugs
- Made github.action_status output lowercase to be consistent with job.status' output (#1944)
-
+- Fixed an issue where job and service container envs were corrupted (#2091)
 ## Misc
- Added small size runner image for ARC (#2250)
- Small change to Node.js 12 deprecation message (#2262)
- Added the option to use the --replace argument to the create-latest-svc.sh (#2273)
- Made runner_name optional defaulting to hostname in delete.sh script (#1871)
- Return exit code when MANUALLY_TRAP_SIG is exported (#2285)
- Use results for uploading step summaries (#2301)

 ## 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.
@@ -27,22 +16,6 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ;
 [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
 ```

-## [Pre-release] Windows arm64
-**Warning:** Windows arm64 runners are currently in preview status and use [unofficial versions of nodejs](https://unofficial-builds.nodejs.org/). They are not intended for production workflows.
-
-We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.
-
-The following snipped needs to be run on `powershell`:
-``` powershell
-# Create a folder under the drive root
-mkdir \actions-runner ; cd \actions-runner
-# Download the latest runner package
-Invoke-WebRequest -Uri https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-win-arm64-<RUNNER_VERSION>.zip -OutFile actions-runner-win-arm64-<RUNNER_VERSION>.zip
-# Extract the installer
-Add-Type -AssemblyName System.IO.Compression.FileSystem ;
-[System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\actions-runner-win-arm64-<RUNNER_VERSION>.zip", "$PWD")
-```
-
 ## OSX x64

 ``` bash
@@ -106,7 +79,6 @@ For additional details about configuring, running, or shutting down the runner p
 The SHA-256 checksums for the packages included in this build are shown below:

 - actions-runner-win-x64-<RUNNER_VERSION>.zip <!-- BEGIN SHA win-x64 --><WIN_X64_SHA><!-- END SHA win-x64 -->
- actions-runner-win-arm64-<RUNNER_VERSION>.zip <!-- BEGIN SHA win-arm64 --><WIN_ARM64_SHA><!-- END SHA win-arm64 -->
 - actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz <!-- BEGIN SHA osx-x64 --><OSX_X64_SHA><!-- END SHA osx-x64 -->
 - actions-runner-osx-arm64-<RUNNER_VERSION>.tar.gz <!-- BEGIN SHA osx-arm64 --><OSX_ARM64_SHA><!-- END SHA osx-arm64 -->
 - actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz <!-- BEGIN SHA linux-x64 --><LINUX_X64_SHA><!-- END SHA linux-x64 -->
@@ -114,7 +86,6 @@ The SHA-256 checksums for the packages included in this build are shown below:
 - actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz <!-- BEGIN SHA linux-arm --><LINUX_ARM_SHA><!-- END SHA linux-arm -->

 - actions-runner-win-x64-<RUNNER_VERSION>-noexternals.zip <!-- BEGIN SHA win-x64_noexternals --><WIN_X64_SHA_NOEXTERNALS><!-- END SHA win-x64_noexternals -->
- actions-runner-win-arm64-<RUNNER_VERSION>-noexternals.zip <!-- BEGIN SHA win-arm64_noexternals --><WIN_ARM64_SHA_NOEXTERNALS><!-- END SHA win-arm64_noexternals -->
 - actions-runner-osx-x64-<RUNNER_VERSION>-noexternals.tar.gz <!-- BEGIN SHA osx-x64_noexternals --><OSX_X64_SHA_NOEXTERNALS><!-- END SHA osx-x64_noexternals -->
 - actions-runner-osx-arm64-<RUNNER_VERSION>-noexternals.tar.gz <!-- BEGIN SHA osx-arm64_noexternals --><OSX_ARM64_SHA_NOEXTERNALS><!-- END SHA osx-arm64_noexternals -->
 - actions-runner-linux-x64-<RUNNER_VERSION>-noexternals.tar.gz <!-- BEGIN SHA linux-x64_noexternals --><LINUX_X64_SHA_NOEXTERNALS><!-- END SHA linux-x64_noexternals -->
@@ -122,7 +93,6 @@ The SHA-256 checksums for the packages included in this build are shown below:
 - actions-runner-linux-arm-<RUNNER_VERSION>-noexternals.tar.gz <!-- BEGIN SHA linux-arm_noexternals --><LINUX_ARM_SHA_NOEXTERNALS><!-- END SHA linux-arm_noexternals -->

 - actions-runner-win-x64-<RUNNER_VERSION>-noruntime.zip <!-- BEGIN SHA win-x64_noruntime --><WIN_X64_SHA_NORUNTIME><!-- END SHA win-x64_noruntime -->
- actions-runner-win-arm64-<RUNNER_VERSION>-noruntime.zip <!-- BEGIN SHA win-arm64_noruntime --><WIN_ARM64_SHA_NORUNTIME><!-- END SHA win-arm64_noruntime -->
 - actions-runner-osx-x64-<RUNNER_VERSION>-noruntime.tar.gz <!-- BEGIN SHA osx-x64_noruntime --><OSX_X64_SHA_NORUNTIME><!-- END SHA osx-x64_noruntime -->
 - actions-runner-osx-arm64-<RUNNER_VERSION>-noruntime.tar.gz <!-- BEGIN SHA osx-arm64_noruntime --><OSX_ARM64_SHA_NORUNTIME><!-- END SHA osx-arm64_noruntime -->
 - actions-runner-linux-x64-<RUNNER_VERSION>-noruntime.tar.gz <!-- BEGIN SHA linux-x64_noruntime --><LINUX_X64_SHA_NORUNTIME><!-- END SHA linux-x64_noruntime -->
@@ -130,7 +100,6 @@ The SHA-256 checksums for the packages included in this build are shown below:
 - actions-runner-linux-arm-<RUNNER_VERSION>-noruntime.tar.gz <!-- BEGIN SHA linux-arm_noruntime --><LINUX_ARM_SHA_NORUNTIME><!-- END SHA linux-arm_noruntime -->

 - actions-runner-win-x64-<RUNNER_VERSION>-noruntime-noexternals.zip <!-- BEGIN SHA win-x64_noruntime_noexternals --><WIN_X64_SHA_NORUNTIME_NOEXTERNALS><!-- END SHA win-x64_noruntime_noexternals -->
- actions-runner-win-arm64-<RUNNER_VERSION>-noruntime-noexternals.zip <!-- BEGIN SHA win-arm64_noruntime_noexternals --><WIN_ARM64_SHA_NORUNTIME_NOEXTERNALS><!-- END SHA win-arm64_noruntime_noexternals -->
 - actions-runner-osx-x64-<RUNNER_VERSION>-noruntime-noexternals.tar.gz <!-- BEGIN SHA osx-x64_noruntime_noexternals --><OSX_X64_SHA_NORUNTIME_NOEXTERNALS><!-- END SHA osx-x64_noruntime_noexternals -->
 - actions-runner-osx-arm64-<RUNNER_VERSION>-noruntime-noexternals.tar.gz <!-- BEGIN SHA osx-arm64_noruntime_noexternals --><OSX_ARM64_SHA_NORUNTIME_NOEXTERNALS><!-- END SHA osx-arm64_noruntime_noexternals -->
 - actions-runner-linux-x64-<RUNNER_VERSION>-noruntime-noexternals.tar.gz <!-- BEGIN SHA linux-x64_noruntime_noexternals --><LINUX_X64_SHA_NORUNTIME_NOEXTERNALS><!-- END SHA linux-x64_noruntime_noexternals -->
--- a/2
+++ b/2
@@ -1 +1 @@
-2.300.0
+<Update to ./src/runnerversion when creating release>
--- 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:' opt; do
    flags_found=true

    case $opt in
@@ -35,12 +35,6 @@ while getopts 's:g:n:r:u:l:df' opt; do
    l)
        labels=$OPTARG
        ;;
-    f)
-        replace='true'
-        ;;
-    d)
-        disableupdate='true'
-        ;;
    *)
        echo "
 Runner Service Installer
@@ -55,9 +49,7 @@ Usage:
    -n          optional  name of the runner, defaults to hostname
    -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"
+    -l          optional  list of labels (split by comma) applied on the runner"
        exit 0
        ;;
    esac
@@ -177,8 +169,8 @@ 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}
+echo "./config.sh --unattended --url $runner_url --token *** --name $runner_name ${labels:+--labels $labels} ${runner_group:+--runnergroup \"$runner_group\"}"
+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"}

 #---------------------------------------
 # 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/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -24,9 +24,6 @@
  <PropertyGroup Condition="'$(BUILD_OS)' == 'Windows' AND '$(PackageRuntime)' == 'win-x86'">
    <DefineConstants>$(DefineConstants);X86</DefineConstants>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(BUILD_OS)' == 'Windows' AND '$(PackageRuntime)' == 'win-arm64'">
-    <DefineConstants>$(DefineConstants);ARM64</DefineConstants>
-  </PropertyGroup>

  <PropertyGroup Condition="'$(BUILD_OS)' == 'OSX' AND '$(PackageRuntime)' == 'osx-x64'">
    <DefineConstants>$(DefineConstants);X64</DefineConstants>
--- a/src/Misc/contentHash/dotnetRuntime/win-arm64
+++ b/src/Misc/contentHash/dotnetRuntime/win-arm64
@@ -1 +0,0 @@
-39d0683f0f115a211cb10c473e9574c16549a19d4e9a6c637ded3d7022bf809f
--- a/src/Misc/contentHash/externals/win-arm64
+++ b/src/Misc/contentHash/externals/win-arm64
@@ -1 +0,0 @@
-e5dace2d41cc0682d096dcce4970079ad48ec7107e46195970eecfdb3df2acef
--- a/src/Misc/expressionFunc/hashFiles/README.md
+++ b/src/Misc/expressionFunc/hashFiles/README.md
@@ -1,4 +1 @@
-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.
+To update hashFiles under `Misc/layoutbin` run `npm install && npm run all`
--- a/src/Misc/expressionFunc/hashFiles/package-lock.json
+++ b/src/Misc/expressionFunc/hashFiles/package-lock.json
@@ -22,13 +22,9 @@
      }
    },
    "node_modules/@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
-      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      }
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
+      "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA=="
    },
    "node_modules/@actions/glob": {
      "version": "0.1.0",
@@ -39,14 +35,6 @@
        "minimatch": "^3.0.4"
      }
    },
-    "node_modules/@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
-      "dependencies": {
-        "tunnel": "^0.0.6"
-      }
-    },
    "node_modules/@eslint/eslintrc": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
@@ -2393,14 +2381,6 @@
        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
      }
    },
-    "node_modules/tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
    "node_modules/type-check": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -2462,14 +2442,6 @@
        "punycode": "^2.1.0"
      }
    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
    "node_modules/v8-compile-cache": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
@@ -2531,13 +2503,9 @@
  },
  "dependencies": {
    "@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
-      "requires": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      }
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
+      "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA=="
    },
    "@actions/glob": {
      "version": "0.1.0",
@@ -2548,14 +2516,6 @@
        "minimatch": "^3.0.4"
      }
    },
-    "@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
-      "requires": {
-        "tunnel": "^0.0.6"
-      }
-    },
    "@eslint/eslintrc": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
@@ -4229,11 +4189,6 @@
        "tslib": "^1.8.1"
      }
    },
-    "tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
-    },
    "type-check": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -4276,11 +4231,6 @@
        "punycode": "^2.1.0"
      }
    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
    "v8-compile-cache": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -3,7 +3,6 @@ PACKAGERUNTIME=$1
 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.13.0"

@@ -135,16 +134,6 @@ if [[ "$PACKAGERUNTIME" == "win-x64" || "$PACKAGERUNTIME" == "win-x86" ]]; then
    fi
 fi

-# Download the external tools only for Windows.
-if [[ "$PACKAGERUNTIME" == "win-arm64" ]]; then
-    # todo: replace these with official release when available
-    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.exe" node16/bin
-    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.lib" node16/bin
-    if [[ "$PRECACHE" != "" ]]; then
-        acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
-    fi
-fi
-
 # Download the external tools only for OSX.
 if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-darwin-x64.tar.gz" node12 fix_nested_dir
--- a/src/Misc/layoutbin/hashFiles/index.js
+++ b/src/Misc/layoutbin/hashFiles/index.js
--- a/src/Misc/layoutroot/run.sh
+++ b/src/Misc/layoutroot/run.sh
@@ -9,52 +9,16 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-run() {
-    # run the helper process which keep the listener alive
-    while :;
-    do
-        cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh
-        "$DIR"/run-helper.sh $*
-        returnCode=$?
-        if [[ $returnCode -eq 2 ]]; then
-            echo "Restarting runner..."
-        else
-            echo "Exiting runner..."
-            exit 0
-        fi
-    done
-}
-
-runWithManualTrap() {
-    # Set job control
-    set -m
-
-    trap 'kill -INT -$PID' INT TERM
-
-    # run the helper process which keep the listener alive
-    while :;
-    do
-        cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh
-        "$DIR"/run-helper.sh $* &
-        PID=$!
-        wait -f $PID
-        returnCode=$?
-        if [[ $returnCode -eq 2 ]]; then
-            echo "Restarting runner..."
-        else
-            echo "Exiting runner..."
-            # Unregister signal handling before exit
-            trap - INT TERM
-            # wait for last parts to be logged
-            wait $PID
-            exit $returnCode
-        fi
-    done
-}
-
-if [[ -z "$RUNNER_MANUALLY_TRAP_SIG" ]]; then
-    run $*
-else
-    runWithManualTrap $*
-fi
+# run the helper process which keep the listener alive
+while :;
+do
+    cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh
+    "$DIR"/run-helper.sh $*
+    returnCode=$?
+    if [[ $returnCode -eq 2 ]]; then
+        echo "Restarting runner..."
+    else
+        echo "Exiting runner..."
+        exit 0
+    fi
+done
--- a/src/Misc/runnerdotnetruntimeassets
+++ b/src/Misc/runnerdotnetruntimeassets
@@ -66,14 +66,12 @@ libmscordbi.dylib
 libmscordbi.so
 Microsoft.CSharp.dll
 Microsoft.DiaSymReader.Native.amd64.dll
-Microsoft.DiaSymReader.Native.arm64.dll
 Microsoft.VisualBasic.Core.dll
 Microsoft.VisualBasic.dll
 Microsoft.Win32.Primitives.dll
 Microsoft.Win32.Registry.dll
 mscordaccore.dll
 mscordaccore_amd64_amd64_6.0.522.21309.dll
-mscordaccore_arm64_arm64_6.0.522.21309.dll
 mscordbi.dll
 mscorlib.dll
 mscorrc.debug.dll
@@ -263,4 +261,4 @@ System.Xml.XmlSerializer.dll
 System.Xml.XPath.dll
 System.Xml.XPath.XDocument.dll
 ucrtbase.dll
-WindowsBase.dll
+WindowsBase.dll
--- a/src/Runner.Common/ActionCommand.cs
+++ b/src/Runner.Common/ActionCommand.cs
@@ -1,3 +1,4 @@
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Generic;
@@ -31,7 +32,7 @@ namespace GitHub.Runner.Common
            new EscapeMapping(token: "%", replacement: "%25"),
        };

-        private readonly Dictionary<string, string> _properties = new(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, string> _properties = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
        public const string Prefix = "##[";
        public const string _commandKey = "::";

--- a/src/Runner.Common/ActionResult.cs
+++ b/src/Runner.Common/ActionResult.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace GitHub.Runner.Common
 {
    public enum ActionResult
--- a/src/Runner.Common/ActionsRunServer.cs
+++ b/src/Runner.Common/ActionsRunServer.cs
@@ -1,51 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.Pipelines;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Runner.Common
-{
-    [ServiceLocator(Default = typeof(ActionsRunServer))]
-    public interface IActionsRunServer : IRunnerService
-    {
-        Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
-
-        Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken token);
-    }
-
-    public sealed class ActionsRunServer : RunnerService, IActionsRunServer
-    {
-        private bool _hasConnection;
-        private VssConnection _connection;
-        private TaskAgentHttpClient _taskAgentClient;
-
-        public async Task ConnectAsync(Uri serverUrl, VssCredentials credentials)
-        {
-            _connection = await EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(100));
-            _taskAgentClient = _connection.GetClient<TaskAgentHttpClient>();
-            _hasConnection = true;
-        }
-
-        private void CheckConnection()
-        {
-            if (!_hasConnection)
-            {
-                throw new InvalidOperationException($"SetConnection");
-            }
-        }
-
-        public Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-            var jobMessage = RetryRequest<AgentJobRequestMessage>(async () =>
-                                                    {
-                                                        return await _taskAgentClient.GetJobMessageAsync(id, cancellationToken);
-                                                    }, cancellationToken);
-
-            return jobMessage;
-        }
-    }
-}
--- a/src/Runner.Common/CommandLineParser.cs
+++ b/src/Runner.Common/CommandLineParser.cs
@@ -1,3 +1,4 @@
+using GitHub.Runner.Common.Util;
 using System;
 using System.Collections.Generic;
 using GitHub.DistributedTask.Logging;
--- a/src/Runner.Common/ConfigurationStore.cs
+++ b/src/Runner.Common/ConfigurationStore.cs
@@ -1,3 +1,4 @@
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.IO;
@@ -74,18 +75,17 @@ namespace GitHub.Runner.Common
        {
            get
            {
-                Uri accountUri = new(this.ServerUrl);
+                Uri accountUri = new Uri(this.ServerUrl);
                string repoOrOrgName = string.Empty;

-                if (accountUri.Host.EndsWith(".githubusercontent.com", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(this.GitHubUrl))
+                if (accountUri.Host.EndsWith(".githubusercontent.com", StringComparison.OrdinalIgnoreCase))
                {
-                    Uri gitHubUrl = new(this.GitHubUrl);
+                    Uri gitHubUrl = new Uri(this.GitHubUrl);

                    // Use the "NWO part" from the GitHub URL path
                    repoOrOrgName = gitHubUrl.AbsolutePath.Trim('/');
                }
-
-                if (string.IsNullOrEmpty(repoOrOrgName))
+                else
                {
                    repoOrOrgName = accountUri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
                }
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -77,7 +77,7 @@ namespace GitHub.Runner.Common
            public static readonly Architecture PlatformArchitecture = Architecture.X64;
 #elif ARM
            public static readonly Architecture PlatformArchitecture = Architecture.Arm;
-#elif ARM64
+#elif ARM64            
            public static readonly Architecture PlatformArchitecture = Architecture.Arm64;
 #endif

@@ -128,7 +128,6 @@ namespace GitHub.Runner.Common
                    public static readonly string Check = "check";
                    public static readonly string Commit = "commit";
                    public static readonly string Ephemeral = "ephemeral";
-                    public static readonly string GenerateServiceConfig = "generateServiceConfig";
                    public static readonly string Help = "help";
                    public static readonly string Replace = "replace";
                    public static readonly string DisableUpdate = "disableupdate";
@@ -153,19 +152,17 @@ namespace GitHub.Runner.Common
                public static readonly string DiskSpaceWarning = "runner.diskspace.warning";
                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 AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks"; 
            }

            public static readonly string InternalTelemetryIssueDataKey = "_internal_telemetry";
            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 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. Please update the following actions to use Node.js 16: {0}";
        }

        public static class RunnerEvent
@@ -244,9 +241,8 @@ namespace GitHub.Runner.Common
                public static readonly string ToolsDirectory = "agent.ToolsDirectory";

                // Set this env var to "node12" to downgrade the node version for internal functions (e.g hashfiles). This does NOT affect the version of node actions.
-                public static readonly string ForcedInternalNodeVersion = "ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION";
-                public static readonly string ForcedActionsNodeVersion = "ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION";
-                public static readonly string PrintLogToStdout = "ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT";
+                public static readonly string ForcedInternalNodeVersion = "ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION"; 
+                public static readonly string ForcedActionsNodeVersion = "ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION"; 
            }

            public static class System
@@ -259,12 +255,5 @@ namespace GitHub.Runner.Common
                public static readonly string PhaseDisplayName = "system.phaseDisplayName";
            }
        }
-
-        public static class OperatingSystem
-        {
-            public static readonly int Windows11BuildVersion = 22000;
-            // Both windows 10 and windows 11 share the same Major Version 10, need to use the build version to differentiate
-            public static readonly int Windows11MajorVersion = 10;
-        }
    }
 }
--- a/src/Runner.Common/ExtensionManager.cs
+++ b/src/Runner.Common/ExtensionManager.cs
@@ -1,3 +1,4 @@
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Concurrent;
@@ -14,7 +15,7 @@ namespace GitHub.Runner.Common

    public sealed class ExtensionManager : RunnerService, IExtensionManager
    {
-        private readonly ConcurrentDictionary<Type, List<IExtension>> _cache = new();
+        private readonly ConcurrentDictionary<Type, List<IExtension>> _cache = new ConcurrentDictionary<Type, List<IExtension>>();

        public List<T> GetExtensions<T>() where T : class, IExtension
        {
@@ -60,8 +61,6 @@ namespace GitHub.Runner.Common
                    Add<T>(extensions, "GitHub.Runner.Worker.AddPathFileCommand, Runner.Worker");
                    Add<T>(extensions, "GitHub.Runner.Worker.SetEnvFileCommand, Runner.Worker");
                    Add<T>(extensions, "GitHub.Runner.Worker.CreateStepSummaryCommand, Runner.Worker");
-                    Add<T>(extensions, "GitHub.Runner.Worker.SaveStateFileCommand, Runner.Worker");
-                    Add<T>(extensions, "GitHub.Runner.Worker.SetOutputFileCommand, Runner.Worker");
                    break;
                case "GitHub.Runner.Listener.Check.ICheckExtension":
                    Add<T>(extensions, "GitHub.Runner.Listener.Check.InternetCheck, Runner.Listener");
--- a/src/Runner.Common/HostContext.cs
+++ b/src/Runner.Common/HostContext.cs
@@ -51,12 +51,12 @@ namespace GitHub.Runner.Common
        private static int _defaultLogRetentionDays = 30;
        private static int[] _vssHttpMethodEventIds = new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 24 };
        private static int[] _vssHttpCredentialEventIds = new int[] { 11, 13, 14, 15, 16, 17, 18, 20, 21, 22, 27, 29 };
-        private readonly ConcurrentDictionary<Type, object> _serviceInstances = new();
-        private readonly ConcurrentDictionary<Type, Type> _serviceTypes = new();
+        private readonly ConcurrentDictionary<Type, object> _serviceInstances = new ConcurrentDictionary<Type, object>();
+        private readonly ConcurrentDictionary<Type, Type> _serviceTypes = new ConcurrentDictionary<Type, Type>();
        private readonly ISecretMasker _secretMasker = new SecretMasker();
-        private readonly List<ProductInfoHeaderValue> _userAgents = new() { new ProductInfoHeaderValue($"GitHubActionsRunner-{BuildConstants.RunnerPackage.PackageName}", BuildConstants.RunnerPackage.Version) };
-        private CancellationTokenSource _runnerShutdownTokenSource = new();
-        private object _perfLock = new();
+        private readonly List<ProductInfoHeaderValue> _userAgents = new List<ProductInfoHeaderValue>() { new ProductInfoHeaderValue($"GitHubActionsRunner-{BuildConstants.RunnerPackage.PackageName}", BuildConstants.RunnerPackage.Version) };
+        private CancellationTokenSource _runnerShutdownTokenSource = new CancellationTokenSource();
+        private object _perfLock = new object();
        private Tracing _trace;
        private Tracing _actionsHttpTrace;
        private Tracing _netcoreHttpTrace;
@@ -66,7 +66,7 @@ namespace GitHub.Runner.Common
        private IDisposable _diagListenerSubscription;
        private StartupType _startupType;
        private string _perfFile;
-        private RunnerWebProxy _webProxy = new();
+        private RunnerWebProxy _webProxy = new RunnerWebProxy();

        public event EventHandler Unloading;
        public CancellationToken RunnerShutdownToken => _runnerShutdownTokenSource.Token;
@@ -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));
--- a/src/Runner.Common/HostTraceListener.cs
+++ b/src/Runner.Common/HostTraceListener.cs
@@ -1,3 +1,4 @@
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Diagnostics;
@@ -164,7 +165,7 @@ namespace GitHub.Runner.Common
        {
            if (_enableLogRetention)
            {
-                DirectoryInfo diags = new(_logFileDirectory);
+                DirectoryInfo diags = new DirectoryInfo(_logFileDirectory);
                var logs = diags.GetFiles($"{_logFilePrefix}*.log");
                foreach (var log in logs)
                {
--- a/src/Runner.Common/JobNotification.cs
+++ b/src/Runner.Common/JobNotification.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
+using System.IO;
+using System.IO.Pipes;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;

 namespace GitHub.Runner.Common
--- a/src/Runner.Common/JobServer.cs
+++ b/src/Runner.Common/JobServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -13,8 +13,7 @@ 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;
+using Newtonsoft.Json;

 namespace GitHub.Runner.Common
 {
@@ -24,13 +23,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 CreateStepSymmaryAsync(string planId, string jobId, string stepId, string file, 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);
@@ -44,7 +41,6 @@ namespace GitHub.Runner.Common
        private bool _hasConnection;
        private VssConnection _connection;
        private TaskHttpClient _taskClient;
-        private ResultsHttpClient _resultsClient;
        private ClientWebSocket _websocketClient;

        private ServiceEndpoint _serviceEndpoint;
@@ -148,12 +144,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);
@@ -316,16 +306,6 @@ namespace GitHub.Runner.Common
            return _taskClient.CreateAttachmentAsync(scopeIdentifier, hubName, planId, timelineId, timelineRecordId, type, name, uploadStream, cancellationToken: cancellationToken);
        }

-        public Task CreateStepSymmaryAsync(string planId, string jobId, string 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<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 QueueSummaryUpload(Guid timelineId, Guid timelineRecordId, string stepId, string name, string path, bool deleteSource);
        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 _delayForSummaryUploadDequeue = TimeSpan.FromMilliseconds(1000);

        // Job message information
        private Guid _scopeIdentifier;
@@ -41,33 +39,30 @@ namespace GitHub.Runner.Common
        private Guid _jobTimelineRecordId;

        // queue for web console line
-        private readonly ConcurrentQueue<ConsoleLineInfo> _webConsoleLineQueue = new();
+        private readonly ConcurrentQueue<ConsoleLineInfo> _webConsoleLineQueue = new ConcurrentQueue<ConsoleLineInfo>();

        // queue for file upload (log file or attachment)
-        private readonly ConcurrentQueue<UploadFileInfo> _fileUploadQueue = new();
-
-        private readonly ConcurrentQueue<SummaryUploadFileInfo> _summaryFileUploadQueue = new();
+        private readonly ConcurrentQueue<UploadFileInfo> _fileUploadQueue = new ConcurrentQueue<UploadFileInfo>();

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

        // indicate how many timelines we have, we will process _timelineUpdateQueue base on the order of timeline in this list
-        private readonly List<Guid> _allTimelines = new();
+        private readonly List<Guid> _allTimelines = new List<Guid>();

        // bufferd timeline records that fail to update
-        private readonly Dictionary<Guid, List<TimelineRecord>> _bufferedRetryRecords = new();
+        private readonly Dictionary<Guid, List<TimelineRecord>> _bufferedRetryRecords = new Dictionary<Guid, List<TimelineRecord>>();

        // Task for each queue's dequeue process
        private Task _webConsoleLineDequeueTask;
        private Task _fileUploadDequeueTask;
-        private Task _summaryUploadDequeueTask;
        private Task _timelineUpdateDequeueTask;

        // common
        private IJobServer _jobServer;
        private Task[] _allDequeueTasks;
-        private readonly TaskCompletionSource<int> _jobCompletionSource = new();
-        private readonly TaskCompletionSource<int> _jobRecordUpdated = new();
+        private readonly TaskCompletionSource<int> _jobCompletionSource = new TaskCompletionSource<int>();
+        private readonly TaskCompletionSource<int> _jobRecordUpdated = new TaskCompletionSource<int>();
        private bool _queueInProcess = false;

        public TaskCompletionSource<int> JobRecordUpdated => _jobRecordUpdated;
@@ -98,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);
-            }
-
-
            if (_queueInProcess)
            {
                Trace.Info("No-opt, all queue process tasks are running.");
@@ -139,13 +120,10 @@ namespace GitHub.Runner.Common
            Trace.Info("Start process file upload queue.");
            _fileUploadDequeueTask = ProcessFilesUploadQueueAsync();

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

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

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

-            Trace.Verbose("Draining results summary upload queue.");
-            await ProcessSummaryUploadQueueAsync(runOnce: true);
-            Trace.Info("Results summary 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.");
@@ -230,28 +204,6 @@ namespace GitHub.Runner.Common
            _fileUploadQueue.Enqueue(newFile);
        }

-        public void QueueSummaryUpload(Guid timelineId, Guid timelineRecordId, string stepId, string name, string path, bool deleteSource)
-        {
-            ArgUtil.NotEmpty(timelineId, nameof(timelineId));
-            ArgUtil.NotEmpty(timelineRecordId, nameof(timelineRecordId));
-
-            // all parameter not null, file path exist.
-            var newFile = new SummaryUploadFileInfo()
-            {
-                TimelineId = timelineId,
-                TimelineRecordId = timelineRecordId,
-                Name = name,
-                Path = path,
-                PlanId = _planId.ToString(),
-                JobId = _jobTimelineRecordId.ToString(),
-                StepId = stepId,
-                DeleteSource = deleteSource
-            };
-
-            Trace.Verbose("Enqueue results file upload queue: file '{0}' attach to record {1}", newFile.Path, timelineRecordId);
-            _summaryFileUploadQueue.Enqueue(newFile);
-        }
-
        public void QueueTimelineRecordUpdate(Guid timelineId, TimelineRecord timelineRecord)
        {
            ArgUtil.NotEmpty(timelineId, nameof(timelineId));
@@ -285,8 +237,8 @@ namespace GitHub.Runner.Common
                }

                // Group consolelines by timeline record of each step
-                Dictionary<Guid, List<TimelineRecordLogLine>> stepsConsoleLines = new();
-                List<Guid> stepRecordIds = new(); // We need to keep lines in order
+                Dictionary<Guid, List<TimelineRecordLogLine>> stepsConsoleLines = new Dictionary<Guid, List<TimelineRecordLogLine>>();
+                List<Guid> stepRecordIds = new List<Guid>(); // We need to keep lines in order
                int linesCounter = 0;
                ConsoleLineInfo lineInfo;
                while (_webConsoleLineQueue.TryDequeue(out lineInfo))
@@ -312,7 +264,7 @@ namespace GitHub.Runner.Common
                {
                    // Split consolelines into batch, each batch will container at most 100 lines.
                    int batchCounter = 0;
-                    List<List<TimelineRecordLogLine>> batchedLines = new();
+                    List<List<TimelineRecordLogLine>> batchedLines = new List<List<TimelineRecordLogLine>>();
                    foreach (var line in stepsConsoleLines[stepRecordId])
                    {
                        var currentBatch = batchedLines.ElementAtOrDefault(batchCounter);
@@ -347,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);
@@ -386,7 +338,7 @@ namespace GitHub.Runner.Common
        {
            while (!_jobCompletionSource.Task.IsCompleted || runOnce)
            {
-                List<UploadFileInfo> filesToUpload = new();
+                List<UploadFileInfo> filesToUpload = new List<UploadFileInfo>();
                UploadFileInfo dequeueFile;
                while (_fileUploadQueue.TryDequeue(out dequeueFile))
                {
@@ -442,71 +394,17 @@ namespace GitHub.Runner.Common
            }
        }

-        private async Task ProcessSummaryUploadQueueAsync(bool runOnce = false)
-        {
-            Trace.Info("Starting results-based upload queue...");
-
-            while (!_jobCompletionSource.Task.IsCompleted || runOnce)
-            {
-                List<SummaryUploadFileInfo> filesToUpload = new();
-                SummaryUploadFileInfo dequeueFile;
-                while (_summaryFileUploadQueue.TryDequeue(out dequeueFile))
-                {
-                    filesToUpload.Add(dequeueFile);
-                    // process at most 10 file upload.
-                    if (!runOnce && filesToUpload.Count > 10)
-                    {
-                        break;
-                    }
-                }
-
-                if (filesToUpload.Count > 0)
-                {
-                    if (runOnce)
-                    {
-                        Trace.Info($"Uploading {filesToUpload.Count} summary files in one shot through results service.");
-                    }
-
-                    int errorCount = 0;
-                    foreach (var file in filesToUpload)
-                    {
-                        try
-                        {
-                            await UploadSummaryFile(file);
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.Info("Catch exception during summary file upload to results, keep going since the process is best effort.");
-                            Trace.Error(ex);
-                            errorCount++;
-                        }
-                    }
-
-                    Trace.Info("Tried to upload {0} summary files to results, success rate: {1}/{0}.", filesToUpload.Count, filesToUpload.Count - errorCount);
-                }
-
-                if (runOnce)
-                {
-                    break;
-                }
-                else
-                {
-                    await Task.Delay(_delayForSummaryUploadDequeue);
-                }
-            }
-        }
-
        private async Task ProcessTimelinesUpdateQueueAsync(bool runOnce = false)
        {
            while (!_jobCompletionSource.Task.IsCompleted || runOnce)
            {
-                List<PendingTimelineRecord> pendingUpdates = new();
+                List<PendingTimelineRecord> pendingUpdates = new List<PendingTimelineRecord>();
                foreach (var timeline in _allTimelines)
                {
                    ConcurrentQueue<TimelineRecord> recordQueue;
                    if (_timelineUpdateQueue.TryGetValue(timeline, out recordQueue))
                    {
-                        List<TimelineRecord> records = new();
+                        List<TimelineRecord> records = new List<TimelineRecord>();
                        TimelineRecord record;
                        while (recordQueue.TryDequeue(out record))
                        {
@@ -528,7 +426,7 @@ namespace GitHub.Runner.Common
                // we need track whether we have new sub-timeline been created on the last run.
                // if so, we need continue update timeline record even we on the last run.
                bool pendingSubtimelineUpdate = false;
-                List<Exception> mainTimelineRecordsUpdateErrors = new();
+                List<Exception> mainTimelineRecordsUpdateErrors = new List<Exception>();
                if (pendingUpdates.Count > 0)
                {
                    foreach (var update in pendingUpdates)
@@ -631,7 +529,7 @@ namespace GitHub.Runner.Common
                return timelineRecords;
            }

-            Dictionary<Guid, TimelineRecord> dict = new();
+            Dictionary<Guid, TimelineRecord> dict = new Dictionary<Guid, TimelineRecord>();
            foreach (TimelineRecord rec in timelineRecords)
            {
                if (rec == null)
@@ -767,35 +665,6 @@ namespace GitHub.Runner.Common
                }
            }
        }
-
-        private async Task UploadSummaryFile(SummaryUploadFileInfo file)
-        {
-            bool uploadSucceed = false;
-            try
-            {
-                // Upload the step summary
-                Trace.Info($"Starting to upload summary file to results service {file.Name}, {file.Path}");
-                var cancellationTokenSource = new CancellationTokenSource();
-                await _jobServer.CreateStepSymmaryAsync(file.PlanId, file.JobId, file.StepId, file.Path, cancellationTokenSource.Token);
-
-                uploadSucceed = true;
-            }
-            finally
-            {
-                if (uploadSucceed && file.DeleteSource)
-                {
-                    try
-                    {
-                        File.Delete(file.Path);
-                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Info("Catch exception during delete success results uploaded summary file.");
-                        Trace.Error(ex);
-                    }
-                }
-            }
-        }
    }

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

-    internal class SummaryUploadFileInfo
-    {
-        public Guid TimelineId { get; set; }
-        public Guid TimelineRecordId { get; set; }
-        public string Name { get; set; }
-        public string Path { get; set; }
-        public string PlanId { get; set; }
-        public string JobId { get; set; }
-        public string StepId { get; set; }
-        public bool DeleteSource { get; set; }
-    }
-
-

    internal class ConsoleLineInfo
    {
--- a/src/Runner.Common/Logging.cs
+++ b/src/Runner.Common/Logging.cs
@@ -1,3 +1,4 @@
+using GitHub.Runner.Common.Util;
 using System;
 using System.IO;

--- a/src/Runner.Common/ProcessChannel.cs
+++ b/src/Runner.Common/ProcessChannel.cs
@@ -76,7 +76,7 @@ namespace GitHub.Runner.Common

        public async Task<WorkerMessage> ReceiveAsync(CancellationToken cancellationToken)
        {
-            WorkerMessage result = new(MessageType.NotInitialized, string.Empty);
+            WorkerMessage result = new WorkerMessage(MessageType.NotInitialized, string.Empty);
            result.MessageType = (MessageType)await _readStream.ReadInt32Async(cancellationToken);
            result.Body = await _readStream.ReadStringAsync(cancellationToken);
            Trace.Info($"Receiving message of length {result.Body.Length}, with hash '{IOUtil.GetSha256Hash(result.Body)}'");
--- a/src/Runner.Common/ProcessExtensions.cs
+++ b/src/Runner.Common/ProcessExtensions.cs
@@ -291,7 +291,7 @@ namespace GitHub.Runner.Common
        public static string GetEnvironmentVariable(this Process process, IHostContext hostContext, string variable)
        {
            var trace = hostContext.GetTrace(nameof(LinuxProcessExtensions));
-            Dictionary<string, string> env = new();
+            Dictionary<string, string> env = new Dictionary<string, string>();

            if (Directory.Exists("/proc"))
            {
@@ -322,8 +322,8 @@ namespace GitHub.Runner.Common
                // It doesn't escape '=' or ' ', so we can't parse the output into a dictionary of all envs.
                // So we only look for the env you request, in the format of variable=value. (it won't work if you variable contains = or space)
                trace.Info($"Read env from output of `ps e -p {process.Id} -o command`");
-                List<string> psOut = new();
-                object outputLock = new();
+                List<string> psOut = new List<string>();
+                object outputLock = new object();
                using (var p = hostContext.CreateService<IProcessInvoker>())
                {
                    p.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
--- a/src/Runner.Common/ProcessInvoker.cs
+++ b/src/Runner.Common/ProcessInvoker.cs
@@ -1,4 +1,4 @@
-using GitHub.Runner.Common.Util;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Generic;
--- a/src/Runner.Common/RunServer.cs
+++ b/src/Runner.Common/RunServer.cs
@@ -1,12 +1,14 @@
 using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
-using Sdk.WebApi.WebApi.RawClient;

 namespace GitHub.Runner.Common
 {
@@ -21,19 +23,42 @@ namespace GitHub.Runner.Common
    public sealed class RunServer : RunnerService, IRunServer
    {
        private bool _hasConnection;
-        private Uri requestUri;
-        private RawConnection _connection;
-        private RunServiceHttpClient _runServiceHttpClient;
+        private VssConnection _connection;
+        private TaskAgentHttpClient _taskAgentClient;

-        public async Task ConnectAsync(Uri serverUri, VssCredentials credentials)
+        public async Task ConnectAsync(Uri serverUrl, VssCredentials credentials)
        {
-            requestUri = serverUri;
-
-            _connection = VssUtil.CreateRawConnection(new Uri(serverUri.Authority), credentials);
-            _runServiceHttpClient = await _connection.GetClientAsync<RunServiceHttpClient>();
+            _connection = await EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(100));
+            _taskAgentClient = _connection.GetClient<TaskAgentHttpClient>();
            _hasConnection = true;
        }

+        private async Task<VssConnection> EstablishVssConnection(Uri serverUrl, VssCredentials credentials, TimeSpan timeout)
+        {
+            Trace.Info($"EstablishVssConnection");
+            Trace.Info($"Establish connection with {timeout.TotalSeconds} seconds timeout.");
+            int attemptCount = 5;
+            while (attemptCount-- > 0)
+            {
+                var connection = VssUtil.CreateConnection(serverUrl, credentials, timeout: timeout);
+                try
+                {
+                    await connection.ConnectAsync();
+                    return connection;
+                }
+                catch (Exception ex) when (attemptCount > 0)
+                {
+                    Trace.Info($"Catch exception during connect. {attemptCount} attempt left.");
+                    Trace.Error(ex);
+
+                    await HostContext.Delay(TimeSpan.FromMilliseconds(100), CancellationToken.None);
+                }
+            }
+
+            // should never reach here.
+            throw new InvalidOperationException(nameof(EstablishVssConnection));
+        }
+
        private void CheckConnection()
        {
            if (!_hasConnection)
@@ -45,15 +70,37 @@ namespace GitHub.Runner.Common
        public Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken cancellationToken)
        {
            CheckConnection();
-            var jobMessage = RetryRequest<AgentJobRequestMessage>(
-                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, cancellationToken), cancellationToken);
-            if (jobMessage == null)
-            {
-                throw new TaskOrchestrationJobNotFoundException(id);
-            }
-
+            var jobMessage = RetryRequest<AgentJobRequestMessage>(async () =>
+                                                    {
+                                                        return await _taskAgentClient.GetJobMessageAsync(id, cancellationToken);
+                                                    }, cancellationToken);
            return jobMessage;
        }

+        private async Task<T> RetryRequest<T>(Func<Task<T>> func,
+                                              CancellationToken cancellationToken,
+                                              int maxRetryAttemptsCount = 5
+                                             )
+        {
+            var retryCount = 0;
+            while (true)
+            {
+                retryCount++;
+                cancellationToken.ThrowIfCancellationRequested();
+                try
+                {
+                    return await func();
+                }
+                // 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 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.");
+                    await Task.Delay(backOff, cancellationToken);
+                }
+            }
+        }
    }
 }
--- a/src/Runner.Common/Runner.Common.csproj
+++ b/src/Runner.Common/Runner.Common.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
--- a/src/Runner.Common/RunnerServer.cs
+++ b/src/Runner.Common/RunnerServer.cs
@@ -1,8 +1,9 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using GitHub.Runner.Common.Util;
 using GitHub.Services.WebApi;
 using GitHub.Services.Common;
 using GitHub.Runner.Sdk;
@@ -38,7 +39,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);
@@ -179,6 +180,31 @@ namespace GitHub.Runner.Common
            }
        }

+        private async Task<VssConnection> EstablishVssConnection(Uri serverUrl, VssCredentials credentials, TimeSpan timeout)
+        {
+            Trace.Info($"Establish connection with {timeout.TotalSeconds} seconds timeout.");
+            int attemptCount = 5;
+            while (attemptCount-- > 0)
+            {
+                var connection = VssUtil.CreateConnection(serverUrl, credentials, timeout: timeout);
+                try
+                {
+                    await connection.ConnectAsync();
+                    return connection;
+                }
+                catch (Exception ex) when (attemptCount > 0)
+                {
+                    Trace.Info($"Catch exception during connect. {attemptCount} attempt left.");
+                    Trace.Error(ex);
+
+                    await HostContext.Delay(TimeSpan.FromMilliseconds(100), CancellationToken.None);
+                }
+            }
+
+            // should never reach here.
+            throw new InvalidOperationException(nameof(EstablishVssConnection));
+        }
+
        private void CheckConnection(RunnerConnectionType connectionType)
        {
            switch (connectionType)
@@ -272,10 +298,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
@@ -1,10 +1,4 @@
 using System;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-using Sdk.WebApi.WebApi.RawClient;

 namespace GitHub.Runner.Common
 {
@@ -27,9 +21,9 @@ namespace GitHub.Runner.Common
        protected IHostContext HostContext { get; private set; }
        protected Tracing Trace { get; private set; }

-        public string TraceName
+        public string TraceName 
        {
-            get
+            get 
            {
                return GetType().Name;
            }
@@ -41,57 +35,5 @@ namespace GitHub.Runner.Common
            Trace = HostContext.GetTrace(TraceName);
            Trace.Entering();
        }
-
-        protected async Task<VssConnection> EstablishVssConnection(Uri serverUrl, VssCredentials credentials, TimeSpan timeout)
-        {
-            Trace.Info($"EstablishVssConnection");
-            Trace.Info($"Establish connection with {timeout.TotalSeconds} seconds timeout.");
-            int attemptCount = 5;
-            while (attemptCount-- > 0)
-            {
-                var connection = VssUtil.CreateConnection(serverUrl, credentials, timeout: timeout);
-                try
-                {
-                    await connection.ConnectAsync();
-                    return connection;
-                }
-                catch (Exception ex) when (attemptCount > 0)
-                {
-                    Trace.Info($"Catch exception during connect. {attemptCount} attempt left.");
-                    Trace.Error(ex);
-
-                    await HostContext.Delay(TimeSpan.FromMilliseconds(100), CancellationToken.None);
-                }
-            }
-
-            // should never reach here.
-            throw new InvalidOperationException(nameof(EstablishVssConnection));
-        }
-
-        protected async Task<T> RetryRequest<T>(Func<Task<T>> func,
-            CancellationToken cancellationToken,
-            int maxRetryAttemptsCount = 5
-        )
-        {
-            var retryCount = 0;
-            while (true)
-            {
-                retryCount++;
-                cancellationToken.ThrowIfCancellationRequested();
-                try
-                {
-                    return await func();
-                }
-                // 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 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.");
-                    await Task.Delay(backOff, cancellationToken);
-                }
-            }
-        }
    }
 }
--- a/src/Runner.Common/StdoutTraceListener.cs
+++ b/src/Runner.Common/StdoutTraceListener.cs
@@ -1,90 +0,0 @@
-using GitHub.Runner.Sdk;
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-
-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;
-            }
-
-            WriteHeader(source, eventType, id);
-            WriteLine(message);
-            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);
@@ -81,7 +81,7 @@ namespace GitHub.Runner.Common
            }

            // Trace whether a value was entered.
-            string val = new(chars.ToArray());
+            string val = new String(chars.ToArray());
            if (!string.IsNullOrEmpty(val))
            {
                HostContext.SecretMasker.AddValue(val);
@@ -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/ThrottlingReportHandler.cs
+++ b/src/Runner.Common/ThrottlingReportHandler.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common.Internal;

--- a/src/Runner.Common/TraceManager.cs
+++ b/src/Runner.Common/TraceManager.cs
@@ -1,3 +1,4 @@
+using GitHub.Runner.Common.Util;
 using System;
 using System.Collections.Concurrent;
 using System.Diagnostics;
@@ -14,25 +15,23 @@ namespace GitHub.Runner.Common

    public sealed class TraceManager : ITraceManager
    {
-        private readonly ConcurrentDictionary<string, Tracing> _sources = new(StringComparer.OrdinalIgnoreCase);
+        private readonly ConcurrentDictionary<string, Tracing> _sources = new ConcurrentDictionary<string, Tracing>(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 +82,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
@@ -1,3 +1,5 @@
+
+using GitHub.Runner.Common.Util;
 using Newtonsoft.Json;
 using System;
 using System.Diagnostics;
@@ -12,7 +14,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 +29,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/Util/NodeUtil.cs
+++ b/src/Runner.Common/Util/NodeUtil.cs
@@ -7,7 +7,7 @@ namespace GitHub.Runner.Common.Util
    {
        private const string _defaultNodeVersion = "node16";

-#if (OS_OSX || OS_WINDOWS) && ARM64
+#if OS_OSX && ARM64
        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node16" });
 #else
        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node12", "node16" });
--- a/src/Runner.Common/Util/VarUtil.cs
+++ b/src/Runner.Common/Util/VarUtil.cs
@@ -1,4 +1,7 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using GitHub.Runner.Sdk;

 namespace GitHub.Runner.Common.Util
 {
--- a/src/Runner.Listener/Checks/CheckUtil.cs
+++ b/src/Runner.Listener/Checks/CheckUtil.cs
@@ -347,8 +347,8 @@ namespace GitHub.Runner.Listener.Check
    public sealed class HttpEventSourceListener : EventListener
    {
        private readonly List<string> _logs;
-        private readonly object _lock = new();
-        private readonly Dictionary<string, HashSet<string>> _ignoredEvent = new()
+        private readonly object _lock = new object();
+        private readonly Dictionary<string, HashSet<string>> _ignoredEvent = new Dictionary<string, HashSet<string>>
        {
            {
                "Microsoft-System-Net-Http",
--- a/src/Runner.Listener/Checks/GitCheck.cs
+++ b/src/Runner.Listener/Checks/GitCheck.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Common;
@@ -167,4 +168,4 @@ namespace GitHub.Runner.Listener.Check
            return result;
        }
    }
-}
+}
--- a/src/Runner.Listener/Checks/NodeJsCheck.cs
+++ b/src/Runner.Listener/Checks/NodeJsCheck.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Common;
@@ -86,7 +87,7 @@ namespace GitHub.Runner.Listener.Check
                result.Logs.Add($"{DateTime.UtcNow.ToString("O")} ***************************************************************************************************************");

                // Request to github.com or ghes server
-                Uri requestUrl = new(url);
+                Uri requestUrl = new Uri(url);
                var env = new Dictionary<string, string>()
                {
                    { "HOSTNAME", requestUrl.Host },
@@ -178,4 +179,4 @@ namespace GitHub.Runner.Listener.Check
            return result;
        }
    }
-}
+}
--- a/src/Runner.Listener/CommandSettings.cs
+++ b/src/Runner.Listener/CommandSettings.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using GitHub.DistributedTask.Logging;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;

@@ -11,7 +12,7 @@ namespace GitHub.Runner.Listener
 {
    public sealed class CommandSettings
    {
-        private readonly Dictionary<string, string> _envArgs = new(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, string> _envArgs = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
        private readonly CommandLineParser _parser;
        private readonly IPromptManager _promptManager;
        private readonly Tracing _trace;
@@ -26,7 +27,7 @@ namespace GitHub.Runner.Listener
        };

        // Valid flags and args for specific command - key: command, value: array of valid flags and args
-        private readonly Dictionary<string, string[]> validOptions = new()
+        private readonly Dictionary<string, string[]> validOptions = new Dictionary<string, string[]>
        {
            // Valid configure flags and args
            [Constants.Runner.CommandLine.Commands.Configure] = 
@@ -34,7 +35,6 @@ namespace GitHub.Runner.Listener
                {
                    Constants.Runner.CommandLine.Flags.DisableUpdate,
                    Constants.Runner.CommandLine.Flags.Ephemeral,
-                    Constants.Runner.CommandLine.Flags.GenerateServiceConfig,
                    Constants.Runner.CommandLine.Flags.Replace,
                    Constants.Runner.CommandLine.Flags.RunAsService,
                    Constants.Runner.CommandLine.Flags.Unattended,
@@ -80,12 +80,11 @@ namespace GitHub.Runner.Listener
        // Flags.
        public bool Check => TestFlag(Constants.Runner.CommandLine.Flags.Check);
        public bool Commit => TestFlag(Constants.Runner.CommandLine.Flags.Commit);
-        public bool DisableUpdate => TestFlag(Constants.Runner.CommandLine.Flags.DisableUpdate);
-        public bool Ephemeral => TestFlag(Constants.Runner.CommandLine.Flags.Ephemeral);
-        public bool GenerateServiceConfig => TestFlag(Constants.Runner.CommandLine.Flags.GenerateServiceConfig);
        public bool Help => TestFlag(Constants.Runner.CommandLine.Flags.Help);
        public bool Unattended => TestFlag(Constants.Runner.CommandLine.Flags.Unattended);
        public bool Version => TestFlag(Constants.Runner.CommandLine.Flags.Version);
+        public bool Ephemeral => TestFlag(Constants.Runner.CommandLine.Flags.Ephemeral);
+        public bool DisableUpdate => TestFlag(Constants.Runner.CommandLine.Flags.DisableUpdate);

        // Keep this around since customers still relies on it
        public bool RunOnce => TestFlag(Constants.Runner.CommandLine.Flags.Once);
@@ -139,7 +138,7 @@ namespace GitHub.Runner.Listener
        // Validate commandline parser result
        public List<string> Validate()
        {
-            List<string> unknowns = new();
+            List<string> unknowns = new List<string>();

            // detect unknown commands
            unknowns.AddRange(_parser.Commands.Where(x => !validOptions.Keys.Contains(x, StringComparer.OrdinalIgnoreCase)));
--- a/src/Runner.Listener/Configuration/ConfigurationManager.cs
+++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs
@@ -81,33 +81,12 @@ namespace GitHub.Runner.Listener.Configuration
            _term.WriteLine("--------------------------------------------------------------------------------");

            Trace.Info(nameof(ConfigureAsync));
-
-            if (command.GenerateServiceConfig)
-            {
-#if OS_LINUX
-                if (!IsConfigured())
-                {
-                    throw new InvalidOperationException("--generateServiceConfig requires that the runner is already configured. For configuring a new runner as a service, run './config.sh'.");
-                }
-
-                RunnerSettings settings = _store.GetSettings();
-
-                Trace.Info($"generate service config for runner: {settings.AgentId}");
-                var controlManager = HostContext.GetService<ILinuxServiceControlManager>();
-                controlManager.GenerateScripts(settings);
-
-                return;
-#else
-                throw new NotSupportedException("--generateServiceConfig is only supported on Linux.");
-#endif
-            }
-
            if (IsConfigured())
            {
                throw new InvalidOperationException("Cannot configure the runner because it is already configured. To reconfigure the runner, run 'config.cmd remove' or './config.sh remove' first.");
            }

-            RunnerSettings runnerSettings = new();
+            RunnerSettings runnerSettings = new RunnerSettings();

            // Loop getting url and creds until you can connect
            ICredentialProvider credProvider = null;
@@ -542,7 +521,7 @@ namespace GitHub.Runner.Listener.Configuration

        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate)
        {
-            TaskAgent agent = new(agentName)
+            TaskAgent agent = new TaskAgent(agentName)
            {
                Authorization = new TaskAgentAuthorization
                {
--- a/src/Runner.Listener/Configuration/CredentialManager.cs
+++ b/src/Runner.Listener/Configuration/CredentialManager.cs
@@ -18,7 +18,7 @@ namespace GitHub.Runner.Listener.Configuration

    public class CredentialManager : RunnerService, ICredentialManager
    {
-        public static readonly Dictionary<string, Type> CredentialTypes = new(StringComparer.OrdinalIgnoreCase)
+        public static readonly Dictionary<string, Type> CredentialTypes = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase)
        {
            { Constants.Configuration.OAuth, typeof(OAuthCredential)},
            { Constants.Configuration.OAuthAccessToken, typeof(OAuthAccessTokenCredential)},
--- a/src/Runner.Listener/Configuration/CredentialProvider.cs
+++ b/src/Runner.Listener/Configuration/CredentialProvider.cs
@@ -48,7 +48,7 @@ namespace GitHub.Runner.Listener.Configuration
            ArgUtil.NotNullOrEmpty(token, nameof(token));

            trace.Info("token retrieved: {0} chars", token.Length);
-            VssCredentials creds = new(new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
+            VssCredentials creds = new VssCredentials(new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
            trace.Info("cred created");

            return creds;
--- a/src/Runner.Listener/Configuration/PromptManager.cs
+++ b/src/Runner.Listener/Configuration/PromptManager.cs
@@ -1,4 +1,5 @@
 using GitHub.Runner.Common;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;

@@ -71,7 +72,7 @@ namespace GitHub.Runner.Listener.Configuration
                {
                    return defaultValue;
                }
-                else if (isOptional)
+                else if (isOptional) 
                {
                    return string.Empty;
                }
@@ -86,12 +87,11 @@ namespace GitHub.Runner.Listener.Configuration
                // Write the message prompt.
                _terminal.Write($"{description} ");

-                if (!string.IsNullOrEmpty(defaultValue))
+                if(!string.IsNullOrEmpty(defaultValue))
                {
                    _terminal.Write($"[press Enter for {defaultValue}] ");
                }
-                else if (isOptional)
-                {
+                else if (isOptional){
                    _terminal.Write($"[press Enter to skip] ");
                }

@@ -112,7 +112,7 @@ namespace GitHub.Runner.Listener.Configuration
                        return string.Empty;
                    }
                }
-
+                
                // Return the value if it is not empty and it is valid.
                // Otherwise try the loop again.
                if (!string.IsNullOrEmpty(value))
--- a/src/Runner.Listener/Configuration/RSAFileKeyManager.cs
+++ b/src/Runner.Listener/Configuration/RSAFileKeyManager.cs
@@ -3,6 +3,7 @@ using System;
 using System.IO;
 using System.Security.Cryptography;
 using System.Threading;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;

--- a/src/Runner.Listener/Configuration/ServiceControlManager.cs
+++ b/src/Runner.Listener/Configuration/ServiceControlManager.cs
@@ -44,7 +44,7 @@ namespace GitHub.Runner.Listener.Configuration
            }

            // For the service name, replace any characters outside of the alpha-numeric set and ".", "_", "-" with "-"
-            Regex regex = new(@"[^0-9a-zA-Z._\-]");
+            Regex regex = new Regex(@"[^0-9a-zA-Z._\-]");
            string repoOrOrgName = regex.Replace(settings.RepoOrOrgName, "-");

            serviceName = StringUtil.Format(serviceNamePattern, repoOrOrgName, settings.AgentName);
--- a/src/Runner.Listener/Configuration/SystemdControlManager.cs
+++ b/src/Runner.Listener/Configuration/SystemdControlManager.cs
@@ -1,4 +1,4 @@
-#if OS_LINUX
+#if OS_LINUX
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Common;
+using GitHub.Runner.Sdk;

 namespace GitHub.Runner.Listener.Configuration
 {
--- a/src/Runner.Listener/JobDispatcher.cs
+++ b/src/Runner.Listener/JobDispatcher.cs
@@ -37,8 +37,8 @@ namespace GitHub.Runner.Listener
    // and the server will not send another job while this one is still running.
    public sealed class JobDispatcher : RunnerService, IJobDispatcher
    {
-        private static Regex _invalidJsonRegex = new(@"invalid\ Json\ at\ position\ '(\d+)':", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        private readonly Lazy<Dictionary<long, TaskResult>> _localRunJobResult = new();
+        private static Regex _invalidJsonRegex = new Regex(@"invalid\ Json\ at\ position\ '(\d+)':", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Lazy<Dictionary<long, TaskResult>> _localRunJobResult = new Lazy<Dictionary<long, TaskResult>>();
        private int _poolId;

        IConfigurationStore _configurationStore;
@@ -47,14 +47,14 @@ namespace GitHub.Runner.Listener
        private static readonly string _workerProcessName = $"Runner.Worker{IOUtil.ExeExtension}";

        // this is not thread-safe
-        private readonly Queue<Guid> _jobDispatchedQueue = new();
-        private readonly ConcurrentDictionary<Guid, WorkerDispatcher> _jobInfos = new();
+        private readonly Queue<Guid> _jobDispatchedQueue = new Queue<Guid>();
+        private readonly ConcurrentDictionary<Guid, WorkerDispatcher> _jobInfos = new ConcurrentDictionary<Guid, WorkerDispatcher>();

        // allow up to 30sec for any data to be transmitted over the process channel
        // timeout limit can be overwritten by environment GITHUB_ACTIONS_RUNNER_CHANNEL_TIMEOUT
        private TimeSpan _channelTimeout;

-        private TaskCompletionSource<bool> _runOnceJobCompleted = new();
+        private TaskCompletionSource<bool> _runOnceJobCompleted = new TaskCompletionSource<bool>();

        public event EventHandler<JobStatusEventArgs> JobStatus;

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

-            WorkerDispatcher newDispatch = new(jobRequestMessage.JobId, jobRequestMessage.RequestId);
+            WorkerDispatcher newDispatch = new WorkerDispatcher(jobRequestMessage.JobId, jobRequestMessage.RequestId);
            if (runOnce)
            {
                Trace.Info("Start dispatcher for one time used runner.");
@@ -357,7 +357,7 @@ namespace GitHub.Runner.Listener
                term.WriteLine($"{DateTime.UtcNow:u}: Running job: {message.JobDisplayName}");

                // first job request renew succeed.
-                TaskCompletionSource<int> firstJobRequestRenewed = new();
+                TaskCompletionSource<int> firstJobRequestRenewed = new TaskCompletionSource<int>();
                var notification = HostContext.GetService<IJobNotification>();

                // lock renew cancellation token.
@@ -398,9 +398,8 @@ namespace GitHub.Runner.Listener
                    HostContext.WritePerfCounter($"JobRequestRenewed_{requestId.ToString()}");

                    Task<int> workerProcessTask = null;
-                    object _outputLock = new();
-                    List<string> workerOutput = new();
-                    bool printToStdout = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Agent.PrintLogToStdout));
+                    object _outputLock = new object();
+                    List<string> workerOutput = new List<string>();
                    using (var processChannel = HostContext.CreateService<IProcessChannel>())
                    using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
                    {
@@ -422,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);
                                            }
                                        }
                                    };
@@ -667,7 +658,7 @@ namespace GitHub.Runner.Listener
            finally
            {
                Busy = false;
-
+                
                if (JobStatus != null)
                {
                    JobStatus(this, new JobStatusEventArgs(TaskAgentStatus.Online));
@@ -945,7 +936,7 @@ namespace GitHub.Runner.Listener

            var runnerServer = HostContext.GetService<IRunnerServer>();
            int completeJobRequestRetryLimit = 5;
-            List<Exception> exceptions = new();
+            List<Exception> exceptions = new List<Exception>();
            while (completeJobRequestRetryLimit-- > 0)
            {
                try
@@ -1048,7 +1039,7 @@ namespace GitHub.Runner.Listener
            public Task WorkerDispatch { get; set; }
            public CancellationTokenSource WorkerCancellationTokenSource { get; private set; }
            public CancellationTokenSource WorkerCancelTimeoutKillTokenSource { get; private set; }
-            private readonly object _lock = new();
+            private readonly object _lock = new object();

            public WorkerDispatcher(Guid jobId, long requestId)
            {
--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -38,7 +38,7 @@ namespace GitHub.Runner.Listener
        private readonly TimeSpan _sessionCreationRetryInterval = TimeSpan.FromSeconds(30);
        private readonly TimeSpan _sessionConflictRetryLimit = TimeSpan.FromMinutes(4);
        private readonly TimeSpan _clockSkewRetryLimit = TimeSpan.FromMinutes(30);
-        private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new();
+        private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new Dictionary<string, int>();
        private TaskAgentStatus runnerStatus = TaskAgentStatus.Online;
        private CancellationTokenSource _getMessagesTokenSource;

@@ -198,7 +198,7 @@ namespace GitHub.Runner.Listener
            bool encounteringError = false;
            int continuousError = 0;
            string errorMessage = string.Empty;
-            Stopwatch heartbeat = new();
+            Stopwatch heartbeat = new Stopwatch();
            heartbeat.Restart();
            while (true)
            {
@@ -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/Program.cs
+++ b/src/Runner.Listener/Program.cs
@@ -1,10 +1,12 @@
 using GitHub.Runner.Common;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Threading;
 using System.Threading.Tasks;

 namespace GitHub.Runner.Listener
@@ -16,7 +18,7 @@ namespace GitHub.Runner.Listener
            // Add environment variables from .env file
            LoadAndSetEnv();

-            using (HostContext context = new("Runner"))
+            using (HostContext context = new HostContext("Runner"))
            {
                return MainAsync(context, args).GetAwaiter().GetResult();
            }
@@ -58,18 +60,6 @@ namespace GitHub.Runner.Listener
                        terminal.WriteLine("This runner version is built for Windows. Please install a correct build for your OS.");
                        return Constants.Runner.ReturnCode.TerminatedError;
                    }
-                    #if ARM64
-                        // A little hacky, but windows gives no way to differentiate between windows 10 and 11.
-                        // By default only 11 supports native x64 app emulation on arm, so we only want to support windows 11
-                        // https://docs.microsoft.com/en-us/windows/arm/overview#build-windows-apps-that-run-on-arm
-                        // Windows 10 and 11 share a MajorVersion, so we also check the build version. Minor for both is 0, so doing < 0 doesn't really make a lot of sense.
-                        if (Environment.OSVersion.Version.Major < Constants.OperatingSystem.Windows11MajorVersion || 
-                            Environment.OSVersion.Version.Build < Constants.OperatingSystem.Windows11BuildVersion)
-                        {
-                            terminal.WriteLine("Win-arm64 runners require windows 11 or later. Please upgrade your operating system.");
-                            return Constants.Runner.ReturnCode.TerminatedError;
-                        }
-                    #endif
                    break;
                default:
                    terminal.WriteLine($"Running the runner on this platform is not supported. The current platform is {RuntimeInformation.OSDescription} and it was built for {Constants.Runner.Platform.ToString()}.");
--- a/src/Runner.Listener/Runner.Listener.csproj
+++ b/src/Runner.Listener/Runner.Listener.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -28,7 +29,7 @@ namespace GitHub.Runner.Listener
        private IMessageListener _listener;
        private ITerminal _term;
        private bool _inConfigStage;
-        private ManualResetEvent _completedCommand = new(false);
+        private ManualResetEvent _completedCommand = new ManualResetEvent(false);

        public override void Initialize(IHostContext hostContext)
        {
@@ -430,22 +431,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")))
@@ -506,26 +497,16 @@ namespace GitHub.Runner.Listener
                                else
                                {
                                    var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
-                                    Pipelines.AgentJobRequestMessage jobRequestMessage = null;

                                    // Create connection
                                    var credMgr = HostContext.GetService<ICredentialManager>();
                                    var creds = credMgr.LoadCredentials();

-                                    if (string.IsNullOrEmpty(messageRef.RunServiceUrl))
-                                    {
-                                        var actionsRunServer = HostContext.CreateService<IActionsRunServer>();
-                                        await actionsRunServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
-                                        jobRequestMessage = await actionsRunServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
-                                    }
-                                    else
-                                    {
-                                        var runServer = HostContext.CreateService<IRunServer>();
-                                        await runServer.ConnectAsync(new Uri(messageRef.RunServiceUrl), creds);
-                                        jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
-                                    }
+                                    var runServer = HostContext.CreateService<IRunServer>();
+                                    await runServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
+                                    var jobMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);

-                                    jobDispatcher.Run(jobRequestMessage, runOnce);
+                                    jobDispatcher.Run(jobMessage, runOnce);
                                    if (runOnce)
                                    {
                                        Trace.Info("One time used runner received job message.");
--- a/src/Runner.Listener/RunnerJobRequestRef.cs
+++ b/src/Runner.Listener/RunnerJobRequestRef.cs
@@ -9,7 +9,5 @@ namespace GitHub.Runner.Listener
        public string Id { get; set; }
        [DataMember(Name = "runner_request_id")]
        public string RunnerRequestId { get; set; }
-        [DataMember(Name = "run_service_url")]
-        public string RunServiceUrl { get; set; }
    }
-}
+}
--- a/src/Runner.Listener/SelfUpdater.cs
+++ b/src/Runner.Listener/SelfUpdater.cs
@@ -32,14 +32,14 @@ namespace GitHub.Runner.Listener
        private static string _platform = BuildConstants.RunnerPackage.PackageName;
        private static string _dotnetRuntime = "dotnetRuntime";
        private static string _externals = "externals";
-        private readonly Dictionary<string, string> _contentHashes = new();
+        private readonly Dictionary<string, string> _contentHashes = new Dictionary<string, string>();

        private PackageMetadata _targetPackage;
        private ITerminal _terminal;
        private IRunnerServer _runnerServer;
        private int _poolId;
        private int _agentId;
-        private readonly ConcurrentQueue<string> _updateTrace = new();
+        private readonly ConcurrentQueue<string> _updateTrace = new ConcurrentQueue<string>();
        private Task _cloneAndCalculateContentHashTask;
        private string _dotnetRuntimeCloneDirectory;
        private string _externalsCloneDirectory;
@@ -134,7 +134,7 @@ namespace GitHub.Runner.Listener
                    string flagFile = "update.finished";
                    IOUtil.DeleteFile(flagFile);
                    // kick off update script
-                    Process invokeScript = new();
+                    Process invokeScript = new Process();
 #if OS_WINDOWS
                    invokeScript.StartInfo.FileName = WhichUtil.Which("cmd.exe", trace: Trace);
                    invokeScript.StartInfo.Arguments = $"/c \"{updateScript}\"";
@@ -191,9 +191,9 @@ namespace GitHub.Runner.Listener
            }

            Trace.Info($"Version '{_targetPackage.Version}' of '{_targetPackage.Type}' package available in server.");
-            PackageVersion serverVersion = new(_targetPackage.Version);
+            PackageVersion serverVersion = new PackageVersion(_targetPackage.Version);
            Trace.Info($"Current running runner version is {BuildConstants.RunnerPackage.Version}");
-            PackageVersion runnerVersion = new(BuildConstants.RunnerPackage.Version);
+            PackageVersion runnerVersion = new PackageVersion(BuildConstants.RunnerPackage.Version);

            return serverVersion.CompareTo(runnerVersion) > 0;
        }
@@ -476,7 +476,7 @@ namespace GitHub.Runner.Listener
                        long downloadSize = 0;

                        //open zip stream in async mode
-                        using (HttpClient httpClient = new(HostContext.CreateHttpClientHandler()))
+                        using (HttpClient httpClient = new HttpClient(HostContext.CreateHttpClientHandler()))
                        {
                            if (!string.IsNullOrEmpty(_targetPackage.Token))
                            {
@@ -486,7 +486,7 @@ namespace GitHub.Runner.Listener

                            Trace.Info($"Downloading {packageDownloadUrl}");

-                            using (FileStream fs = new(archiveFile, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true))
+                            using (FileStream fs = new FileStream(archiveFile, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true))
                            using (Stream result = await httpClient.GetStreamAsync(packageDownloadUrl))
                            {
                                //81920 is the default used by System.IO.Stream.CopyTo and is under the large object heap threshold (85k).
@@ -596,7 +596,7 @@ namespace GitHub.Runner.Listener
                    int exitCode = await processInvoker.ExecuteAsync(extractDirectory, tar, $"-xzf \"{archiveFile}\"", null, token);
                    if (exitCode != 0)
                    {
-                        throw new NotSupportedException($"Can't use 'tar -xzf' to extract archive file: {archiveFile}. return code: {exitCode}.");
+                        throw new NotSupportedException($"Can't use 'tar -xzf' extract archive file: {archiveFile}. return code: {exitCode}.");
                    }
                }
            }
--- a/src/Runner.PluginHost/Program.cs
+++ b/src/Runner.PluginHost/Program.cs
@@ -1,10 +1,13 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.Loader;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using GitHub.Runner.Sdk;
 using GitHub.DistributedTask.WebApi;

@@ -12,7 +15,7 @@ namespace GitHub.Runner.PluginHost
 {
    public static class Program
    {
-        private static CancellationTokenSource tokenSource = new();
+        private static CancellationTokenSource tokenSource = new CancellationTokenSource();
        private static string executingAssemblyLocation = string.Empty;

        public static int Main(string[] args)
--- a/src/Runner.PluginHost/Runner.PluginHost.csproj
+++ b/src/Runner.PluginHost/Runner.PluginHost.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
--- a/src/Runner.Plugins/Artifact/DownloadArtifact.cs
+++ b/src/Runner.Plugins/Artifact/DownloadArtifact.cs
@@ -63,7 +63,7 @@ namespace GitHub.Runner.Plugins.Artifact
            string containerPath = actionsStorageArtifact.Name; // In actions storage artifacts, name equals the path
            long containerId = actionsStorageArtifact.ContainerId;

-            FileContainerServer fileContainerServer = new(context.VssConnection, projectId: new Guid(), containerId, containerPath);
+            FileContainerServer fileContainerServer = new FileContainerServer(context.VssConnection, projectId: new Guid(), containerId, containerPath);
            await fileContainerServer.DownloadFromContainerAsync(context, targetPath, token);

            context.Output("Artifact download finished.");
--- a/src/Runner.Plugins/Artifact/FileContainerServer.cs
+++ b/src/Runner.Plugins/Artifact/FileContainerServer.cs
@@ -23,10 +23,10 @@ namespace GitHub.Runner.Plugins.Artifact
        //81920 is the default used by System.IO.Stream.CopyTo and is under the large object heap threshold (85k). 
        private const int _defaultCopyBufferSize = 81920;

-        private readonly ConcurrentQueue<string> _fileUploadQueue = new();
-        private readonly ConcurrentQueue<DownloadInfo> _fileDownloadQueue = new();
-        private readonly ConcurrentDictionary<string, ConcurrentQueue<string>> _fileUploadTraceLog = new();
-        private readonly ConcurrentDictionary<string, ConcurrentQueue<string>> _fileUploadProgressLog = new();
+        private readonly ConcurrentQueue<string> _fileUploadQueue = new ConcurrentQueue<string>();
+        private readonly ConcurrentQueue<DownloadInfo> _fileDownloadQueue = new ConcurrentQueue<DownloadInfo>();
+        private readonly ConcurrentDictionary<string, ConcurrentQueue<string>> _fileUploadTraceLog = new ConcurrentDictionary<string, ConcurrentQueue<string>>();
+        private readonly ConcurrentDictionary<string, ConcurrentQueue<string>> _fileUploadProgressLog = new ConcurrentDictionary<string, ConcurrentQueue<string>>();
        private readonly FileContainerHttpClient _fileContainerHttpClient;

        private CancellationTokenSource _uploadCancellationTokenSource;
@@ -67,7 +67,7 @@ namespace GitHub.Runner.Plugins.Artifact
            CancellationToken cancellationToken)
        {
            // Find out all container items need to be processed
-            List<FileContainerItem> containerItems = new();
+            List<FileContainerItem> containerItems = new List<FileContainerItem>();
            int retryCount = 0;
            while (retryCount < 3)
            {
@@ -106,7 +106,7 @@ namespace GitHub.Runner.Plugins.Artifact
            // Create all required empty folders and emptry files, gather a list of files that we need to download from server.
            int foldersCreated = 0;
            int emptryFilesCreated = 0;
-            List<DownloadInfo> downloadFiles = new();
+            List<DownloadInfo> downloadFiles = new List<DownloadInfo>();
            foreach (var item in containerItems.OrderBy(x => x.Path))
            {
                if (!item.Path.StartsWith(_containerPath, StringComparison.OrdinalIgnoreCase))
@@ -306,7 +306,7 @@ namespace GitHub.Runner.Plugins.Artifact
            Task downloadMonitor = DownloadReportingAsync(context, files.Count(), token);

            // Start parallel download tasks.
-            List<Task<DownloadResult>> parallelDownloadingTasks = new();
+            List<Task<DownloadResult>> parallelDownloadingTasks = new List<Task<DownloadResult>>();
            for (int downloader = 0; downloader < concurrentDownloads; downloader++)
            {
                parallelDownloadingTasks.Add(DownloadAsync(context, downloader, token));
@@ -358,7 +358,7 @@ namespace GitHub.Runner.Plugins.Artifact
            Task uploadMonitor = UploadReportingAsync(context, files.Count(), _uploadCancellationTokenSource.Token);

            // Start parallel upload tasks.
-            List<Task<UploadResult>> parallelUploadingTasks = new();
+            List<Task<UploadResult>> parallelUploadingTasks = new List<Task<UploadResult>>();
            for (int uploader = 0; uploader < concurrentUploads; uploader++)
            {
                parallelUploadingTasks.Add(UploadAsync(context, uploader, _uploadCancellationTokenSource.Token));
@@ -381,8 +381,8 @@ namespace GitHub.Runner.Plugins.Artifact

        private async Task<DownloadResult> DownloadAsync(RunnerActionPluginExecutionContext context, int downloaderId, CancellationToken token)
        {
-            List<DownloadInfo> failedFiles = new();
-            Stopwatch downloadTimer = new();
+            List<DownloadInfo> failedFiles = new List<DownloadInfo>();
+            Stopwatch downloadTimer = new Stopwatch();
            while (_fileDownloadQueue.TryDequeue(out DownloadInfo fileToDownload))
            {
                token.ThrowIfCancellationRequested();
@@ -396,7 +396,7 @@ namespace GitHub.Runner.Plugins.Artifact
                        {
                            context.Debug($"Start downloading file: '{fileToDownload.ItemPath}' (Downloader {downloaderId})");
                            downloadTimer.Restart();
-                            using (FileStream fs = new(fileToDownload.LocalPath, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: _defaultFileStreamBufferSize, useAsync: true))
+                            using (FileStream fs = new FileStream(fileToDownload.LocalPath, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: _defaultFileStreamBufferSize, useAsync: true))
                            using (var downloadStream = await _fileContainerHttpClient.DownloadFileAsync(_containerId, fileToDownload.ItemPath, token, _projectId))
                            {
                                await downloadStream.CopyToAsync(fs, _defaultCopyBufferSize, token);
@@ -453,10 +453,10 @@ namespace GitHub.Runner.Plugins.Artifact

        private async Task<UploadResult> UploadAsync(RunnerActionPluginExecutionContext context, int uploaderId, CancellationToken token)
        {
-            List<string> failedFiles = new();
+            List<string> failedFiles = new List<string>();
            long uploadedSize = 0;
            string fileToUpload;
-            Stopwatch uploadTimer = new();
+            Stopwatch uploadTimer = new Stopwatch();
            while (_fileUploadQueue.TryDequeue(out fileToUpload))
            {
                token.ThrowIfCancellationRequested();
--- a/src/Runner.Plugins/Artifact/PipelinesServer.cs
+++ b/src/Runner.Plugins/Artifact/PipelinesServer.cs
@@ -1,3 +1,5 @@
+using System;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Actions.Pipelines.WebApi;
--- a/src/Runner.Plugins/Artifact/PublishArtifact.cs
+++ b/src/Runner.Plugins/Artifact/PublishArtifact.cs
@@ -68,7 +68,7 @@ namespace GitHub.Runner.Plugins.Artifact

            context.Output($"Uploading artifact '{artifactName}' from '{fullPath}' for run #{buildId}");

-            FileContainerServer fileContainerHelper = new(context.VssConnection, projectId: Guid.Empty, containerId, artifactName);
+            FileContainerServer fileContainerHelper = new FileContainerServer(context.VssConnection, projectId: Guid.Empty, containerId, artifactName);
            var propertiesDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

            long size = 0;
@@ -87,7 +87,7 @@ namespace GitHub.Runner.Plugins.Artifact
                // Definition ID is a dummy value only used by HTTP client routing purposes
                int definitionId = 1;

-                PipelinesServer pipelinesHelper = new(context.VssConnection);
+                PipelinesServer pipelinesHelper = new PipelinesServer(context.VssConnection);

                var artifact = await pipelinesHelper.AssociateActionsStorageArtifactAsync(
                    definitionId,
--- a/src/Runner.Plugins/Repository/GitCliManager.cs
+++ b/src/Runner.Plugins/Repository/GitCliManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -8,6 +9,7 @@ using System.Threading.Tasks;
 using System.IO;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
+using GitHub.DistributedTask.Pipelines.ContextData;

 namespace GitHub.Runner.Plugins.Repository
 {
@@ -18,7 +20,7 @@ namespace GitHub.Runner.Plugins.Repository
 #else
        private static readonly Encoding s_encoding = null;
 #endif
-        private readonly Dictionary<string, string> gitEnv = new(StringComparer.OrdinalIgnoreCase)
+        private readonly Dictionary<string, string> gitEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
        {
            { "GIT_TERMINAL_PROMPT", "0" },
        };
@@ -92,11 +94,11 @@ namespace GitHub.Runner.Plugins.Repository
            }

            // required 2.0, all git operation commandline args need min git version 2.0
-            Version minRequiredGitVersion = new(2, 0);
+            Version minRequiredGitVersion = new Version(2, 0);
            EnsureGitVersion(minRequiredGitVersion, throwOnNotMatch: true);

            // suggest user upgrade to 2.9 for better git experience
-            Version recommendGitVersion = new(2, 9);
+            Version recommendGitVersion = new Version(2, 9);
            if (!EnsureGitVersion(recommendGitVersion, throwOnNotMatch: false))
            {
                context.Output($"To get a better Git experience, upgrade your Git to at least version '{recommendGitVersion}'. Your current Git version is '{gitVersion}'.");
@@ -430,7 +432,7 @@ namespace GitHub.Runner.Plugins.Repository
            context.Debug($"Inspect remote.origin.url for repository under {repositoryPath}");
            Uri fetchUrl = null;

-            List<string> outputStrings = new();
+            List<string> outputStrings = new List<string>();
            int exitCode = await ExecuteGitCommandAsync(context, repositoryPath, "config", "--get remote.origin.url", outputStrings);

            if (exitCode != 0)
@@ -477,7 +479,7 @@ namespace GitHub.Runner.Plugins.Repository
            context.Debug($"Checking git config {configKey} exist or not");

            // ignore any outputs by redirect them into a string list, since the output might contains secrets.
-            List<string> outputStrings = new();
+            List<string> outputStrings = new List<string>();
            int exitcode = await ExecuteGitCommandAsync(context, repositoryPath, "config", StringUtil.Format($"--get-all {configKey}"), outputStrings);

            return exitcode == 0;
@@ -539,7 +541,7 @@ namespace GitHub.Runner.Plugins.Repository
            string runnerWorkspace = context.GetRunnerContext("workspace");
            ArgUtil.Directory(runnerWorkspace, "runnerWorkspace");
            Version version = null;
-            List<string> outputStrings = new();
+            List<string> outputStrings = new List<string>();
            int exitCode = await ExecuteGitCommandAsync(context, runnerWorkspace, "version", null, outputStrings);
            context.Output($"{string.Join(Environment.NewLine, outputStrings)}");
            if (exitCode == 0)
@@ -550,7 +552,7 @@ namespace GitHub.Runner.Plugins.Repository
                {
                    string verString = outputStrings.First();
                    // we interested about major.minor.patch version
-                    Regex verRegex = new("\\d+\\.\\d+(\\.\\d+)?", RegexOptions.IgnoreCase);
+                    Regex verRegex = new Regex("\\d+\\.\\d+(\\.\\d+)?", RegexOptions.IgnoreCase);
                    var matchResult = verRegex.Match(verString);
                    if (matchResult.Success && !string.IsNullOrEmpty(matchResult.Value))
                    {
@@ -572,7 +574,7 @@ namespace GitHub.Runner.Plugins.Repository
            string runnerWorkspace = context.GetRunnerContext("workspace");
            ArgUtil.Directory(runnerWorkspace, "runnerWorkspace");
            Version version = null;
-            List<string> outputStrings = new();
+            List<string> outputStrings = new List<string>();
            int exitCode = await ExecuteGitCommandAsync(context, runnerWorkspace, "lfs version", null, outputStrings);
            context.Output($"{string.Join(Environment.NewLine, outputStrings)}");
            if (exitCode == 0)
@@ -583,7 +585,7 @@ namespace GitHub.Runner.Plugins.Repository
                {
                    string verString = outputStrings.First();
                    // we interested about major.minor.patch version
-                    Regex verRegex = new("\\d+\\.\\d+(\\.\\d+)?", RegexOptions.IgnoreCase);
+                    Regex verRegex = new Regex("\\d+\\.\\d+(\\.\\d+)?", RegexOptions.IgnoreCase);
                    var matchResult = verRegex.Match(verString);
                    if (matchResult.Success && !string.IsNullOrEmpty(matchResult.Value))
                    {
--- a/src/Runner.Plugins/Repository/v1.0/GitSourceProvider.cs
+++ b/src/Runner.Plugins/Repository/v1.0/GitSourceProvider.cs
@@ -6,9 +6,11 @@ using System.Threading.Tasks;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Text;
+using System.Diagnostics;
 using GitHub.Runner.Sdk;
 using System.Linq;
 using GitHub.DistributedTask.WebApi;
+using GitHub.Services.WebApi;

 namespace GitHub.Runner.Plugins.Repository.v1_0
 {
@@ -21,7 +23,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
        private const string _remotePullRefsPrefix = "refs/remotes/pull/";

        // min git version that support add extra auth header.
-        private Version _minGitVersionSupportAuthHeader = new(2, 9);
+        private Version _minGitVersionSupportAuthHeader = new Version(2, 9);

 #if OS_WINDOWS
        // min git version that support override sslBackend setting.
@@ -29,7 +31,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
 #endif

        // min git-lfs version that support add extra auth header.
-        private Version _minGitLfsVersionSupportAuthHeader = new(2, 1);
+        private Version _minGitLfsVersionSupportAuthHeader = new Version(2, 1);

        private void RequirementCheck(RunnerActionPluginExecutionContext executionContext, GitCliManager gitCommandManager, bool checkGitLfs)
        {
@@ -83,7 +85,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
            var githubUrl = executionContext.GetGitHubContext("server_url");
            var githubUri = new Uri(!string.IsNullOrEmpty(githubUrl) ? githubUrl : "https://github.com");
            var portInfo = githubUri.IsDefaultPort ? string.Empty : $":{githubUri.Port}";
-            Uri repositoryUrl = new($"{githubUri.Scheme}://{githubUri.Host}{portInfo}/{repoFullName}");
+            Uri repositoryUrl = new Uri($"{githubUri.Scheme}://{githubUri.Host}{portInfo}/{repoFullName}");
            if (!repositoryUrl.IsAbsoluteUri)
            {
                throw new InvalidOperationException("Repository url need to be an absolute uri.");
@@ -121,7 +123,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
            executionContext.Debug($"gitLfsSupport={gitLfsSupport}");

            // Initialize git command manager with additional environment variables.
-            Dictionary<string, string> gitEnv = new(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, string> gitEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

            // Disable prompting for git credential manager
            gitEnv["GCM_INTERACTIVE"] = "Never";
@@ -141,7 +143,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                gitEnv[formattedKey] = variable.Value?.Value ?? string.Empty;
            }

-            GitCliManager gitCommandManager = new(gitEnv);
+            GitCliManager gitCommandManager = new GitCliManager(gitEnv);
            await gitCommandManager.LoadGitExecutionInfo(executionContext);

            // Make sure the build machine met all requirements for the git repository
@@ -293,8 +295,8 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                await RemoveGitConfig(executionContext, gitCommandManager, targetPath, $"http.{repositoryUrl.AbsoluteUri}.extraheader", string.Empty);
            }

-            List<string> additionalFetchArgs = new();
-            List<string> additionalLfsFetchArgs = new();
+            List<string> additionalFetchArgs = new List<string>();
+            List<string> additionalLfsFetchArgs = new List<string>();

            // add accessToken as basic auth header to handle auth challenge. 
            if (!string.IsNullOrEmpty(accessToken))
@@ -320,7 +322,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                }
            }

-            List<string> additionalFetchSpecs = new();
+            List<string> additionalFetchSpecs = new List<string>();
            additionalFetchSpecs.Add("+refs/heads/*:refs/remotes/origin/*");

            if (IsPullRequest(sourceBranch))
@@ -395,7 +397,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                    throw new InvalidOperationException($"Git submodule sync failed with exit code: {exitCode_submoduleSync}");
                }

-                List<string> additionalSubmoduleUpdateArgs = new();
+                List<string> additionalSubmoduleUpdateArgs = new List<string>();

                if (!string.IsNullOrEmpty(accessToken))
                {
--- a/src/Runner.Plugins/Repository/v1.0/RepositoryPlugin.cs
+++ b/src/Runner.Plugins/Repository/v1.0/RepositoryPlugin.cs
@@ -1,9 +1,12 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 using System.IO;
+using GitHub.DistributedTask.Pipelines.ContextData;
 using System.Text.RegularExpressions;
 using GitHub.DistributedTask.Pipelines.Expressions;
 using System.Text;
@@ -12,7 +15,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
 {
    public class CheckoutTask : IRunnerActionPlugin
    {
-        private readonly Regex _validSha1 = new(@"\b[0-9a-f]{40}\b", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled, TimeSpan.FromSeconds(2));
+        private readonly Regex _validSha1 = new Regex(@"\b[0-9a-f]{40}\b", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled, TimeSpan.FromSeconds(2));

        public async Task RunAsync(RunnerActionPluginExecutionContext executionContext, CancellationToken token)
        {
--- a/src/Runner.Plugins/Repository/v1.1/GitSourceProvider.cs
+++ b/src/Runner.Plugins/Repository/v1.1/GitSourceProvider.cs
@@ -4,7 +4,9 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Text;
+using System.Diagnostics;
 using GitHub.Runner.Sdk;
 using System.Linq;
 using GitHub.DistributedTask.WebApi;
@@ -22,7 +24,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
        private const string _tagRefsPrefix = "refs/tags/";

        // min git version that support add extra auth header.
-        private Version _minGitVersionSupportAuthHeader = new(2, 9);
+        private Version _minGitVersionSupportAuthHeader = new Version(2, 9);

 #if OS_WINDOWS
        // min git version that support override sslBackend setting.
@@ -30,7 +32,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
 #endif

        // min git-lfs version that support add extra auth header.
-        private Version _minGitLfsVersionSupportAuthHeader = new(2, 1);
+        private Version _minGitLfsVersionSupportAuthHeader = new Version(2, 1);

        public static string ProblemMatcher => @"    
 {
@@ -62,9 +64,9 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
        {
            // Validate args.
            ArgUtil.NotNull(executionContext, nameof(executionContext));
-            Dictionary<string, string> configModifications = new();
+            Dictionary<string, string> configModifications = new Dictionary<string, string>();
            executionContext.Output($"Syncing repository: {repoFullName}");
-            Uri repositoryUrl = new($"https://github.com/{repoFullName}");
+            Uri repositoryUrl = new Uri($"https://github.com/{repoFullName}");
            if (!repositoryUrl.IsAbsoluteUri)
            {
                throw new InvalidOperationException("Repository url need to be an absolute uri.");
@@ -102,7 +104,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
            executionContext.Debug($"gitLfsSupport={gitLfsSupport}");

            // Initialize git command manager with additional environment variables.
-            Dictionary<string, string> gitEnv = new(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, string> gitEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

            // Disable git prompt
            gitEnv["GIT_TERMINAL_PROMPT"] = "0";
@@ -125,7 +127,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                gitEnv[formattedKey] = variable.Value?.Value ?? string.Empty;
            }

-            GitCliManager gitCommandManager = new(gitEnv);
+            GitCliManager gitCommandManager = new GitCliManager(gitEnv);
            await gitCommandManager.LoadGitExecutionInfo(executionContext);

            // Make sure the build machine met all requirements for the git repository
@@ -277,8 +279,8 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                await RemoveGitConfig(executionContext, gitCommandManager, targetPath, $"http.{repositoryUrl.AbsoluteUri}.extraheader", string.Empty);
            }

-            List<string> additionalFetchArgs = new();
-            List<string> additionalLfsFetchArgs = new();
+            List<string> additionalFetchArgs = new List<string>();
+            List<string> additionalLfsFetchArgs = new List<string>();

            // Add http.https://github.com.extraheader=... to gitconfig
            // accessToken as basic auth header to handle any auth challenge from github.com 
@@ -303,7 +305,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                }
            }

-            List<string> additionalFetchSpecs = new();
+            List<string> additionalFetchSpecs = new List<string>();
            additionalFetchSpecs.Add("+refs/heads/*:refs/remotes/origin/*");

            if (IsPullRequest(sourceBranch))
@@ -378,7 +380,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                    throw new InvalidOperationException($"Git submodule sync failed with exit code: {exitCode_submoduleSync}");
                }

-                List<string> additionalSubmoduleUpdateArgs = new();
+                List<string> additionalSubmoduleUpdateArgs = new List<string>();

                int exitCode_submoduleUpdate = await gitCommandManager.GitSubmoduleUpdate(executionContext, targetPath, fetchDepth, string.Join(" ", additionalSubmoduleUpdateArgs), checkoutNestedSubmodules, cancellationToken);
                if (exitCode_submoduleUpdate != 0)
@@ -404,7 +406,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
            executionContext.Output($"Cleanup cached git credential from {repositoryPath}.");

            // Initialize git command manager
-            GitCliManager gitCommandManager = new();
+            GitCliManager gitCommandManager = new GitCliManager();
            await gitCommandManager.LoadGitExecutionInfo(executionContext);

            executionContext.Debug("Remove any extraheader setting from git config.");
@@ -499,7 +501,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                    string gitConfig = Path.Combine(targetPath, ".git/config");
                    if (File.Exists(gitConfig))
                    {
-                        List<string> safeGitConfig = new();
+                        List<string> safeGitConfig = new List<string>();
                        var gitConfigContents = File.ReadAllLines(gitConfig);
                        foreach (var line in gitConfigContents)
                        {
--- a/src/Runner.Plugins/Repository/v1.1/RepositoryPlugin.cs
+++ b/src/Runner.Plugins/Repository/v1.1/RepositoryPlugin.cs
@@ -1,9 +1,13 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 using System.IO;
+using GitHub.DistributedTask.Pipelines.ContextData;
+using System.Text.RegularExpressions;
 using GitHub.DistributedTask.Pipelines.Expressions;
 using System.Text;

--- a/src/Runner.Plugins/Runner.Plugins.csproj
+++ b/src/Runner.Plugins/Runner.Plugins.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
--- a/src/Runner.Sdk/ActionPlugin.cs
+++ b/src/Runner.Sdk/ActionPlugin.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -10,6 +11,7 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using Newtonsoft.Json;
+using Pipelines = GitHub.DistributedTask.Pipelines;

 namespace GitHub.Runner.Sdk
 {
@@ -23,7 +25,7 @@ namespace GitHub.Runner.Sdk
        private readonly string DebugEnvironmentalVariable = "ACTIONS_STEP_DEBUG";
        private VssConnection _connection;
        private RunnerWebProxy _webProxy;
-        private readonly object _stdoutLock = new();
+        private readonly object _stdoutLock = new object();
        private readonly ITraceWriter _trace; // for unit tests

        public RunnerActionPluginExecutionContext()
@@ -220,7 +222,7 @@ namespace GitHub.Runner.Sdk
            return input;
        }

-        private Dictionary<string, string> _commandEscapeMappings = new(StringComparer.OrdinalIgnoreCase)
+        private Dictionary<string, string> _commandEscapeMappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
        {
            {
                ";", "%3B"
--- a/src/Runner.Sdk/ProcessInvoker.cs
+++ b/src/Runner.Sdk/ProcessInvoker.cs
@@ -24,18 +24,18 @@ namespace GitHub.Runner.Sdk
        private Stopwatch _stopWatch;
        private int _asyncStreamReaderCount = 0;
        private bool _waitingOnStreams = false;
-        private readonly AsyncManualResetEvent _outputProcessEvent = new();
-        private readonly TaskCompletionSource<bool> _processExitedCompletionSource = new();
-        private readonly CancellationTokenSource _processStandardInWriteCancellationTokenSource = new();
-        private readonly ConcurrentQueue<string> _errorData = new();
-        private readonly ConcurrentQueue<string> _outputData = new();
+        private readonly AsyncManualResetEvent _outputProcessEvent = new AsyncManualResetEvent();
+        private readonly TaskCompletionSource<bool> _processExitedCompletionSource = new TaskCompletionSource<bool>();
+        private readonly CancellationTokenSource _processStandardInWriteCancellationTokenSource = new CancellationTokenSource();
+        private readonly ConcurrentQueue<string> _errorData = new ConcurrentQueue<string>();
+        private readonly ConcurrentQueue<string> _outputData = new ConcurrentQueue<string>();
        private readonly TimeSpan _sigintTimeout = TimeSpan.FromMilliseconds(7500);
        private readonly TimeSpan _sigtermTimeout = TimeSpan.FromMilliseconds(2500);
        private ITraceWriter Trace { get; set; }

        private class AsyncManualResetEvent
        {
-            private volatile TaskCompletionSource<bool> m_tcs = new();
+            private volatile TaskCompletionSource<bool> m_tcs = new TaskCompletionSource<bool>();

            public Task WaitAsync() { return m_tcs.Task; }

@@ -387,8 +387,8 @@ namespace GitHub.Runner.Sdk

        private void ProcessOutput()
        {
-            List<string> errorData = new();
-            List<string> outputData = new();
+            List<string> errorData = new List<string>();
+            List<string> outputData = new List<string>();

            string errorLine;
            while (_errorData.TryDequeue(out errorLine))
--- a/src/Runner.Sdk/Runner.Sdk.csproj
+++ b/src/Runner.Sdk/Runner.Sdk.csproj
@@ -3,12 +3,12 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64</RuntimeIdentifiers>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
    <NoWarn>NU1701;NU1603</NoWarn>
    <Version>$(Version)</Version>
  </PropertyGroup>
-
+  
  <ItemGroup>
    <ProjectReference Include="..\Sdk\Sdk.csproj" />
  </ItemGroup>
--- a/src/Runner.Sdk/RunnerWebProxy.cs
+++ b/src/Runner.Sdk/RunnerWebProxy.cs
@@ -23,9 +23,9 @@ namespace GitHub.Runner.Sdk
        private string _httpsProxyPassword;
        private string _noProxyString;

-        private readonly List<ByPassInfo> _noProxyList = new();
-        private readonly HashSet<string> _noProxyUnique = new(StringComparer.OrdinalIgnoreCase);
-        private readonly Regex _validIpRegex = new("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$", RegexOptions.Compiled);
+        private readonly List<ByPassInfo> _noProxyList = new List<ByPassInfo>();
+        private readonly HashSet<string> _noProxyUnique = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private readonly Regex _validIpRegex = new Regex("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$", RegexOptions.Compiled);

        public string HttpProxyAddress => _httpProxyAddress;
        public string HttpProxyUsername => _httpProxyUsername;
--- a/src/Runner.Sdk/Util/IOUtil.cs
+++ b/src/Runner.Sdk/Util/IOUtil.cs
@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
@@ -52,7 +53,7 @@ namespace GitHub.Runner.Sdk
            using (SHA256 sha256hash = SHA256.Create())
            {
                byte[] data = sha256hash.ComputeHash(Encoding.UTF8.GetBytes(hashString));
-                StringBuilder sBuilder = new();
+                StringBuilder sBuilder = new StringBuilder();
                for (int i = 0; i < data.Length; i++)
                {
                    sBuilder.Append(data[i].ToString("x2"));
@@ -77,7 +78,7 @@ namespace GitHub.Runner.Sdk
        public static void DeleteDirectory(string path, bool contentsOnly, bool continueOnContentDeleteError, CancellationToken cancellationToken)
        {
            ArgUtil.NotNullOrEmpty(path, nameof(path));
-            DirectoryInfo directory = new(path);
+            DirectoryInfo directory = new DirectoryInfo(path);
            if (!directory.Exists)
            {
                return;
@@ -363,12 +364,12 @@ namespace GitHub.Runner.Sdk
            Directory.CreateDirectory(target);

            // Get the file contents of the directory to copy.
-            DirectoryInfo sourceDir = new(source);
+            DirectoryInfo sourceDir = new DirectoryInfo(source);
            foreach (FileInfo sourceFile in sourceDir.GetFiles() ?? new FileInfo[0])
            {
                // Check if the file already exists.
                cancellationToken.ThrowIfCancellationRequested();
-                FileInfo targetFile = new(Path.Combine(target, sourceFile.Name));
+                FileInfo targetFile = new FileInfo(Path.Combine(target, sourceFile.Name));
                if (!targetFile.Exists ||
                    sourceFile.Length != targetFile.Length ||
                    sourceFile.LastWriteTime != targetFile.LastWriteTime)
--- a/src/Runner.Sdk/Util/PathUtil.cs
+++ b/src/Runner.Sdk/Util/PathUtil.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;

 namespace GitHub.Runner.Sdk
--- a/src/Runner.Sdk/Util/StringUtil.cs
+++ b/src/Runner.Sdk/Util/StringUtil.cs
@@ -1,7 +1,11 @@
-using GitHub.Services.WebApi;
+using GitHub.Services.WebApi;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
+using System.Reflection;
 using System.Text;

 namespace GitHub.Runner.Sdk
@@ -9,7 +13,7 @@ namespace GitHub.Runner.Sdk
    public static class StringUtil
    {
        private static readonly object[] s_defaultFormatArgs = new object[] { null };
-        private static Lazy<JsonSerializerSettings> s_serializerSettings = new(() =>
+        private static Lazy<JsonSerializerSettings> s_serializerSettings = new Lazy<JsonSerializerSettings>(() =>
        {
            var settings = new VssJsonMediaTypeFormatter().SerializerSettings;
            settings.DateParseHandling = DateParseHandling.None;
--- a/src/Runner.Sdk/Util/UrlUtil.cs
+++ b/src/Runner.Sdk/Util/UrlUtil.cs
@@ -21,7 +21,7 @@ namespace GitHub.Runner.Sdk
                return baseUrl;
            }

-            UriBuilder credUri = new(baseUrl);
+            UriBuilder credUri = new UriBuilder(baseUrl);

            // ensure we have a username, uribuild will throw if username is empty but password is not.
            if (string.IsNullOrEmpty(username))
--- a/src/Runner.Sdk/Util/VssUtil.cs
+++ b/src/Runner.Sdk/Util/VssUtil.cs
@@ -9,7 +9,6 @@ using GitHub.Services.OAuth;
 using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
 using System.Net;
-using Sdk.WebApi.WebApi.RawClient;

 namespace GitHub.Runner.Sdk
 {
@@ -35,11 +34,7 @@ namespace GitHub.Runner.Sdk
            }
        }

-        public static VssConnection CreateConnection(
-            Uri serverUri,
-            VssCredentials credentials,
-            IEnumerable<DelegatingHandler> additionalDelegatingHandler = null,
-            TimeSpan? timeout = null)
+        public static VssConnection CreateConnection(Uri serverUri, VssCredentials credentials, IEnumerable<DelegatingHandler> additionalDelegatingHandler = null, TimeSpan? timeout = null)
        {
            VssClientHttpRequestSettings settings = VssClientHttpRequestSettings.Default.Clone();

@@ -76,47 +71,7 @@ namespace GitHub.Runner.Sdk
            // settings are applied to an HttpRequestMessage.
            settings.AcceptLanguages.Remove(CultureInfo.InvariantCulture);

-            VssConnection connection = new(serverUri, new VssHttpMessageHandler(credentials, settings), additionalDelegatingHandler);
-            return connection;
-        }
-
-        public static RawConnection CreateRawConnection(
-            Uri serverUri,
-            VssCredentials credentials,
-            IEnumerable<DelegatingHandler> additionalDelegatingHandler = null,
-            TimeSpan? timeout = null)
-        {
-            RawClientHttpRequestSettings settings = RawClientHttpRequestSettings.Default.Clone();
-
-            int maxRetryRequest;
-            if (!int.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_HTTP_RETRY") ?? string.Empty, out maxRetryRequest))
-            {
-                maxRetryRequest = 3;
-            }
-
-            // make sure MaxRetryRequest in range [3, 10]
-            settings.MaxRetryRequest = Math.Min(Math.Max(maxRetryRequest, 3), 10);
-
-            if (!int.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_HTTP_TIMEOUT") ?? string.Empty, out int httpRequestTimeoutSeconds))
-            {
-                settings.SendTimeout = timeout ?? TimeSpan.FromSeconds(100);
-            }
-            else
-            {
-                // prefer environment variable
-                settings.SendTimeout = TimeSpan.FromSeconds(Math.Min(Math.Max(httpRequestTimeoutSeconds, 100), 1200));
-            }
-
-            // Remove Invariant from the list of accepted languages.
-            //
-            // The constructor of VssHttpRequestSettings (base class of VssClientHttpRequestSettings) adds the current
-            // UI culture to the list of accepted languages. The UI culture will be Invariant on OSX/Linux when the
-            // LANG environment variable is not set when the program starts. If Invariant is in the list of accepted
-            // languages, then "System.ArgumentException: The value cannot be null or empty." will be thrown when the
-            // settings are applied to an HttpRequestMessage.
-            settings.AcceptLanguages.Remove(CultureInfo.InvariantCulture);
-
-            RawConnection connection = new(serverUri, new RawHttpMessageHandler(credentials.ToOAuthCredentials(), settings), additionalDelegatingHandler);
+            VssConnection connection = new VssConnection(serverUri, new VssHttpMessageHandler(credentials, settings), additionalDelegatingHandler);
            return connection;
        }

--- a/src/Runner.Service/Windows/App.config
+++ b/src/Runner.Service/Windows/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-    <startup>
+    <startup> 
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
    </startup>
-</configuration>
+</configuration>
--- a/src/Runner.Service/Windows/AppARM.config
+++ b/src/Runner.Service/Windows/AppARM.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-    </startup>
-</configuration>
--- a/src/Runner.Service/Windows/RunnerService.csproj
+++ b/src/Runner.Service/Windows/RunnerService.csproj
@@ -11,15 +11,10 @@
    <AssemblyName>RunnerService</AssemblyName>
    <SignAssembly>false</SignAssembly>
    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(PackageRuntime)' == 'win-arm64' ">
-      <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(PackageRuntime)' != 'win-arm64' ">
-      <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
@@ -66,10 +61,7 @@
      <DependentUpon>Resource.resx</DependentUpon>
    </Compile>
  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'ARM' ">
-    <None Include="AppARM.config" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' != 'ARM' ">
+  <ItemGroup>
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
@@ -79,7 +71,7 @@
    </EmbeddedResource>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
--- a/src/Runner.Worker/ActionCommandManager.cs
+++ b/src/Runner.Worker/ActionCommandManager.cs
@@ -21,9 +21,9 @@ namespace GitHub.Runner.Worker
    public sealed class ActionCommandManager : RunnerService, IActionCommandManager
    {
        private const string _stopCommand = "stop-commands";
-        private readonly Dictionary<string, IActionCommandExtension> _commandExtensions = new(StringComparer.OrdinalIgnoreCase);
-        private readonly HashSet<string> _registeredCommands = new(StringComparer.OrdinalIgnoreCase);
-        private readonly object _commandSerializeLock = new();
+        private readonly Dictionary<string, IActionCommandExtension> _commandExtensions = new Dictionary<string, IActionCommandExtension>(StringComparer.OrdinalIgnoreCase);
+        private readonly HashSet<string> _registeredCommands = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private readonly object _commandSerializeLock = new object();
        private bool _stopProcessCommand = false;
        private string _stopToken = null;

@@ -307,17 +307,6 @@ namespace GitHub.Runner.Worker

        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
        {
-            if (context.Global.Variables.GetBoolean("DistributedTask.DeprecateStepOutputCommands") ?? false)
-            {
-                var issue = new Issue()
-                {
-                    Type = IssueType.Warning,
-                    Message = String.Format(Constants.Runner.UnsupportedCommandMessage, this.Command)
-                };
-                issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.UnsupportedCommand;
-                context.AddIssue(issue);
-            }
-
            if (!command.Properties.TryGetValue(SetOutputCommandProperties.Name, out string outputName) || string.IsNullOrEmpty(outputName))
            {
                throw new Exception("Required field 'name' is missing in ##[set-output] command.");
@@ -342,17 +331,6 @@ namespace GitHub.Runner.Worker

        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
        {
-            if (context.Global.Variables.GetBoolean("DistributedTask.DeprecateStepOutputCommands") ?? false)
-            {
-                var issue = new Issue()
-                {
-                    Type = IssueType.Warning,
-                    Message = String.Format(Constants.Runner.UnsupportedCommandMessage, this.Command)
-                };
-                issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.UnsupportedCommand;
-                context.AddIssue(issue);
-            }
-
            if (!command.Properties.TryGetValue(SaveStateCommandProperties.Name, out string stateName) || string.IsNullOrEmpty(stateName))
            {
                throw new Exception("Required field 'name' is missing in ##[save-state] command.");
@@ -608,7 +586,7 @@ namespace GitHub.Runner.Worker
        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command, ContainerInfo container)
        {
            ValidateLinesAndColumns(command, context);
-
+        
            command.Properties.TryGetValue(IssueCommandProperties.File, out string file);
            command.Properties.TryGetValue(IssueCommandProperties.Line, out string line);
            command.Properties.TryGetValue(IssueCommandProperties.Column, out string column);
@@ -618,7 +596,7 @@ namespace GitHub.Runner.Worker
                context.Debug("Enhanced Annotations not enabled on the server. The 'title', 'end_line', and 'end_column' fields are unsupported.");
            }

-            Issue issue = new()
+            Issue issue = new Issue()
            {
                Category = "General",
                Type = this.Type,
--- a/src/Runner.Worker/ActionManager.cs
+++ b/src/Runner.Worker/ActionManager.cs
@@ -52,16 +52,16 @@ namespace GitHub.Runner.Worker
        private const int _defaultCopyBufferSize = 81920;
        private const string _dotcomApiUrl = "https://api.github.com";

-        private readonly Dictionary<Guid, ContainerInfo> _cachedActionContainers = new();
+        private readonly Dictionary<Guid, ContainerInfo> _cachedActionContainers = new Dictionary<Guid, ContainerInfo>();
        public Dictionary<Guid, ContainerInfo> CachedActionContainers => _cachedActionContainers;

-        private readonly Dictionary<Guid, List<Pipelines.ActionStep>> _cachedEmbeddedPreSteps = new();
+        private readonly Dictionary<Guid, List<Pipelines.ActionStep>> _cachedEmbeddedPreSteps = new Dictionary<Guid, List<Pipelines.ActionStep>>();
        public Dictionary<Guid, List<Pipelines.ActionStep>> CachedEmbeddedPreSteps => _cachedEmbeddedPreSteps;

-        private readonly Dictionary<Guid, List<Guid>> _cachedEmbeddedStepIds = new();
+        private readonly Dictionary<Guid, List<Guid>> _cachedEmbeddedStepIds = new Dictionary<Guid, List<Guid>>();
        public Dictionary<Guid, List<Guid>> CachedEmbeddedStepIds => _cachedEmbeddedStepIds;

-        private readonly Dictionary<Guid, Stack<Pipelines.ActionStep>> _cachedEmbeddedPostSteps = new();
+        private readonly Dictionary<Guid, Stack<Pipelines.ActionStep>> _cachedEmbeddedPostSteps = new Dictionary<Guid, Stack<Pipelines.ActionStep>>();
        public Dictionary<Guid, Stack<Pipelines.ActionStep>> CachedEmbeddedPostSteps => _cachedEmbeddedPostSteps;

        public async Task<PrepareResult> PrepareActionsAsync(IExecutionContext executionContext, IEnumerable<Pipelines.JobStep> steps, Guid rootStepId = default(Guid))
@@ -791,7 +791,7 @@ namespace GitHub.Runner.Worker
                        try
                        {
                            //open zip stream in async mode
-                            using (FileStream fs = new(archiveFile, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: _defaultFileStreamBufferSize, useAsync: true))
+                            using (FileStream fs = new FileStream(archiveFile, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: _defaultFileStreamBufferSize, useAsync: true))
                            using (var httpClientHandler = HostContext.CreateHttpClientHandler())
                            using (var httpClient = new HttpClient(httpClientHandler))
                            {
--- a/src/Runner.Worker/ActionManifestManager.cs
+++ b/src/Runner.Worker/ActionManifestManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -10,6 +10,9 @@ using GitHub.DistributedTask.ObjectTemplating.Schema;
 using GitHub.DistributedTask.ObjectTemplating;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using GitHub.DistributedTask.Pipelines.ContextData;
+using YamlDotNet.Core;
+using YamlDotNet.Core.Events;
+using System.Globalization;
 using System.Linq;
 using Pipelines = GitHub.DistributedTask.Pipelines;

@@ -53,7 +56,7 @@ namespace GitHub.Runner.Worker
        public ActionDefinitionData Load(IExecutionContext executionContext, string manifestFile)
        {
            var templateContext = CreateTemplateContext(executionContext);
-            ActionDefinitionData actionDefinition = new();
+            ActionDefinitionData actionDefinition = new ActionDefinitionData();

            // Clean up file name real quick
            // Instead of using Regex which can be computationally expensive, 
--- a/src/Runner.Worker/ActionRunner.cs
+++ b/src/Runner.Worker/ActionRunner.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.ObjectTemplating;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
--- a/src/Runner.Worker/ConditionTraceWriter.cs
+++ b/src/Runner.Worker/ConditionTraceWriter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using GitHub.DistributedTask.Pipelines;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
@@ -10,7 +11,7 @@ namespace GitHub.Runner.Worker
    {
        private readonly IExecutionContext _executionContext;
        private readonly Tracing _trace;
-        private readonly StringBuilder _traceBuilder = new();
+        private readonly StringBuilder _traceBuilder = new StringBuilder();

        public string Trace => _traceBuilder.ToString();

--- a/src/Runner.Worker/Container/ContainerInfo.cs
+++ b/src/Runner.Worker/Container/ContainerInfo.cs
@@ -15,7 +15,7 @@ namespace GitHub.Runner.Worker.Container
        private IDictionary<string, string> _userPortMappings;
        private List<PortMapping> _portMappings;
        private IDictionary<string, string> _environmentVariables;
-        private List<PathMapping> _pathMappings = new();
+        private List<PathMapping> _pathMappings = new List<PathMapping>();

        public ContainerInfo()
        {
@@ -92,8 +92,6 @@ namespace GitHub.Runner.Worker.Container
        public bool IsJobContainer { get; set; }
        public bool IsAlpine { get; set; }

-        public bool FailedInitialization { get; set; }
-
        public IDictionary<string, string> ContainerEnvironmentVariables
        {
            get
--- a/src/Runner.Worker/Container/DockerCommandManager.cs
+++ b/src/Runner.Worker/Container/DockerCommandManager.cs
@@ -60,7 +60,7 @@ namespace GitHub.Runner.Worker.Container
            context.Output($"Docker client API version: {clientVersionStr}");

            // we interested about major.minor.patch version
-            Regex verRegex = new("\\d+\\.\\d+(\\.\\d+)?", RegexOptions.IgnoreCase);
+            Regex verRegex = new Regex("\\d+\\.\\d+(\\.\\d+)?", RegexOptions.IgnoreCase);

            Version serverVersion = null;
            var serverVersionMatchResult = verRegex.Match(serverVersionStr);
@@ -107,6 +107,7 @@ namespace GitHub.Runner.Worker.Container
        public async Task<string> DockerCreate(IExecutionContext context, ContainerInfo container)
        {
            IList<string> dockerOptions = new List<string>();
+            IDictionary<string, string> environment = new Dictionary<string, string>();
            // OPTIONS
            dockerOptions.Add($"--name {container.ContainerDisplayName}");
            dockerOptions.Add($"--label {DockerInstanceLabel}");
@@ -135,7 +136,8 @@ namespace GitHub.Runner.Worker.Container
                }
                else
                {
-                    dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key, env.Value));
+                    environment.Add(env.Key, env.Value);
+                    dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key));
                }
            }

@@ -183,7 +185,7 @@ namespace GitHub.Runner.Worker.Container
            dockerOptions.Add($"{container.ContainerEntryPointArgs}");

            var optionsString = string.Join(" ", dockerOptions);
-            List<string> outputStrings = await ExecuteDockerCommandAsync(context, "create", optionsString);
+            List<string> outputStrings = await ExecuteDockerCommandAsync(context, "create", optionsString, environment);

            return outputStrings.FirstOrDefault();
        }
@@ -309,7 +311,7 @@ namespace GitHub.Runner.Worker.Container
            string arg = $"exec {options} {containerId} {command}".Trim();
            context.Command($"{DockerPath} {arg}");

-            object outputLock = new();
+            object outputLock = new object();
            var processInvoker = HostContext.CreateService<IProcessInvoker>();
            processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
            {
@@ -443,11 +445,16 @@ namespace GitHub.Runner.Worker.Container
        }

        private async Task<List<string>> ExecuteDockerCommandAsync(IExecutionContext context, string command, string options)
+        {
+            return await ExecuteDockerCommandAsync(context, command, options, null);
+        }
+
+        private async Task<List<string>> ExecuteDockerCommandAsync(IExecutionContext context, string command, string options, IDictionary<string, string> environment)
        {
            string arg = $"{command} {options}".Trim();
            context.Command($"{DockerPath} {arg}");

-            List<string> output = new();
+            List<string> output = new List<string>();
            var processInvoker = HostContext.CreateService<IProcessInvoker>();
            processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
            {
@@ -470,7 +477,7 @@ namespace GitHub.Runner.Worker.Container
                            workingDirectory: context.GetGitHubContext("workspace"),
                            fileName: DockerPath,
                            arguments: arg,
-                            environment: null,
+                            environment: environment,
                            requireExitCodeZero: true,
                            outputEncoding: null,
                            cancellationToken: CancellationToken.None);
--- a/src/Runner.Worker/Container/DockerUtil.cs
+++ b/src/Runner.Worker/Container/DockerUtil.cs
@@ -6,9 +6,6 @@ namespace GitHub.Runner.Worker.Container
 {
    public class DockerUtil
    {
-        private static readonly Regex QuoteEscape = new(@"(\\*)" + "\"", RegexOptions.Compiled);
-        private static readonly Regex EndOfStringEscape = new(@"(\\+)$", RegexOptions.Compiled);
-
        public static List<PortMapping> ParseDockerPort(IList<string> portMappingLines)
        {
            const string targetPort = "targetPort";
@@ -19,7 +16,7 @@ namespace GitHub.Runner.Worker.Container
            //"TARGET_PORT/PROTO -> HOST:HOST_PORT"
            string pattern = $"^(?<{targetPort}>\\d+)/(?<{proto}>\\w+) -> (?<{host}>.+):(?<{hostPort}>\\d+)$";

-            List<PortMapping> portMappings = new();
+            List<PortMapping> portMappings = new List<PortMapping>();
            foreach (var line in portMappingLines)
            {
                Match m = Regex.Match(line, pattern, RegexOptions.None, TimeSpan.FromSeconds(1));
@@ -71,37 +68,12 @@ namespace GitHub.Runner.Worker.Container
            {
                return "";
            }
-            return $"{flag} {EscapeString(key)}";
-        }
-
-        public static string CreateEscapedOption(string flag, string key, string value)
-        {
-            if (String.IsNullOrEmpty(key))
-            {
-                return "";
-            }
-            var escapedString = EscapeString($"{key}={value}");
-            return $"{flag} {escapedString}";
+            return $"{flag} \"{EscapeString(key)}\"";
        }

        private static string EscapeString(string value)
        {
-            if (String.IsNullOrEmpty(value))
-            {
-                return "";
-            }
-            // Dotnet escaping rules are weird here, we can only escape \ if it precedes a "
-            // If a double quotation mark follows two or an even number of backslashes, each proceeding backslash pair is replaced with one backslash and the double quotation mark is removed.
-            // If a double quotation mark follows an odd number of backslashes, including just one, each preceding pair is replaced with one backslash and the remaining backslash is removed; however, in this case the double quotation mark is not removed.
-            // https://docs.microsoft.com/en-us/dotnet/api/system.environment.getcommandlineargs?redirectedfrom=MSDN&view=net-6.0#remarks
-
-            // First, find any \ followed by a " and double the number of \ + 1.
-             value = QuoteEscape.Replace(value, @"$1$1\" + "\"");
-            // Next, what if it ends in `\`, it would escape the end quote. So, we need to detect that at the end of the string and perform the same escape
-            // Luckily, we can just use the $ character with detects the end of string in regex
-            value = EndOfStringEscape.Replace(value, @"$1$1");
-            // Finally, wrap it in quotes
-            return $"\"{value}\"";
+            return value.Replace("\\", "\\\\").Replace("\"", "\\\"");
        }
    }
 }
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`39d0683f0f115a211cb10c473e9574c16549a19d4e9a6c637ded3d7022bf809f`
				`@@ -1 +0,0 @@`
				`e5dace2d41cc0682d096dcce4970079ad48ec7107e46195970eecfdb3df2acef`