Update build.yml

2025-12-10 12:36:23 +00:00 · 2022-09-20 13:10:16 -04:00 · 2022-09-20 13:06:18 -04:00
153 changed files with 779 additions and 3910 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
@@ -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,14 +44,16 @@ jobs:
          os: windows-2019
          devScript: ./dev

-        - runtime: win-arm64
-          os: windows-latest
-          devScript: ./dev
-
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v3
-
+    # Needed for runner service (win only)
+    - name: Install dotnet framework 4.5
+      if: matrix.runtime == 'win-x64'
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: | 
+          5.0.x
    # Build runner layout
    - name: Build & Layout Release
      run: |
@@ -86,7 +88,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 +103,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/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
@@ -301,7 +288,6 @@ jobs:
        release_name: "v${{ steps.releaseNote.outputs.version }}"
        body: |
          ${{ steps.releaseNote.outputs.note }}
-        prerelease: true

    # Upload release assets (full runner packages)
    - name: Upload Release Asset (win-x64)
@@ -314,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:
@@ -385,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:
@@ -457,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:
@@ -529,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:
@@ -601,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:
--- 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
@@ -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/releaseNote.md
+++ b/releaseNote.md
@@ -1,19 +1,6 @@
-## Features
- Displays the error logs in dedicated sub-sections of the Initialize containers section (#2182)
- Add generateServiceConfig option for configure command (#2226)
- Setting debug using GitHub Action variables (#2234)
- run.sh installs SIGINT and SIGTERM traps to gracefully stop runner (#2233, 2240)
-
-
 ## Bugs
- Use Global.Variables instead of JobContext and include action path/ref in the message. (#2214)
- Sanitize Windows ENVs (#2280)
-
+- Fixed an issue where self hosted environments had their docker env's overwritten (#2107)
 ## Misc
- Allow '--disableupdate' in create-latest-svc.sh (#2201)
- Fix markup for support link (#2114)
- Add runner devcontainer (#2187)
- Setup linter for Runner (#2211, #2213, #2216)

 ## Windows x64
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.
@@ -29,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
@@ -108,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 -->
@@ -116,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 -->
@@ -124,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 -->
@@ -132,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.299.2
+<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:d' opt; do
+while getopts 's:g:n:r:u:l:' opt; do
    flags_found=true

    case $opt in
@@ -35,9 +35,6 @@ while getopts 's:g:n:r:u:l:d' opt; do
    l)
        labels=$OPTARG
        ;;
-    d)
-        disableupdate='true'
-        ;;
    *)
        echo "
 Runner Service Installer
@@ -52,8 +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"
+    -l          optional  list of labels (split by comma) applied on the runner"
        exit 0
        ;;
    esac
@@ -173,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 --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/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/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/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 0
-        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
@@ -31,7 +31,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/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/ConfigurationStore.cs
+++ b/src/Runner.Common/ConfigurationStore.cs
@@ -74,18 +74,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,18 +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 Node12DetectedAfterEndOfLife = "Node.js 12 actions are deprecated. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/. Please update the following actions to use Node.js 16: {0}";
+            public static readonly string Node12DetectedAfterEndOfLife = "Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: {0}";
        }

        public static class RunnerEvent
@@ -243,8 +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 ForcedInternalNodeVersion = "ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION"; 
+                public static readonly string ForcedActionsNodeVersion = "ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION"; 
            }

            public static class System
@@ -257,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
@@ -14,7 +14,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 +60,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;
--- a/src/Runner.Common/HostTraceListener.cs
+++ b/src/Runner.Common/HostTraceListener.cs
@@ -164,7 +164,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/JobServerQueue.cs
+++ b/src/Runner.Common/JobServerQueue.cs
@@ -39,19 +39,19 @@ 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<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;
@@ -61,8 +61,8 @@ namespace GitHub.Runner.Common
        // 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;
@@ -237,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))
@@ -264,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);
@@ -338,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))
                {
@@ -398,13 +398,13 @@ namespace GitHub.Runner.Common
        {
            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))
                        {
@@ -426,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)
@@ -529,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)
--- 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/RunServer.cs
+++ b/src/Runner.Common/RunServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.Pipelines;
@@ -6,7 +6,6 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
-using Sdk.WebApi.WebApi.RawClient;

 namespace GitHub.Runner.Common
 {
@@ -21,19 +20,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 +67,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
@@ -179,6 +179,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)
--- 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/Terminal.cs
+++ b/src/Runner.Common/Terminal.cs
@@ -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);
--- a/src/Runner.Common/TraceManager.cs
+++ b/src/Runner.Common/TraceManager.cs
@@ -14,7 +14,7 @@ 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 TraceSetting _traceSetting;
        private ISecretMasker _secretMasker;
--- 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.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/NodeJsCheck.cs
+++ b/src/Runner.Listener/Checks/NodeJsCheck.cs
@@ -86,7 +86,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 },
--- a/src/Runner.Listener/CommandSettings.cs
+++ b/src/Runner.Listener/CommandSettings.cs
@@ -11,7 +11,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 +26,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 +34,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 +79,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 +137,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/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/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,8 +398,8 @@ namespace GitHub.Runner.Listener
                    HostContext.WritePerfCounter($"JobRequestRenewed_{requestId.ToString()}");

                    Task<int> workerProcessTask = null;
-                    object _outputLock = new();
-                    List<string> workerOutput = new();
+                    object _outputLock = new object();
+                    List<string> workerOutput = new List<string>();
                    using (var processChannel = HostContext.CreateService<IProcessChannel>())
                    using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
                    {
@@ -936,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
@@ -1039,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)
            {
--- a/src/Runner.Listener/Program.cs
+++ b/src/Runner.Listener/Program.cs
@@ -16,7 +16,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 +58,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
@@ -28,7 +28,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)
        {
@@ -496,26 +496,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
@@ -12,7 +12,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/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
@@ -18,7 +18,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 +92,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 +430,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 +477,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 +539,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 +550,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 +572,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 +583,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
@@ -21,7 +21,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 +29,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 +83,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 +121,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 +141,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 +293,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 +320,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 +395,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
@@ -12,7 +12,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
@@ -22,7 +22,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 +30,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 +62,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 +102,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 +125,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 +277,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 +303,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 +378,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 +404,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 +499,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/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
@@ -23,7 +23,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 +220,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; }

@@ -264,17 +264,7 @@ namespace GitHub.Runner.Sdk
            {
                foreach (KeyValuePair<string, string> kvp in environment)
                {
-#if OS_WINDOWS
-                    string tempKey = String.IsNullOrWhiteSpace(kvp.Key) ? kvp.Key : kvp.Key.Split('\0')[0];
-                    string tempValue = String.IsNullOrWhiteSpace(kvp.Value) ? kvp.Value : kvp.Value.Split('\0')[0];
-                    if(!String.IsNullOrWhiteSpace(tempKey))
-                    {
-                         _proc.StartInfo.Environment[tempKey] = tempValue;
-                    }
-#else
                    _proc.StartInfo.Environment[kvp.Key] = kvp.Value;
-
-#endif
                }
            }

@@ -397,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
@@ -52,7 +52,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 +77,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 +363,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/StringUtil.cs
+++ b/src/Runner.Sdk/Util/StringUtil.cs
@@ -9,7 +9,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
@@ -53,7 +53,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/ConditionTraceWriter.cs
+++ b/src/Runner.Worker/ConditionTraceWriter.cs
@@ -10,7 +10,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);
@@ -309,7 +309,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)
            {
@@ -447,7 +447,7 @@ namespace GitHub.Runner.Worker.Container
            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)
            {
--- a/src/Runner.Worker/Container/DockerUtil.cs
+++ b/src/Runner.Worker/Container/DockerUtil.cs
@@ -6,8 +6,8 @@ namespace GitHub.Runner.Worker.Container
 {
    public class DockerUtil
    {
-        private static readonly Regex QuoteEscape = new(@"(\\*)" + "\"", RegexOptions.Compiled);
-        private static readonly Regex EndOfStringEscape = new(@"(\\+)$", RegexOptions.Compiled);
+        private static readonly Regex QuoteEscape = new Regex(@"(\\*)" + "\"", RegexOptions.Compiled);
+        private static readonly Regex EndOfStringEscape = new Regex(@"(\\+)$", RegexOptions.Compiled);

        public static List<PortMapping> ParseDockerPort(IList<string> portMappingLines)
        {
@@ -19,7 +19,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));
--- a/src/Runner.Worker/ContainerOperationProvider.cs
+++ b/src/Runner.Worker/ContainerOperationProvider.cs
@@ -98,41 +98,12 @@ namespace GitHub.Runner.Worker
                await StartContainerAsync(executionContext, container);
            }

-            await RunContainersHealthcheck(executionContext, containers);
-        }
-
-        public async Task RunContainersHealthcheck(IExecutionContext executionContext, List<ContainerInfo> containers)
-        {
            executionContext.Output("##[group]Waiting for all services to be ready");
-
-            var unhealthyContainers = new List<ContainerInfo>();
            foreach (var container in containers.Where(c => !c.IsJobContainer))
            {
-                var healthy_container = await ContainerHealthcheck(executionContext, container);
-
-                if (!healthy_container)
-                {
-                    unhealthyContainers.Add(container);
-                }
-                else
-                {
-                    executionContext.Output($"{container.ContainerNetworkAlias} service is healthy.");
-                }
+                await ContainerHealthcheck(executionContext, container);
            }
            executionContext.Output("##[endgroup]");
-
-            if (unhealthyContainers.Count > 0)
-            {
-                foreach (var container in unhealthyContainers)
-                {
-                    executionContext.Output($"##[group]Service container {container.ContainerNetworkAlias} failed.");
-                    await _dockerManager.DockerLogs(context: executionContext, containerId: container.ContainerId);
-                    executionContext.Error($"Failed to initialize container {container.ContainerImage}");
-                    container.FailedInitialization = true;
-                    executionContext.Output("##[endgroup]");
-                }
-                throw new InvalidOperationException("One or more containers failed to start.");
-            }
        }

        public async Task StopContainersAsync(IExecutionContext executionContext, object data)
@@ -328,8 +299,9 @@ namespace GitHub.Runner.Worker

            if (!string.IsNullOrEmpty(container.ContainerId))
            {
-                if (!container.IsJobContainer && !container.FailedInitialization)
+                if (!container.IsJobContainer)
                {
+                    // Print logs for service container jobs (not the "action" job itself b/c that's already logged).
                    executionContext.Output($"Print service container logs: {container.ContainerDisplayName}");

                    int logsExitCode = await _dockerManager.DockerLogs(executionContext, container.ContainerId);
@@ -354,8 +326,8 @@ namespace GitHub.Runner.Worker
        {
            context.Command($"{command} {arg}");

-            List<string> outputs = new();
-            object outputLock = new();
+            List<string> outputs = new List<string>();
+            object outputLock = new object();
            var processInvoker = HostContext.CreateService<IProcessInvoker>();
            processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs message)
            {
@@ -423,14 +395,14 @@ namespace GitHub.Runner.Worker
            }
        }

-        private async Task<bool> ContainerHealthcheck(IExecutionContext executionContext, ContainerInfo container)
+        private async Task ContainerHealthcheck(IExecutionContext executionContext, ContainerInfo container)
        {
            string healthCheck = "--format=\"{{if .Config.Healthcheck}}{{print .State.Health.Status}}{{end}}\"";
            string serviceHealth = (await _dockerManager.DockerInspect(context: executionContext, dockerObject: container.ContainerId, options: healthCheck)).FirstOrDefault();
            if (string.IsNullOrEmpty(serviceHealth))
            {
                // Container has no HEALTHCHECK
-                return true;
+                return;
            }
            var retryCount = 0;
            while (string.Equals(serviceHealth, "starting", StringComparison.OrdinalIgnoreCase))
@@ -441,7 +413,14 @@ namespace GitHub.Runner.Worker
                serviceHealth = (await _dockerManager.DockerInspect(context: executionContext, dockerObject: container.ContainerId, options: healthCheck)).FirstOrDefault();
                retryCount++;
            }
-            return string.Equals(serviceHealth, "healthy", StringComparison.OrdinalIgnoreCase);
+            if (string.Equals(serviceHealth, "healthy", StringComparison.OrdinalIgnoreCase))
+            {
+                executionContext.Output($"{container.ContainerNetworkAlias} service is healthy.");
+            }
+            else
+            {
+                throw new InvalidOperationException($"Failed to initialize, {container.ContainerNetworkAlias} service is {serviceHealth}.");
+            }
        }

        private async Task<string> ContainerRegistryLogin(IExecutionContext executionContext, ContainerInfo container)
@@ -562,7 +541,7 @@ namespace GitHub.Runner.Worker
 #if OS_WINDOWS
            Version requiredDockerEngineAPIVersion = new Version(1, 30);  // Docker-EE version 17.6
 #else
-            Version requiredDockerEngineAPIVersion = new(1, 35); // Docker-CE version 17.12
+            Version requiredDockerEngineAPIVersion = new Version(1, 35); // Docker-CE version 17.12
 #endif

            if (dockerVersion.ServerVersion < requiredDockerEngineAPIVersion)
--- a/src/Runner.Worker/ExecutionContext.cs
+++ b/src/Runner.Worker/ExecutionContext.cs
@@ -122,10 +122,10 @@ namespace GitHub.Runner.Worker
        private const int _maxIssueCountInTelemetry = 3; // Only send the first 3 issues to telemetry
        private const int _maxIssueMessageLengthInTelemetry = 256; // Only send the first 256 characters of issue message to telemetry

-        private readonly TimelineRecord _record = new();
-        private readonly Dictionary<Guid, TimelineRecord> _detailRecords = new();
-        private readonly object _loggerLock = new();
-        private readonly object _matchersLock = new();
+        private readonly TimelineRecord _record = new TimelineRecord();
+        private readonly Dictionary<Guid, TimelineRecord> _detailRecords = new Dictionary<Guid, TimelineRecord>();
+        private readonly object _loggerLock = new object();
+        private readonly object _matchersLock = new object();

        private event OnMatcherChanged _onMatcherChanged;

@@ -140,7 +140,7 @@ namespace GitHub.Runner.Worker
        private bool _expandedForPostJob = false;
        private int _childTimelineRecordOrder = 0;
        private CancellationTokenSource _cancellationTokenSource;
-        private TaskCompletionSource<int> _forceCompleted = new();
+        private TaskCompletionSource<int> _forceCompleted = new TaskCompletionSource<int>();
        private bool _throttlingReported = false;

        // only job level ExecutionContext will track throttling delay.
@@ -686,11 +686,8 @@ namespace GitHub.Runner.Worker
            // Endpoints
            Global.Endpoints = message.Resources.Endpoints;

-            // Ser debug using vars context if debug variables are not already present.
-            var variables = message.Variables;
-            SetDebugUsingVars(variables, message.ContextData);
-
-            Global.Variables = new Variables(HostContext, variables);
+            // Variables
+            Global.Variables = new Variables(HostContext, message.Variables);

            if (Global.Variables.GetBoolean("DistributedTask.ForceInternalNodeVersionOnRunnerTo12") ?? false)
            {
@@ -1080,31 +1077,6 @@ namespace GitHub.Runner.Worker
            return CreateChild(newGuid, displayName, newGuid.ToString("N"), null, null, ActionRunStage.Post, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count, siblingScopeName: siblingScopeName);
        }

-        // Sets debug using vars context in case debug variables are not present.
-        private static void SetDebugUsingVars(IDictionary<string, VariableValue> variables, IDictionary<string, PipelineContextData> contextData)
-        {
-            if (contextData != null &&
-                contextData.TryGetValue(PipelineTemplateConstants.Vars, out var varsPipelineContextData) &&
-                varsPipelineContextData != null && 
-                varsPipelineContextData is DictionaryContextData varsContextData)
-            {
-                // Set debug variables only when StepDebug/RunnerDebug variables are not present.
-                if (!variables.ContainsKey(Constants.Variables.Actions.StepDebug) &&
-                    varsContextData.TryGetValue(Constants.Variables.Actions.StepDebug, out var stepDebugValue) &&
-                    stepDebugValue is StringContextData)
-                {
-                    variables[Constants.Variables.Actions.StepDebug] = stepDebugValue.ToString();
-                }
-
-                if (!variables.ContainsKey(Constants.Variables.Actions.RunnerDebug) &&
-                    varsContextData.TryGetValue(Constants.Variables.Actions.RunnerDebug, out var runDebugValue) &&
-                    runDebugValue is StringContextData)
-                {
-                    variables[Constants.Variables.Actions.RunnerDebug] = runDebugValue.ToString();
-                }
-            }
-        }
-
        public void ApplyContinueOnError(TemplateToken continueOnErrorToken)
        {
            if (Result != TaskResult.Failed)
--- a/src/Runner.Worker/Expressions/HashFilesFunction.cs
+++ b/src/Runner.Worker/Expressions/HashFilesFunction.cs
@@ -32,7 +32,7 @@ namespace GitHub.Runner.Worker.Expressions

            string githubWorkspace = workspaceData.Value;
            bool followSymlink = false;
-            List<string> patterns = new();
+            List<string> patterns = new List<string>();
            var firstParameter = true;
            foreach (var parameter in Parameters)
            {
--- a/src/Runner.Worker/FileCommandManager.cs
+++ b/src/Runner.Worker/FileCommandManager.cs
@@ -138,10 +138,74 @@ namespace GitHub.Runner.Worker

        public void ProcessCommand(IExecutionContext context, string filePath, ContainerInfo container)
        {
-            var pairs = new EnvFileKeyValuePairs(context, filePath);
-            foreach (var pair in pairs)
+            try
            {
-                SetEnvironmentVariable(context, pair.Key, pair.Value);
+                var text = File.ReadAllText(filePath) ?? string.Empty;
+                var index = 0;
+                var line = ReadLine(text, ref index);
+                while (line != null)
+                {
+                    if (!string.IsNullOrEmpty(line))
+                    {
+                        var equalsIndex = line.IndexOf("=", StringComparison.Ordinal);
+                        var heredocIndex = line.IndexOf("<<", StringComparison.Ordinal);
+
+                        // Normal style NAME=VALUE
+                        if (equalsIndex >= 0 && (heredocIndex < 0 || equalsIndex < heredocIndex))
+                        {
+                            var split = line.Split(new[] { '=' }, 2, StringSplitOptions.None);
+                            if (string.IsNullOrEmpty(line))
+                            {
+                                throw new Exception($"Invalid environment variable format '{line}'. Environment variable name must not be empty");
+                            }
+                            SetEnvironmentVariable(context, split[0], split[1]);
+                        }
+                        // Heredoc style NAME<<EOF
+                        else if (heredocIndex >= 0 && (equalsIndex < 0 || heredocIndex < equalsIndex))
+                        {
+                            var split = line.Split(new[] { "<<" }, 2, StringSplitOptions.None);
+                            if (string.IsNullOrEmpty(split[0]) || string.IsNullOrEmpty(split[1]))
+                            {
+                                throw new Exception($"Invalid environment variable format '{line}'. Environment variable name must not be empty and delimiter must not be empty");
+                            }
+                            var name = split[0];
+                            var delimiter = split[1];
+                            var startIndex = index; // Start index of the value (inclusive)
+                            var endIndex = index;   // End index of the value (exclusive)
+                            var tempLine = ReadLine(text, ref index, out var newline);
+                            while (!string.Equals(tempLine, delimiter, StringComparison.Ordinal))
+                            {
+                                if (tempLine == null)
+                                {
+                                    throw new Exception($"Invalid environment variable value. Matching delimiter not found '{delimiter}'");
+                                }
+                                if (newline == null)
+                                {
+                                    throw new Exception($"Invalid environment variable value. EOF marker missing new line.");
+                                }
+                                endIndex = index - newline.Length;
+                                tempLine = ReadLine(text, ref index, out newline);
+                            }
+
+                            var value = endIndex > startIndex ? text.Substring(startIndex, endIndex - startIndex) : string.Empty;
+                            SetEnvironmentVariable(context, name, value);
+                        }
+                        else
+                        {
+                            throw new Exception($"Invalid environment variable format '{line}'");
+                        }
+                    }
+
+                    line = ReadLine(text, ref index);
+                }
+            }
+            catch (DirectoryNotFoundException)
+            {
+                context.Debug($"Environment variables file does not exist '{filePath}'");
+            }
+            catch (FileNotFoundException)
+            {
+                context.Debug($"Environment variables file does not exist '{filePath}'");
            }
        }

@@ -154,6 +218,48 @@ namespace GitHub.Runner.Worker
            context.SetEnvContext(name, value);
            context.Debug($"{name}='{value}'");
        }
+
+        private static string ReadLine(
+            string text,
+            ref int index)
+        {
+            return ReadLine(text, ref index, out _);
+        }
+
+        private static string ReadLine(
+            string text,
+            ref int index,
+            out string newline)
+        {
+            if (index >= text.Length)
+            {
+                newline = null;
+                return null;
+            }
+
+            var originalIndex = index;
+            var lfIndex = text.IndexOf("\n", index, StringComparison.Ordinal);
+            if (lfIndex < 0)
+            {
+                index = text.Length;
+                newline = null;
+                return text.Substring(originalIndex);
+            }
+
+#if OS_WINDOWS
+            var crLFIndex = text.IndexOf("\r\n", index, StringComparison.Ordinal);
+            if (crLFIndex >= 0 && crLFIndex < lfIndex)
+            {
+                index = crLFIndex + 2; // Skip over CRLF
+                newline = "\r\n";
+                return text.Substring(originalIndex, crLFIndex - originalIndex);
+            }
+#endif
+
+            index = lfIndex + 1; // Skip over LF
+            newline = "\n";
+            return text.Substring(originalIndex, lfIndex - originalIndex);
+        }
    }

    public sealed class CreateStepSummaryCommand : RunnerService, IFileCommandExtension
@@ -219,200 +325,4 @@ namespace GitHub.Runner.Worker
            }
        }
    }
-
-    public sealed class SaveStateFileCommand : RunnerService, IFileCommandExtension
-    {
-        public string ContextName => "state";
-        public string FilePrefix => "save_state_";
-
-        public Type ExtensionType => typeof(IFileCommandExtension);
-
-        public void ProcessCommand(IExecutionContext context, string filePath, ContainerInfo container)
-        {
-            var pairs = new EnvFileKeyValuePairs(context, filePath);
-            foreach (var pair in pairs)
-            {
-                // Embedded steps (composite) keep track of the state at the root level
-                if (context.IsEmbedded)
-                {
-                    var id = context.EmbeddedId;
-                    if (!context.Root.EmbeddedIntraActionState.ContainsKey(id))
-                    {
-                        context.Root.EmbeddedIntraActionState[id] = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                    }
-                    context.Root.EmbeddedIntraActionState[id][pair.Key] = pair.Value;
-                }
-                // Otherwise modify the ExecutionContext
-                else
-                {
-                    context.IntraActionState[pair.Key] = pair.Value;
-                }
-
-                context.Debug($"Save intra-action state {pair.Key} = {pair.Value}");
-            }
-        }
-    }
-
-    public sealed class SetOutputFileCommand : RunnerService, IFileCommandExtension
-    {
-        public string ContextName => "output";
-        public string FilePrefix => "set_output_";
-
-        public Type ExtensionType => typeof(IFileCommandExtension);
-
-        public void ProcessCommand(IExecutionContext context, string filePath, ContainerInfo container)
-        {
-            var pairs = new EnvFileKeyValuePairs(context, filePath);
-            foreach (var pair in pairs)
-            {
-                context.SetOutput(pair.Key, pair.Value, out var reference);
-                context.Debug($"Set output {pair.Key} = {pair.Value}");
-            }
-        }
-    }
-
-    public sealed class EnvFileKeyValuePairs: IEnumerable<KeyValuePair<string, string>>
-    {
-        private IExecutionContext _context;
-        private string _filePath;
-
-        public EnvFileKeyValuePairs(IExecutionContext context, string filePath)
-        {
-            _context = context;
-            _filePath = filePath;
-        }
-
-        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-        {
-            var text = string.Empty;
-            try
-            {
-                text = File.ReadAllText(_filePath) ?? string.Empty;
-            }
-            catch (DirectoryNotFoundException)
-            {
-                _context.Debug($"File does not exist '{_filePath}'");
-                yield break;
-            }
-            catch (FileNotFoundException)
-            {
-                _context.Debug($"File does not exist '{_filePath}'");
-                yield break;
-            }
-
-            var index = 0;
-            var line = ReadLine(text, ref index);
-            while (line != null)
-            {
-                if (!string.IsNullOrEmpty(line))
-                {
-                    var key = string.Empty;
-                    var output = string.Empty;
-
-                    var equalsIndex = line.IndexOf("=", StringComparison.Ordinal);
-                    var heredocIndex = line.IndexOf("<<", StringComparison.Ordinal);
-
-                    // Normal style NAME=VALUE
-                    if (equalsIndex >= 0 && (heredocIndex < 0 || equalsIndex < heredocIndex))
-                    {
-                        var split = line.Split(new[] { '=' }, 2, StringSplitOptions.None);
-                        if (string.IsNullOrEmpty(line))
-                        {
-                            throw new Exception($"Invalid format '{line}'. Name must not be empty");
-                        }
-
-                        key = split[0];
-                        output = split[1];
-                    }
-
-                    // Heredoc style NAME<<EOF
-                    else if (heredocIndex >= 0 && (equalsIndex < 0 || heredocIndex < equalsIndex))
-                    {
-                        var split = line.Split(new[] { "<<" }, 2, StringSplitOptions.None);
-                        if (string.IsNullOrEmpty(split[0]) || string.IsNullOrEmpty(split[1]))
-                        {
-                            throw new Exception($"Invalid format '{line}'. Name must not be empty and delimiter must not be empty");
-                        }
-                        key = split[0];
-                        var delimiter = split[1];
-                        var startIndex = index; // Start index of the value (inclusive)
-                        var endIndex = index;   // End index of the value (exclusive)
-                        var tempLine = ReadLine(text, ref index, out var newline);
-                        while (!string.Equals(tempLine, delimiter, StringComparison.Ordinal))
-                        {
-                            if (tempLine == null)
-                            {
-                                throw new Exception($"Invalid value. Matching delimiter not found '{delimiter}'");
-                            }
-                            if (newline == null)
-                            {
-                                throw new Exception($"Invalid value. EOF marker missing new line.");
-                            }
-                            endIndex = index - newline.Length;
-                            tempLine = ReadLine(text, ref index, out newline);
-                        }
-
-                        output = endIndex > startIndex ? text.Substring(startIndex, endIndex - startIndex) : string.Empty;
-                    }
-                    else
-                    {
-                        throw new Exception($"Invalid format '{line}'");
-                    }
-
-                    yield return new KeyValuePair<string, string>(key, output);
-                }
-
-                line = ReadLine(text, ref index);
-            }
-        }
-
-        System.Collections.IEnumerator
-            System.Collections.IEnumerable.GetEnumerator()
-        {
-            // Invoke IEnumerator<KeyValuePair<string, string>> GetEnumerator() above.
-            return GetEnumerator();
-        }
-
-        private static string ReadLine(
-                string text,
-                ref int index)
-        {
-            return ReadLine(text, ref index, out _);
-        }
-
-        private static string ReadLine(
-                string text,
-                ref int index,
-                out string newline)
-        {
-            if (index >= text.Length)
-            {
-                newline = null;
-                return null;
-            }
-
-            var originalIndex = index;
-            var lfIndex = text.IndexOf("\n", index, StringComparison.Ordinal);
-            if (lfIndex < 0)
-            {
-                index = text.Length;
-                newline = null;
-                return text.Substring(originalIndex);
-            }
-
-#if OS_WINDOWS
-            var crLFIndex = text.IndexOf("\r\n", index, StringComparison.Ordinal);
-            if (crLFIndex >= 0 && crLFIndex < lfIndex)
-            {
-                index = crLFIndex + 2; // Skip over CRLF
-                newline = "\r\n";
-                return text.Substring(originalIndex, crLFIndex - originalIndex);
-            }
-#endif
-
-            index = lfIndex + 1; // Skip over LF
-            newline = "\n";
-            return text.Substring(originalIndex, lfIndex - originalIndex);
-        }
-    }
 }
--- a/src/Runner.Worker/GitHubContext.cs
+++ b/src/Runner.Worker/GitHubContext.cs
@@ -6,7 +6,7 @@ namespace GitHub.Runner.Worker
 {
    public sealed class GitHubContext : DictionaryContextData, IEnvironmentContextData
    {
-        private readonly HashSet<string> _contextEnvAllowlist = new(StringComparer.OrdinalIgnoreCase)
+        private readonly HashSet<string> _contextEnvAllowlist = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
        {
            "action_path",
            "action_ref",
@@ -21,7 +21,6 @@ namespace GitHub.Runner.Worker
            "graphql_url",
            "head_ref",
            "job",
-            "output",
            "path",
            "ref_name",
            "ref_protected",
@@ -35,7 +34,6 @@ namespace GitHub.Runner.Worker
            "run_number",
            "server_url",
            "sha",
-            "state",
            "step_summary",
            "triggering_actor",
            "workflow",
--- a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
+++ b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -8,8 +7,8 @@ using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Worker.Container;
 using GitHub.Runner.Worker.Container.ContainerHooks;

@@ -98,15 +97,11 @@ namespace GitHub.Runner.Worker.Handlers
                workingDirectory = HostContext.GetDirectory(WellKnownDirectory.Work);
            }

-#if OS_OSX || OS_WINDOWS
+#if OS_OSX
            if (string.Equals(Data.NodeVersion, "node12", StringComparison.OrdinalIgnoreCase) &&
                Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.Arm64))
            {
-#if OS_OSX
                ExecutionContext.Output($"The node12 is not supported on macOS ARM64 platform. Use node16 instead.");
-#elif OS_WINDOWS
-                ExecutionContext.Output($"The node12 is not supported on windows ARM64 platform. Use node16 instead.");
-#endif
                Data.NodeVersion = "node16";
            }
 #endif
@@ -138,25 +133,13 @@ namespace GitHub.Runner.Worker.Handlers

            if (Data.NodeVersion == "node12" && (ExecutionContext.Global.Variables.GetBoolean(Constants.Runner.Features.Node12Warning) ?? false))
            {
+                if (!ExecutionContext.JobContext.ContainsKey("Node12ActionsWarnings"))
+                {                     
+                    ExecutionContext.JobContext["Node12ActionsWarnings"] = new ArrayContextData();
+                }
                var repoAction = Action as RepositoryPathReference;
-                var warningActions = new HashSet<string>();
-                if (ExecutionContext.Global.Variables.TryGetValue("Node12ActionsWarnings", out var node12Warnings))
-                {
-                    warningActions = StringUtil.ConvertFromJson<HashSet<string>>(node12Warnings);
-                }
-
-                var repoActionFullName = "";
-                if (string.IsNullOrEmpty(repoAction.Name))
-                {
-                    repoActionFullName = repoAction.Path; // local actions don't have a 'Name'
-                }
-                else
-                {
-                    repoActionFullName = $"{repoAction.Name}/{repoAction.Path ?? string.Empty}".TrimEnd('/') + $"@{repoAction.Ref}";
-                }
-
-                warningActions.Add(repoActionFullName);
-                ExecutionContext.Global.Variables.Set("Node12ActionsWarnings", StringUtil.ConvertToJson(warningActions));
+                var actionDisplayName = new StringContextData(repoAction.Name ?? repoAction.Path); // local actions don't have a 'Name'                
+                ExecutionContext.JobContext["Node12ActionsWarnings"].AssertArray("Node12ActionsWarnings").Add(actionDisplayName);
            }

            using (var stdoutManager = new OutputManager(ExecutionContext, ActionCommandManager))
--- a/src/Runner.Worker/Handlers/OutputManager.cs
+++ b/src/Runner.Worker/Handlers/OutputManager.cs
@@ -16,16 +16,16 @@ namespace GitHub.Runner.Worker.Handlers
        private const string _colorCodePrefix = "\033[";
        private const int _maxAttempts = 3;
        private const string _timeoutKey = "GITHUB_ACTIONS_RUNNER_ISSUE_MATCHER_TIMEOUT";
-        private static readonly Regex _colorCodeRegex = new(@"\x0033\[[0-9;]*m?", RegexOptions.Compiled | RegexOptions.CultureInvariant);
+        private static readonly Regex _colorCodeRegex = new Regex(@"\x0033\[[0-9;]*m?", RegexOptions.Compiled | RegexOptions.CultureInvariant);
        private readonly IActionCommandManager _commandManager;
        private readonly ContainerInfo _container;
        private readonly IExecutionContext _executionContext;
        private readonly int _failsafe = 50;
-        private readonly object _matchersLock = new();
+        private readonly object _matchersLock = new object();
        private readonly TimeSpan _timeout;
        private IssueMatcher[] _matchers = Array.Empty<IssueMatcher>();
        // Mapping that indicates whether a directory belongs to the workflow repository
-        private readonly Dictionary<string, string> _directoryMap = new();
+        private readonly Dictionary<string, string> _directoryMap = new Dictionary<string, string>();

        public OutputManager(IExecutionContext executionContext, IActionCommandManager commandManager, ContainerInfo container = null)
        {
--- a/src/Runner.Worker/Handlers/ScriptHandlerHelpers.cs
+++ b/src/Runner.Worker/Handlers/ScriptHandlerHelpers.cs
@@ -10,7 +10,7 @@ namespace GitHub.Runner.Worker.Handlers
 {
    internal static class ScriptHandlerHelpers
    {
-        private static readonly Dictionary<string, string> _defaultArguments = new(StringComparer.OrdinalIgnoreCase)
+        private static readonly Dictionary<string, string> _defaultArguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
        {
            ["cmd"] = "/D /E:ON /V:OFF /S /C \"CALL \"{0}\"\"",
            ["pwsh"] = "-command \". '{0}'\"",
@@ -20,7 +20,7 @@ namespace GitHub.Runner.Worker.Handlers
            ["python"] = "{0}"
        };

-        private static readonly Dictionary<string, string> _extensions = new(StringComparer.OrdinalIgnoreCase)
+        private static readonly Dictionary<string, string> _extensions = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
        {
            ["cmd"] = ".cmd",
            ["pwsh"] = ".ps1",
--- a/src/Runner.Worker/JobExtension.cs
+++ b/src/Runner.Worker/JobExtension.cs
@@ -39,10 +39,10 @@ namespace GitHub.Runner.Worker

    public sealed class JobExtension : RunnerService, IJobExtension
    {
-        private readonly HashSet<string> _existingProcesses = new(StringComparer.OrdinalIgnoreCase);
+        private readonly HashSet<string> _existingProcesses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
        private bool _processCleanup;
        private string _processLookupId = $"github_{Guid.NewGuid()}";
-        private CancellationTokenSource _diskSpaceCheckToken = new();
+        private CancellationTokenSource _diskSpaceCheckToken = new CancellationTokenSource();
        private Task _diskSpaceCheckTask = null;

        // Download all required actions.
@@ -59,8 +59,8 @@ namespace GitHub.Runner.Worker
            context.StepTelemetry.Type = "runner";
            context.StepTelemetry.Action = "setup_job";

-            List<IStep> preJobSteps = new();
-            List<IStep> jobSteps = new();
+            List<IStep> preJobSteps = new List<IStep>();
+            List<IStep> jobSteps = new List<IStep>();
            using (var register = jobContext.CancellationToken.Register(() => { context.CancelToken(); }))
            {
                try
@@ -220,11 +220,6 @@ namespace GitHub.Runner.Worker
                        {
                            var networkAlias = pair.Key;
                            var serviceContainer = pair.Value;
-                            if (serviceContainer == null)
-                            {
-                                context.Output($"The service '{networkAlias}' will not be started because the container definition has an empty image.");
-                                continue;
-                            }
                            jobContext.Global.ServiceContainers.Add(new Container.ContainerInfo(HostContext, serviceContainer, false, networkAlias));
                        }
                    }
@@ -391,7 +386,7 @@ namespace GitHub.Runner.Worker
                                                                          data: (object)jobHookData));
                    }

-                    List<IStep> steps = new();
+                    List<IStep> steps = new List<IStep>();
                    steps.AddRange(preJobSteps);
                    steps.AddRange(jobSteps);

@@ -679,7 +674,7 @@ namespace GitHub.Runner.Worker

        private Dictionary<int, Process> SnapshotProcesses()
        {
-            Dictionary<int, Process> snapshot = new();
+            Dictionary<int, Process> snapshot = new Dictionary<int, Process>();
            foreach (var proc in Process.GetProcesses())
            {
                try
--- a/src/Runner.Worker/JobRunner.cs
+++ b/src/Runner.Worker/JobRunner.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -258,9 +258,9 @@ namespace GitHub.Runner.Worker
                }
            }

-            if (jobContext.Global.Variables.TryGetValue("Node12ActionsWarnings", out var node12Warnings))
+            if (jobContext.JobContext.ContainsKey("Node12ActionsWarnings"))
            {
-                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node12Warnings));
+                var actions = string.Join(", ", jobContext.JobContext["Node12ActionsWarnings"].AssertArray("Node12ActionsWarnings").Select(action => action.ToString()));
                jobContext.Warning(string.Format(Constants.Runner.Node12DetectedAfterEndOfLife, actions));
            }

--- a/src/Runner.Worker/Program.cs
+++ b/src/Runner.Worker/Program.cs
@@ -11,7 +11,7 @@ namespace GitHub.Runner.Worker
    {
        public static int Main(string[] args)
        {
-            using (HostContext context = new("Worker"))
+            using (HostContext context = new HostContext("Worker"))
            {
                return MainAsync(context, args).GetAwaiter().GetResult();
            }
--- a/src/Runner.Worker/Runner.Worker.csproj
+++ b/src/Runner.Worker/Runner.Worker.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.Worker/RunnerPluginManager.cs
+++ b/src/Runner.Worker/RunnerPluginManager.cs
@@ -26,7 +26,7 @@ namespace GitHub.Runner.Worker

    public sealed class RunnerPluginManager : RunnerService, IRunnerPluginManager
    {
-        private readonly Dictionary<string, RunnerPluginActionInfo> _actionPlugins = new(StringComparer.OrdinalIgnoreCase)
+        private readonly Dictionary<string, RunnerPluginActionInfo> _actionPlugins = new Dictionary<string, RunnerPluginActionInfo>(StringComparer.OrdinalIgnoreCase)
        {
            {
                "checkout",
@@ -97,7 +97,7 @@ namespace GitHub.Runner.Worker
            string arguments = $"action \"{plugin}\"";

            // construct plugin context
-            RunnerActionPluginExecutionContext pluginContext = new()
+            RunnerActionPluginExecutionContext pluginContext = new RunnerActionPluginExecutionContext
            {
                Inputs = inputs,
                Endpoints = context.Global.Endpoints,
--- a/src/Runner.Worker/StepsContext.cs
+++ b/src/Runner.Worker/StepsContext.cs
@@ -16,8 +16,8 @@ namespace GitHub.Runner.Worker
    /// </summary>
    public sealed class StepsContext
    {
-        private static readonly Regex _propertyRegex = new("^[a-zA-Z_][a-zA-Z0-9_]*$", RegexOptions.Compiled);
-        private readonly DictionaryContextData _contextData = new();
+        private static readonly Regex _propertyRegex = new Regex("^[a-zA-Z_][a-zA-Z0-9_]*$", RegexOptions.Compiled);
+        private readonly DictionaryContextData _contextData = new DictionaryContextData();

        /// <summary>
        /// Clears memory for a composite action's isolated "steps" context, after the action
--- a/src/Runner.Worker/TrackingManager.cs
+++ b/src/Runner.Worker/TrackingManager.cs
@@ -32,7 +32,7 @@ namespace GitHub.Runner.Worker
            Trace.Entering();

            // Create the new tracking config.
-            TrackingConfig config = new(executionContext);
+            TrackingConfig config = new TrackingConfig(executionContext);
            WriteToFile(file, config);
            return config;
        }
--- a/src/Runner.Worker/Variables.cs
+++ b/src/Runner.Worker/Variables.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using GitHub.DistributedTask.WebApi;
 using GitHub.DistributedTask.Logging;
 using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
@@ -14,9 +14,9 @@ namespace GitHub.Runner.Worker
    public sealed class Variables
    {
        private readonly IHostContext _hostContext;
-        private readonly ConcurrentDictionary<string, Variable> _variables = new(StringComparer.OrdinalIgnoreCase);
+        private readonly ConcurrentDictionary<string, Variable> _variables = new ConcurrentDictionary<string, Variable>(StringComparer.OrdinalIgnoreCase);
        private readonly ISecretMasker _secretMasker;
-        private readonly object _setLock = new();
+        private readonly object _setLock = new object();
        private readonly Tracing _trace;

        public IEnumerable<Variable> AllVariables
@@ -43,7 +43,7 @@ namespace GitHub.Runner.Worker
            }

            // Initialize the variable dictionary.
-            List<Variable> variables = new();
+            List<Variable> variables = new List<Variable>();
            foreach (var variable in copy)
            {
                if (!string.IsNullOrWhiteSpace(variable.Key))
@@ -136,12 +136,6 @@ namespace GitHub.Runner.Worker
            return null;
        }

-        public void Set(string name, string val)
-        {
-            ArgUtil.NotNullOrEmpty(name, nameof(name));
-            _variables[name] = new Variable(name, val, false);
-        }
-
        public bool TryGetValue(string name, out string val)
        {
            Variable variable;
--- a/src/Runner.Worker/Worker.cs
+++ b/src/Runner.Worker/Worker.cs
@@ -22,10 +22,10 @@ namespace GitHub.Runner.Worker
    public sealed class Worker : RunnerService, IWorker
    {
        private readonly TimeSpan _workerStartTimeout = TimeSpan.FromSeconds(30);
-        private ManualResetEvent _completedCommand = new(false);
+        private ManualResetEvent _completedCommand = new ManualResetEvent(false);

        // Do not mask the values of these secrets
-        private static HashSet<String> SecretVariableMaskWhitelist = new(StringComparer.OrdinalIgnoreCase)
+        private static HashSet<String> SecretVariableMaskWhitelist = new HashSet<String>(StringComparer.OrdinalIgnoreCase)
        {
            Constants.Variables.Actions.StepDebug,
            Constants.Variables.Actions.RunnerDebug
--- a/src/Sdk/Common/Common/Authentication/VssCredentialsExtension.cs
+++ b/src/Sdk/Common/Common/Authentication/VssCredentialsExtension.cs
@@ -1,20 +0,0 @@
-using GitHub.Services.OAuth;
-
-namespace GitHub.Services.Common
-{
-    public static class VssCredentialsExtension
-    {
-        public static VssOAuthCredential ToOAuthCredentials(
-            this VssCredentials credentials)
-        {
-            if (credentials.Federated.CredentialType == VssCredentialsType.OAuth)
-            {
-                return credentials.Federated as VssOAuthCredential;
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}
--- a/src/Sdk/Common/Common/RawClientHttpRequestSettings.cs
+++ b/src/Sdk/Common/Common/RawClientHttpRequestSettings.cs
@@ -1,194 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-using GitHub.Services.WebApi.Utilities.Internal;
-
-namespace GitHub.Services.Common
-{
-    public class RawClientHttpRequestSettings
-    {
-        /// <summary>
-        /// Timespan to wait before timing out a request. Defaults to 100 seconds
-        /// </summary>
-        public TimeSpan SendTimeout
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// User-Agent header passed along in the request,
-        /// For multiple values, the order in the list is the order
-        /// in which they will appear in the header
-        /// </summary>
-        public List<ProductInfoHeaderValue> UserAgent
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The name of the culture is passed in the Accept-Language header
-        /// </summary>
-        public ICollection<CultureInfo> AcceptLanguages
-        {
-            get
-            {
-                return m_acceptLanguages;
-            }
-        }
-
-        /// <summary>
-        /// A unique identifier for the user session
-        /// </summary>
-        public Guid SessionId
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Optional implementation used to validate server certificate validation
-        /// </summary>
-        public Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> ServerCertificateValidationCallback
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Number of times to retry a request that has an ambient failure
-        /// </summary>
-        /// <remarks>
-        /// This property is only used by RawConnection, so only relevant on the client
-        /// </remarks>
-        [DefaultValue(c_defaultMaxRetry)]
-        public Int32 MaxRetryRequest
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets the property name used to reference this object.
-        /// </summary>
-        public const String PropertyName = "Actions.RequestSettings";
-
-        public static RawClientHttpRequestSettings Default => s_defaultSettings.Value;
-
-        protected RawClientHttpRequestSettings(RawClientHttpRequestSettings copy)
-        {
-            this.SendTimeout = copy.SendTimeout;
-            this.m_acceptLanguages = new List<CultureInfo>(copy.AcceptLanguages);
-            this.SessionId = copy.SessionId;
-            this.UserAgent = new List<ProductInfoHeaderValue>(copy.UserAgent);
-            this.ServerCertificateValidationCallback = copy.ServerCertificateValidationCallback;
-            this.MaxRetryRequest = copy.MaxRetryRequest;
-        }
-
-        public RawClientHttpRequestSettings Clone()
-        {
-            return new RawClientHttpRequestSettings(this);
-        }
-
-        public RawClientHttpRequestSettings()
-            : this(Guid.NewGuid())
-        {
-        }
-
-        public RawClientHttpRequestSettings(Guid sessionId)
-        {
-            this.SendTimeout = s_defaultTimeout;
-            if (!String.IsNullOrEmpty(CultureInfo.CurrentUICulture.Name)) // InvariantCulture for example has an empty name.
-            {
-                this.AcceptLanguages.Add(CultureInfo.CurrentUICulture);
-            }
-            this.SessionId = sessionId;
-            this.ServerCertificateValidationCallback = null;
-
-            // If different, we'll also add CurrentCulture to the request headers,
-            // but UICulture was added first, so it gets first preference
-            if (!CultureInfo.CurrentCulture.Equals(CultureInfo.CurrentUICulture) && !String.IsNullOrEmpty(CultureInfo.CurrentCulture.Name))
-            {
-                this.AcceptLanguages.Add(CultureInfo.CurrentCulture);
-            }
-
-            this.MaxRetryRequest = c_defaultMaxRetry;
-
-#if DEBUG
-            string customClientRequestTimeout = Environment.GetEnvironmentVariable("VSS_Client_Request_Timeout");
-            if (!string.IsNullOrEmpty(customClientRequestTimeout) && int.TryParse(customClientRequestTimeout, out int customTimeout))
-            {
-                // avoid disrupting a debug session due to the request timing out by setting a custom timeout.
-                this.SendTimeout = TimeSpan.FromSeconds(customTimeout);
-            }
-#endif
-        }
-
-        protected internal virtual Boolean ApplyTo(HttpRequestMessage request)
-        {
-            // Make sure we only apply the settings to the request once
-            if (request.Options.TryGetValue<object>(PropertyName, out _))
-            {
-                return false;
-            }
-
-            request.Options.Set(new HttpRequestOptionsKey<RawClientHttpRequestSettings>(PropertyName), this);
-
-            if (this.AcceptLanguages != null && this.AcceptLanguages.Count > 0)
-            {
-                // An empty or null CultureInfo name will cause an ArgumentNullException in the
-                // StringWithQualityHeaderValue constructor. CultureInfo.InvariantCulture is an example of
-                // a CultureInfo that has an empty name.
-                foreach (CultureInfo culture in this.AcceptLanguages.Where(a => !String.IsNullOrEmpty(a.Name)))
-                {
-                    request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(culture.Name));
-                }
-            }
-
-            if (this.UserAgent != null)
-            {
-                foreach (var headerVal in this.UserAgent)
-                {
-                    if (!request.Headers.UserAgent.Contains(headerVal))
-                    {
-                        request.Headers.UserAgent.Add(headerVal);
-                    }
-                }
-            }
-
-            if (!request.Headers.Contains(Internal.RawHttpHeaders.SessionHeader))
-            {
-                request.Headers.Add(Internal.RawHttpHeaders.SessionHeader, this.SessionId.ToString("D"));
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Creates an instance of the default request settings.
-        /// </summary>
-        /// <returns>The default request settings</returns>
-        private static RawClientHttpRequestSettings ConstructDefaultSettings()
-        {
-            // Set up reasonable defaults in case the registry keys are not present
-            var settings = new RawClientHttpRequestSettings();
-            settings.UserAgent = UserAgentUtility.GetDefaultRestUserAgent();
-
-            return settings;
-        }
-
-        private static Lazy<RawClientHttpRequestSettings> s_defaultSettings
-            = new Lazy<RawClientHttpRequestSettings>(ConstructDefaultSettings);
-
-        private const Int32 c_defaultMaxRetry = 3;
-        private static readonly TimeSpan s_defaultTimeout = TimeSpan.FromSeconds(100); //default WebAPI timeout
-        private ICollection<CultureInfo> m_acceptLanguages = new List<CultureInfo>();
-    }
-}
--- a/src/Sdk/Common/Common/RawHttpHeaders.cs
+++ b/src/Sdk/Common/Common/RawHttpHeaders.cs
@@ -1,12 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-
-namespace GitHub.Services.Common.Internal
-{
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class RawHttpHeaders
-    {
-        public const String SessionHeader = "X-Runner-Session";
-    }
-}
--- a/src/Sdk/Common/Common/RawHttpMessageHandler.cs
+++ b/src/Sdk/Common/Common/RawHttpMessageHandler.cs
@@ -1,349 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Services.Common.Diagnostics;
-using GitHub.Services.Common.Internal;
-using GitHub.Services.OAuth;
-
-namespace GitHub.Services.Common
-{
-    public class RawHttpMessageHandler: HttpMessageHandler
-    {
-        public RawHttpMessageHandler(
-            VssOAuthCredential credentials)
-            : this(credentials, new RawClientHttpRequestSettings())
-        {
-        }
-
-        public RawHttpMessageHandler(
-            VssOAuthCredential credentials,
-            RawClientHttpRequestSettings settings)
-            : this(credentials, settings, new HttpClientHandler())
-        {
-        }
-
-        public RawHttpMessageHandler(
-            VssOAuthCredential credentials,
-            RawClientHttpRequestSettings settings,
-            HttpMessageHandler innerHandler)
-        {
-            this.Credentials = credentials;
-            this.Settings = settings;
-            m_messageInvoker = new HttpMessageInvoker(innerHandler);
-            m_credentialWrapper = new CredentialWrapper();
-
-            // If we were given a pipeline make sure we find the inner-most handler to apply our settings as this
-            // will be the actual outgoing transport.
-            {
-                HttpMessageHandler transportHandler = innerHandler;
-                DelegatingHandler delegatingHandler = transportHandler as DelegatingHandler;
-                while (delegatingHandler != null)
-                {
-                    transportHandler = delegatingHandler.InnerHandler;
-                    delegatingHandler = transportHandler as DelegatingHandler;
-                }
-
-                m_transportHandler = transportHandler;
-            }
-
-            ApplySettings(m_transportHandler, m_credentialWrapper, this.Settings);
-
-            m_thisLock = new Object();
-        }
-
-        /// <summary>
-        /// Gets the credentials associated with this handler.
-        /// </summary>
-        public VssOAuthCredential Credentials
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the settings associated with this handler.
-        /// </summary>
-        public RawClientHttpRequestSettings Settings
-        {
-            get;
-            private set;
-        }
-
-        // setting this to WebRequest.DefaultWebProxy in NETSTANDARD is causing a System.PlatformNotSupportedException
-        //.in System.Net.SystemWebProxy.IsBypassed.  Comment in IsBypassed method indicates ".NET Core and .NET Native
-        // code will handle this exception and call into WinInet/WinHttp as appropriate to use the system proxy."
-        // This needs to be investigated further.
-        private static IWebProxy s_defaultWebProxy = null;
-
-        /// <summary>
-        /// Allows you to set a proxy to be used by all RawHttpMessageHandler requests without affecting the global WebRequest.DefaultWebProxy.  If not set it returns the WebRequest.DefaultWebProxy.
-        /// </summary>
-        public static IWebProxy DefaultWebProxy
-        {
-            get
-            {
-                var toReturn = WebProxyWrapper.Wrap(s_defaultWebProxy);
-
-                if (null != toReturn &&
-                    toReturn.Credentials == null)
-                {
-                    toReturn.Credentials = CredentialCache.DefaultCredentials;
-                }
-
-                return toReturn;
-            }
-            set
-            {
-                s_defaultWebProxy = value;
-            }
-        }
-
-        protected override async Task<HttpResponseMessage> SendAsync(
-            HttpRequestMessage request,
-            CancellationToken cancellationToken)
-        {
-            VssTraceActivity traceActivity = VssTraceActivity.Current;
-
-            lock (m_thisLock)
-            {
-                // Ensure that we attempt to use the most appropriate authentication mechanism by default.
-                if (m_tokenProvider == null)
-                {
-                    m_tokenProvider = this.Credentials.GetTokenProvider(request.RequestUri);
-                }
-            }
-
-            CancellationTokenSource tokenSource = null;
-            HttpResponseMessage response = null;
-            Boolean succeeded = false;
-            HttpResponseMessageWrapper responseWrapper;
-
-            Int32 retries = m_maxAuthRetries;
-            try
-            {
-                tokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-                if (this.Settings.SendTimeout > TimeSpan.Zero)
-                {
-                    tokenSource.CancelAfter(this.Settings.SendTimeout);
-                }
-
-                do
-                {
-                    if (response != null)
-                    {
-                        response.Dispose();
-                    }
-
-                    // Let's start with sending a token
-                    IssuedToken token = await m_tokenProvider.GetTokenAsync(null, tokenSource.Token).ConfigureAwait(false);
-                    ApplyToken(request, token);
-
-                    // ConfigureAwait(false) enables the continuation to be run outside any captured
-                    // SyncronizationContext (such as ASP.NET's) which keeps things from deadlocking...
-                    response = await m_messageInvoker.SendAsync(request, tokenSource.Token).ConfigureAwait(false);
-
-                    responseWrapper = new HttpResponseMessageWrapper(response);
-
-                    var isUnAuthorized = responseWrapper.StatusCode == HttpStatusCode.Unauthorized;
-                    if (!isUnAuthorized)
-                    {
-                        // Validate the token after it has been successfully authenticated with the server.
-                        m_tokenProvider?.ValidateToken(token, responseWrapper);
-                        succeeded = true;
-                        break;
-                    }
-                    else
-                    {
-                        m_tokenProvider?.InvalidateToken(token);
-
-                        if (retries == 0 || retries < m_maxAuthRetries)
-                        {
-                            break;
-                        }
-
-                        token = await m_tokenProvider.GetTokenAsync(token, tokenSource.Token).ConfigureAwait(false);
-
-                        retries--;
-                    }
-                }
-                while (retries >= 0);
-
-                // We're out of retries and the response was an auth challenge -- then the request was unauthorized
-                // and we will throw a strongly-typed exception with a friendly error message.
-                if (!succeeded && response != null && responseWrapper.StatusCode == HttpStatusCode.Unauthorized)
-                {
-                    // Make sure we do not leak the response object when raising an exception
-                    if (response != null)
-                    {
-                        response.Dispose();
-                    }
-
-                    var message = CommonResources.VssUnauthorized(request.RequestUri.GetLeftPart(UriPartial.Authority));
-                    VssHttpEventSource.Log.HttpRequestUnauthorized(traceActivity, request, message);
-                    VssUnauthorizedException unauthorizedException = new VssUnauthorizedException(message);
-                    throw unauthorizedException;
-                }
-
-                return response;
-            }
-            catch (OperationCanceledException ex)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    VssHttpEventSource.Log.HttpRequestCancelled(traceActivity, request);
-                    throw;
-                }
-                else
-                {
-                    VssHttpEventSource.Log.HttpRequestTimedOut(traceActivity, request, this.Settings.SendTimeout);
-                    throw new TimeoutException(CommonResources.HttpRequestTimeout(this.Settings.SendTimeout), ex);
-                }
-            }
-            finally
-            {
-                // We always dispose of the token source since otherwise we leak resources if there is a timer pending
-                if (tokenSource != null)
-                {
-                    tokenSource.Dispose();
-                }
-            }
-        }
-
-        private void ApplyToken(
-            HttpRequestMessage request,
-            IssuedToken token)
-        {
-            switch (token)
-            {
-                case null:
-                    return;
-                case ICredentials credentialsToken:
-                    m_credentialWrapper.InnerCredentials = credentialsToken;
-                    break;
-                default:
-                    token.ApplyTo(new HttpRequestMessageWrapper(request));
-                    break;
-            }
-        }
-
-        private static void ApplySettings(
-            HttpMessageHandler handler,
-            ICredentials defaultCredentials,
-            RawClientHttpRequestSettings settings)
-        {
-            HttpClientHandler httpClientHandler = handler as HttpClientHandler;
-            if (httpClientHandler != null)
-            {
-                httpClientHandler.ClientCertificateOptions = ClientCertificateOption.Manual;
-                //Setting httpClientHandler.UseDefaultCredentials to false in .Net Core, clears httpClientHandler.Credentials if
-                //credentials is already set to defaultcredentials. Therefore httpClientHandler.Credentials must be
-                //set after httpClientHandler.UseDefaultCredentials.
-                httpClientHandler.UseDefaultCredentials = false;
-                httpClientHandler.Credentials = defaultCredentials;
-                httpClientHandler.PreAuthenticate = false;
-                httpClientHandler.Proxy = DefaultWebProxy;
-                httpClientHandler.UseCookies = false;
-                httpClientHandler.UseProxy = true;
-            }
-        }
-
-        private readonly HttpMessageHandler m_transportHandler;
-        private HttpMessageInvoker m_messageInvoker;
-        private CredentialWrapper m_credentialWrapper;
-        private object m_thisLock;
-        private const Int32 m_maxAuthRetries = 3;
-        private VssOAuthTokenProvider m_tokenProvider;
-
-        //.Net Core does not attempt NTLM schema on Linux, unless ICredentials is a CredentialCache instance
-        //This workaround may not be needed after this corefx fix is consumed: https://github.com/dotnet/corefx/pull/7923
-        private sealed class CredentialWrapper : CredentialCache, ICredentials
-        {
-            public ICredentials InnerCredentials
-            {
-                get;
-                set;
-            }
-
-            NetworkCredential ICredentials.GetCredential(
-                Uri uri,
-                String authType)
-            {
-                return InnerCredentials != null ? InnerCredentials.GetCredential(uri, authType) : null;
-            }
-        }
-
-        private sealed class WebProxyWrapper : IWebProxy
-        {
-            private WebProxyWrapper(IWebProxy toWrap)
-            {
-                m_wrapped = toWrap;
-                m_credentials = null;
-            }
-
-            public static WebProxyWrapper Wrap(IWebProxy toWrap)
-            {
-                if (null == toWrap)
-                {
-                    return null;
-                }
-
-                return new WebProxyWrapper(toWrap);
-            }
-
-            public ICredentials Credentials
-            {
-                get
-                {
-                    ICredentials credentials = m_credentials;
-
-                    if (null == credentials)
-                    {
-                        // This means to fall back to the Credentials from the wrapped
-                        // IWebProxy.
-                        credentials = m_wrapped.Credentials;
-                    }
-                    else if (Object.ReferenceEquals(credentials, m_nullCredentials))
-                    {
-                        // This sentinel value means we have explicitly had our credentials
-                        // set to null.
-                        credentials = null;
-                    }
-
-                    return credentials;
-                }
-
-                set
-                {
-                    if (null == value)
-                    {
-                        // Use this as a sentinel value to distinguish the case when someone has
-                        // explicitly set our credentials to null. We don't want to fall back to
-                        // m_wrapped.Credentials when we have credentials that are explicitly null.
-                        m_credentials = m_nullCredentials;
-                    }
-                    else
-                    {
-                        m_credentials = value;
-                    }
-                }
-            }
-
-            public Uri GetProxy(Uri destination)
-            {
-                return m_wrapped.GetProxy(destination);
-            }
-
-            public bool IsBypassed(Uri host)
-            {
-                return m_wrapped.IsBypassed(host);
-            }
-
-            private readonly IWebProxy m_wrapped;
-            private ICredentials m_credentials;
-
-            private static readonly ICredentials m_nullCredentials = new CredentialWrapper();
-        }
-    }
-}
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConstants.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConstants.cs
@@ -73,7 +73,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
        public const String TimeoutMinutes = "timeout-minutes";
        public const String Username = "username";
        public const String Uses = "uses";
-        public const String Vars = "vars";
        public const String VmImage = "vmImage";
        public const String Volumes = "volumes";
        public const String With = "with";
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
@@ -316,7 +316,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating

            if (String.IsNullOrEmpty(result.Image))
            {
-                return null;
+                context.Error(value, "Container image cannot be empty");
            }

            return result;
@@ -631,7 +631,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
        {
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.GitHub),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Needs),
-            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Vars),
        };
        private static readonly INamedValueInfo[] s_stepNamedValues = new INamedValueInfo[]
        {
@@ -644,7 +643,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Runner),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Env),
            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Needs),
-            new NamedValueInfo<NoOperationNamedValue>(PipelineTemplateConstants.Vars),
        };
        private static readonly IFunctionInfo[] s_stepConditionFunctions = new IFunctionInfo[]
        {
--- a/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs
+++ b/src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs
@@ -465,7 +465,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
            PipelineTemplateConstants.Job,
            PipelineTemplateConstants.Runner,
            PipelineTemplateConstants.Env,
-            PipelineTemplateConstants.Vars,
        };
        private readonly String[] s_expressionFunctionNames = new[]
        {
--- a/src/Sdk/DTPipelines/workflow-v1.0.json
+++ b/src/Sdk/DTPipelines/workflow-v1.0.json
@@ -36,8 +36,7 @@
    "workflow-env": {
      "context": [
        "github",
-        "secrets",
-        "vars"
+        "secrets"
      ],
      "mapping": {
        "loose-key-type": "non-empty-string",
@@ -87,7 +86,6 @@
      "context": [
        "github",
        "needs",
-        "vars",
        "always(0,0)",
        "failure(0,MAX)",
        "cancelled(0,0)",
@@ -100,7 +98,6 @@
      "context": [
        "github",
        "needs",
-        "vars",
        "always(0,0)",
        "failure(0,MAX)",
        "cancelled(0,0)",
@@ -119,8 +116,7 @@
    "strategy": {
      "context": [
        "github",
-        "needs",
-        "vars"
+        "needs"
      ],
      "mapping": {
        "properties": {
@@ -160,8 +156,7 @@
        "github",
        "needs",
        "strategy",
-        "matrix",
-        "vars"
+        "matrix"
      ],
      "one-of": [
        "non-empty-string",
@@ -187,8 +182,7 @@
        "needs",
        "strategy",
        "matrix",
-        "secrets",
-        "vars"
+        "secrets"
      ],
      "mapping": {
        "loose-key-type": "non-empty-string",
@@ -210,8 +204,7 @@
        "strategy",
        "matrix",
        "needs",
-        "env",
-        "vars"
+        "env"
      ],
      "mapping": {
        "properties": {
@@ -288,7 +281,6 @@
        "job",
        "runner",
        "env",
-        "vars",
        "always(0,0)",
        "failure(0,0)",
        "cancelled(0,0)",
@@ -307,7 +299,6 @@
        "job",
        "runner",
        "env",
-        "vars",
        "always(0,0)",
        "failure(0,0)",
        "cancelled(0,0)",
@@ -335,7 +326,6 @@
        "job",
        "runner",
        "env",
-        "vars",
        "hashFiles(1,255)"
      ],
      "mapping": {
@@ -355,7 +345,6 @@
        "job",
        "runner",
        "env",
-        "vars",
        "hashFiles(1,255)"
      ],
      "mapping": {
@@ -369,8 +358,7 @@
        "github",
        "needs",
        "strategy",
-        "matrix",
-        "vars"
+        "matrix"
      ],
      "one-of": [
        "string",
@@ -381,7 +369,7 @@
    "container-mapping": {
      "mapping": {
        "properties": {
-          "image": "string",
+          "image": "non-empty-string",
          "options": "non-empty-string",
          "env": "container-env",
          "ports": "sequence-of-non-empty-string",
@@ -396,8 +384,7 @@
        "github",
        "needs",
        "strategy",
-        "matrix",
-        "vars"
+        "matrix"
      ],
      "mapping": {
        "loose-key-type": "non-empty-string",
@@ -410,11 +397,10 @@
        "github",
        "needs",
        "strategy",
-        "matrix",
-        "vars"
+        "matrix"
      ],
      "one-of": [
-        "string",
+        "non-empty-string",
        "container-mapping"
      ]
    },
@@ -423,8 +409,7 @@
      "context": [
        "secrets",
        "env",
-        "github",
-        "vars"
+        "github"
      ],
      "mapping": {
        "properties": {
@@ -458,8 +443,7 @@
        "github",
        "needs",
        "strategy",
-        "matrix",
-        "vars"
+        "matrix"
      ],
      "boolean": {}
    },
@@ -469,8 +453,7 @@
        "github",
        "needs",
        "strategy",
-        "matrix",
-        "vars"
+        "matrix"
      ],
      "number": {}
    },
@@ -480,8 +463,7 @@
        "github",
        "needs",
        "strategy",
-        "matrix",
-        "vars"
+        "matrix"
      ],
      "string": {}
    },
@@ -497,7 +479,6 @@
        "job",
        "runner",
        "env",
-        "vars",
        "hashFiles(1,255)"
      ],
      "boolean": {}
@@ -514,7 +495,6 @@
        "job",
        "runner",
        "env",
-        "vars",
        "hashFiles(1,255)"
      ],
      "number": {}
@@ -530,8 +510,7 @@
        "steps",
        "job",
        "runner",
-        "env",
-        "vars"
+        "env"
      ],
      "string": {}
    },
@@ -545,8 +524,7 @@
        "steps",
        "job",
        "runner",
-        "env",
-        "vars"
+        "env"
      ],
      "string": {}
    },
@@ -562,7 +540,6 @@
        "job",
        "runner",
        "env",
-        "vars",
        "hashFiles(1,255)"
      ],
      "string": {}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Boop	8727cba87a	Update build.yml	2022-09-20 13:10:16 -04:00
Thomas Boop	12c7ed855e	Update build.yml	2022-09-20 13:06:18 -04:00
				`@@ -1 +0,0 @@`
				`39d0683f0f115a211cb10c473e9574c16549a19d4e9a6c637ded3d7022bf809f`
				`@@ -1 +0,0 @@`
				`e5dace2d41cc0682d096dcce4970079ad48ec7107e46195970eecfdb3df2acef`