Update releaseVersion

.devcontainer/devcontainer.json

@@ -1,24 +1,27 @@
+// 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.415"
-    },
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "16"
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-azuretools.vscode-docker",
-        "ms-dotnettools.csharp",
-        "eamodio.gitlens"
-      ]
-    }
-  },
-  "postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
-  "remoteUser": "vscode"
-}
+	"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.412"
+		},
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "16"
+		}
+	},
+	"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"
+}

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

@@ -1,18 +0,0 @@
-name: Close Bugs Bot
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *' # every day at midnight
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v8
-        with:
-          close-issue-message: "This issue does not seem to be a problem with the runner application, it concerns the GitHub actions platform more generally. Could you please post your feedback on the [GitHub Community Support Forum](https://github.com/orgs/community/discussions/categories/actions) which is actively monitored. Using the forum ensures that we route your problem to the correct team. 😃"
-          exempt-issue-labels: "keep"
-          stale-issue-label: "actions-bug"
-          only-labels: "actions-bug"
-          days-before-stale: 0
-          days-before-close: 1
-          close-issue-reason: "completed"

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

@@ -1,18 +0,0 @@
-name: Close Features Bot
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *' # every day at midnight
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v8
-        with:
-          close-issue-message: "Thank you for your interest in the runner application and taking the time to provide your valuable feedback. We kindly ask you to redirect this feedback to the [GitHub Community Support Forum](https://github.com/orgs/community/discussions/categories/actions-and-packages) which our team actively monitors and would be a better place to start a discussion for new feature requests in GitHub Actions. For more information on this policy please [read our contribution guidelines](https://github.com/actions/runner#contribute). 😃"
-          exempt-issue-labels: "keep"
-          stale-issue-label: "actions-feature"
-          only-labels: "actions-feature"
-          days-before-stale: 0
-          days-before-close: 1
-          close-issue-reason: "completed"

.github/workflows/dotnet-upgrade.yml

@@ -1,306 +0,0 @@
-name: "DotNet SDK Upgrade"
-
-on:
-  schedule:
-    - cron: '0 0 * * 1'
-  workflow_dispatch:
-
-jobs:
-  dotnet-update:
-    runs-on: ubuntu-latest
-    outputs: 
-      SHOULD_UPDATE: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE }}
-      BRANCH_EXISTS: ${{ steps.fetch_latest_version.outputs.BRANCH_EXISTS }}
-      DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-      DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Get current major minor version
-        id: fetch_current_version
-        shell: bash
-        run: |
-          current_major_minor_patch_version=$(jq .sdk.version ./src/global.json | xargs)
-          current_major_minor_version=$(cut -d '.' -f 1,2 <<< "$current_major_minor_patch_version")
-
-          echo "DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION=${current_major_minor_patch_version}" >> $GITHUB_OUTPUT
-          echo "DOTNET_CURRENT_MAJOR_MINOR_VERSION=${current_major_minor_version}" >> $GITHUB_OUTPUT
-      - name: Check patch version
-        id: fetch_latest_version
-        shell: bash
-        run: |
-          latest_patch_version=$(curl -sb -H "Accept: application/json" "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}/latest.version")
-          current_patch_version=${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}
-
-          should_update=0
-          [ "$current_patch_version" != "$latest_patch_version" ] && should_update=1
-
-          # check if git branch already exists for the upgrade
-          branch_already_exists=0
-          
-          if git ls-remote --heads --exit-code origin refs/heads/feature/dotnetsdk-upgrade/${latest_patch_version};
-          then 
-            branch_already_exists=1
-            should_update=0
-          fi
-          echo "DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION=${latest_patch_version}" >> $GITHUB_OUTPUT
-          echo "SHOULD_UPDATE=${should_update}" >> $GITHUB_OUTPUT
-          echo "BRANCH_EXISTS=${branch_already_exists}" >> $GITHUB_OUTPUT
-      - name: Create an error annotation if branch exists
-        if: ${{ steps.fetch_latest_version.outputs.BRANCH_EXISTS == 1 }}
-        run: echo "::error links::feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} https://github.com/actions/runner/tree/feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}::Branch feature/dotnetsdk-upgrade/${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} already exists. Please take a look and delete that branch if you wish to recreate"
-      - name: Create a warning annotation if no need to update
-        if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 0 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
-        run: echo "::warning ::Latest DotNet SDK patch is ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}, and we are on ${{ steps.fetch_latest_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}. No need to update"
-      - name: Update patch version
-        if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 1 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
-        shell: bash
-        run: |
-          patch_version="${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}"
-          current_version="${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}"
-
-          # Update globals
-          echo Updating globals
-          globals_temp=$(mktemp)
-          jq --unbuffered --arg patch_version "$patch_version" '.sdk.version = $patch_version' ./src/global.json > "$globals_temp" && mv "$globals_temp" ./src/global.json
-
-          # Update devcontainer
-          echo Updating devcontainer
-          devcontainer_temp=$(mktemp)
-          jq --unbuffered --arg patch_version "$patch_version" '.features."ghcr.io/devcontainers/features/dotnet".version = $patch_version' ./.devcontainer/devcontainer.json > "$devcontainer_temp" && mv "$devcontainer_temp" ./.devcontainer/devcontainer.json
-
-          # Update dev.sh
-          echo Updating start script
-          sed -i "s/DOTNETSDK_VERSION=\"$current_version\"/DOTNETSDK_VERSION=\"$patch_version\"/g" ./src/dev.sh
-      - name: GIT commit and push all changed files
-        if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 1 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
-        id: create_branch
-        run: |
-          branch_name="feature/dotnetsdk-upgrade/${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}"
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
-
-          git checkout -b $branch_name
-          git commit -a -m "Upgrade dotnet sdk to v${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}"
-          git push --set-upstream origin $branch_name
-
-  build-hashes:
-    if: ${{ needs.dotnet-update.outputs.SHOULD_UPDATE == 1 && needs.dotnet-update.outputs.BRANCH_EXISTS == 0 }}
-    needs: [dotnet-update]
-    outputs: 
-      # pass outputs from this job to create-pr for use
-      DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-      DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ needs.dotnet-update.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
-      NEEDS_HASH_UPDATE: ${{ steps.compute-hash.outputs.NEED_UPDATE }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, win-arm64, osx-x64, osx-arm64 ]
-        include:
-        - runtime: linux-x64
-          os: ubuntu-latest
-          devScript: ./dev.sh
-
-        - runtime: linux-arm64
-          os: ubuntu-latest
-          devScript: ./dev.sh
-
-        - runtime: linux-arm
-          os: ubuntu-latest
-          devScript: ./dev.sh
-
-        - runtime: osx-x64
-          os: macOS-latest
-          devScript: ./dev.sh
-
-        - runtime: osx-arm64
-          os: macOS-latest
-          devScript: ./dev.sh
-
-        - runtime: win-x64
-          os: windows-2019
-          devScript: ./dev
-
-        - runtime: win-arm64
-          os: windows-latest
-          devScript: ./dev
-
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v3 
-      with:
-        ref: feature/dotnetsdk-upgrade/${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-
-    # Build runner layout
-    - name: Build & Layout Release
-      run: |
-        ${{ matrix.devScript }} layout Release ${{ matrix.runtime }}
-      working-directory: src
-
-    # Check runtime/externals hash
-    - name: Compute/Compare runtime and externals Hash
-      id: compute-hash
-      continue-on-error: true
-      shell: bash
-      run: |
-        echo "Current dotnet runtime hash result: $DOTNET_RUNTIME_HASH"
-        echo "Current Externals hash result: $EXTERNALS_HASH"
-
-        NeedUpdate=0
-        if [ "$EXTERNALS_HASH" != "$(cat ./src/Misc/contentHash/externals/${{ matrix.runtime }})" ] ;then
-          echo Hash mismatch, Update ./src/Misc/contentHash/externals/${{ matrix.runtime }} to $EXTERNALS_HASH
-
-          echo "EXTERNAL_HASH=$EXTERNALS_HASH" >> $GITHUB_OUTPUT
-          NeedUpdate=1
-        fi
-
-        if [ "$DOTNET_RUNTIME_HASH" != "$(cat ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }})" ] ;then
-          echo Hash mismatch, Update ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }} to $DOTNET_RUNTIME_HASH
-
-          echo "DOTNET_RUNTIME_HASH=$DOTNET_RUNTIME_HASH" >> $GITHUB_OUTPUT
-          NeedUpdate=1
-        fi
-
-        echo "NEED_UPDATE=$NeedUpdate" >> $GITHUB_OUTPUT
-      env:
-        DOTNET_RUNTIME_HASH: ${{hashFiles('**/_layout_trims/runtime/**/*')}}
-        EXTERNALS_HASH: ${{hashFiles('**/_layout_trims/externals/**/*')}}
-    - name: update hash
-      if: ${{ steps.compute-hash.outputs.NEED_UPDATE == 1 }}
-      shell: bash
-      run: |
-        ExternalHash=${{ steps.compute-hash.outputs.EXTERNAL_HASH }}
-        DotNetRuntimeHash=${{ steps.compute-hash.outputs.DOTNET_RUNTIME_HASH }}
-
-        if [ -n "$ExternalHash" ]; then
-          echo "$ExternalHash" > ./src/Misc/contentHash/externals/${{ matrix.runtime }}
-        fi
-
-        if [ -n "$DotNetRuntimeHash" ]; then
-          echo "$DotNetRuntimeHash" > ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }}
-        fi
-    - name: cache updated hashes
-      if: ${{ steps.compute-hash.outputs.NEED_UPDATE == 1 }}
-      uses: actions/cache/save@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/${{ matrix.runtime }}
-          ./src/Misc/contentHash/dotnetRuntime/${{ matrix.runtime }}
-        key: compute-hashes-${{ matrix.runtime }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-
-
-  hash-update:
-    needs: [build-hashes]
-    if: ${{ needs.build-hashes.outputs.NEEDS_HASH_UPDATE == 1 }}
-    outputs: 
-      # pass outputs from this job to create-pr for use
-      DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ needs.build-hashes.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-      DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ needs.build-hashes.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-      with: 
-        ref: feature/dotnetsdk-upgrade/${{ needs.build-hashes.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-    - name: Restore cached hashes - linux-x64
-      id: cache-restore-linux-x64
-      uses: actions/cache/restore@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/linux-x64
-          ./src/Misc/contentHash/dotnetRuntime/linux-x64
-        key: compute-hashes-linux-x64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-    - name: Restore cached hashes - linux-arm64
-      id: cache-restore-linux-arm64
-      uses: actions/cache/restore@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/linux-arm64
-          ./src/Misc/contentHash/dotnetRuntime/linux-arm64
-        key: compute-hashes-linux-arm64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-    - name: Restore cached hashes - linux-arm
-      id: cache-restore-linux-arm
-      uses: actions/cache/restore@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/linux-arm
-          ./src/Misc/contentHash/dotnetRuntime/linux-arm
-        key: compute-hashes-linux-arm-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-    - name: Restore cached hashes - osx-x64
-      id: cache-restore-osx-x64
-      uses: actions/cache/restore@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/osx-x64
-          ./src/Misc/contentHash/dotnetRuntime/osx-x64
-        key: compute-hashes-osx-x64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-    - name: Restore cached hashes - osx-arm64
-      id: cache-restore-osx-arm64
-      uses: actions/cache/restore@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/osx-arm64
-          ./src/Misc/contentHash/dotnetRuntime/osx-arm64
-        key: compute-hashes-osx-arm64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-    - name: Restore cached hashes - win-x64
-      id: cache-restore-win-x64
-      uses: actions/cache/restore@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/win-x64
-          ./src/Misc/contentHash/dotnetRuntime/win-x64
-        key: compute-hashes-win-x64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-    - name: Restore cached hashes - win-arm64
-      id: cache-restore-win-arm64
-      uses: actions/cache/restore@v3
-      with:
-        enableCrossOsArchive: true
-        path: |
-          ./src/Misc/contentHash/externals/win-arm64
-          ./src/Misc/contentHash/dotnetRuntime/win-arm64
-        key: compute-hashes-win-arm64-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-    - name: Fetch cached computed hashes
-      if: steps.cache-restore-linux-x64.outputs.cache-hit == 'true' ||
-          steps.cache-restore-linux-arm64.outputs.cache-hit == 'true' ||
-          steps.cache-restore-linux-arm.outputs.cache-hit == 'true' ||
-          steps.cache-restore-win-x64.outputs.cache-hit == 'true' ||
-          steps.cache-restore-win-arm64.outputs.cache-hit == 'true' ||
-          steps.cache-restore-osx-x64.outputs.cache-hit == 'true' ||
-          steps.cache-restore-osx-arm64.outputs.cache-hit == 'true'
-      shell: bash
-      run: |
-        Environments=( "linux-x64" "linux-arm64" "linux-arm" "win-x64" "win-arm64" "osx-x64" "osx-arm64" )
-
-        git config --global user.name "github-actions[bot]"
-        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-        git commit -a -m "Update computed hashes"
-        git push --set-upstream origin feature/dotnetsdk-upgrade/${{ needs.build-hashes.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-
-  create-pr:
-    needs: [hash-update]
-    outputs:
-      # pass outputs from this job to run-tests for use
-      DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION: ${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-      DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ needs.hash-update.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        ref: feature/dotnetsdk-upgrade/${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}
-    - name: Create Pull Request
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        gh pr create -B main -H feature/dotnetsdk-upgrade/${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} --title "Update dotnet sdk to latest version @${{ needs.hash-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}" --body "
-          https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${{ needs.hash-update.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}/latest.version
-          
-            
-          ---
-            
-          Autogenerated by [DotNet SDK Upgrade Workflow](https://github.com/actions/runner/blob/main/.github/workflows/dotnet-upgrade.yml)"

.github/workflows/stale-bot.yml

@@ -1,4 +1,4 @@
-name: Stale Bot
+name: ‘Close stale Runner issues’
 on:
   workflow_dispatch:
   schedule:
@@ -9,8 +9,9 @@ jobs:
     steps:
       - uses: actions/stale@v8
         with:
-          stale-issue-message: "This issue is stale because it has been open 365 days with no activity. Remove stale label or comment or this will be closed in 15 days."
-          close-issue-message: "This issue was closed because it has been stalled for 15 days with no activity."
-          exempt-issue-labels: "keep"
+          stale-issue-message: ‘This issue is stale because it has been open 365 days with no activity. Remove stale label or comment or this will be closed in 15 days.’
+          close-issue-message: ‘This issue was closed because it has been stalled for 15 days with no activity.’
+          exempt-issue-labels: ‘keep’
           days-before-stale: 365
-          days-before-close: 15
+          days-before-close: 15
+          debug-only: true

.husky/pre-commit

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-cd src/Misc/expressionFunc/hashFiles
-
-npx lint-staged

docs/checks/actions.md

@@ -9,13 +9,11 @@ Make sure the runner has access to actions service for GitHub.com or GitHub Ente
   - The runner needs to access `https://api.github.com` for downloading actions.
   - The runner needs to access `https://vstoken.actions.githubusercontent.com/_apis/.../` for requesting an access token.
   - The runner needs to access `https://pipelines.actions.githubusercontent.com/_apis/.../` for receiving workflow jobs.
-  ---
-  **NOTE:** for the full list of domains that are required to be in the firewall allow list refer to the [GitHub self-hosted runners requirements documentation](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#communication-between-self-hosted-runners-and-github).
 
   These can by tested by running the following `curl` commands from your self-hosted runner machine:
 
     ```
-    curl -v https://api.github.com/zen
+    curl -v https://api.github.com/api/v3/zen
     curl -v https://vstoken.actions.githubusercontent.com/_apis/health
     curl -v https://pipelines.actions.githubusercontent.com/_apis/health
     ```

docs/checks/network.md

@@ -14,7 +14,7 @@
 
 - A Proxy may try to modify the HTTPS request (like add or change some http headers) and causes the request become incompatible with the Actions Service (ASP.NetCore), Ex: [Nginx](https://github.com/dotnet/aspnetcore/issues/17081)
 
-- Firewall rules that block action runner from accessing [certain hosts](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#communication-between-self-hosted-runners-and-github), ex: `*.github.com`, `*.actions.githubusercontent.com`, etc
+- Firewall rules that block action runner from accessing certain hosts, ex: `*.github.com`, `*.actions.githubusercontent.com`, etc
 
 
 ### Identify and solve these problems

images/Dockerfile

@@ -4,9 +4,8 @@ FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build
 ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.4.0
-ARG DOCKER_VERSION=24.0.6
-ARG BUILDX_VERSION=0.11.2
+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2
+ARG DOCKER_VERSION=20.10.23
 
 RUN apt update -y && apt install curl unzip -y
 
@@ -26,11 +25,7 @@ RUN export RUNNER_ARCH=${TARGETARCH} \
     && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
     && curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \
     && tar zxvf docker.tgz \
-    && rm -rf docker.tgz \
-    && mkdir -p /usr/local/lib/docker/cli-plugins \
-    && curl -fLo /usr/local/lib/docker/cli-plugins/docker-buildx \
-        "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \
-    && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
+    && rm -rf docker.tgz
 
 FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy
 
@@ -54,7 +49,6 @@ RUN adduser --disabled-password --gecos "" --uid 1001 runner \
 WORKDIR /home/runner
 
 COPY --chown=runner:docker --from=build /actions-runner .
-COPY --from=build /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/lib/docker/cli-plugins/docker-buildx
 
 RUN install -o root -g root -m 755 docker/* /usr/bin/ && rm -rf docker
 

releaseNote.md

@@ -1,20 +1,19 @@
-## What's Changed
-* Trim whitespace in `./Misc/contentHash/dotnetRuntime/*` by @TingluoHuang in https://github.com/actions/runner/pull/2915
-* Send os and arch during long poll by @luketomlinson in https://github.com/actions/runner/pull/2913
-* Revert "Update default version to node20 (#2844)" by @takost in https://github.com/actions/runner/pull/2918
-* Fix telemetry publish from JobServerQueue. by @TingluoHuang in https://github.com/actions/runner/pull/2919
-* Use block blob instead of append blob  by @yacaovsnc in https://github.com/actions/runner/pull/2924
-* Provide detail info on untar failures. by @TingluoHuang in https://github.com/actions/runner/pull/2939
-* Bump node.js to 20.8.1 by @TingluoHuang in https://github.com/actions/runner/pull/2945
-* Update dotnet sdk to latest version @6.0.415 by @github-actions in https://github.com/actions/runner/pull/2929
-* Fix typo in log strings by @rajbos in https://github.com/actions/runner/pull/2695
-* feat: add support of arm64 arch runners in service creation script by @tuxity in https://github.com/actions/runner/pull/2606
-* Add `buildx` to images by @ajschmidt8 in https://github.com/actions/runner/pull/2901
+## Features
+- Support linux/arm64 docker build (#2601)
+- Add node20 to runner (#2732)
+- Update node16 to latest version (#2736)
+- Remove node12 from runner (#2717)
 
-## New Contributors
-* @tuxity made their first contribution in https://github.com/actions/runner/pull/2606
-
-**Full Changelog**: https://github.com/actions/runner/compare/v2.310.2...v2.311.0
+## Misc
+- Pass timeout in ExecutionContext instead of StepsRunner (#2714)
+- Return early on invalid_client OAuth exception (#2721)
+- Expose results service endpoint as environment variable (#2726)
+- Update HTTPEventSourceListener to trace the right events (#2727)
+- Change RunnerId/AgentId from int32 to uint64 (#2661)
+- Configure stale bot for Runner (#2729)
+- Add in dependabot security scanning/updates (#2743)
+- Bump dotnet sdk to latest version (#2733)
+- Switch from InnerException to ErrorCode on disableupdate check (#2718)
 
 _Note: Actions Runner follows a progressive release policy, so the latest release might not be available to your enterprise, organization, or repository yet. 
 To confirm which version of the Actions Runner you should expect, please view the download instructions for your enterprise, organization, or repository. 

releaseVersion

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

scripts/create-latest-svc.sh

@@ -8,7 +8,7 @@ set -e
 # Configures it as a service more secure
 # Should be used on VMs and not containers
 # Works on OSX and Linux
-# Assumes x64 arch (support arm64)
+# Assumes x64 arch
 # See EXAMPLES below
 
 flags_found=false
@@ -87,9 +87,6 @@ sudo echo
 runner_plat=linux
 [ ! -z "$(which sw_vers)" ] && runner_plat=osx;
 
-runner_arch=x64
-[ ! -z "$(arch | grep arm64)" ] && runner_arch=arm64
-
 function fatal()
 {
    echo "error: $1" >&2
@@ -142,7 +139,7 @@ echo "Downloading latest runner ..."
 # For the GHES Alpha, download the runner from github.com
 latest_version_label=$(curl -s -X GET 'https://api.github.com/repos/actions/runner/releases/latest' | jq -r '.tag_name')
 latest_version=$(echo ${latest_version_label:1})
-runner_file="actions-runner-${runner_plat}-${runner_arch}-${latest_version}.tar.gz"
+runner_file="actions-runner-${runner_plat}-x64-${latest_version}.tar.gz"
 
 if [ -f "${runner_file}" ]; then
     echo "${runner_file} exists. skipping download."

src/Misc/contentHash/dotnetRuntime/linux-arm

@@ -1 +1 @@
-531b31914e525ecb12cc5526415bc70a112ebc818f877347af1a231011f539c5
+7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3

src/Misc/contentHash/dotnetRuntime/linux-arm64

@@ -1 +1 @@
-722dd5fa5ecc207fcccf67f6e502d689f2119d8117beff2041618fba17dc66a4
+6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7

src/Misc/contentHash/dotnetRuntime/linux-x64

@@ -1 +1 @@
-8ca75c76e15ab9dc7fe49a66c5c74e171e7fabd5d26546fda8931bd11bff30f9
+921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5

src/Misc/contentHash/dotnetRuntime/osx-arm64

@@ -1 +1 @@
-70496eb1c99b39b3373b5088c95a35ebbaac1098e6c47c8aab94771f3ffbf501
+50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b

src/Misc/contentHash/dotnetRuntime/osx-x64

@@ -1 +1 @@
-4f8d48727d535daabcaec814e0dafb271c10625366c78e7e022ca7477a73023f
+16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd

src/Misc/contentHash/dotnetRuntime/win-arm64

@@ -1 +1 @@
-d54d7428f2b9200a0030365a6a4e174e30a1b29b922f8254dffb2924bd09549d
+e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87

src/Misc/contentHash/dotnetRuntime/win-x64

@@ -1 +1 @@
-eaa939c45307f46b7003902255b3a2a09287215d710984107667e03ac493eb26
+16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb

src/Misc/contentHash/externals/linux-arm

@@ -1 +1 @@
-4bf3e1af0d482af1b2eaf9f08250248a8c1aea8ec20a3c5be116d58cdd930009
+5bdddd32bab1e57af252b470579083049496e9e39b6e4f50de01232581f9a2d8

src/Misc/contentHash/externals/linux-arm64

@@ -1 +1 @@
-ec1719a8cb4d8687328aa64f4aa7c4e3498a715d8939117874782e3e6e63a14b
+54b3b3a72da93db0fa38708c759fceadddb70cacdd3620a079084a242126dd78

src/Misc/contentHash/externals/linux-x64

@@ -1 +1 @@
-50538de29f173bb73f708c4ed2c8328a62b8795829b97b2a6cb57197e2305287
+e7f2da271abb174285c3a757503538b3e9792e9d731b0382b6d1f21bb59a79ba

src/Misc/contentHash/externals/osx-arm64

@@ -1 +1 @@
-a0a96cbb7593643b69e669bf14d7b29b7f27800b3a00bb3305aebe041456c701
+2481c5b0d06b2b5621635f2568b86a43b0e5b259fed1298167ba4f33d4c464c7

src/Misc/contentHash/externals/osx-x64

@@ -1 +1 @@
-6255b22692779467047ecebd60ad46984866d75cdfe10421d593a7b51d620b09
+85de7677165e65ec69b8a9e344c0811efa51b7fe5376a1aa083505c560ea6f57

src/Misc/contentHash/externals/win-arm64

@@ -1 +1 @@
-6ff1abd055dc35bfbf06f75c2f08908f660346f66ad1d8f81c910068e9ba029d
+763d18de11c11fd299c0e75e98fefc8a0e6605ae0ad6aba3bbc110db2262ab41

src/Misc/contentHash/externals/win-x64

@@ -1 +1 @@
-433a6d748742d12abd20dc2a79b62ac3d9718ae47ef26f8e84dc8c180eea3659
+16f3cc545dfe10e84df43746073fc64d3c44d1891782532805aeb2118869a55d

src/Misc/expressionFunc/hashFiles/.prettierrc.json

@@ -1,19 +1,11 @@
-
 {
-  "printWidth": 80,
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": false,
-  "singleQuote": true,
-  "trailingComma": "none",
-  "bracketSpacing": false,
-  "arrowParens": "avoid",
-  "overrides": [
-    {
-      "files": "*.{js,ts,json}",
-      "options": {
-        "tabWidth": 2
-      }
-    }
-  ]
-}
+    "printWidth": 80,
+    "tabWidth": 2,
+    "useTabs": false,
+    "semi": false,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "bracketSpacing": false,
+    "arrowParens": "avoid",
+    "parser": "typescript"
+  }

src/Misc/expressionFunc/hashFiles/README.md

@@ -1,3 +1,4 @@
-To compile this package (output will be stored in `Misc/layoutbin`) run `npm install && npm run prepare && npm run all`.
+To compile this package (output will be stored in `Misc/layoutbin`) run `npm install && npm run all`.
 
-When you commit changes to the JSON or Typescript file, the javascript binary will be automatically re-compiled and added to the latest commit.
+> Note: this package also needs to be recompiled for dependabot PRs updating one of
+> its dependencies.

src/Misc/expressionFunc/hashFiles/package.json

@@ -9,9 +9,7 @@
     "format-check": "prettier --check **/*.ts",
     "lint": "eslint src/**/*.ts",
     "pack": "ncc build -o ../../layoutbin/hashFiles",
-    "all": "npm run format && npm run lint && npm run build && npm run pack",
-    "prepare": "cd ../../../../ && husky install"
-
+    "all": "npm run build && npm run format && npm run lint && npm run pack"
   },
   "repository": {
     "type": "git",
@@ -20,32 +18,20 @@
   "keywords": [
     "actions"
   ],
-  "lint-staged": {
-    "*.md": [
-      "prettier --write",
-      "git add ."
-    ],
-    "*.{ts,json}": [
-      "sh -c 'npm run all'",
-      "git add ."
-    ]
-  },
   "author": "GitHub Actions",
   "license": "MIT",
   "dependencies": {
-    "@actions/glob": "^0.4.0"
+    "@actions/glob": "^0.1.0"
   },
   "devDependencies": {
-    "@types/node": "^20.6.2",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
-    "@vercel/ncc": "^0.38.0",
-    "eslint": "^8.47.0",
-    "eslint-plugin-github": "^4.10.0",
+    "@types/node": "^12.7.12",
+    "@typescript-eslint/eslint-plugin": "^6.3.0",
+    "@typescript-eslint/parser": "^6.3.0",
+    "@vercel/ncc": "^0.36.1",
+    "eslint": "^8.11.0",
+    "eslint-plugin-github": "^4.9.2",
     "eslint-plugin-prettier": "^5.0.0",
-    "prettier": "^3.0.3",
-    "typescript": "^5.2.2",
-    "husky": "^8.0.3",
-    "lint-staged": "^14.0.0"
+    "prettier": "^3.0.1",
+    "typescript": "^5.1.6"
   }
-}
+}

src/Misc/expressionFunc/hashFiles/src/hashFiles.ts

@@ -52,13 +52,12 @@ async function run(): Promise<void> {
   }
 }
 
-;(async () => {
-  try {
-    const out = await run()
+run()
+  .then(out => {
     console.log(out)
     process.exit(0)
-  } catch (err) {
+  })
+  .catch(err => {
     console.error(err)
     process.exit(1)
-  }
-})()
+  })

src/Misc/externals.sh

@@ -4,9 +4,8 @@ PRECACHE=$2
 
 NODE_URL=https://nodejs.org/dist
 UNOFFICIAL_NODE_URL=https://unofficial-builds.nodejs.org/download/release
-NODE_ALPINE_URL=https://github.com/actions/alpine_nodejs/releases/download
-NODE16_VERSION="16.20.2"
-NODE20_VERSION="20.8.1"
+NODE16_VERSION="16.20.1"
+NODE20_VERSION="20.5.0"
 # used only for win-arm64, remove node16 unofficial version when official version is available
 NODE16_UNOFFICIAL_VERSION="16.20.0"
 
@@ -176,9 +175,9 @@ fi
 # Download the external tools for Linux PACKAGERUNTIMEs.
 if [[ "$PACKAGERUNTIME" == "linux-x64" ]]; then
     acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-x64.tar.gz" node16 fix_nested_dir
-    acquireExternalTool "$NODE_ALPINE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-alpine-x64.tar.gz" node16_alpine
+    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE16_VERSION}/alpine/x64/node-v${NODE16_VERSION}-alpine-x64.tar.gz" node16_alpine
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-x64.tar.gz" node20 fix_nested_dir
-    acquireExternalTool "$NODE_ALPINE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-alpine-x64.tar.gz" node20_alpine
+    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE20_VERSION}/alpine/x64/node-v${NODE20_VERSION}-alpine-x64.tar.gz" node20_alpine
 fi
 
 if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then

src/Misc/layoutbin/hashFiles/index.js

@@ -6,29 +6,6 @@
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -45,6 +22,13 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const crypto = __importStar(__nccwpck_require__(6113));
 const fs = __importStar(__nccwpck_require__(7147));
@@ -53,7 +37,7 @@ const path = __importStar(__nccwpck_require__(1017));
 const stream = __importStar(__nccwpck_require__(2781));
 const util = __importStar(__nccwpck_require__(3837));
 function run() {
-    var _a, e_1, _b, _c;
+    var e_1, _a;
     return __awaiter(this, void 0, void 0, function* () {
         // arg0 -> node
         // arg1 -> hashFiles.js
@@ -72,10 +56,8 @@ function run() {
         let count = 0;
         const globber = yield glob.create(matchPatterns, { followSymbolicLinks });
         try {
-            for (var _d = true, _e = __asyncValues(globber.globGenerator()), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const file = _c;
+            for (var _b = __asyncValues(globber.globGenerator()), _c; _c = yield _b.next(), !_c.done;) {
+                const file = _c.value;
                 console.log(file);
                 if (!file.startsWith(`${githubWorkspace}${path.sep}`)) {
                     console.log(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`);
@@ -98,7 +80,7 @@ function run() {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
+                if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -112,18 +94,15 @@ function run() {
         }
     });
 }
-;
-(() => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const out = yield run();
-        console.log(out);
-        process.exit(0);
-    }
-    catch (err) {
-        console.error(err);
-        process.exit(1);
-    }
-}))();
+run()
+    .then(out => {
+    console.log(out);
+    process.exit(0);
+})
+    .catch(err => {
+    console.error(err);
+    process.exit(1);
+});
 
 
 /***/ }),
@@ -267,6 +246,7 @@ const file_command_1 = __nccwpck_require__(717);
 const utils_1 = __nccwpck_require__(5278);
 const os = __importStar(__nccwpck_require__(2037));
 const path = __importStar(__nccwpck_require__(1017));
+const uuid_1 = __nccwpck_require__(5840);
 const oidc_utils_1 = __nccwpck_require__(8041);
 /**
  * The code to exit an action
@@ -296,9 +276,20 @@ function exportVariable(name, val) {
     process.env[name] = convertedVal;
     const filePath = process.env['GITHUB_ENV'] || '';
     if (filePath) {
-        return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
+        const delimiter = `ghadelimiter_${uuid_1.v4()}`;
+        // These should realistically never happen, but just in case someone finds a way to exploit uuid generation let's not allow keys or values that contain the delimiter.
+        if (name.includes(delimiter)) {
+            throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
+        }
+        if (convertedVal.includes(delimiter)) {
+            throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
+        }
+        const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
+        file_command_1.issueCommand('ENV', commandValue);
+    }
+    else {
+        command_1.issueCommand('set-env', { name }, convertedVal);
     }
-    command_1.issueCommand('set-env', { name }, convertedVal);
 }
 exports.exportVariable = exportVariable;
 /**
@@ -316,7 +307,7 @@ exports.setSecret = setSecret;
 function addPath(inputPath) {
     const filePath = process.env['GITHUB_PATH'] || '';
     if (filePath) {
-        file_command_1.issueFileCommand('PATH', inputPath);
+        file_command_1.issueCommand('PATH', inputPath);
     }
     else {
         command_1.issueCommand('add-path', {}, inputPath);
@@ -356,10 +347,7 @@ function getMultilineInput(name, options) {
     const inputs = getInput(name, options)
         .split('\n')
         .filter(x => x !== '');
-    if (options && options.trimWhitespace === false) {
-        return inputs;
-    }
-    return inputs.map(input => input.trim());
+    return inputs;
 }
 exports.getMultilineInput = getMultilineInput;
 /**
@@ -392,12 +380,8 @@ exports.getBooleanInput = getBooleanInput;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function setOutput(name, value) {
-    const filePath = process.env['GITHUB_OUTPUT'] || '';
-    if (filePath) {
-        return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
-    }
     process.stdout.write(os.EOL);
-    command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
+    command_1.issueCommand('set-output', { name }, value);
 }
 exports.setOutput = setOutput;
 /**
@@ -526,11 +510,7 @@ exports.group = group;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function saveState(name, value) {
-    const filePath = process.env['GITHUB_STATE'] || '';
-    if (filePath) {
-        return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
-    }
-    command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
+    command_1.issueCommand('save-state', { name }, value);
 }
 exports.saveState = saveState;
 /**
@@ -596,14 +576,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
+exports.issueCommand = void 0;
 // We use any as a valid input type
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const fs = __importStar(__nccwpck_require__(7147));
 const os = __importStar(__nccwpck_require__(2037));
-const uuid_1 = __nccwpck_require__(5840);
 const utils_1 = __nccwpck_require__(5278);
-function issueFileCommand(command, message) {
+function issueCommand(command, message) {
     const filePath = process.env[`GITHUB_${command}`];
     if (!filePath) {
         throw new Error(`Unable to find environment variable for file command ${command}`);
@@ -615,22 +594,7 @@ function issueFileCommand(command, message) {
         encoding: 'utf8'
     });
 }
-exports.issueFileCommand = issueFileCommand;
-function prepareKeyValueMessage(key, value) {
-    const delimiter = `ghadelimiter_${uuid_1.v4()}`;
-    const convertedValue = utils_1.toCommandValue(value);
-    // These should realistically never happen, but just in case someone finds a
-    // way to exploit uuid generation let's not allow keys or values that contain
-    // the delimiter.
-    if (key.includes(delimiter)) {
-        throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
-    }
-    if (convertedValue.includes(delimiter)) {
-        throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
-    }
-    return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
-}
-exports.prepareKeyValueMessage = prepareKeyValueMessage;
+exports.issueCommand = issueCommand;
 //# sourceMappingURL=file-command.js.map
 
 /***/ }),
@@ -1136,9 +1100,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.hashFiles = exports.create = void 0;
 const internal_globber_1 = __nccwpck_require__(8298);
-const internal_hash_files_1 = __nccwpck_require__(2448);
 /**
  * Constructs a globber
  *
@@ -1151,56 +1113,17 @@ function create(patterns, options) {
     });
 }
 exports.create = create;
-/**
- * Computes the sha256 hash of a glob
- *
- * @param patterns  Patterns separated by newlines
- * @param currentWorkspace  Workspace used when matching files
- * @param options   Glob options
- * @param verbose   Enables verbose logging
- */
-function hashFiles(patterns, currentWorkspace = '', options, verbose = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let followSymbolicLinks = true;
-        if (options && typeof options.followSymbolicLinks === 'boolean') {
-            followSymbolicLinks = options.followSymbolicLinks;
-        }
-        const globber = yield create(patterns, { followSymbolicLinks });
-        return internal_hash_files_1.hashFiles(globber, currentWorkspace, verbose);
-    });
-}
-exports.hashFiles = hashFiles;
 //# sourceMappingURL=glob.js.map
 
 /***/ }),
 
 /***/ 1026:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getOptions = void 0;
-const core = __importStar(__nccwpck_require__(2186));
+const core = __nccwpck_require__(2186);
 /**
  * Returns a copy with defaults filled in.
  */
@@ -1208,7 +1131,6 @@ function getOptions(copy) {
     const result = {
         followSymbolicLinks: true,
         implicitDescendants: true,
-        matchDirectories: true,
         omitBrokenSymbolicLinks: true
     };
     if (copy) {
@@ -1220,10 +1142,6 @@ function getOptions(copy) {
             result.implicitDescendants = copy.implicitDescendants;
             core.debug(`implicitDescendants '${result.implicitDescendants}'`);
         }
-        if (typeof copy.matchDirectories === 'boolean') {
-            result.matchDirectories = copy.matchDirectories;
-            core.debug(`matchDirectories '${result.matchDirectories}'`);
-        }
         if (typeof copy.omitBrokenSymbolicLinks === 'boolean') {
             result.omitBrokenSymbolicLinks = copy.omitBrokenSymbolicLinks;
             core.debug(`omitBrokenSymbolicLinks '${result.omitBrokenSymbolicLinks}'`);
@@ -1241,25 +1159,6 @@ exports.getOptions = getOptions;
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -1289,12 +1188,11 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DefaultGlobber = void 0;
-const core = __importStar(__nccwpck_require__(2186));
-const fs = __importStar(__nccwpck_require__(7147));
-const globOptionsHelper = __importStar(__nccwpck_require__(1026));
-const path = __importStar(__nccwpck_require__(1017));
-const patternHelper = __importStar(__nccwpck_require__(9005));
+const core = __nccwpck_require__(2186);
+const fs = __nccwpck_require__(7147);
+const globOptionsHelper = __nccwpck_require__(1026);
+const path = __nccwpck_require__(1017);
+const patternHelper = __nccwpck_require__(9005);
 const internal_match_kind_1 = __nccwpck_require__(1063);
 const internal_pattern_1 = __nccwpck_require__(4536);
 const internal_search_state_1 = __nccwpck_require__(9117);
@@ -1340,7 +1238,7 @@ class DefaultGlobber {
                 if (options.implicitDescendants &&
                     (pattern.trailingSeparator ||
                         pattern.segments[pattern.segments.length - 1] !== '**')) {
-                    patterns.push(new internal_pattern_1.Pattern(pattern.negate, true, pattern.segments.concat('**')));
+                    patterns.push(new internal_pattern_1.Pattern(pattern.negate, pattern.segments.concat('**')));
                 }
             }
             // Push the search paths
@@ -1383,7 +1281,7 @@ class DefaultGlobber {
                 // Directory
                 if (stats.isDirectory()) {
                     // Matched
-                    if (match & internal_match_kind_1.MatchKind.Directory && options.matchDirectories) {
+                    if (match & internal_match_kind_1.MatchKind.Directory) {
                         yield yield __await(item.path);
                     }
                     // Descend?
@@ -1478,117 +1376,12 @@ exports.DefaultGlobber = DefaultGlobber;
 
 /***/ }),
 
-/***/ 2448:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.hashFiles = void 0;
-const crypto = __importStar(__nccwpck_require__(6113));
-const core = __importStar(__nccwpck_require__(2186));
-const fs = __importStar(__nccwpck_require__(7147));
-const stream = __importStar(__nccwpck_require__(2781));
-const util = __importStar(__nccwpck_require__(3837));
-const path = __importStar(__nccwpck_require__(1017));
-function hashFiles(globber, currentWorkspace, verbose = false) {
-    var e_1, _a;
-    var _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const writeDelegate = verbose ? core.info : core.debug;
-        let hasMatch = false;
-        const githubWorkspace = currentWorkspace
-            ? currentWorkspace
-            : (_b = process.env['GITHUB_WORKSPACE']) !== null && _b !== void 0 ? _b : process.cwd();
-        const result = crypto.createHash('sha256');
-        let count = 0;
-        try {
-            for (var _c = __asyncValues(globber.globGenerator()), _d; _d = yield _c.next(), !_d.done;) {
-                const file = _d.value;
-                writeDelegate(file);
-                if (!file.startsWith(`${githubWorkspace}${path.sep}`)) {
-                    writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`);
-                    continue;
-                }
-                if (fs.statSync(file).isDirectory()) {
-                    writeDelegate(`Skip directory '${file}'.`);
-                    continue;
-                }
-                const hash = crypto.createHash('sha256');
-                const pipeline = util.promisify(stream.pipeline);
-                yield pipeline(fs.createReadStream(file), hash);
-                result.write(hash.digest());
-                count++;
-                if (!hasMatch) {
-                    hasMatch = true;
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_a = _c.return)) yield _a.call(_c);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        result.end();
-        if (hasMatch) {
-            writeDelegate(`Found ${count} files to hash.`);
-            return result.digest('hex');
-        }
-        else {
-            writeDelegate(`No matches found for glob`);
-            return '';
-        }
-    });
-}
-exports.hashFiles = hashFiles;
-//# sourceMappingURL=internal-hash-files.js.map
-
-/***/ }),
-
 /***/ 1063:
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MatchKind = void 0;
 /**
  * Indicates whether a pattern matches a path
  */
@@ -1608,36 +1401,13 @@ var MatchKind;
 /***/ }),
 
 /***/ 1849:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.safeTrimTrailingSeparator = exports.normalizeSeparators = exports.hasRoot = exports.hasAbsoluteRoot = exports.ensureAbsoluteRoot = exports.dirname = void 0;
-const path = __importStar(__nccwpck_require__(1017));
-const assert_1 = __importDefault(__nccwpck_require__(9491));
+const assert = __nccwpck_require__(9491);
+const path = __nccwpck_require__(1017);
 const IS_WINDOWS = process.platform === 'win32';
 /**
  * Similar to path.dirname except normalizes the path separators and slightly better handling for Windows UNC paths.
@@ -1677,8 +1447,8 @@ exports.dirname = dirname;
  * or `C:` are expanded based on the current working directory.
  */
 function ensureAbsoluteRoot(root, itemPath) {
-    assert_1.default(root, `ensureAbsoluteRoot parameter 'root' must not be empty`);
-    assert_1.default(itemPath, `ensureAbsoluteRoot parameter 'itemPath' must not be empty`);
+    assert(root, `ensureAbsoluteRoot parameter 'root' must not be empty`);
+    assert(itemPath, `ensureAbsoluteRoot parameter 'itemPath' must not be empty`);
     // Already rooted
     if (hasAbsoluteRoot(itemPath)) {
         return itemPath;
@@ -1688,7 +1458,7 @@ function ensureAbsoluteRoot(root, itemPath) {
         // Check for itemPath like C: or C:foo
         if (itemPath.match(/^[A-Z]:[^\\/]|^[A-Z]:$/i)) {
             let cwd = process.cwd();
-            assert_1.default(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
+            assert(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
             // Drive letter matches cwd? Expand to cwd
             if (itemPath[0].toUpperCase() === cwd[0].toUpperCase()) {
                 // Drive only, e.g. C:
@@ -1713,11 +1483,11 @@ function ensureAbsoluteRoot(root, itemPath) {
         // Check for itemPath like \ or \foo
         else if (normalizeSeparators(itemPath).match(/^\\$|^\\[^\\]/)) {
             const cwd = process.cwd();
-            assert_1.default(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
+            assert(cwd.match(/^[A-Z]:\\/i), `Expected current directory to start with an absolute drive root. Actual '${cwd}'`);
             return `${cwd[0]}:\\${itemPath.substr(1)}`;
         }
     }
-    assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`);
+    assert(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`);
     // Otherwise ensure root ends with a separator
     if (root.endsWith('/') || (IS_WINDOWS && root.endsWith('\\'))) {
         // Intentionally empty
@@ -1734,7 +1504,7 @@ exports.ensureAbsoluteRoot = ensureAbsoluteRoot;
  * `\\hello\share` and `C:\hello` (and using alternate separator).
  */
 function hasAbsoluteRoot(itemPath) {
-    assert_1.default(itemPath, `hasAbsoluteRoot parameter 'itemPath' must not be empty`);
+    assert(itemPath, `hasAbsoluteRoot parameter 'itemPath' must not be empty`);
     // Normalize separators
     itemPath = normalizeSeparators(itemPath);
     // Windows
@@ -1751,7 +1521,7 @@ exports.hasAbsoluteRoot = hasAbsoluteRoot;
  * `\`, `\hello`, `\\hello\share`, `C:`, and `C:\hello` (and using alternate separator).
  */
 function hasRoot(itemPath) {
-    assert_1.default(itemPath, `isRooted parameter 'itemPath' must not be empty`);
+    assert(itemPath, `isRooted parameter 'itemPath' must not be empty`);
     // Normalize separators
     itemPath = normalizeSeparators(itemPath);
     // Windows
@@ -1813,37 +1583,14 @@ exports.safeTrimTrailingSeparator = safeTrimTrailingSeparator;
 /***/ }),
 
 /***/ 6836:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Path = void 0;
-const path = __importStar(__nccwpck_require__(1017));
-const pathHelper = __importStar(__nccwpck_require__(1849));
-const assert_1 = __importDefault(__nccwpck_require__(9491));
+const assert = __nccwpck_require__(9491);
+const path = __nccwpck_require__(1017);
+const pathHelper = __nccwpck_require__(1849);
 const IS_WINDOWS = process.platform === 'win32';
 /**
  * Helper class for parsing paths into segments
@@ -1857,7 +1604,7 @@ class Path {
         this.segments = [];
         // String
         if (typeof itemPath === 'string') {
-            assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`);
+            assert(itemPath, `Parameter 'itemPath' must not be empty`);
             // Normalize slashes and trim unnecessary trailing slash
             itemPath = pathHelper.safeTrimTrailingSeparator(itemPath);
             // Not rooted
@@ -1884,24 +1631,24 @@ class Path {
         // Array
         else {
             // Must not be empty
-            assert_1.default(itemPath.length > 0, `Parameter 'itemPath' must not be an empty array`);
+            assert(itemPath.length > 0, `Parameter 'itemPath' must not be an empty array`);
             // Each segment
             for (let i = 0; i < itemPath.length; i++) {
                 let segment = itemPath[i];
                 // Must not be empty
-                assert_1.default(segment, `Parameter 'itemPath' must not contain any empty segments`);
+                assert(segment, `Parameter 'itemPath' must not contain any empty segments`);
                 // Normalize slashes
                 segment = pathHelper.normalizeSeparators(itemPath[i]);
                 // Root segment
                 if (i === 0 && pathHelper.hasRoot(segment)) {
                     segment = pathHelper.safeTrimTrailingSeparator(segment);
-                    assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`);
+                    assert(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`);
                     this.segments.push(segment);
                 }
                 // All other segments
                 else {
                     // Must not contain slash
-                    assert_1.default(!segment.includes(path.sep), `Parameter 'itemPath' contains unexpected path separators`);
+                    assert(!segment.includes(path.sep), `Parameter 'itemPath' contains unexpected path separators`);
                     this.segments.push(segment);
                 }
             }
@@ -1933,32 +1680,12 @@ exports.Path = Path;
 /***/ }),
 
 /***/ 9005:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.partialMatch = exports.match = exports.getSearchPaths = void 0;
-const pathHelper = __importStar(__nccwpck_require__(1849));
+const pathHelper = __nccwpck_require__(1849);
 const internal_match_kind_1 = __nccwpck_require__(1063);
 const IS_WINDOWS = process.platform === 'win32';
 /**
@@ -2034,44 +1761,21 @@ exports.partialMatch = partialMatch;
 /***/ }),
 
 /***/ 4536:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Pattern = void 0;
-const os = __importStar(__nccwpck_require__(2037));
-const path = __importStar(__nccwpck_require__(1017));
-const pathHelper = __importStar(__nccwpck_require__(1849));
-const assert_1 = __importDefault(__nccwpck_require__(9491));
+const assert = __nccwpck_require__(9491);
+const os = __nccwpck_require__(2037);
+const path = __nccwpck_require__(1017);
+const pathHelper = __nccwpck_require__(1849);
 const minimatch_1 = __nccwpck_require__(3973);
 const internal_match_kind_1 = __nccwpck_require__(1063);
 const internal_path_1 = __nccwpck_require__(6836);
 const IS_WINDOWS = process.platform === 'win32';
 class Pattern {
-    constructor(patternOrNegate, isImplicitPattern = false, segments, homedir) {
+    constructor(patternOrNegate, segments) {
         /**
          * Indicates whether matches should be excluded from the result set
          */
@@ -2085,9 +1789,9 @@ class Pattern {
         else {
             // Convert to pattern
             segments = segments || [];
-            assert_1.default(segments.length, `Parameter 'segments' must not empty`);
+            assert(segments.length, `Parameter 'segments' must not empty`);
             const root = Pattern.getLiteral(segments[0]);
-            assert_1.default(root && pathHelper.hasAbsoluteRoot(root), `Parameter 'segments' first element must be a root path`);
+            assert(root && pathHelper.hasAbsoluteRoot(root), `Parameter 'segments' first element must be a root path`);
             pattern = new internal_path_1.Path(segments).toString().trim();
             if (patternOrNegate) {
                 pattern = `!${pattern}`;
@@ -2099,7 +1803,7 @@ class Pattern {
             pattern = pattern.substr(1).trim();
         }
         // Normalize slashes and ensures absolute root
-        pattern = Pattern.fixupPattern(pattern, homedir);
+        pattern = Pattern.fixupPattern(pattern);
         // Segments
         this.segments = new internal_path_1.Path(pattern).segments;
         // Trailing slash indicates the pattern should only match directories, not regular files
@@ -2115,7 +1819,6 @@ class Pattern {
         this.searchPath = new internal_path_1.Path(searchSegments).toString();
         // Root RegExp (required when determining partial match)
         this.rootRegExp = new RegExp(Pattern.regExpEscape(searchSegments[0]), IS_WINDOWS ? 'i' : '');
-        this.isImplicitPattern = isImplicitPattern;
         // Create minimatch
         const minimatchOptions = {
             dot: true,
@@ -2137,11 +1840,11 @@ class Pattern {
             // Normalize slashes
             itemPath = pathHelper.normalizeSeparators(itemPath);
             // Append a trailing slash. Otherwise Minimatch will not match the directory immediately
-            // preceding the globstar. For example, given the pattern `/foo/**`, Minimatch returns
+            // preceeding the globstar. For example, given the pattern `/foo/**`, Minimatch returns
             // false for `/foo` but returns true for `/foo/`. Append a trailing slash to handle that quirk.
-            if (!itemPath.endsWith(path.sep) && this.isImplicitPattern === false) {
+            if (!itemPath.endsWith(path.sep)) {
                 // Note, this is safe because the constructor ensures the pattern has an absolute root.
-                // For example, formats like C: and C:foo on Windows are resolved to an absolute root.
+                // For example, formats like C: and C:foo on Windows are resolved to an aboslute root.
                 itemPath = `${itemPath}${path.sep}`;
             }
         }
@@ -2179,15 +1882,15 @@ class Pattern {
     /**
      * Normalizes slashes and ensures absolute root
      */
-    static fixupPattern(pattern, homedir) {
+    static fixupPattern(pattern) {
         // Empty
-        assert_1.default(pattern, 'pattern cannot be empty');
+        assert(pattern, 'pattern cannot be empty');
         // Must not contain `.` segment, unless first segment
         // Must not contain `..` segment
         const literalSegments = new internal_path_1.Path(pattern).segments.map(x => Pattern.getLiteral(x));
-        assert_1.default(literalSegments.every((x, i) => (x !== '.' || i === 0) && x !== '..'), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`);
+        assert(literalSegments.every((x, i) => (x !== '.' || i === 0) && x !== '..'), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`);
         // Must not contain globs in root, e.g. Windows UNC path \\foo\b*r
-        assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`);
+        assert(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`);
         // Normalize slashes
         pattern = pathHelper.normalizeSeparators(pattern);
         // Replace leading `.` segment
@@ -2196,9 +1899,9 @@ class Pattern {
         }
         // Replace leading `~` segment
         else if (pattern === '~' || pattern.startsWith(`~${path.sep}`)) {
-            homedir = homedir || os.homedir();
-            assert_1.default(homedir, 'Unable to determine HOME directory');
-            assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`);
+            const homedir = os.homedir();
+            assert(homedir, 'Unable to determine HOME directory');
+            assert(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`);
             pattern = Pattern.globEscape(homedir) + pattern.substr(1);
         }
         // Replace relative drive root, e.g. pattern is C: or C:foo
@@ -2301,7 +2004,6 @@ exports.Pattern = Pattern;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SearchState = void 0;
 class SearchState {
     constructor(path, level) {
         this.path = path;
@@ -2530,19 +2232,6 @@ class HttpClientResponse {
             }));
         });
     }
-    readBodyBuffer() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                const chunks = [];
-                this.message.on('data', (chunk) => {
-                    chunks.push(chunk);
-                });
-                this.message.on('end', () => {
-                    resolve(Buffer.concat(chunks));
-                });
-            }));
-        });
-    }
 }
 exports.HttpClientResponse = HttpClientResponse;
 function isHttps(requestUrl) {
@@ -3047,13 +2736,7 @@ function getProxyUrl(reqUrl) {
         }
     })();
     if (proxyVar) {
-        try {
-            return new URL(proxyVar);
-        }
-        catch (_a) {
-            if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://'))
-                return new URL(`http://${proxyVar}`);
-        }
+        return new URL(proxyVar);
     }
     else {
         return undefined;
@@ -3064,10 +2747,6 @@ function checkBypass(reqUrl) {
     if (!reqUrl.hostname) {
         return false;
     }
-    const reqHost = reqUrl.hostname;
-    if (isLoopbackAddress(reqHost)) {
-        return true;
-    }
     const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || '';
     if (!noProxy) {
         return false;
@@ -3093,24 +2772,13 @@ function checkBypass(reqUrl) {
         .split(',')
         .map(x => x.trim().toUpperCase())
         .filter(x => x)) {
-        if (upperNoProxyItem === '*' ||
-            upperReqHosts.some(x => x === upperNoProxyItem ||
-                x.endsWith(`.${upperNoProxyItem}`) ||
-                (upperNoProxyItem.startsWith('.') &&
-                    x.endsWith(`${upperNoProxyItem}`)))) {
+        if (upperReqHosts.some(x => x === upperNoProxyItem)) {
             return true;
         }
     }
     return false;
 }
 exports.checkBypass = checkBypass;
-function isLoopbackAddress(host) {
-    const hostLower = host.toLowerCase();
-    return (hostLower === 'localhost' ||
-        hostLower.startsWith('127.') ||
-        hostLower.startsWith('[::1]') ||
-        hostLower.startsWith('[0:0:0:0:0:0:0:1]'));
-}
 //# sourceMappingURL=proxy.js.map
 
 /***/ }),
@@ -3149,9 +2817,6 @@ function range(a, b, str) {
   var i = ai;
 
   if (ai >= 0 && bi > 0) {
-    if(a===b) {
-      return [ai, bi];
-    }
     begs = [];
     left = str.length;
 

src/Misc/layoutroot/run-helper.cmd.template

@@ -2,7 +2,7 @@
 SET UPDATEFILE=update.finished
 "%~dp0\bin\Runner.Listener.exe" run %*
 
-rem using `if %ERRORLEVEL% EQU N` instead of `if ERRORLEVEL N`
+rem using `if %ERRORLEVEL% EQU N` insterad of `if ERRORLEVEL N`
 rem `if ERRORLEVEL N` means: error level is N or MORE
   
 if %ERRORLEVEL% EQU 0 (

src/Misc/runnerdotnetruntimeassets

@@ -76,8 +76,6 @@ mscordaccore_amd64_amd64_6.0.522.21309.dll
 mscordaccore_arm64_arm64_6.0.522.21309.dll
 mscordaccore_amd64_amd64_6.0.1322.58009.dll
 mscordaccore_amd64_amd64_6.0.2023.32017.dll
-mscordaccore_amd64_amd64_6.0.2223.42425.dll
-mscordaccore_amd64_amd64_6.0.2323.48002.dll
 mscordbi.dll
 mscorlib.dll
 mscorrc.debug.dll

src/Runner.Common/BrokerServer.cs

@@ -17,7 +17,7 @@ namespace GitHub.Runner.Common
     {
         Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
 
-        Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate);
+        Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version);
     }
 
     public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -44,11 +44,11 @@ namespace GitHub.Runner.Common
             }
         }
 
-        public Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken cancellationToken, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate)
+        public Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken cancellationToken, TaskAgentStatus status, string version)
         {
             CheckConnection();
             var jobMessage = RetryRequest<TaskAgentMessage>(
-                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, os, architecture, disableUpdate, cancellationToken), cancellationToken);
+                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken);
 
             return jobMessage;
         }

src/Runner.Common/Constants.cs

@@ -69,8 +69,6 @@ namespace GitHub.Runner.Common
             public static readonly OSPlatform Platform = OSPlatform.OSX;
 #elif OS_WINDOWS
             public static readonly OSPlatform Platform = OSPlatform.Windows;
-#else
-            public static readonly OSPlatform Platform = OSPlatform.Linux;
 #endif
 
 #if X86
@@ -81,8 +79,6 @@ namespace GitHub.Runner.Common
             public static readonly Architecture PlatformArchitecture = Architecture.Arm;
 #elif ARM64
             public static readonly Architecture PlatformArchitecture = Architecture.Arm64;
-#else
-            public static readonly Architecture PlatformArchitecture = Architecture.X64;
 #endif
 
             public static readonly TimeSpan ExitOnUnloadTimeout = TimeSpan.FromSeconds(30);
@@ -175,9 +171,6 @@ namespace GitHub.Runner.Common
             public static readonly string UnsupportedStopCommandTokenDisabled = "You cannot use a endToken that is an empty string, the string 'pause-logging', or another workflow command. For more information see: https://docs.github.com/actions/learn-github-actions/workflow-commands-for-github-actions#example-stopping-and-starting-workflow-commands or opt into insecure command execution by setting the `ACTIONS_ALLOW_UNSECURE_STOPCOMMAND_TOKENS` environment variable to `true`.";
             public static readonly string UnsupportedSummarySize = "$GITHUB_STEP_SUMMARY upload aborted, supports content up to a size of {0}k, got {1}k. For more information see: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-markdown-summary";
             public static readonly string SummaryUploadError = "$GITHUB_STEP_SUMMARY upload aborted, an error occurred when uploading the summary. For more information see: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-markdown-summary";
-            public static readonly string DetectedNodeAfterEndOfLifeMessage = "Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: {0}. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.";
-            public static readonly string DeprecatedNodeDetectedAfterEndOfLifeActions = "DeprecatedNodeActionsMessageWarnings";
-            public static readonly string DeprecatedNodeVersion = "node16";
             public static readonly string EnforcedNode12DetectedAfterEndOfLife = "The following actions uses node12 which is deprecated and will be forced to run on node16: {0}. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/";
             public static readonly string EnforcedNode12DetectedAfterEndOfLifeEnvVariable = "Node16ForceActionsWarnings";
         }
@@ -261,7 +254,6 @@ namespace GitHub.Runner.Common
                 public static readonly string ForcedInternalNodeVersion = "ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION";
                 public static readonly string ForcedActionsNodeVersion = "ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION";
                 public static readonly string PrintLogToStdout = "ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT";
-                public static readonly string ActionArchiveCacheDirectory = "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE";
             }
 
             public static class System

src/Runner.Common/HostContext.cs

@@ -203,7 +203,7 @@ namespace GitHub.Runner.Common
 
             if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY")))
             {
-                _trace.Warning($"Runner is running under insecure mode: HTTPS server certificate validation has been turned off by GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY environment variable.");
+                _trace.Warning($"Runner is running under insecure mode: HTTPS server certifcate validation has been turned off by GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY environment variable.");
             }
 
             var credFile = GetConfigFile(WellKnownConfigFile.Credentials);

src/Runner.Common/JobServerQueue.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -15,11 +14,10 @@ namespace GitHub.Runner.Common
     [ServiceLocator(Default = typeof(JobServerQueue))]
     public interface IJobServerQueue : IRunnerService, IThrottlingReporter
     {
-        IList<JobTelemetry> JobTelemetries { get; }
         TaskCompletionSource<int> JobRecordUpdated { get; }
         event EventHandler<ThrottlingEventArgs> JobServerQueueThrottling;
         Task ShutdownAsync();
-        void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultsServiceOnly = false, bool enableTelemetry = false);
+        void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultServiceOnly = false);
         void QueueWebConsoleLine(Guid stepRecordId, string line, long? lineNumber = null);
         void QueueFileUpload(Guid timelineId, Guid timelineRecordId, string type, string name, string path, bool deleteSource);
         void QueueResultsUpload(Guid timelineRecordId, string name, string path, string type, bool deleteSource, bool finalize, bool firstBlock, long totalLines);
@@ -71,18 +69,13 @@ namespace GitHub.Runner.Common
         private Task[] _allDequeueTasks;
         private readonly TaskCompletionSource<int> _jobCompletionSource = new();
         private readonly TaskCompletionSource<int> _jobRecordUpdated = new();
-        private readonly List<JobTelemetry> _jobTelemetries = new();
         private bool _queueInProcess = false;
         private bool _resultsServiceOnly = false;
-        private Stopwatch _resultsUploadTimer = new();
-        private Stopwatch _actionsUploadTimer = new();
 
         public TaskCompletionSource<int> JobRecordUpdated => _jobRecordUpdated;
 
         public event EventHandler<ThrottlingEventArgs> JobServerQueueThrottling;
 
-        public IList<JobTelemetry> JobTelemetries => _jobTelemetries;
-
         // Web console dequeue will start with process queue every 250ms for the first 60*4 times (~60 seconds).
         // Then the dequeue will happen every 500ms.
         // In this way, customer still can get instance live console output on job start,
@@ -94,7 +87,6 @@ namespace GitHub.Runner.Common
         private bool _firstConsoleOutputs = true;
 
         private bool _resultsClientInitiated = false;
-        private bool _enableTelemetry = false;
         private delegate Task ResultsFileUploadHandler(ResultsUploadFileInfo file);
 
         public override void Initialize(IHostContext hostContext)
@@ -104,15 +96,14 @@ namespace GitHub.Runner.Common
             _resultsServer = hostContext.GetService<IResultsServer>();
         }
 
-        public void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultsServiceOnly = false, bool enableTelemetry = false)
+        public void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultServiceOnly = false)
         {
             Trace.Entering();
-            _resultsServiceOnly = resultsServiceOnly;
-            _enableTelemetry = enableTelemetry;
+            _resultsServiceOnly = resultServiceOnly;
 
             var serviceEndPoint = jobRequest.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
 
-            if (!resultsServiceOnly)
+            if (!resultServiceOnly)
             {
                 _jobServer.InitializeWebsocketClient(serviceEndPoint);
             }
@@ -128,7 +119,7 @@ namespace GitHub.Runner.Common
             {
                 string liveConsoleFeedUrl = null;
                 Trace.Info("Initializing results client");
-                if (resultsServiceOnly
+                if (resultServiceOnly
                     && serviceEndPoint.Data.TryGetValue("FeedStreamUrl", out var feedStreamUrl)
                     && !string.IsNullOrEmpty(feedStreamUrl))
                 {
@@ -220,12 +211,6 @@ namespace GitHub.Runner.Common
             await _resultsServer.DisposeAsync();
 
             Trace.Info("All queue process tasks have been stopped, and all queues are drained.");
-            if (_enableTelemetry)
-            {
-                var uploadTimeComparison = $"Actions upload time: {_actionsUploadTimer.ElapsedMilliseconds} ms, Result upload time: {_resultsUploadTimer.ElapsedMilliseconds} ms";
-                Trace.Info(uploadTimeComparison);
-                _jobTelemetries.Add(new JobTelemetry() { Type = JobTelemetryType.General, Message = uploadTimeComparison });
-            }
         }
 
         public void QueueWebConsoleLine(Guid stepRecordId, string line, long? lineNumber)
@@ -471,10 +456,6 @@ namespace GitHub.Runner.Common
                     {
                         try
                         {
-                            if (_enableTelemetry)
-                            {
-                                _actionsUploadTimer.Start();
-                            }
                             await UploadFile(file);
                         }
                         catch (Exception ex)
@@ -490,13 +471,6 @@ namespace GitHub.Runner.Common
                             //    _fileUploadQueue.Enqueue(file);
                             //}
                         }
-                        finally
-                        {
-                            if (_enableTelemetry)
-                            {
-                                _actionsUploadTimer.Stop();
-                            }
-                        }
                     }
 
                     Trace.Info("Try to upload {0} log files or attachments, success rate: {1}/{0}.", filesToUpload.Count, filesToUpload.Count - errorCount);
@@ -543,10 +517,6 @@ namespace GitHub.Runner.Common
                     {
                         try
                         {
-                            if (_enableTelemetry)
-                            {
-                                _resultsUploadTimer.Start();
-                            }
                             if (String.Equals(file.Type, ChecksAttachmentType.StepSummary, StringComparison.OrdinalIgnoreCase))
                             {
                                 await UploadSummaryFile(file);
@@ -571,19 +541,10 @@ namespace GitHub.Runner.Common
                             Trace.Error(ex);
                             errorCount++;
 
-                            // If we hit any exceptions uploading to Results, let's skip any additional uploads to Results unless Results is serving logs
-                            if (!_resultsServiceOnly)
-                            {
-                                _resultsClientInitiated = false;
-                                SendResultsTelemetry(ex);
-                            }
-                        }
-                        finally
-                        {
-                            if (_enableTelemetry)
-                            {
-                                _resultsUploadTimer.Stop();
-                            }
+                            // If we hit any exceptions uploading to Results, let's skip any additional uploads to Results
+                            _resultsClientInitiated = false;
+
+                            SendResultsTelemetry(ex);
                         }
                     }
 
@@ -699,11 +660,9 @@ namespace GitHub.Runner.Common
                             {
                                 Trace.Info("Catch exception during update steps, skip update Results.");
                                 Trace.Error(e);
-                                if (!_resultsServiceOnly)
-                                {
-                                    _resultsClientInitiated = false;
-                                    SendResultsTelemetry(e);
-                                }
+                                _resultsClientInitiated = false;
+
+                                SendResultsTelemetry(e);
                             }
 
                             if (_bufferedRetryRecords.Remove(update.TimelineId))

src/Runner.Common/RedirectMessageHandler.cs

@@ -1,73 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-
-namespace GitHub.Runner.Common
-{
-    /// <summary>
-    /// Handles redirects for Http requests
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class RedirectMessageHandler : DelegatingHandler
-    {
-        public RedirectMessageHandler(ITraceWriter trace)
-        {
-            Trace = trace;
-        }
-
-        protected override async Task<HttpResponseMessage> SendAsync(
-            HttpRequestMessage request,
-            CancellationToken cancellationToken)
-        {
-            HttpResponseMessage response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
-
-            if (response != null &&
-                IsRedirect(response.StatusCode) &&
-                response.Headers.Location != null)
-            {
-                Trace.Info($"Redirecting to '{response.Headers.Location}'.");
-
-                request = await CloneAsync(request, response.Headers.Location).ConfigureAwait(false);
-
-                response.Dispose();
-
-                response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
-            }
-
-            return response;
-        }
-
-        private static bool IsRedirect(HttpStatusCode statusCode)
-        {
-            return (int)statusCode >= 300 && (int)statusCode < 400;
-        }
-
-        private static async Task<HttpRequestMessage> CloneAsync(HttpRequestMessage request, Uri requestUri)
-        {
-            var clone = new HttpRequestMessage(request.Method, requestUri)
-            {
-                Version = request.Version
-            };
-
-            request.Headers.ForEach(header => clone.Headers.TryAddWithoutValidation(header.Key, header.Value));
-
-            request.Options.ForEach(option => clone.Options.Set(new HttpRequestOptionsKey<object>(option.Key), option.Value));
-
-            if (request.Content != null)
-            {
-                clone.Content = new ByteArrayContent(await request.Content.ReadAsByteArrayAsync().ConfigureAwait(false));
-
-                request.Content.Headers.ForEach(header => clone.Content.Headers.TryAddWithoutValidation(header.Key, header.Value));
-            }
-
-            return clone;
-        }
-
-        private readonly ITraceWriter Trace;
-    }
-}

src/Runner.Common/ResultsServer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.WebSockets;
 using System.Security;
@@ -53,8 +52,8 @@ namespace GitHub.Runner.Common
 
         public void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string token)
         {
-            this._resultsClient = CreateHttpClient(uri, token);
-
+            var httpMessageHandler = HostContext.CreateHttpClientHandler();
+            this._resultsClient = new ResultsHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
             _token = token;
             if (!string.IsNullOrEmpty(liveConsoleFeedUrl))
             {
@@ -63,26 +62,6 @@ namespace GitHub.Runner.Common
             }
         }
 
-        public ResultsHttpClient CreateHttpClient(Uri uri, string token)
-        {
-            // Using default 100 timeout
-            RawClientHttpRequestSettings settings = VssUtil.GetHttpRequestSettings(null);
-
-            // Create retry handler
-            IEnumerable<DelegatingHandler> delegatingHandlers = new List<DelegatingHandler>();
-            if (settings.MaxRetryRequest > 0)
-            {
-                delegatingHandlers = new DelegatingHandler[] { new VssHttpRetryMessageHandler(settings.MaxRetryRequest) };
-            }
-
-            // Setup RawHttpMessageHandler without credentials
-            var httpMessageHandler = new RawHttpMessageHandler(new NoOpCredentials(null), settings);
-
-            var pipeline = HttpClientFactory.CreatePipeline(httpMessageHandler, delegatingHandlers);
-
-            return new ResultsHttpClient(uri, pipeline, token, disposeHandler: true);
-        }
-
         public Task CreateResultsStepSummaryAsync(string planId, string jobId, Guid stepId, string file,
             CancellationToken cancellationToken)
         {

src/Runner.Common/Runner.Common.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
     <PackageReference Include="System.Threading.Channels" Version="4.4.0" />

src/Runner.Common/RunnerDotcomServer.cs

@@ -15,11 +15,12 @@ namespace GitHub.Runner.Common
     [ServiceLocator(Default = typeof(RunnerDotcomServer))]
     public interface IRunnerDotcomServer : IRunnerService
     {
-        Task<List<TaskAgent>> GetRunnerByNameAsync(string githubUrl, string githubToken, string agentName);
+        Task<List<TaskAgent>> GetRunnersAsync(int runnerGroupId, string githubUrl, string githubToken, string agentName);
 
         Task<DistributedTask.WebApi.Runner> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey);
-        Task<DistributedTask.WebApi.Runner> ReplaceRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey);
         Task<List<TaskAgentPool>> GetRunnerGroupsAsync(string githubUrl, string githubToken);
+
+        string GetGitHubRequestId(HttpResponseHeaders headers);
     }
 
     public enum RequestType
@@ -41,7 +42,7 @@ namespace GitHub.Runner.Common
         }
 
 
-        public async Task<List<TaskAgent>> GetRunnerByNameAsync(string githubUrl, string githubToken, string agentName)
+        public async Task<List<TaskAgent>> GetRunnersAsync(int runnerGroupId, string githubUrl, string githubToken, string agentName = null)
         {
             var githubApiUrl = "";
             var gitHubUrlBuilder = new UriBuilder(githubUrl);
@@ -51,11 +52,11 @@ namespace GitHub.Runner.Common
                 // org runner
                 if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
                 {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions/runner-groups/{runnerGroupId}/runners";
                 }
                 else
                 {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runner-groups/{runnerGroupId}/runners";
                 }
             }
             else if (path.Length == 2)
@@ -68,11 +69,11 @@ namespace GitHub.Runner.Common
 
                 if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
                 {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runner-groups/{runnerGroupId}/runners";
                 }
                 else
                 {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runner-groups/{runnerGroupId}/runners";
                 }
             }
             else
@@ -81,8 +82,14 @@ namespace GitHub.Runner.Common
             }
 
             var runnersList = await RetryRequest<ListRunnersResponse>(githubApiUrl, githubToken, RequestType.Get, 3, "Failed to get agents pools");
+            var agents = runnersList.ToTaskAgents();
 
-            return runnersList.ToTaskAgents();
+            if (string.IsNullOrEmpty(agentName))
+            {
+                return agents;
+            }
+
+            return agents.Where(x => string.Equals(x.Name, agentName, StringComparison.OrdinalIgnoreCase)).ToList();
         }
 
         public async Task<List<TaskAgentPool>> GetRunnerGroupsAsync(string githubUrl, string githubToken)
@@ -130,16 +137,6 @@ namespace GitHub.Runner.Common
         }
 
         public async Task<DistributedTask.WebApi.Runner> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey)
-        {
-            return await AddOrReplaceRunner(runnerGroupId, agent, githubUrl, githubToken, publicKey, false);
-        }
-
-        public async Task<DistributedTask.WebApi.Runner> ReplaceRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey)
-        {
-            return await AddOrReplaceRunner(runnerGroupId, agent, githubUrl, githubToken, publicKey, true);
-        }
-
-        private async Task<DistributedTask.WebApi.Runner> AddOrReplaceRunner(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey, bool replace)
         {
             var gitHubUrlBuilder = new UriBuilder(githubUrl);
             var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
@@ -162,15 +159,9 @@ namespace GitHub.Runner.Common
                         {"updates_disabled", agent.DisableUpdate},
                         {"ephemeral", agent.Ephemeral},
                         {"labels", agent.Labels},
-                        {"public_key", publicKey},
+                        {"public_key", publicKey}
                     };
 
-            if (replace)
-            {
-                bodyObject.Add("runner_id", agent.Id);
-                bodyObject.Add("replace", replace);
-            }
-
             var body = new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json");
 
             return await RetryRequest<DistributedTask.WebApi.Runner>(githubApiUrl, githubToken, RequestType.Post, 3, "Failed to add agent", body);
@@ -204,7 +195,7 @@ namespace GitHub.Runner.Common
                         if (response != null)
                         {
                             responseStatus = response.StatusCode;
-                            var githubRequestId = UrlUtil.GetGitHubRequestId(response.Headers);
+                            var githubRequestId = GetGitHubRequestId(response.Headers);
 
                             if (response.IsSuccessStatusCode)
                             {
@@ -224,7 +215,7 @@ namespace GitHub.Runner.Common
                     }
                     catch (Exception ex) when (retry < maxRetryAttemptsCount && responseStatus != System.Net.HttpStatusCode.NotFound)
                     {
-                        Trace.Error($"{errorMessage} -- Attempt: {retry}");
+                        Trace.Error($"{errorMessage} -- Atempt: {retry}");
                         Trace.Error(ex);
                     }
                 }
@@ -233,5 +224,14 @@ namespace GitHub.Runner.Common
                 await Task.Delay(backOff);
             }
         }
+
+        public string GetGitHubRequestId(HttpResponseHeaders headers)
+        {
+            if (headers.TryGetValues("x-github-request-id", out var headerValues))
+            {
+                return headerValues.FirstOrDefault();
+            }
+            return string.Empty;
+        }
     }
 }

src/Runner.Common/RunnerServer.cs

@@ -38,7 +38,7 @@ namespace GitHub.Runner.Common
         Task<TaskAgentSession> CreateAgentSessionAsync(Int32 poolId, TaskAgentSession session, CancellationToken cancellationToken);
         Task DeleteAgentMessageAsync(Int32 poolId, Int64 messageId, Guid sessionId, CancellationToken cancellationToken);
         Task DeleteAgentSessionAsync(Int32 poolId, Guid sessionId, CancellationToken cancellationToken);
-        Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, string os, string architecture, bool disableUpdate, CancellationToken cancellationToken);
+        Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, CancellationToken cancellationToken);
 
         // job request
         Task<TaskAgentJobRequest> GetAgentRequestAsync(int poolId, long requestId, CancellationToken cancellationToken);
@@ -272,10 +272,10 @@ namespace GitHub.Runner.Common
             return _messageTaskAgentClient.DeleteAgentSessionAsync(poolId, sessionId, cancellationToken: cancellationToken);
         }
 
-        public Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, string os, string architecture, bool disableUpdate, CancellationToken cancellationToken)
+        public Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, CancellationToken cancellationToken)
         {
             CheckConnection(RunnerConnectionType.MessageQueue);
-            return _messageTaskAgentClient.GetMessageAsync(poolId, sessionId, lastMessageId, status, runnerVersion, os, architecture, disableUpdate, cancellationToken: cancellationToken);
+            return _messageTaskAgentClient.GetMessageAsync(poolId, sessionId, lastMessageId, status, runnerVersion, cancellationToken: cancellationToken);
         }
 
         //-----------------------------------------------------------------

src/Runner.Common/TraceSetting.cs

@@ -19,13 +19,6 @@ namespace GitHub.Runner.Common
             {
                 DefaultTraceLevel = TraceLevel.Verbose;
             }
-            else if (int.TryParse(Environment.GetEnvironmentVariable("ACTIONS_RUNNER_TRACE_LEVEL"), out var traceLevel))
-            {
-                // force user's TraceLevel to comply with runner TraceLevel enums
-                traceLevel = Math.Clamp(traceLevel, 0, 5);
-
-                DefaultTraceLevel = (TraceLevel)traceLevel;
-            }
         }
 
         [DataMember(EmitDefaultValue = false)]

src/Runner.Listener/BrokerMessageListener.cs

@@ -73,12 +73,7 @@ namespace GitHub.Runner.Listener
                 _getMessagesTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token);
                 try
                 {
-                    message = await _brokerServer.GetRunnerMessageAsync(_getMessagesTokenSource.Token,
-                                                                        runnerStatus,
-                                                                        BuildConstants.RunnerPackage.Version,
-                                                                        VarUtil.OS,
-                                                                        VarUtil.OSArchitecture,
-                                                                        _settings.DisableUpdate);
+                    message = await _brokerServer.GetRunnerMessageAsync(_getMessagesTokenSource.Token, runnerStatus, BuildConstants.RunnerPackage.Version);
 
                     if (message == null)
                     {
@@ -113,7 +108,7 @@ namespace GitHub.Runner.Listener
 
                     if (!IsGetNextMessageExceptionRetriable(ex))
                     {
-                        throw new NonRetryableException("Get next message failed with non-retryable error.", ex);
+                        throw;
                     }
                     else
                     {

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -244,11 +244,11 @@ namespace GitHub.Runner.Listener.Configuration
                 List<TaskAgent> agents;
                 if (runnerSettings.UseV2Flow)
                 {
-                    agents = await _dotcomServer.GetRunnerByNameAsync(runnerSettings.GitHubUrl, registerToken, runnerSettings.AgentName);
+                    agents = await _dotcomServer.GetRunnersAsync(runnerSettings.PoolId, runnerSettings.GitHubUrl, registerToken, runnerSettings.AgentName);
                 }
                 else
                 {
-                    agents = await _runnerServer.GetAgentsAsync(runnerSettings.AgentName);
+                    agents = await _runnerServer.GetAgentsAsync(runnerSettings.PoolId, runnerSettings.AgentName);
                 }
 
                 Trace.Verbose("Returns {0} agents", agents.Count);
@@ -263,23 +263,7 @@ namespace GitHub.Runner.Listener.Configuration
 
                         try
                         {
-                            if (runnerSettings.UseV2Flow)
-                            {
-                                var runner = await _dotcomServer.ReplaceRunnerAsync(runnerSettings.PoolId, agent, runnerSettings.GitHubUrl, registerToken, publicKeyXML);
-                                runnerSettings.ServerUrlV2 = runner.RunnerAuthorization.ServerUrl;
-
-                                agent.Id = runner.Id;
-                                agent.Authorization = new TaskAgentAuthorization()
-                                {
-                                    AuthorizationUrl = runner.RunnerAuthorization.AuthorizationUrl,
-                                    ClientId = new Guid(runner.RunnerAuthorization.ClientId)
-                                };
-                            }
-                            else
-                            {
-                                agent = await _runnerServer.ReplaceAgentAsync(runnerSettings.PoolId, agent);
-                            }
-
+                            agent = await _runnerServer.ReplaceAgentAsync(runnerSettings.PoolId, agent);
                             if (command.DisableUpdate &&
                                 command.DisableUpdate != agent.DisableUpdate)
                             {
@@ -725,7 +709,7 @@ namespace GitHub.Runner.Listener.Configuration
                     {
                         var response = await httpClient.PostAsync(githubApiUrl, new StringContent(string.Empty));
                         responseStatus = response.StatusCode;
-                        var githubRequestId = UrlUtil.GetGitHubRequestId(response.Headers);
+                        var githubRequestId = _dotcomServer.GetGitHubRequestId(response.Headers);
 
                         if (response.IsSuccessStatusCode)
                         {
@@ -744,7 +728,7 @@ namespace GitHub.Runner.Listener.Configuration
                     catch (Exception ex) when (retryCount < 2 && responseStatus != System.Net.HttpStatusCode.NotFound)
                     {
                         retryCount++;
-                        Trace.Error($"Failed to get JIT runner token -- Attempt: {retryCount}");
+                        Trace.Error($"Failed to get JIT runner token -- Atempt: {retryCount}");
                         Trace.Error(ex);
                     }
                 }
@@ -788,7 +772,7 @@ namespace GitHub.Runner.Listener.Configuration
                     {
                         var response = await httpClient.PostAsync(githubApiUrl, new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json"));
                         responseStatus = response.StatusCode;
-                        var githubRequestId = UrlUtil.GetGitHubRequestId(response.Headers);
+                        var githubRequestId = _dotcomServer.GetGitHubRequestId(response.Headers);
 
                         if (response.IsSuccessStatusCode)
                         {
@@ -807,7 +791,7 @@ namespace GitHub.Runner.Listener.Configuration
                     catch (Exception ex) when (retryCount < 2 && responseStatus != System.Net.HttpStatusCode.NotFound)
                     {
                         retryCount++;
-                        Trace.Error($"Failed to get tenant credentials -- Attempt: {retryCount}");
+                        Trace.Error($"Failed to get tenant credentials -- Atempt: {retryCount}");
                         Trace.Error(ex);
                     }
                 }

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -46,7 +46,7 @@ namespace GitHub.Runner.Listener.Configuration
 
             if (!store.HasCredentials())
             {
-                throw new InvalidOperationException("Credentials not stored. Must reconfigure.");
+                throw new InvalidOperationException("Credentials not stored.  Must reconfigure.");
             }
 
             CredentialData credData = store.GetCredentials();

src/Runner.Listener/Configuration/NativeWindowsServiceHelper.cs

@@ -514,25 +514,9 @@ namespace GitHub.Runner.Listener.Configuration
                 failureActions.Add(new FailureAction(RecoverAction.Restart, 60000));
 
                 // Lock the Service Database
-                int svcLockRetries = 10;
-                int svcLockRetryTimeout = 5000;
-                while (true)
+                svcLock = LockServiceDatabase(scmHndl);
+                if (svcLock.ToInt64() <= 0)
                 {
-                    svcLock = LockServiceDatabase(scmHndl);
-                    if (svcLock.ToInt64() > 0)
-                    {
-                        break;
-                    }
-
-                    _term.WriteLine("Retrying Lock Service Database...");
-
-                    svcLockRetries--;
-                    if (svcLockRetries > 0)
-                    {
-                        Thread.Sleep(svcLockRetryTimeout);
-                        continue;
-                    }
-
                     throw new Exception("Failed to Lock Service Database for Write");
                 }
 

src/Runner.Listener/JobDispatcher.cs

@@ -98,7 +98,7 @@ namespace GitHub.Runner.Listener
                 Guid dispatchedJobId = _jobDispatchedQueue.Dequeue();
                 if (_jobInfos.TryGetValue(dispatchedJobId, out currentDispatch))
                 {
-                    Trace.Verbose($"Retrive previous WorkerDispatcher for job {currentDispatch.JobId}.");
+                    Trace.Verbose($"Retrive previous WorkerDispather for job {currentDispatch.JobId}.");
                 }
             }
 
@@ -162,12 +162,12 @@ namespace GitHub.Runner.Listener
                 dispatchedJobId = _jobDispatchedQueue.Dequeue();
                 if (_jobInfos.TryGetValue(dispatchedJobId, out currentDispatch))
                 {
-                    Trace.Verbose($"Retrive previous WorkerDispatcher for job {currentDispatch.JobId}.");
+                    Trace.Verbose($"Retrive previous WorkerDispather for job {currentDispatch.JobId}.");
                 }
             }
             else
             {
-                Trace.Verbose($"There is no running WorkerDispatcher needs to await.");
+                Trace.Verbose($"There is no running WorkerDispather needs to await.");
             }
 
             if (currentDispatch != null)
@@ -176,7 +176,7 @@ namespace GitHub.Runner.Listener
                 {
                     try
                     {
-                        Trace.Info($"Waiting WorkerDispatcher for job {currentDispatch.JobId} run to finish.");
+                        Trace.Info($"Waiting WorkerDispather for job {currentDispatch.JobId} run to finish.");
                         await currentDispatch.WorkerDispatch;
                         Trace.Info($"Job request {currentDispatch.JobId} processed succeed.");
                     }
@@ -190,7 +190,7 @@ namespace GitHub.Runner.Listener
                         WorkerDispatcher workerDispatcher;
                         if (_jobInfos.TryRemove(currentDispatch.JobId, out workerDispatcher))
                         {
-                            Trace.Verbose($"Remove WorkerDispatcher from {nameof(_jobInfos)} dictionary for job {currentDispatch.JobId}.");
+                            Trace.Verbose($"Remove WorkerDispather from {nameof(_jobInfos)} dictionary for job {currentDispatch.JobId}.");
                             workerDispatcher.Dispose();
                         }
                     }
@@ -209,7 +209,7 @@ namespace GitHub.Runner.Listener
                 {
                     try
                     {
-                        Trace.Info($"Ensure WorkerDispatcher for job {currentDispatch.JobId} run to finish, cancel any running job.");
+                        Trace.Info($"Ensure WorkerDispather for job {currentDispatch.JobId} run to finish, cancel any running job.");
                         await EnsureDispatchFinished(currentDispatch, cancelRunningJob: true);
                     }
                     catch (Exception ex)
@@ -222,7 +222,7 @@ namespace GitHub.Runner.Listener
                         WorkerDispatcher workerDispatcher;
                         if (_jobInfos.TryRemove(currentDispatch.JobId, out workerDispatcher))
                         {
-                            Trace.Verbose($"Remove WorkerDispatcher from {nameof(_jobInfos)} dictionary for job {currentDispatch.JobId}.");
+                            Trace.Verbose($"Remove WorkerDispather from {nameof(_jobInfos)} dictionary for job {currentDispatch.JobId}.");
                             workerDispatcher.Dispose();
                         }
                     }
@@ -327,7 +327,7 @@ namespace GitHub.Runner.Listener
                 WorkerDispatcher workerDispatcher;
                 if (_jobInfos.TryRemove(jobDispatch.JobId, out workerDispatcher))
                 {
-                    Trace.Verbose($"Remove WorkerDispatcher from {nameof(_jobInfos)} dictionary for job {jobDispatch.JobId}.");
+                    Trace.Verbose($"Remove WorkerDispather from {nameof(_jobInfos)} dictionary for job {jobDispatch.JobId}.");
                     workerDispatcher.Dispose();
                 }
             }

src/Runner.Listener/MessageListener.cs

@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
@@ -129,7 +128,7 @@ namespace GitHub.Runner.Listener
                         // "invalid_client" means the runner registration has been deleted from the server.
                         if (string.Equals(vssOAuthEx.Error, "invalid_client", StringComparison.OrdinalIgnoreCase))
                         {
-                            _term.WriteError("Failed to create a session. The runner registration has been deleted from the server, please re-configure. Runner registrations are automatically deleted for runners that have not connected to the service recently.");
+                            _term.WriteError("Failed to create a session. The runner registration has been deleted from the server, please re-configure.");
                             return false;
                         }
 
@@ -140,7 +139,7 @@ namespace GitHub.Runner.Listener
                         var authError = await oauthTokenProvider.ValidateCredentialAsync(token);
                         if (string.Equals(authError, "invalid_client", StringComparison.OrdinalIgnoreCase))
                         {
-                            _term.WriteError("Failed to create a session. The runner registration has been deleted from the server, please re-configure. Runner registrations are automatically deleted for runners that have not connected to the service recently.");
+                            _term.WriteError("Failed to create a session. The runner registration has been deleted from the server, please re-configure.");
                             return false;
                         }
                     }
@@ -220,9 +219,6 @@ namespace GitHub.Runner.Listener
                                                                 _lastMessageId,
                                                                 runnerStatus,
                                                                 BuildConstants.RunnerPackage.Version,
-                                                                VarUtil.OS,
-                                                                VarUtil.OSArchitecture,
-                                                                _settings.DisableUpdate,
                                                                 _getMessagesTokenSource.Token);
 
                     // Decrypt the message body if the session is using encryption

src/Runner.Listener/Runner.Listener.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />

src/Runner.Listener/Runner.cs

@@ -457,13 +457,22 @@ namespace GitHub.Runner.Listener
 
                             message = await getNextMessage; //get next message
                             HostContext.WritePerfCounter($"MessageReceived_{message.MessageType}");
-                            if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
+                            if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase) ||
+                                string.Equals(message.MessageType, RunnerRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
                             {
                                 if (autoUpdateInProgress == false)
                                 {
                                     autoUpdateInProgress = true;
-                                    AgentRefreshMessage runnerUpdateMessage = JsonUtility.FromString<AgentRefreshMessage>(message.Body);
-
+                                    AgentRefreshMessage runnerUpdateMessage = null;
+                                    if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
+                                    {
+                                        runnerUpdateMessage = JsonUtility.FromString<AgentRefreshMessage>(message.Body);
+                                    }
+                                    else
+                                    {
+                                        var brokerRunnerUpdateMessage = JsonUtility.FromString<RunnerRefreshMessage>(message.Body);
+                                        runnerUpdateMessage = new AgentRefreshMessage(brokerRunnerUpdateMessage.RunnerId, brokerRunnerUpdateMessage.TargetVersion, TimeSpan.FromSeconds(brokerRunnerUpdateMessage.TimeoutInSeconds));
+                                    }
 #if DEBUG
                                     // Can mock the update for testing
                                     if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_IS_MOCK_UPDATE")))
@@ -494,22 +503,6 @@ namespace GitHub.Runner.Listener
                                     Trace.Info("Refresh message received, skip autoupdate since a previous autoupdate is already running.");
                                 }
                             }
-                            else if (string.Equals(message.MessageType, RunnerRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
-                            {
-                                if (autoUpdateInProgress == false)
-                                {
-                                    autoUpdateInProgress = true;
-                                    RunnerRefreshMessage brokerRunnerUpdateMessage = JsonUtility.FromString<RunnerRefreshMessage>(message.Body);
-
-                                    var selfUpdater = HostContext.GetService<ISelfUpdaterV2>();
-                                    selfUpdateTask = selfUpdater.SelfUpdate(brokerRunnerUpdateMessage, jobDispatcher, false, HostContext.RunnerShutdownToken);
-                                    Trace.Info("Refresh message received, kick-off selfupdate background process.");
-                                }
-                                else
-                                {
-                                    Trace.Info("Refresh message received, skip autoupdate since a previous autoupdate is already running.");
-                                }
-                            }
                             else if (string.Equals(message.MessageType, JobRequestMessageTypes.PipelineAgentJobRequest, StringComparison.OrdinalIgnoreCase))
                             {
                                 if (autoUpdateInProgress || runOnceJobReceived)

src/Runner.Listener/SelfUpdaterV2.cs

@@ -1,569 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net.Http;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Runner.Listener
-{
-    // This class is a fork of SelfUpdater.cs and is intended to only be used for the
-    // new self-update flow where the PackageMetadata is sent in the message directly. 
-    // Forking the class prevents us from accidentally breaking the old flow while it's still in production
-
-    [ServiceLocator(Default = typeof(SelfUpdaterV2))]
-    public interface ISelfUpdaterV2 : IRunnerService
-    {
-        bool Busy { get; }
-        Task<bool> SelfUpdate(RunnerRefreshMessage updateMessage, IJobDispatcher jobDispatcher, bool restartInteractiveRunner, CancellationToken token);
-    }
-    public class SelfUpdaterV2 : RunnerService, ISelfUpdaterV2
-    {
-        private static string _platform = BuildConstants.RunnerPackage.PackageName;
-        private ITerminal _terminal;
-        private IRunnerServer _runnerServer;
-        private int _poolId;
-        private ulong _agentId;
-
-        private const int _numberOfOldVersionsToKeep = 1;
-
-        private readonly ConcurrentQueue<string> _updateTrace = new();
-        public bool Busy { get; private set; }
-
-        public override void Initialize(IHostContext hostContext)
-        {
-            base.Initialize(hostContext);
-
-            _terminal = hostContext.GetService<ITerminal>();
-            _runnerServer = HostContext.GetService<IRunnerServer>();
-            var configStore = HostContext.GetService<IConfigurationStore>();
-            var settings = configStore.GetSettings();
-            _poolId = settings.PoolId;
-            _agentId = settings.AgentId;
-        }
-
-        public async Task<bool> SelfUpdate(RunnerRefreshMessage updateMessage, IJobDispatcher jobDispatcher, bool restartInteractiveRunner, CancellationToken token)
-        {
-            Busy = true;
-            try
-            {
-                var totalUpdateTime = Stopwatch.StartNew();
-
-                Trace.Info($"An update is available.");
-                _updateTrace.Enqueue($"RunnerPlatform: {updateMessage.OS}");
-
-                // Print console line that warn user not shutdown runner.
-                _terminal.WriteLine("Runner update in progress, do not shutdown runner.");
-                _terminal.WriteLine($"Downloading {updateMessage.TargetVersion} runner");
-
-                await DownloadLatestRunner(token, updateMessage.TargetVersion, updateMessage.DownloadUrl, updateMessage.SHA256Checksum, updateMessage.OS);
-                Trace.Info($"Download latest runner and unzip into runner root.");
-
-                // wait till all running job finish
-                _terminal.WriteLine("Waiting for current job finish running.");
-
-                await jobDispatcher.WaitAsync(token);
-                Trace.Info($"All running job has exited.");
-
-                // We need to keep runner backup around for macOS until we fixed https://github.com/actions/runner/issues/743
-                // delete runner backup
-                var stopWatch = Stopwatch.StartNew();
-                DeletePreviousVersionRunnerBackup(token, updateMessage.TargetVersion);
-                Trace.Info($"Delete old version runner backup.");
-                stopWatch.Stop();
-                // generate update script from template
-                _updateTrace.Enqueue($"DeleteRunnerBackupTime: {stopWatch.ElapsedMilliseconds}ms");
-                _terminal.WriteLine("Generate and execute update script.");
-
-                string updateScript = GenerateUpdateScript(restartInteractiveRunner, updateMessage.TargetVersion);
-                Trace.Info($"Generate update script into: {updateScript}");
-
-
-#if DEBUG
-                // For L0, we will skip execute update script.
-                if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("_GITHUB_ACTION_EXECUTE_UPDATE_SCRIPT")))
-#endif
-                {
-                    string flagFile = "update.finished";
-                    IOUtil.DeleteFile(flagFile);
-                    // kick off update script
-                    Process invokeScript = new();
-#if OS_WINDOWS
-                    invokeScript.StartInfo.FileName = WhichUtil.Which("cmd.exe", trace: Trace);
-                    invokeScript.StartInfo.Arguments = $"/c \"{updateScript}\"";
-#elif (OS_OSX || OS_LINUX)
-                    invokeScript.StartInfo.FileName = WhichUtil.Which("bash", trace: Trace);
-                    invokeScript.StartInfo.Arguments = $"\"{updateScript}\"";
-#endif
-                    invokeScript.Start();
-                    Trace.Info($"Update script start running");
-                }
-
-                totalUpdateTime.Stop();
-
-                _updateTrace.Enqueue($"TotalUpdateTime: {totalUpdateTime.ElapsedMilliseconds}ms");
-                _terminal.WriteLine("Runner will exit shortly for update, should be back online within 10 seconds.");
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                _updateTrace.Enqueue(ex.ToString());
-                throw;
-            }
-            finally
-            {
-                _terminal.WriteLine("Runner update process finished.");
-                Busy = false;
-            }
-        }
-
-        /// <summary>
-        /// _work
-        ///     \_update
-        ///            \bin
-        ///            \externals
-        ///            \run.sh
-        ///            \run.cmd
-        ///            \package.zip //temp download .zip/.tar.gz
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        private async Task DownloadLatestRunner(CancellationToken token, string targetVersion, string packageDownloadUrl, string packageHashValue, string targetPlatform)
-        {
-            string latestRunnerDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Work), Constants.Path.UpdateDirectory);
-            IOUtil.DeleteDirectory(latestRunnerDirectory, token);
-            Directory.CreateDirectory(latestRunnerDirectory);
-
-            string archiveFile = null;
-
-            // Only try trimmed package if sever sends them and we have calculated hash value of the current runtime/externals.
-            _updateTrace.Enqueue($"DownloadUrl: {packageDownloadUrl}");
-
-            try
-            {
-#if DEBUG
-                // Much of the update process (targetVersion, archive) is server-side, this is a way to control it from here for testing specific update scenarios
-                // Add files like 'runner2.281.2.tar.gz' or 'runner2.283.0.zip' (depending on your platform) to your runner root folder
-                // Note that runners still need to be older than the server's runner version in order to receive an 'AgentRefreshMessage' and trigger this update
-                // Wrapped in #if DEBUG as this should not be in the RELEASE build
-                if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_IS_MOCK_UPDATE")))
-                {
-                    var waitForDebugger = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_IS_MOCK_UPDATE_WAIT_FOR_DEBUGGER"));
-                    if (waitForDebugger)
-                    {
-                        int waitInSeconds = 20;
-                        while (!Debugger.IsAttached && waitInSeconds-- > 0)
-                        {
-                            await Task.Delay(1000);
-                        }
-                        Debugger.Break();
-                    }
-
-                    if (targetPlatform.StartsWith("win"))
-                    {
-                        archiveFile = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"runner{targetVersion}.zip");
-                    }
-                    else
-                    {
-                        archiveFile = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"runner{targetVersion}.tar.gz");
-                    }
-
-                    if (File.Exists(archiveFile))
-                    {
-                        _updateTrace.Enqueue($"Mocking update with file: '{archiveFile}' and targetVersion: '{targetVersion}', nothing is downloaded");
-                        _terminal.WriteLine($"Mocking update with file: '{archiveFile}' and targetVersion: '{targetVersion}', nothing is downloaded");
-                    }
-                    else
-                    {
-                        archiveFile = null;
-                        _terminal.WriteLine($"Mock runner archive not found at {archiveFile} for target version {targetVersion}, proceeding with download instead");
-                        _updateTrace.Enqueue($"Mock runner archive not found at {archiveFile} for target version {targetVersion}, proceeding with download instead");
-                    }
-                }
-#endif
-                // archiveFile is not null only if we mocked it above
-                if (string.IsNullOrEmpty(archiveFile))
-                {
-                    archiveFile = await DownLoadRunner(latestRunnerDirectory, packageDownloadUrl, packageHashValue, targetPlatform, token);
-
-                    if (string.IsNullOrEmpty(archiveFile))
-                    {
-                        throw new TaskCanceledException($"Runner package '{packageDownloadUrl}' failed after {Constants.RunnerDownloadRetryMaxAttempts} download attempts");
-                    }
-                    await ValidateRunnerHash(archiveFile, packageHashValue);
-                }
-
-                await ExtractRunnerPackage(archiveFile, latestRunnerDirectory, token);
-            }
-            finally
-            {
-                try
-                {
-                    // delete .zip file
-                    if (!string.IsNullOrEmpty(archiveFile) && File.Exists(archiveFile))
-                    {
-                        Trace.Verbose("Deleting latest runner package zip: {0}", archiveFile);
-                        IOUtil.DeleteFile(archiveFile);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    //it is not critical if we fail to delete the .zip file
-                    Trace.Warning("Failed to delete runner package zip '{0}'. Exception: {1}", archiveFile, ex);
-                }
-            }
-
-            await CopyLatestRunnerToRoot(latestRunnerDirectory, targetVersion, token);
-        }
-
-        private async Task<string> DownLoadRunner(string downloadDirectory, string packageDownloadUrl, string packageHashValue, string packagePlatform, CancellationToken token)
-        {
-            var stopWatch = Stopwatch.StartNew();
-            int runnerSuffix = 1;
-            string archiveFile = null;
-            bool downloadSucceeded = false;
-
-            // Download the runner, using multiple attempts in order to be resilient against any networking/CDN issues
-            for (int attempt = 1; attempt <= Constants.RunnerDownloadRetryMaxAttempts; attempt++)
-            {
-                // Generate an available package name, and do our best effort to clean up stale local zip files
-                while (true)
-                {
-                    if (packagePlatform.StartsWith("win"))
-                    {
-                        archiveFile = Path.Combine(downloadDirectory, $"runner{runnerSuffix}.zip");
-                    }
-                    else
-                    {
-                        archiveFile = Path.Combine(downloadDirectory, $"runner{runnerSuffix}.tar.gz");
-                    }
-
-                    try
-                    {
-                        // delete .zip file
-                        if (!string.IsNullOrEmpty(archiveFile) && File.Exists(archiveFile))
-                        {
-                            Trace.Verbose("Deleting latest runner package zip '{0}'", archiveFile);
-                            IOUtil.DeleteFile(archiveFile);
-                        }
-
-                        break;
-                    }
-                    catch (Exception ex)
-                    {
-                        // couldn't delete the file for whatever reason, so generate another name
-                        Trace.Warning("Failed to delete runner package zip '{0}'. Exception: {1}", archiveFile, ex);
-                        runnerSuffix++;
-                    }
-                }
-
-                // Allow a 15-minute package download timeout, which is good enough to update the runner from a 1 Mbit/s ADSL connection.
-                if (!int.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_DOWNLOAD_TIMEOUT") ?? string.Empty, out int timeoutSeconds))
-                {
-                    timeoutSeconds = 15 * 60;
-                }
-
-                Trace.Info($"Attempt {attempt}: save latest runner into {archiveFile}.");
-
-                using (var downloadTimeout = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutSeconds)))
-                using (var downloadCts = CancellationTokenSource.CreateLinkedTokenSource(downloadTimeout.Token, token))
-                {
-                    try
-                    {
-                        Trace.Info($"Download runner: begin download");
-                        long downloadSize = 0;
-
-                        //open zip stream in async mode
-                        using (HttpClient httpClient = new(HostContext.CreateHttpClientHandler()))
-                        {
-                            Trace.Info($"Downloading {packageDownloadUrl}");
-
-                            using (FileStream fs = new(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).
-                                await result.CopyToAsync(fs, 81920, downloadCts.Token);
-                                await fs.FlushAsync(downloadCts.Token);
-                                downloadSize = fs.Length;
-                            }
-                        }
-
-                        Trace.Info($"Download runner: finished download");
-                        downloadSucceeded = true;
-                        stopWatch.Stop();
-                        _updateTrace.Enqueue($"PackageDownloadTime: {stopWatch.ElapsedMilliseconds}ms");
-                        _updateTrace.Enqueue($"Attempts: {attempt}");
-                        _updateTrace.Enqueue($"PackageSize: {downloadSize / 1024 / 1024}MB");
-                        break;
-                    }
-                    catch (OperationCanceledException) when (token.IsCancellationRequested)
-                    {
-                        Trace.Info($"Runner download has been cancelled.");
-                        throw;
-                    }
-                    catch (Exception ex)
-                    {
-                        if (downloadCts.Token.IsCancellationRequested)
-                        {
-                            Trace.Warning($"Runner download has timed out after {timeoutSeconds} seconds");
-                        }
-
-                        Trace.Warning($"Failed to get package '{archiveFile}' from '{packageDownloadUrl}'. Exception {ex}");
-                    }
-                }
-            }
-
-            if (downloadSucceeded)
-            {
-                return archiveFile;
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        private async Task ValidateRunnerHash(string archiveFile, string packageHashValue)
-        {
-            var stopWatch = Stopwatch.StartNew();
-            // Validate Hash Matches if it is provided
-            using (FileStream stream = File.OpenRead(archiveFile))
-            {
-                if (!string.IsNullOrEmpty(packageHashValue))
-                {
-                    using (SHA256 sha256 = SHA256.Create())
-                    {
-                        byte[] srcHashBytes = await sha256.ComputeHashAsync(stream);
-                        var hash = PrimitiveExtensions.ConvertToHexString(srcHashBytes);
-                        if (hash != packageHashValue)
-                        {
-                            // Hash did not match, we can't recover from this, just throw
-                            throw new Exception($"Computed runner hash {hash} did not match expected Runner Hash {packageHashValue} for {archiveFile}");
-                        }
-
-                        stopWatch.Stop();
-                        Trace.Info($"Validated Runner Hash matches {archiveFile} : {packageHashValue}");
-                        _updateTrace.Enqueue($"ValidateHashTime: {stopWatch.ElapsedMilliseconds}ms");
-                    }
-                }
-            }
-        }
-
-        private async Task ExtractRunnerPackage(string archiveFile, string extractDirectory, CancellationToken token)
-        {
-            var stopWatch = Stopwatch.StartNew();
-
-            if (archiveFile.EndsWith(".zip", StringComparison.OrdinalIgnoreCase))
-            {
-                ZipFile.ExtractToDirectory(archiveFile, extractDirectory);
-            }
-            else if (archiveFile.EndsWith(".tar.gz", StringComparison.OrdinalIgnoreCase))
-            {
-                string tar = WhichUtil.Which("tar", trace: Trace);
-
-                if (string.IsNullOrEmpty(tar))
-                {
-                    throw new NotSupportedException($"tar -xzf");
-                }
-
-                // tar -xzf
-                using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
-                {
-                    processInvoker.OutputDataReceived += new EventHandler<ProcessDataReceivedEventArgs>((sender, args) =>
-                    {
-                        if (!string.IsNullOrEmpty(args.Data))
-                        {
-                            Trace.Info(args.Data);
-                        }
-                    });
-
-                    processInvoker.ErrorDataReceived += new EventHandler<ProcessDataReceivedEventArgs>((sender, args) =>
-                    {
-                        if (!string.IsNullOrEmpty(args.Data))
-                        {
-                            Trace.Error(args.Data);
-                        }
-                    });
-
-                    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}.");
-                    }
-                }
-            }
-            else
-            {
-                throw new NotSupportedException($"{archiveFile}");
-            }
-
-            stopWatch.Stop();
-            Trace.Info($"Finished getting latest runner package at: {extractDirectory}.");
-            _updateTrace.Enqueue($"PackageExtractTime: {stopWatch.ElapsedMilliseconds}ms");
-        }
-
-        private Task CopyLatestRunnerToRoot(string latestRunnerDirectory, string targetVersion, CancellationToken token)
-        {
-            var stopWatch = Stopwatch.StartNew();
-            // copy latest runner into runner root folder
-            // copy bin from _work/_update -> bin.version under root
-            string binVersionDir = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"{Constants.Path.BinDirectory}.{targetVersion}");
-            Directory.CreateDirectory(binVersionDir);
-            Trace.Info($"Copy {Path.Combine(latestRunnerDirectory, Constants.Path.BinDirectory)} to {binVersionDir}.");
-            IOUtil.CopyDirectory(Path.Combine(latestRunnerDirectory, Constants.Path.BinDirectory), binVersionDir, token);
-
-            // copy externals from _work/_update -> externals.version under root
-            string externalsVersionDir = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"{Constants.Path.ExternalsDirectory}.{targetVersion}");
-            Directory.CreateDirectory(externalsVersionDir);
-            Trace.Info($"Copy {Path.Combine(latestRunnerDirectory, Constants.Path.ExternalsDirectory)} to {externalsVersionDir}.");
-            IOUtil.CopyDirectory(Path.Combine(latestRunnerDirectory, Constants.Path.ExternalsDirectory), externalsVersionDir, token);
-
-            // copy and replace all .sh/.cmd files
-            Trace.Info($"Copy any remaining .sh/.cmd files into runner root.");
-            foreach (FileInfo file in new DirectoryInfo(latestRunnerDirectory).GetFiles() ?? new FileInfo[0])
-            {
-                string destination = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), file.Name);
-
-                // Removing the file instead of just trying to overwrite it works around permissions issues on linux.
-                // https://github.com/actions/runner/issues/981
-                Trace.Info($"Copy {file.FullName} to {destination}");
-                IOUtil.DeleteFile(destination);
-                file.CopyTo(destination, true);
-            }
-
-            stopWatch.Stop();
-            _updateTrace.Enqueue($"CopyRunnerToRootTime: {stopWatch.ElapsedMilliseconds}ms");
-            return Task.CompletedTask;
-        }
-
-        private void DeletePreviousVersionRunnerBackup(CancellationToken token, string targetVersion)
-        {
-            // delete previous backup runner (back compat, can be remove after serval sprints)
-            // bin.bak.2.99.0
-            // externals.bak.2.99.0
-            foreach (string existBackUp in Directory.GetDirectories(HostContext.GetDirectory(WellKnownDirectory.Root), "*.bak.*"))
-            {
-                Trace.Info($"Delete existing runner backup at {existBackUp}.");
-                try
-                {
-                    IOUtil.DeleteDirectory(existBackUp, token);
-                }
-                catch (Exception ex) when (!(ex is OperationCanceledException))
-                {
-                    Trace.Error(ex);
-                    Trace.Info($"Catch exception during delete backup folder {existBackUp}, ignore this error try delete the backup folder on next auto-update.");
-                }
-            }
-
-            // delete old bin.2.99.0 folder, only leave the current version and the latest download version
-            var allBinDirs = Directory.GetDirectories(HostContext.GetDirectory(WellKnownDirectory.Root), "bin.*");
-            if (allBinDirs.Length > _numberOfOldVersionsToKeep)
-            {
-                // there are more than {_numberOfOldVersionsToKeep} bin.version folder.
-                // delete older bin.version folders.
-                foreach (var oldBinDir in allBinDirs)
-                {
-                    if (string.Equals(oldBinDir, Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"bin"), StringComparison.OrdinalIgnoreCase) ||
-                        string.Equals(oldBinDir, Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"bin.{BuildConstants.RunnerPackage.Version}"), StringComparison.OrdinalIgnoreCase) ||
-                        string.Equals(oldBinDir, Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"bin.{targetVersion}"), StringComparison.OrdinalIgnoreCase))
-                    {
-                        // skip for current runner version
-                        continue;
-                    }
-
-                    Trace.Info($"Delete runner bin folder's backup at {oldBinDir}.");
-                    try
-                    {
-                        IOUtil.DeleteDirectory(oldBinDir, token);
-                    }
-                    catch (Exception ex) when (!(ex is OperationCanceledException))
-                    {
-                        Trace.Error(ex);
-                        Trace.Info($"Catch exception during delete backup folder {oldBinDir}, ignore this error try delete the backup folder on next auto-update.");
-                    }
-                }
-            }
-
-            // delete old externals.2.99.0 folder, only leave the current version and the latest download version
-            var allExternalsDirs = Directory.GetDirectories(HostContext.GetDirectory(WellKnownDirectory.Root), "externals.*");
-            if (allExternalsDirs.Length > _numberOfOldVersionsToKeep)
-            {
-                // there are more than {_numberOfOldVersionsToKeep} externals.version folder.
-                // delete older externals.version folders.
-                foreach (var oldExternalDir in allExternalsDirs)
-                {
-                    if (string.Equals(oldExternalDir, Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"externals"), StringComparison.OrdinalIgnoreCase) ||
-                        string.Equals(oldExternalDir, Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"externals.{BuildConstants.RunnerPackage.Version}"), StringComparison.OrdinalIgnoreCase) ||
-                        string.Equals(oldExternalDir, Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), $"externals.{targetVersion}"), StringComparison.OrdinalIgnoreCase))
-                    {
-                        // skip for current runner version
-                        continue;
-                    }
-
-                    Trace.Info($"Delete runner externals folder's backup at {oldExternalDir}.");
-                    try
-                    {
-                        IOUtil.DeleteDirectory(oldExternalDir, token);
-                    }
-                    catch (Exception ex) when (!(ex is OperationCanceledException))
-                    {
-                        Trace.Error(ex);
-                        Trace.Info($"Catch exception during delete backup folder {oldExternalDir}, ignore this error try delete the backup folder on next auto-update.");
-                    }
-                }
-            }
-        }
-
-        private string GenerateUpdateScript(bool restartInteractiveRunner, string targetVersion)
-        {
-            int processId = Process.GetCurrentProcess().Id;
-            string updateLog = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Diag), $"SelfUpdate-{DateTime.UtcNow.ToString("yyyyMMdd-HHmmss")}.log");
-            string runnerRoot = HostContext.GetDirectory(WellKnownDirectory.Root);
-
-#if OS_WINDOWS
-            string templateName = "update.cmd.template";
-#else
-            string templateName = "update.sh.template";
-#endif
-
-            string templatePath = Path.Combine(runnerRoot, $"bin.{targetVersion}", templateName);
-            string template = File.ReadAllText(templatePath);
-
-            template = template.Replace("_PROCESS_ID_", processId.ToString());
-            template = template.Replace("_RUNNER_PROCESS_NAME_", $"Runner.Listener{IOUtil.ExeExtension}");
-            template = template.Replace("_ROOT_FOLDER_", runnerRoot);
-            template = template.Replace("_EXIST_RUNNER_VERSION_", BuildConstants.RunnerPackage.Version);
-            template = template.Replace("_DOWNLOAD_RUNNER_VERSION_", targetVersion);
-            template = template.Replace("_UPDATE_LOG_", updateLog);
-            template = template.Replace("_RESTART_INTERACTIVE_RUNNER_", restartInteractiveRunner ? "1" : "0");
-
-#if OS_WINDOWS
-            string scriptName = "_update.cmd";
-#else
-            string scriptName = "_update.sh";
-#endif
-
-            string updateScript = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Work), scriptName);
-            if (File.Exists(updateScript))
-            {
-                IOUtil.DeleteFile(updateScript);
-            }
-
-            File.WriteAllText(updateScript, template);
-            return updateScript;
-        }
-    }
-}

src/Runner.Sdk/Util/IOUtil.cs

@@ -6,8 +6,6 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Services.Common;
 
 namespace GitHub.Runner.Sdk
 {
@@ -74,25 +72,6 @@ namespace GitHub.Runner.Sdk
             }
         }
 
-        public static async Task<string> GetFileContentSha256HashAsync(string path)
-        {
-            if (!File.Exists(path))
-            {
-                return string.Empty;
-            }
-
-            using (FileStream stream = File.OpenRead(path))
-            {
-                using (SHA256 sha256 = SHA256.Create())
-                {
-                    byte[] srcHashBytes = await sha256.ComputeHashAsync(stream);
-                    var hash = PrimitiveExtensions.ConvertToHexString(srcHashBytes);
-                    return hash;
-                }
-
-            }
-        }
-
         public static void Delete(string path, CancellationToken cancellationToken)
         {
             DeleteDirectory(path, cancellationToken);

src/Runner.Sdk/Util/UrlUtil.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Linq;
-using System.Net.Http.Headers;
 
 namespace GitHub.Runner.Sdk
 {
@@ -50,15 +48,5 @@ namespace GitHub.Runner.Sdk
 
             return credUri.Uri;
         }
-
-        public static string GetGitHubRequestId(HttpResponseHeaders headers)
-        {
-            if (headers != null &&
-                headers.TryGetValues("x-github-request-id", out var headerValues))
-            {
-                return headerValues.FirstOrDefault();
-            }
-            return string.Empty;
-        }
     }
 }

src/Runner.Sdk/Util/VssUtil.cs

@@ -85,35 +85,6 @@ namespace GitHub.Runner.Sdk
             VssCredentials credentials,
             IEnumerable<DelegatingHandler> additionalDelegatingHandler = null,
             TimeSpan? timeout = null)
-        {
-            RawClientHttpRequestSettings settings = GetHttpRequestSettings(timeout);
-            RawConnection connection = new(serverUri, new RawHttpMessageHandler(credentials.Federated, settings), additionalDelegatingHandler);
-            return connection;
-        }
-
-        public static VssCredentials GetVssCredential(ServiceEndpoint serviceEndpoint)
-        {
-            ArgUtil.NotNull(serviceEndpoint, nameof(serviceEndpoint));
-            ArgUtil.NotNull(serviceEndpoint.Authorization, nameof(serviceEndpoint.Authorization));
-            ArgUtil.NotNullOrEmpty(serviceEndpoint.Authorization.Scheme, nameof(serviceEndpoint.Authorization.Scheme));
-
-            if (serviceEndpoint.Authorization.Parameters.Count == 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(serviceEndpoint));
-            }
-
-            VssCredentials credentials = null;
-            string accessToken;
-            if (serviceEndpoint.Authorization.Scheme == EndpointAuthorizationSchemes.OAuth &&
-                serviceEndpoint.Authorization.Parameters.TryGetValue(EndpointAuthorizationParameters.AccessToken, out accessToken))
-            {
-                credentials = new VssCredentials(new VssOAuthAccessTokenCredential(accessToken), CredentialPromptType.DoNotPrompt);
-            }
-
-            return credentials;
-        }
-
-        public static RawClientHttpRequestSettings GetHttpRequestSettings(TimeSpan? timeout = null)
         {
             RawClientHttpRequestSettings settings = RawClientHttpRequestSettings.Default.Clone();
 
@@ -145,7 +116,30 @@ namespace GitHub.Runner.Sdk
             // settings are applied to an HttpRequestMessage.
             settings.AcceptLanguages.Remove(CultureInfo.InvariantCulture);
 
-            return settings;
+            RawConnection connection = new(serverUri, new RawHttpMessageHandler(credentials.Federated, settings), additionalDelegatingHandler);
+            return connection;
+        }
+
+        public static VssCredentials GetVssCredential(ServiceEndpoint serviceEndpoint)
+        {
+            ArgUtil.NotNull(serviceEndpoint, nameof(serviceEndpoint));
+            ArgUtil.NotNull(serviceEndpoint.Authorization, nameof(serviceEndpoint.Authorization));
+            ArgUtil.NotNullOrEmpty(serviceEndpoint.Authorization.Scheme, nameof(serviceEndpoint.Authorization.Scheme));
+
+            if (serviceEndpoint.Authorization.Parameters.Count == 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(serviceEndpoint));
+            }
+
+            VssCredentials credentials = null;
+            string accessToken;
+            if (serviceEndpoint.Authorization.Scheme == EndpointAuthorizationSchemes.OAuth &&
+                serviceEndpoint.Authorization.Parameters.TryGetValue(EndpointAuthorizationParameters.AccessToken, out accessToken))
+            {
+                credentials = new VssCredentials(new VssOAuthAccessTokenCredential(accessToken), CredentialPromptType.DoNotPrompt);
+            }
+
+            return credentials;
         }
     }
 }

src/Runner.Sdk/Util/WhichUtil.cs

@@ -114,128 +114,6 @@ namespace GitHub.Runner.Sdk
                 }
             }
 
-#if OS_WINDOWS
-            trace?.Info($"{command}: command not found. Make sure '{command}' is installed and its location included in the 'Path' environment variable.");
-#else
-            trace?.Info($"{command}: command not found. Make sure '{command}' is installed and its location included in the 'PATH' environment variable.");
-#endif
-            if (require)
-            {
-                throw new FileNotFoundException(
-                    message: $"{command}: command not found",
-                    fileName: command);
-            }
-
-            return null;
-        }
-
-        public static string Which2(string command, bool require = false, ITraceWriter trace = null, string prependPath = null)
-        {
-            ArgUtil.NotNullOrEmpty(command, nameof(command));
-            trace?.Info($"Which2: '{command}'");
-            if (Path.IsPathFullyQualified(command) && File.Exists(command))
-            {
-                trace?.Info($"Fully qualified path: '{command}'");
-                return command;
-            }
-            string path = Environment.GetEnvironmentVariable(PathUtil.PathVariable);
-            if (string.IsNullOrEmpty(path))
-            {
-                trace?.Info("PATH environment variable not defined.");
-                path = path ?? string.Empty;
-            }
-            if (!string.IsNullOrEmpty(prependPath))
-            {
-                path = PathUtil.PrependPath(prependPath, path);
-            }
-
-            string[] pathSegments = path.Split(new Char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries);
-            for (int i = 0; i < pathSegments.Length; i++)
-            {
-                pathSegments[i] = Environment.ExpandEnvironmentVariables(pathSegments[i]);
-            }
-
-            foreach (string pathSegment in pathSegments)
-            {
-                if (!string.IsNullOrEmpty(pathSegment) && Directory.Exists(pathSegment))
-                {
-#if OS_WINDOWS
-                    string pathExt = Environment.GetEnvironmentVariable("PATHEXT");
-                    if (string.IsNullOrEmpty(pathExt))
-                    {
-                        // XP's system default value for PATHEXT system variable
-                        pathExt = ".com;.exe;.bat;.cmd;.vbs;.vbe;.js;.jse;.wsf;.wsh";
-                    }
-
-                    string[] pathExtSegments = pathExt.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-
-                    // if command already has an extension.
-                    if (pathExtSegments.Any(ext => command.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
-                    {
-                        try
-                        {
-                            foreach (var file in Directory.EnumerateFiles(pathSegment, command))
-                            {
-                                if (IsPathValid(file, trace))
-                                {
-                                    trace?.Info($"Location: '{file}'");
-                                    return file;
-                                }
-                            }
-                        }
-                        catch (UnauthorizedAccessException ex)
-                        {
-                            trace?.Info("Ignore UnauthorizedAccess exception during Which.");
-                            trace?.Verbose(ex.ToString());
-                        }
-                    }
-                    else
-                    {
-                        string searchPattern;
-                        searchPattern = StringUtil.Format($"{command}.*");
-                        try
-                        {
-                            foreach (var file in Directory.EnumerateFiles(pathSegment, searchPattern))
-                            {
-                                // add extension.
-                                for (int i = 0; i < pathExtSegments.Length; i++)
-                                {
-                                    string fullPath = Path.Combine(pathSegment, $"{command}{pathExtSegments[i]}");
-                                    if (string.Equals(file, fullPath, StringComparison.OrdinalIgnoreCase) && IsPathValid(fullPath, trace))
-                                    {
-                                        trace?.Info($"Location: '{fullPath}'");
-                                        return fullPath;
-                                    }
-                                }
-                            }
-                        }
-                        catch (UnauthorizedAccessException ex)
-                        {
-                            trace?.Info("Ignore UnauthorizedAccess exception during Which.");
-                            trace?.Verbose(ex.ToString());
-                        }
-                    }
-#else
-                    try
-                    {
-                        foreach (var file in Directory.EnumerateFiles(pathSegment, command))
-                        {
-                            if (IsPathValid(file, trace))
-                            {
-                                trace?.Info($"Location: '{file}'");
-                                return file;
-                            }
-                        }
-                    }
-                    catch (UnauthorizedAccessException ex)
-                    {
-                        trace?.Info("Ignore UnauthorizedAccess exception during Which.");
-                        trace?.Verbose(ex.ToString());
-                    }
-#endif
-                }
-            }
-
 #if OS_WINDOWS
             trace?.Info($"{command}: command not found. Make sure '{command}' is installed and its location included in the 'Path' environment variable.");
 #else
@@ -256,12 +134,7 @@ namespace GitHub.Runner.Sdk
         {
             var fileInfo = new FileInfo(path);
             var linkTargetFullPath = fileInfo.Directory?.FullName + Path.DirectorySeparatorChar + fileInfo.LinkTarget;
-            if (fileInfo.LinkTarget == null ||
-                File.Exists(linkTargetFullPath) ||
-                File.Exists(fileInfo.LinkTarget))
-            {
-                return true;
-            }
+            if (fileInfo.LinkTarget == null || File.Exists(linkTargetFullPath) || File.Exists(fileInfo.LinkTarget)) return true;
             trace?.Info($"the target '{fileInfo.LinkTarget}' of the symbolic link '{path}', does not exist");
             return false;
         }

src/Runner.Worker/ActionManager.cs

@@ -6,20 +6,19 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker.Container;
 using GitHub.Services.Common;
+using WebApi = GitHub.DistributedTask.WebApi;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 using PipelineTemplateConstants = GitHub.DistributedTask.Pipelines.ObjectTemplating.PipelineTemplateConstants;
-using WebApi = GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Worker
 {
@@ -53,6 +52,7 @@ namespace GitHub.Runner.Worker
 
         //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 const string _dotcomApiUrl = "https://api.github.com";
 
         private readonly Dictionary<Guid, ContainerInfo> _cachedActionContainers = new();
         public Dictionary<Guid, ContainerInfo> CachedActionContainers => _cachedActionContainers;
@@ -115,14 +115,6 @@ namespace GitHub.Runner.Worker
                 executionContext.Result = TaskResult.Failed;
                 throw;
             }
-            catch (InvalidActionArchiveException ex)
-            {
-                // Log the error and fail the PrepareActionsAsync Initialization.
-                Trace.Error($"Caught exception from PrepareActionsAsync Initialization: {ex}");
-                executionContext.InfrastructureError(ex.Message);
-                executionContext.Result = TaskResult.Failed;
-                throw;
-            }
             if (!FeatureManager.IsContainerHooksEnabled(executionContext.Global.Variables))
             {
                 if (state.ImagesToPull.Count > 0)
@@ -739,7 +731,10 @@ namespace GitHub.Runner.Worker
 
             ArgUtil.NotNull(actionDownloadInfos, nameof(actionDownloadInfos));
             ArgUtil.NotNull(actionDownloadInfos.Actions, nameof(actionDownloadInfos.Actions));
+            var apiUrl = GetApiUrl(executionContext);
             var defaultAccessToken = executionContext.GetGitHubContext("token");
+            var configurationStore = HostContext.GetService<IConfigurationStore>();
+            var runnerSettings = configurationStore.GetSettings();
 
             foreach (var actionDownloadInfo in actionDownloadInfos.Actions.Values)
             {
@@ -763,8 +758,6 @@ namespace GitHub.Runner.Worker
             ArgUtil.NotNull(downloadInfo, nameof(downloadInfo));
             ArgUtil.NotNullOrEmpty(downloadInfo.NameWithOwner, nameof(downloadInfo.NameWithOwner));
             ArgUtil.NotNullOrEmpty(downloadInfo.Ref, nameof(downloadInfo.Ref));
-            ArgUtil.NotNullOrEmpty(downloadInfo.Ref, nameof(downloadInfo.ResolvedNameWithOwner));
-            ArgUtil.NotNullOrEmpty(downloadInfo.Ref, nameof(downloadInfo.ResolvedSha));
 
             string destDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Actions), downloadInfo.NameWithOwner.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), downloadInfo.Ref);
             string watermarkFile = GetWatermarkFilePath(destDirectory);
@@ -781,6 +774,31 @@ namespace GitHub.Runner.Worker
                 executionContext.Output($"Download action repository '{downloadInfo.NameWithOwner}@{downloadInfo.Ref}' (SHA:{downloadInfo.ResolvedSha})");
             }
 
+            await DownloadRepositoryActionAsync(executionContext, downloadInfo, destDirectory);
+        }
+
+        private string GetApiUrl(IExecutionContext executionContext)
+        {
+            string apiUrl = executionContext.GetGitHubContext("api_url");
+            if (!string.IsNullOrEmpty(apiUrl))
+            {
+                return apiUrl;
+            }
+            // Once the api_url is set for hosted, we can remove this fallback (it doesn't make sense for GHES)
+            return _dotcomApiUrl;
+        }
+
+        private static string BuildLinkToActionArchive(string apiUrl, string repository, string @ref)
+        {
+#if OS_WINDOWS
+            return $"{apiUrl}/repos/{repository}/zipball/{@ref}";
+#else
+            return $"{apiUrl}/repos/{repository}/tarball/{@ref}";
+#endif
+        }
+
+        private async Task DownloadRepositoryActionAsync(IExecutionContext executionContext, WebApi.ActionDownloadInfo downloadInfo, string destDirectory)
+        {
             //download and extract action in a temp folder and rename it on success
             string tempDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Actions), "_temp_" + Guid.NewGuid());
             Directory.CreateDirectory(tempDirectory);
@@ -793,76 +811,108 @@ namespace GitHub.Runner.Worker
             string link = downloadInfo?.TarballUrl;
 #endif
 
+            Trace.Info($"Save archive '{link}' into {archiveFile}.");
             try
             {
-                var useActionArchiveCache = false;
-                if (executionContext.Global.Variables.GetBoolean("DistributedTask.UseActionArchiveCache") == true)
+                int retryCount = 0;
+
+                // Allow up to 20 * 60s for any action to be downloaded from github graph.
+                int timeoutSeconds = 20 * 60;
+                while (retryCount < 3)
                 {
-                    var hasActionArchiveCache = false;
-                    var actionArchiveCacheDir = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ActionArchiveCacheDirectory);
-                    if (!string.IsNullOrEmpty(actionArchiveCacheDir) &&
-                        Directory.Exists(actionArchiveCacheDir))
+                    using (var actionDownloadTimeout = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutSeconds)))
+                    using (var actionDownloadCancellation = CancellationTokenSource.CreateLinkedTokenSource(actionDownloadTimeout.Token, executionContext.CancellationToken))
                     {
-                        hasActionArchiveCache = true;
-                        Trace.Info($"Check if action archive '{downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha}' already exists in cache directory '{actionArchiveCacheDir}'");
-#if OS_WINDOWS
-                        var cacheArchiveFile = Path.Combine(actionArchiveCacheDir, downloadInfo.ResolvedNameWithOwner.Replace(Path.DirectorySeparatorChar, '_').Replace(Path.AltDirectorySeparatorChar, '_'), $"{downloadInfo.ResolvedSha}.zip");
-#else
-                        var cacheArchiveFile = Path.Combine(actionArchiveCacheDir, downloadInfo.ResolvedNameWithOwner.Replace(Path.DirectorySeparatorChar, '_').Replace(Path.AltDirectorySeparatorChar, '_'), $"{downloadInfo.ResolvedSha}.tar.gz");
-#endif
-                        if (File.Exists(cacheArchiveFile))
+                        try
                         {
-                            try
+                            //open zip stream in async mode
+                            using (FileStream fs = new(archiveFile, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: _defaultFileStreamBufferSize, useAsync: true))
+                            using (var httpClientHandler = HostContext.CreateHttpClientHandler())
+                            using (var httpClient = new HttpClient(httpClientHandler))
                             {
-                                Trace.Info($"Found action archive '{cacheArchiveFile}' in cache directory '{actionArchiveCacheDir}'");
-                                File.Copy(cacheArchiveFile, archiveFile);
-                                useActionArchiveCache = true;
-                                executionContext.Debug($"Copied action archive '{cacheArchiveFile}' to '{archiveFile}'");
+                                httpClient.DefaultRequestHeaders.Authorization = CreateAuthHeader(downloadInfo.Authentication?.Token);
+
+                                httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
+                                using (var response = await httpClient.GetAsync(link))
+                                {
+                                    if (response.IsSuccessStatusCode)
+                                    {
+                                        using (var result = await response.Content.ReadAsStreamAsync())
+                                        {
+                                            await result.CopyToAsync(fs, _defaultCopyBufferSize, actionDownloadCancellation.Token);
+                                            await fs.FlushAsync(actionDownloadCancellation.Token);
+
+                                            // download succeed, break out the retry loop.
+                                            break;
+                                        }
+                                    }
+                                    else if (response.StatusCode == HttpStatusCode.NotFound)
+                                    {
+                                        // It doesn't make sense to retry in this case, so just stop
+                                        throw new ActionNotFoundException(new Uri(link));
+                                    }
+                                    else
+                                    {
+                                        // Something else bad happened, let's go to our retry logic
+                                        response.EnsureSuccessStatusCode();
+                                    }
+                                }
                             }
-                            catch (Exception ex)
+                        }
+                        catch (OperationCanceledException) when (executionContext.CancellationToken.IsCancellationRequested)
+                        {
+                            Trace.Info("Action download has been cancelled.");
+                            throw;
+                        }
+                        catch (ActionNotFoundException)
+                        {
+                            Trace.Info($"The action at '{link}' does not exist");
+                            throw;
+                        }
+                        catch (Exception ex) when (retryCount < 2)
+                        {
+                            retryCount++;
+                            Trace.Error($"Fail to download archive '{link}' -- Attempt: {retryCount}");
+                            Trace.Error(ex);
+                            if (actionDownloadTimeout.Token.IsCancellationRequested)
                             {
-                                Trace.Error($"Failed to copy action archive '{cacheArchiveFile}' to '{archiveFile}'. Error: {ex}");
+                                // action download didn't finish within timeout
+                                executionContext.Warning($"Action '{link}' didn't finish download within {timeoutSeconds} seconds.");
+                            }
+                            else
+                            {
+                                executionContext.Warning($"Failed to download action '{link}'. Error: {ex.Message}");
                             }
                         }
                     }
 
-                    executionContext.Global.JobTelemetry.Add(new JobTelemetry()
+                    if (String.IsNullOrEmpty(Environment.GetEnvironmentVariable("_GITHUB_ACTION_DOWNLOAD_NO_BACKOFF")))
                     {
-                        Type = JobTelemetryType.General,
-                        Message = $"Action archive cache usage: {downloadInfo.ResolvedNameWithOwner}@{downloadInfo.ResolvedSha} use cache {useActionArchiveCache} has cache {hasActionArchiveCache}"
-                    });
+                        var backOff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(30));
+                        executionContext.Warning($"Back off {backOff.TotalSeconds} seconds before retry.");
+                        await Task.Delay(backOff);
+                    }
                 }
 
-                if (!useActionArchiveCache)
-                {
-                    await DownloadRepositoryArchive(executionContext, link, downloadInfo.Authentication?.Token, archiveFile);
-                }
+                ArgUtil.NotNullOrEmpty(archiveFile, nameof(archiveFile));
+                executionContext.Debug($"Download '{link}' to '{archiveFile}'");
 
                 var stagingDirectory = Path.Combine(tempDirectory, "_staging");
                 Directory.CreateDirectory(stagingDirectory);
 
 #if OS_WINDOWS
-                try
-                {
-                    ZipFile.ExtractToDirectory(archiveFile, stagingDirectory);
-                }
-                catch (InvalidDataException e)
-                {
-                    throw new InvalidActionArchiveException($"Can't un-zip archive file: {archiveFile}. action being checked out: {downloadInfo.NameWithOwner}@{downloadInfo.Ref}. error: {e}.");
-                }
+                ZipFile.ExtractToDirectory(archiveFile, stagingDirectory);
 #else
                 string tar = WhichUtil.Which("tar", require: true, trace: Trace);
 
                 // tar -xzf
                 using (var processInvoker = HostContext.CreateService<IProcessInvoker>())
                 {
-                    var tarOutputs = new List<string>();
                     processInvoker.OutputDataReceived += new EventHandler<ProcessDataReceivedEventArgs>((sender, args) =>
                     {
                         if (!string.IsNullOrEmpty(args.Data))
                         {
                             Trace.Info(args.Data);
-                            tarOutputs.Add($"STDOUT: {args.Data}");
                         }
                     });
 
@@ -871,23 +921,13 @@ namespace GitHub.Runner.Worker
                         if (!string.IsNullOrEmpty(args.Data))
                         {
                             Trace.Error(args.Data);
-                            tarOutputs.Add($"STDERR: {args.Data}");
                         }
                     });
 
                     int exitCode = await processInvoker.ExecuteAsync(stagingDirectory, tar, $"-xzf \"{archiveFile}\"", null, executionContext.CancellationToken);
                     if (exitCode != 0)
                     {
-                        if (executionContext.Global.Variables.GetBoolean("DistributedTask.DetailUntarFailure") == true)
-                        {
-                            var fileInfo = new FileInfo(archiveFile);
-                            var sha256hash = await IOUtil.GetFileContentSha256HashAsync(archiveFile);
-                            throw new InvalidActionArchiveException($"Can't use 'tar -xzf' extract archive file: {archiveFile} (SHA256 '{sha256hash}', size '{fileInfo.Length}' bytes, tar outputs '{string.Join(' ', tarOutputs)}'). Action being checked out: {downloadInfo.NameWithOwner}@{downloadInfo.Ref}. return code: {exitCode}.");
-                        }
-                        else
-                        {
-                            throw new InvalidActionArchiveException($"Can't use 'tar -xzf' extract archive file: {archiveFile}. Action being checked out: {downloadInfo.NameWithOwner}@{downloadInfo.Ref}. return code: {exitCode}.");
-                        }
+                        throw new NotSupportedException($"Can't use 'tar -xzf' extract archive file: {archiveFile}. return code: {exitCode}.");
                     }
                 }
 #endif
@@ -905,6 +945,7 @@ namespace GitHub.Runner.Worker
                 }
 
                 Trace.Verbose("Create watermark file indicate action download succeed.");
+                string watermarkFile = GetWatermarkFilePath(destDirectory);
                 File.WriteAllText(watermarkFile, DateTime.UtcNow.ToString());
 
                 executionContext.Debug($"Archive '{archiveFile}' has been unzipped into '{destDirectory}'.");
@@ -929,6 +970,29 @@ namespace GitHub.Runner.Worker
             }
         }
 
+        private void ConfigureAuthorizationFromContext(IExecutionContext executionContext, HttpClient httpClient)
+        {
+            var authToken = Environment.GetEnvironmentVariable("_GITHUB_ACTION_TOKEN");
+            if (string.IsNullOrEmpty(authToken))
+            {
+                // TODO: Deprecate the PREVIEW_ACTION_TOKEN
+                authToken = executionContext.Global.Variables.Get("PREVIEW_ACTION_TOKEN");
+            }
+
+            if (!string.IsNullOrEmpty(authToken))
+            {
+                HostContext.SecretMasker.AddValue(authToken);
+                var base64EncodingToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"PAT:{authToken}"));
+                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodingToken);
+            }
+            else
+            {
+                var accessToken = executionContext.GetGitHubContext("token");
+                var base64EncodingToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"x-access-token:{accessToken}"));
+                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodingToken);
+            }
+        }
+
         private string GetWatermarkFilePath(string directory) => directory + ".completed";
 
         private ActionSetupInfo PrepareRepositoryActionAsync(IExecutionContext executionContext, Pipelines.ActionStep repositoryAction)
@@ -1101,6 +1165,13 @@ namespace GitHub.Runner.Worker
             return $"{repositoryReference.Name}@{repositoryReference.Ref}";
         }
 
+        private static string GetDownloadInfoLookupKey(WebApi.ActionDownloadInfo info)
+        {
+            ArgUtil.NotNullOrEmpty(info.NameWithOwner, nameof(info.NameWithOwner));
+            ArgUtil.NotNullOrEmpty(info.Ref, nameof(info.Ref));
+            return $"{info.NameWithOwner}@{info.Ref}";
+        }
+
         private AuthenticationHeaderValue CreateAuthHeader(string token)
         {
             if (string.IsNullOrEmpty(token))
@@ -1112,104 +1183,6 @@ namespace GitHub.Runner.Worker
             HostContext.SecretMasker.AddValue(base64EncodingToken);
             return new AuthenticationHeaderValue("Basic", base64EncodingToken);
         }
-
-        private async Task DownloadRepositoryArchive(IExecutionContext executionContext, string downloadUrl, string downloadAuthToken, string archiveFile)
-        {
-            Trace.Info($"Save archive '{downloadUrl}' into {archiveFile}.");
-            int retryCount = 0;
-
-            // Allow up to 20 * 60s for any action to be downloaded from github graph.
-            int timeoutSeconds = 20 * 60;
-            while (retryCount < 3)
-            {
-                using (var actionDownloadTimeout = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutSeconds)))
-                using (var actionDownloadCancellation = CancellationTokenSource.CreateLinkedTokenSource(actionDownloadTimeout.Token, executionContext.CancellationToken))
-                {
-                    try
-                    {
-                        //open zip stream in async mode
-                        using (FileStream fs = new(archiveFile, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: _defaultFileStreamBufferSize, useAsync: true))
-                        using (var httpClientHandler = HostContext.CreateHttpClientHandler())
-                        using (var httpClient = new HttpClient(httpClientHandler))
-                        {
-                            httpClient.DefaultRequestHeaders.Authorization = CreateAuthHeader(downloadAuthToken);
-
-                            httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
-                            using (var response = await httpClient.GetAsync(downloadUrl))
-                            {
-                                var requestId = UrlUtil.GetGitHubRequestId(response.Headers);
-                                if (!string.IsNullOrEmpty(requestId))
-                                {
-                                    Trace.Info($"Request URL: {downloadUrl} X-GitHub-Request-Id: {requestId} Http Status: {response.StatusCode}");
-                                }
-
-                                if (response.IsSuccessStatusCode)
-                                {
-                                    using (var result = await response.Content.ReadAsStreamAsync())
-                                    {
-                                        await result.CopyToAsync(fs, _defaultCopyBufferSize, actionDownloadCancellation.Token);
-                                        await fs.FlushAsync(actionDownloadCancellation.Token);
-
-                                        // download succeed, break out the retry loop.
-                                        break;
-                                    }
-                                }
-                                else if (response.StatusCode == HttpStatusCode.NotFound)
-                                {
-                                    // It doesn't make sense to retry in this case, so just stop
-                                    throw new ActionNotFoundException(new Uri(downloadUrl), requestId);
-                                }
-                                else
-                                {
-                                    // Something else bad happened, let's go to our retry logic
-                                    response.EnsureSuccessStatusCode();
-                                }
-                            }
-                        }
-                    }
-                    catch (OperationCanceledException) when (executionContext.CancellationToken.IsCancellationRequested)
-                    {
-                        Trace.Info("Action download has been cancelled.");
-                        throw;
-                    }
-                    catch (OperationCanceledException ex) when (!executionContext.CancellationToken.IsCancellationRequested && retryCount >= 2)
-                    {
-                        Trace.Info($"Action download final retry timeout after {timeoutSeconds} seconds.");
-                        throw new TimeoutException($"Action '{downloadUrl}' download has timed out. Error: {ex.Message}");
-                    }
-                    catch (ActionNotFoundException)
-                    {
-                        Trace.Info($"The action at '{downloadUrl}' does not exist");
-                        throw;
-                    }
-                    catch (Exception ex) when (retryCount < 2)
-                    {
-                        retryCount++;
-                        Trace.Error($"Fail to download archive '{downloadUrl}' -- Attempt: {retryCount}");
-                        Trace.Error(ex);
-                        if (actionDownloadTimeout.Token.IsCancellationRequested)
-                        {
-                            // action download didn't finish within timeout
-                            executionContext.Warning($"Action '{downloadUrl}' didn't finish download within {timeoutSeconds} seconds.");
-                        }
-                        else
-                        {
-                            executionContext.Warning($"Failed to download action '{downloadUrl}'. Error: {ex.Message}");
-                        }
-                    }
-                }
-
-                if (String.IsNullOrEmpty(Environment.GetEnvironmentVariable("_GITHUB_ACTION_DOWNLOAD_NO_BACKOFF")))
-                {
-                    var backOff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(30));
-                    executionContext.Warning($"Back off {backOff.TotalSeconds} seconds before retry.");
-                    await Task.Delay(backOff);
-                }
-            }
-
-            ArgUtil.NotNullOrEmpty(archiveFile, nameof(archiveFile));
-            executionContext.Debug($"Download '{downloadUrl}' to '{archiveFile}'");
-        }
     }
 
     public sealed class Definition

src/Runner.Worker/ActionNotFoundException.cs

@@ -5,8 +5,8 @@ namespace GitHub.Runner.Worker
 {
     public class ActionNotFoundException : Exception
     {
-        public ActionNotFoundException(Uri actionUri, string requestId)
-            : base(FormatMessage(actionUri, requestId))
+        public ActionNotFoundException(Uri actionUri)
+            : base(FormatMessage(actionUri))
         {
         }
 
@@ -25,13 +25,8 @@ namespace GitHub.Runner.Worker
         {
         }
 
-        private static string FormatMessage(Uri actionUri, string requestId)
+        private static string FormatMessage(Uri actionUri)
         {
-            if (!string.IsNullOrEmpty(requestId))
-            {
-                return $"An action could not be found at the URI '{actionUri}' ({requestId})";
-            }
-
             return $"An action could not be found at the URI '{actionUri}'";
         }
     }

src/Runner.Worker/Container/DockerCommandManager.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Channels;
@@ -47,9 +46,7 @@ namespace GitHub.Runner.Worker.Container
         {
             base.Initialize(hostContext);
             DockerPath = WhichUtil.Which("docker", true, Trace);
-            string path = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), ".runner");
-            string json = File.ReadAllText(path, Encoding.UTF8);
-            DockerInstanceLabel = IOUtil.GetSha256Hash(json).Substring(0, 6);
+            DockerInstanceLabel = IOUtil.GetSha256Hash(hostContext.GetDirectory(WellKnownDirectory.Root)).Substring(0, 6);
         }
 
         public async Task<DockerVersion> DockerVersion(IExecutionContext context)

src/Runner.Worker/FileCommandManager.cs

@@ -141,28 +141,6 @@ namespace GitHub.Runner.Worker
             var pairs = new EnvFileKeyValuePairs(context, filePath);
             foreach (var pair in pairs)
             {
-                var isBlocked = false;
-                foreach (var blocked in _setEnvBlockList)
-                {
-                    if (string.Equals(blocked, pair.Key, StringComparison.OrdinalIgnoreCase))
-                    {
-                        // Log Telemetry and let user know they shouldn't do this
-                        var issue = new Issue()
-                        {
-                            Type = IssueType.Error,
-                            Message = $"Can't store {blocked} output parameter using '$GITHUB_ENV' command."
-                        };
-                        issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = $"{Constants.Runner.UnsupportedCommand}_{pair.Key}";
-                        context.AddIssue(issue, ExecutionContextLogOptions.Default);
-
-                        isBlocked = true;
-                        break;
-                    }
-                }
-                if (isBlocked)
-                {
-                    continue;
-                }
                 SetEnvironmentVariable(context, pair.Key, pair.Value);
             }
         }
@@ -176,11 +154,6 @@ namespace GitHub.Runner.Worker
             context.SetEnvContext(name, value);
             context.Debug($"{name}='{value}'");
         }
-
-        private string[] _setEnvBlockList =
-        {
-            "NODE_OPTIONS"
-        };
     }
 
     public sealed class CreateStepSummaryCommand : RunnerService, IFileCommandExtension
@@ -349,21 +322,9 @@ namespace GitHub.Runner.Worker
                     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))
+                    // Heredoc style NAME<<EOF (where EOF is typically randomly-generated Base64 and may include an '=' character)
+                    // see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+                    if (heredocIndex >= 0 && (equalsIndex < 0 || heredocIndex < equalsIndex))
                     {
                         var split = line.Split(new[] { "<<" }, 2, StringSplitOptions.None);
                         if (string.IsNullOrEmpty(split[0]) || string.IsNullOrEmpty(split[1]))
@@ -391,6 +352,18 @@ namespace GitHub.Runner.Worker
 
                         output = endIndex > startIndex ? text.Substring(startIndex, endIndex - startIndex) : string.Empty;
                     }
+                    // Normal style NAME=VALUE
+                    else if (equalsIndex >= 0 && heredocIndex < 0)
+                    {
+                        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];
+                    }
                     else
                     {
                         throw new Exception($"Invalid format '{line}'");

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -134,28 +134,6 @@ namespace GitHub.Runner.Worker.Handlers
             // Remove environment variable that may cause conflicts with the node within the runner.
             Environment.Remove("NODE_ICU_DATA"); // https://github.com/actions/runner/issues/795
 
-            if (string.Equals(Data.NodeVersion, Constants.Runner.DeprecatedNodeVersion, StringComparison.OrdinalIgnoreCase) && (ExecutionContext.Global.Variables.GetBoolean(Constants.Runner.Features.Node16Warning) ?? false))
-            {
-                var repoAction = Action as RepositoryPathReference;
-                var warningActions = new HashSet<string>();
-                if (ExecutionContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
-                {
-                    warningActions = StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings);
-                }
-
-                if (string.IsNullOrEmpty(repoAction.Name))
-                {
-                    // local actions don't have a 'Name'
-                    warningActions.Add(repoAction.Path);
-                }
-                else
-                {
-                    warningActions.Add($"{repoAction.Name}/{repoAction.Path ?? string.Empty}".TrimEnd('/') + $"@{repoAction.Ref}");
-                }
-
-                ExecutionContext.Global.Variables.Set(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, StringUtil.ConvertToJson(warningActions));
-            }
-
             using (var stdoutManager = new OutputManager(ExecutionContext, ActionCommandManager))
             using (var stderrManager = new OutputManager(ExecutionContext, ActionCommandManager))
             {

src/Runner.Worker/Handlers/ScriptHandler.cs

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

src/Runner.Worker/JobRunner.cs

@@ -51,13 +51,6 @@ namespace GitHub.Runner.Worker
                 HostContext.UserAgents.Add(new ProductInfoHeaderValue("OrchestrationId", orchestrationId.Value));
             }
 
-            var jobServerQueueTelemetry = false;
-            if (message.Variables.TryGetValue("DistributedTask.EnableJobServerQueueTelemetry", out VariableValue enableJobServerQueueTelemetry) &&
-                !string.IsNullOrEmpty(enableJobServerQueueTelemetry?.Value))
-            {
-                jobServerQueueTelemetry = StringUtil.ConvertToBoolean(enableJobServerQueueTelemetry.Value);
-            }
-
             ServiceEndpoint systemConnection = message.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
             if (MessageUtil.IsRunServiceJob(message.MessageType))
             {
@@ -79,7 +72,7 @@ namespace GitHub.Runner.Worker
                     launchServer.InitializeLaunchClient(new Uri(launchReceiverEndpoint), accessToken);
                 }
                 _jobServerQueue = HostContext.GetService<IJobServerQueue>();
-                _jobServerQueue.Start(message, resultsServiceOnly: true, enableTelemetry: jobServerQueueTelemetry);
+                _jobServerQueue.Start(message, resultServiceOnly: true);
             }
             else
             {
@@ -91,17 +84,10 @@ namespace GitHub.Runner.Worker
                 Trace.Info($"Creating job server with URL: {jobServerUrl}");
                 // jobServerQueue is the throttling reporter.
                 _jobServerQueue = HostContext.GetService<IJobServerQueue>();
-                var delegatingHandlers = new List<DelegatingHandler>() { new ThrottlingReportHandler(_jobServerQueue) };
-                message.Variables.TryGetValue("Actions.EnableHttpRedirects", out VariableValue enableHttpRedirects);
-                if (StringUtil.ConvertToBoolean(enableHttpRedirects?.Value) &&
-                    !StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_NO_HTTP_REDIRECTS")))
-                {
-                    delegatingHandlers.Add(new RedirectMessageHandler(Trace));
-                }
-                VssConnection jobConnection = VssUtil.CreateConnection(jobServerUrl, jobServerCredential, delegatingHandlers);
+                VssConnection jobConnection = VssUtil.CreateConnection(jobServerUrl, jobServerCredential, new DelegatingHandler[] { new ThrottlingReportHandler(_jobServerQueue) });
                 await jobServer.ConnectAsync(jobConnection);
 
-                _jobServerQueue.Start(message, enableTelemetry: jobServerQueueTelemetry);
+                _jobServerQueue.Start(message);
                 server = jobServer;
             }
 
@@ -283,12 +269,6 @@ namespace GitHub.Runner.Worker
         {
             jobContext.Debug($"Finishing: {message.JobDisplayName}");
             TaskResult result = jobContext.Complete(taskResult);
-            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
-            {
-                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings));
-                jobContext.Warning(string.Format(Constants.Runner.DetectedNodeAfterEndOfLifeMessage, actions));
-            }
-
             if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
             {
                 var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings));
@@ -388,12 +368,6 @@ namespace GitHub.Runner.Worker
                 }
             }
 
-            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
-            {
-                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings));
-                jobContext.Warning(string.Format(Constants.Runner.DetectedNodeAfterEndOfLifeMessage, actions));
-            }
-
             if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
             {
                 var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings));
@@ -402,12 +376,7 @@ namespace GitHub.Runner.Worker
 
             try
             {
-                var jobQueueTelemetry = await ShutdownQueue(throwOnFailure: true);
-                // include any job telemetry from the background upload process.
-                if (jobQueueTelemetry.Count > 0)
-                {
-                    jobContext.Global.JobTelemetry.AddRange(jobQueueTelemetry);
-                }
+                await ShutdownQueue(throwOnFailure: true);
             }
             catch (Exception ex)
             {
@@ -509,7 +478,7 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        private async Task<IList<JobTelemetry>> ShutdownQueue(bool throwOnFailure)
+        private async Task ShutdownQueue(bool throwOnFailure)
         {
             if (_jobServerQueue != null)
             {
@@ -517,7 +486,6 @@ namespace GitHub.Runner.Worker
                 {
                     Trace.Info("Shutting down the job server queue.");
                     await _jobServerQueue.ShutdownAsync();
-                    return _jobServerQueue.JobTelemetries;
                 }
                 catch (Exception ex) when (!throwOnFailure)
                 {
@@ -529,8 +497,6 @@ namespace GitHub.Runner.Worker
                     _jobServerQueue = null; // Prevent multiple attempts.
                 }
             }
-
-            return Array.Empty<JobTelemetry>();
         }
     }
 }

src/Sdk/Common/Common/Authentication/NoOpCredentials.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace GitHub.Services.Common
-{
-    // Set of classes used to bypass token operations
-    // Results Service and External services follow a different auth model but
-    // we are required to pass in a credentials object to create a RawHttpMessageHandler
-    public class NoOpCredentials : FederatedCredential
-    {
-        public NoOpCredentials(IssuedToken initialToken) : base(initialToken)
-        {
-        }
-
-        public override VssCredentialsType CredentialType { get; }
-        protected override IssuedTokenProvider OnCreateTokenProvider(Uri serverUrl, IHttpResponse response)
-        {
-            return null;
-        }
-    }
-}

src/Sdk/Common/Common/RawHttpMessageHandler.cs

@@ -109,7 +109,7 @@ namespace GitHub.Services.Common
             lock (m_thisLock)
             {
                 // Ensure that we attempt to use the most appropriate authentication mechanism by default.
-                if (m_tokenProvider == null && !(this.Credentials is NoOpCredentials))
+                if (m_tokenProvider == null)
                 {
                     m_tokenProvider = this.Credentials.CreateTokenProvider(request.RequestUri, null, null);
                 }
@@ -121,8 +121,7 @@ namespace GitHub.Services.Common
             HttpResponseMessageWrapper responseWrapper;
 
             Boolean lastResponseDemandedProxyAuth = false;
-            // do not retry if we cannot recreate tokens
-            Int32 retries = this.Credentials is NoOpCredentials ? 0 : m_maxAuthRetries;
+            Int32 retries = m_maxAuthRetries;
             try
             {
                 tokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
@@ -139,12 +138,8 @@ namespace GitHub.Services.Common
                     }
 
                     // Let's start with sending a token
-                    IssuedToken token = null;
-                    if (m_tokenProvider != null)
-                    {
-                        token = await m_tokenProvider.GetTokenAsync(null, tokenSource.Token).ConfigureAwait(false);
-                        ApplyToken(request, token, applyICredentialsToWebProxy: lastResponseDemandedProxyAuth);
-                    }
+                    IssuedToken token = await m_tokenProvider.GetTokenAsync(null, tokenSource.Token).ConfigureAwait(false);
+                    ApplyToken(request, token, applyICredentialsToWebProxy: lastResponseDemandedProxyAuth);
 
                     // The WinHttpHandler will chunk any content that does not have a computed length which is
                     // not what we want. By loading into a buffer up-front we bypass this behavior and there is

src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs

@@ -461,9 +461,6 @@ namespace GitHub.DistributedTask.WebApi
             long? lastMessageId = null,
             TaskAgentStatus? status = null,
             string runnerVersion = null,
-            string os = null,
-            string architecture = null,
-            bool? disableUpdate = null,
             object userState = null,
             CancellationToken cancellationToken = default)
         {
@@ -486,21 +483,6 @@ namespace GitHub.DistributedTask.WebApi
                 queryParams.Add("runnerVersion", runnerVersion);
             }
 
-            if (os != null)
-            {
-                queryParams.Add("os", os);
-            }
-
-            if (architecture != null)
-            {
-                queryParams.Add("architecture", architecture);
-            }
-
-            if (disableUpdate != null)
-            {
-                queryParams.Add("disableUpdate", disableUpdate.Value.ToString().ToLower());
-            }
-
             return SendAsync<TaskAgentMessage>(
                 httpMethod,
                 locationId,

src/Sdk/DTLogging/Logging/ValueEncoders.cs

@@ -123,11 +123,8 @@ namespace GitHub.DistributedTask.Logging
                 var secretSection = string.Empty;
                 if (value.Contains("&+"))
                 {
-                    if (value.Length > value.IndexOf("&+") + "&+".Length + 1)
-                    {
-                        // +1 to skip the letter that got colored
-                        secretSection = value.Substring(value.IndexOf("&+") + "&+".Length + 1);
-                    }
+                    // +1 to skip the letter that got colored
+                    secretSection = value.Substring(value.IndexOf("&+") + "&+".Length + 1);
                 }
                 else
                 {

src/Sdk/DTWebApi/WebApi/Exceptions.cs

@@ -2516,23 +2516,4 @@ namespace GitHub.DistributedTask.WebApi
         {
         }
     }
-
-    [Serializable]
-    public sealed class InvalidActionArchiveException : DistributedTaskException
-    {
-        public InvalidActionArchiveException(String message)
-            : base(message)
-        {
-        }
-
-        public InvalidActionArchiveException(String message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        private InvalidActionArchiveException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
 }

src/Sdk/DTWebApi/WebApi/JobTelemetryType.cs

@@ -2,7 +2,6 @@
 
 namespace GitHub.DistributedTask.WebApi
 {
-    // do NOT add new enum since it will break backward compatibility with GHES
     public enum JobTelemetryType
     {
         [EnumMember]

src/Sdk/DTWebApi/WebApi/ListRunnersResponse.cs

@@ -41,7 +41,7 @@ namespace GitHub.DistributedTask.WebApi
 
         public List<TaskAgent> ToTaskAgents()
         {
-            return Runners.Select(runner => new TaskAgent() { Id = runner.Id, Name = runner.Name }).ToList();
+            return Runners.Select(runner => new TaskAgent() { Name = runner.Name }).ToList();
         }
     }
 

src/Sdk/DTWebApi/WebApi/RunnerRefreshMessage.cs

@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 
@@ -16,32 +15,35 @@ namespace GitHub.DistributedTask.WebApi
         {
         }
 
-        [DataMember(Name = "target_version")]
+        public RunnerRefreshMessage(
+            ulong runnerId,
+            String targetVersion,
+            int? timeoutInSeconds = null)
+        {
+            this.RunnerId = runnerId;
+            this.TimeoutInSeconds = timeoutInSeconds ?? TimeSpan.FromMinutes(60).Seconds;
+            this.TargetVersion = targetVersion;
+        }
+
+        [DataMember]
+        public ulong RunnerId
+        {
+            get;
+            private set;
+        }
+
+        [DataMember]
+        public int TimeoutInSeconds
+        {
+            get;
+            private set;
+        }
+
+        [DataMember]
         public String TargetVersion
         {
             get;
-            set;
-        }
-
-        [DataMember(Name = "download_url")]
-        public string DownloadUrl
-        {
-            get;
-            set;
-        }
-
-        [DataMember(Name = "sha256_checksum")]
-        public string SHA256Checksum
-        {
-            get;
-            set;
-        }
-
-        [DataMember(Name = "os")]
-        public string OS
-        {
-            get;
-            set;
+            private set;
         }
     }
 }

src/Sdk/Sdk.csproj

@@ -14,16 +14,14 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.4" />
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.1" />
         <PackageReference Include="System.Security.Cryptography.Cng" Version="4.4.0" />
         <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
         <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
         <PackageReference Include="Minimatch" Version="2.0.0" />
         <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
-        <PackageReference Include="System.Net.Http" Version="4.3.4" />
-        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     </ItemGroup>
 
     <ItemGroup>

src/Sdk/WebApi/WebApi/BrokerHttpClient.cs

@@ -59,9 +59,6 @@ namespace GitHub.Actions.RunService.WebApi
         public async Task<TaskAgentMessage> GetRunnerMessageAsync(
             string runnerVersion,
             TaskAgentStatus? status,
-            string os = null,
-            string architecture = null,
-            bool? disableUpdate = null,
             CancellationToken cancellationToken = default
         )
         {
@@ -78,21 +75,6 @@ namespace GitHub.Actions.RunService.WebApi
                 queryParams.Add("runnerVersion", runnerVersion);
             }
 
-            if (os != null)
-            {
-                queryParams.Add("os", os);
-            }
-
-            if (architecture != null)
-            {
-                queryParams.Add("architecture", architecture);
-            }
-
-            if (disableUpdate != null)
-            {
-                queryParams.Add("disableUpdate", disableUpdate.Value.ToString().ToLower());
-            }
-
             var result = await SendAsync<TaskAgentMessage>(
                 new HttpMethod("GET"),
                 requestUri: requestUri,

src/Sdk/WebApi/WebApi/ResultsHttpClient.cs

@@ -258,38 +258,6 @@ namespace GitHub.Services.Results.Client
             await StepSummaryUploadCompleteAsync(planId, jobId, stepId, fileSize, cancellationToken);
         }
 
-        private async Task<HttpResponseMessage> UploadLogFile(string file, bool finalize, bool firstBlock, string sasUrl, string blobStorageType,
-            CancellationToken cancellationToken)
-        {
-            HttpResponseMessage response;
-            if (firstBlock && finalize)
-            {
-                // This is the one and only block, just use a block blob
-                using (var fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true))
-                {
-                    response = await UploadBlockFileAsync(sasUrl, blobStorageType, fileStream, cancellationToken);
-                }
-            }
-            else
-            {
-                // This is either not the first block, which means it's using appendBlob; or first block and need to wait for additional blocks.  Using append blob in either case. 
-                // Create the Append blob
-                if (firstBlock)
-                {
-                    await CreateAppendFileAsync(sasUrl, blobStorageType, cancellationToken);
-                }
-
-                // Upload content
-                var fileSize = new FileInfo(file).Length;
-                using (var fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true))
-                {
-                    response = await UploadAppendFileAsync(sasUrl, blobStorageType, fileStream, finalize, fileSize, cancellationToken);
-                }
-            }
-
-            return response;
-        }
-
         // Handle file upload for step log
         public async Task UploadResultsStepLogAsync(string planId, string jobId, Guid stepId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken)
         {
@@ -300,7 +268,18 @@ namespace GitHub.Services.Results.Client
                 throw new Exception("Failed to get step log upload url");
             }
 
-            await UploadLogFile(file, finalize, firstBlock, uploadUrlResponse.LogsUrl, uploadUrlResponse.BlobStorageType, cancellationToken);
+            // Create the Append blob
+            if (firstBlock)
+            {
+                await CreateAppendFileAsync(uploadUrlResponse.LogsUrl, uploadUrlResponse.BlobStorageType, cancellationToken);
+            }
+
+            // Upload content
+            var fileSize = new FileInfo(file).Length;
+            using (var fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true))
+            {
+                var response = await UploadAppendFileAsync(uploadUrlResponse.LogsUrl, uploadUrlResponse.BlobStorageType, fileStream, finalize, fileSize, cancellationToken);
+            }
 
             // Update metadata
             if (finalize)
@@ -320,7 +299,18 @@ namespace GitHub.Services.Results.Client
                 throw new Exception("Failed to get job log upload url");
             }
 
-            await UploadLogFile(file, finalize, firstBlock, uploadUrlResponse.LogsUrl, uploadUrlResponse.BlobStorageType, cancellationToken);
+            // Create the Append blob
+            if (firstBlock)
+            {
+                await CreateAppendFileAsync(uploadUrlResponse.LogsUrl, uploadUrlResponse.BlobStorageType, cancellationToken);
+            }
+
+            // Upload content
+            var fileSize = new FileInfo(file).Length;
+            using (var fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true))
+            {
+                var response = await UploadAppendFileAsync(uploadUrlResponse.LogsUrl, uploadUrlResponse.BlobStorageType, fileStream, finalize, fileSize, cancellationToken);
+            }
 
             // Update metadata
             if (finalize)

src/Test/L0/HostContextL0.cs

@@ -120,7 +120,6 @@ namespace GitHub.Runner.Common.Tests
         [InlineData("secret&+secret&secret", "secret&+\x0033[96ms\x0033[0mecret&secret", "***\x0033[96ms\x0033[0m***")]
         [InlineData("secret&+secret&+secret", "secret&+\x0033[96ms\x0033[0mecret&+secret", "***\x0033[96ms\x0033[0m***")]
         [InlineData("secret&+secret&secret&+secret", "secret&+\x0033[96ms\x0033[0mecret&secret&+secret", "***\x0033[96ms\x0033[0m***")]
-        [InlineData("secret&secret&+", "secret&secret&+\x0033[96m\x0033[0m", "***\x0033[96m\x0033[0m")]
         [Trait("Level", "L0")]
         [Trait("Category", "Common")]
         public void SecretSectionMasking(string secret, string rawOutput, string maskedOutput)
@@ -172,43 +171,6 @@ namespace GitHub.Runner.Common.Tests
             }
         }
 
-        [Theory]
-        [InlineData("randomString", "0", "VERB", "FALSELEVEL")]
-        [InlineData("", "-1", "", "INFO")]
-        [InlineData("", "6", "VERB", "FALSELEVEL")]
-        [InlineData("", "99", "VERB", "FALSELEVEL")]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void TraceLevel(string trace, string traceLevel, string mustContainTraceLevel, string mustNotContainTraceLevel)
-        {
-            try
-            {
-                Environment.SetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TRACE", trace);
-                Environment.SetEnvironmentVariable("ACTIONS_RUNNER_TRACE_LEVEL", traceLevel);
-
-                // Arrange.
-                Setup();
-                _hc.SetDefaultCulture("hu-HU"); // logs [VERB] if traceLevel allows it
-
-                // Assert.
-                var logFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"trace_{nameof(HostContextL0)}_{nameof(TraceLevel)}.log");
-                var tempFile = Path.GetTempFileName();
-                File.Delete(tempFile);
-                File.Copy(logFile, tempFile);
-
-                var content = File.ReadAllText(tempFile);
-                Assert.Contains($"{mustContainTraceLevel}", content);
-                Assert.DoesNotContain($"{mustNotContainTraceLevel}", content);
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TRACE", null);
-                Environment.SetEnvironmentVariable("ACTIONS_RUNNER_TRACE_LEVEL", null);
-                // Cleanup.
-                Teardown();
-            }
-        }
-
         private void Setup([CallerMemberName] string testName = "")
         {
             _tokenSource = new CancellationTokenSource();

src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs

@@ -110,12 +110,12 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
             _runnerServer.Setup(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.IsAny<TaskAgentPoolType>())).Returns(Task.FromResult(expectedPools));
 
             var expectedAgents = new List<TaskAgent>();
-            _runnerServer.Setup(x => x.GetAgentsAsync(It.IsAny<string>())).Returns(Task.FromResult(expectedAgents));
+            _runnerServer.Setup(x => x.GetAgentsAsync(It.IsAny<int>(), It.IsAny<string>())).Returns(Task.FromResult(expectedAgents));
 
             _runnerServer.Setup(x => x.AddAgentAsync(It.IsAny<int>(), It.IsAny<TaskAgent>())).Returns(Task.FromResult(expectedAgent));
             _runnerServer.Setup(x => x.ReplaceAgentAsync(It.IsAny<int>(), It.IsAny<TaskAgent>())).Returns(Task.FromResult(expectedAgent));
 
-            _dotcomServer.Setup(x => x.GetRunnerByNameAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(Task.FromResult(expectedAgents));
+            _dotcomServer.Setup(x => x.GetRunnersAsync(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(Task.FromResult(expectedAgents));
             _dotcomServer.Setup(x => x.GetRunnerGroupsAsync(It.IsAny<string>(), It.IsAny<string>())).Returns(Task.FromResult(expectedPools));
             _dotcomServer.Setup(x => x.AddRunnerAsync(It.IsAny<int>(), It.IsAny<TaskAgent>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(Task.FromResult(expectedRunner));
 

src/Test/L0/Listener/MessageListenerL0.cs

@@ -192,8 +192,8 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _runnerServer
                     .Setup(x => x.GetAgentMessageAsync(
-                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
-                    .Returns(async (Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, string os, string architecture, bool disableUpdate, CancellationToken cancellationToken) =>
+                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                    .Returns(async (Int32 poolId, Guid sessionId, Int64? lastMessageId, TaskAgentStatus status, string runnerVersion, CancellationToken cancellationToken) =>
                     {
                         await Task.Yield();
                         return messages.Dequeue();
@@ -208,7 +208,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 //Assert
                 _runnerServer
                     .Verify(x => x.GetAgentMessageAsync(
-                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()), Times.Exactly(arMessages.Length));
+                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Exactly(arMessages.Length));
             }
         }
 
@@ -293,7 +293,7 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _runnerServer
                     .Setup(x => x.GetAgentMessageAsync(
-                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<CancellationToken>()))
                     .Throws(new TaskAgentAccessTokenExpiredException("test"));
                 try
                 {
@@ -311,7 +311,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 //Assert
                 _runnerServer
                     .Verify(x => x.GetAgentMessageAsync(
-                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()), Times.Once);
+                        _settings.PoolId, expectedSession.SessionId, It.IsAny<long?>(), TaskAgentStatus.Online, It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
 
                 _runnerServer
                     .Verify(x => x.DeleteAgentSessionAsync(

src/Test/L0/Listener/SelfUpdaterV2L0.cs

@@ -1,241 +0,0 @@
-#if !(OS_WINDOWS && ARM64)
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Listener;
-using GitHub.Runner.Sdk;
-using Moq;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Listener
-{
-    public sealed class SelfUpdaterV2L0
-    {
-        private Mock<IRunnerServer> _runnerServer;
-        private Mock<ITerminal> _term;
-        private Mock<IConfigurationStore> _configStore;
-        private Mock<IJobDispatcher> _jobDispatcher;
-        private AgentRefreshMessage _refreshMessage = new(1, "2.999.0");
-        private List<TrimmedPackageMetadata> _trimmedPackages = new();
-
-#if !OS_WINDOWS
-        private string _packageUrl = null;
-#else
-        private string _packageUrl = null;
-#endif
-        public SelfUpdaterV2L0()
-        {
-            _runnerServer = new Mock<IRunnerServer>();
-            _term = new Mock<ITerminal>();
-            _configStore = new Mock<IConfigurationStore>();
-            _jobDispatcher = new Mock<IJobDispatcher>();
-            _configStore.Setup(x => x.GetSettings()).Returns(new RunnerSettings() { PoolId = 1, AgentId = 1 });
-
-            Environment.SetEnvironmentVariable("_GITHUB_ACTION_EXECUTE_UPDATE_SCRIPT", "1");
-        }
-
-        private async Task FetchLatestRunner()
-        {
-            var latestVersion = "";
-            var httpClientHandler = new HttpClientHandler();
-            httpClientHandler.AllowAutoRedirect = false;
-            using (var client = new HttpClient(httpClientHandler))
-            {
-                var response = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "https://github.com/actions/runner/releases/latest"));
-                if (response.StatusCode == System.Net.HttpStatusCode.Redirect)
-                {
-                    var redirectUrl = response.Headers.Location.ToString();
-                    Regex regex = new(@"/runner/releases/tag/v(?<version>\d+\.\d+\.\d+)");
-                    var match = regex.Match(redirectUrl);
-                    if (match.Success)
-                    {
-                        latestVersion = match.Groups["version"].Value;
-
-#if !OS_WINDOWS
-                        _packageUrl = $"https://github.com/actions/runner/releases/download/v{latestVersion}/actions-runner-{BuildConstants.RunnerPackage.PackageName}-{latestVersion}.tar.gz";
-#else
-                        _packageUrl = $"https://github.com/actions/runner/releases/download/v{latestVersion}/actions-runner-{BuildConstants.RunnerPackage.PackageName}-{latestVersion}.zip";
-#endif
-                    }
-                    else
-                    {
-                        throw new Exception("The latest runner version could not be determined so a download URL could not be generated for it. Please check the location header of the redirect response of 'https://github.com/actions/runner/releases/latest'");
-                    }
-                }
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync()
-        {
-            try
-            {
-                await FetchLatestRunner();
-                Assert.NotNull(_packageUrl);
-                Assert.NotNull(_trimmedPackages);
-                Environment.SetEnvironmentVariable("RUNNER_L0_OVERRIDEBINDIR", Path.GetFullPath(Path.Combine(TestUtil.GetSrcPath(), "..", "_layout", "bin")));
-                using (var hc = new TestHostContext(this))
-                {
-                    hc.GetTrace().Info(_packageUrl);
-                    hc.GetTrace().Info(StringUtil.ConvertToJson(_trimmedPackages));
-
-                    //Arrange
-                    var updater = new Runner.Listener.SelfUpdaterV2();
-                    hc.SetSingleton<ITerminal>(_term.Object);
-                    hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                    hc.SetSingleton<IConfigurationStore>(_configStore.Object);
-                    hc.SetSingleton<IHttpClientHandlerFactory>(new HttpClientHandlerFactory());
-
-                    var p1 = new ProcessInvokerWrapper();
-                    p1.Initialize(hc);
-                    var p2 = new ProcessInvokerWrapper();
-                    p2.Initialize(hc);
-                    var p3 = new ProcessInvokerWrapper();
-                    p3.Initialize(hc);
-                    hc.EnqueueInstance<IProcessInvoker>(p1);
-                    hc.EnqueueInstance<IProcessInvoker>(p2);
-                    hc.EnqueueInstance<IProcessInvoker>(p3);
-                    updater.Initialize(hc);
-
-                    try
-                    {
-                        var message = new RunnerRefreshMessage()
-                        {
-                            TargetVersion = "2.999.0",
-                            OS = BuildConstants.RunnerPackage.PackageName,
-                            DownloadUrl = _packageUrl
-
-                        };
-
-                        var result = await updater.SelfUpdate(message, _jobDispatcher.Object, true, hc.RunnerShutdownToken);
-                        Assert.True(result);
-                        Assert.True(Directory.Exists(Path.Combine(hc.GetDirectory(WellKnownDirectory.Root), "bin.2.999.0")));
-                        Assert.True(Directory.Exists(Path.Combine(hc.GetDirectory(WellKnownDirectory.Root), "externals.2.999.0")));
-                    }
-                    finally
-                    {
-                        IOUtil.DeleteDirectory(Path.Combine(hc.GetDirectory(WellKnownDirectory.Root), "bin.2.999.0"), CancellationToken.None);
-                        IOUtil.DeleteDirectory(Path.Combine(hc.GetDirectory(WellKnownDirectory.Root), "externals.2.999.0"), CancellationToken.None);
-                    }
-                }
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("RUNNER_L0_OVERRIDEBINDIR", null);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync_DownloadRetry()
-        {
-            try
-            {
-                await FetchLatestRunner();
-                Assert.NotNull(_packageUrl);
-                Assert.NotNull(_trimmedPackages);
-                Environment.SetEnvironmentVariable("RUNNER_L0_OVERRIDEBINDIR", Path.GetFullPath(Path.Combine(TestUtil.GetSrcPath(), "..", "_layout", "bin")));
-                using (var hc = new TestHostContext(this))
-                {
-                    hc.GetTrace().Info(_packageUrl);
-                    hc.GetTrace().Info(StringUtil.ConvertToJson(_trimmedPackages));
-
-                    //Arrange
-                    var updater = new Runner.Listener.SelfUpdaterV2();
-                    hc.SetSingleton<ITerminal>(_term.Object);
-                    hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                    hc.SetSingleton<IConfigurationStore>(_configStore.Object);
-                    hc.SetSingleton<IHttpClientHandlerFactory>(new HttpClientHandlerFactory());
-
-                    var p1 = new ProcessInvokerWrapper();
-                    p1.Initialize(hc);
-                    var p2 = new ProcessInvokerWrapper();
-                    p2.Initialize(hc);
-                    var p3 = new ProcessInvokerWrapper();
-                    p3.Initialize(hc);
-                    hc.EnqueueInstance<IProcessInvoker>(p1);
-                    hc.EnqueueInstance<IProcessInvoker>(p2);
-                    hc.EnqueueInstance<IProcessInvoker>(p3);
-                    updater.Initialize(hc);
-
-                    var message = new RunnerRefreshMessage()
-                    {
-                        TargetVersion = "2.999.0",
-                        OS = BuildConstants.RunnerPackage.PackageName,
-                        DownloadUrl = "https://github.com/actions/runner/notexists"
-                    };
-
-                    var ex = await Assert.ThrowsAsync<TaskCanceledException>(() => updater.SelfUpdate(message, _jobDispatcher.Object, true, hc.RunnerShutdownToken));
-                    Assert.Contains($"failed after {Constants.RunnerDownloadRetryMaxAttempts} download attempts", ex.Message);
-                }
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("RUNNER_L0_OVERRIDEBINDIR", null);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync_ValidateHash()
-        {
-            try
-            {
-                await FetchLatestRunner();
-                Assert.NotNull(_packageUrl);
-                Assert.NotNull(_trimmedPackages);
-                Environment.SetEnvironmentVariable("RUNNER_L0_OVERRIDEBINDIR", Path.GetFullPath(Path.Combine(TestUtil.GetSrcPath(), "..", "_layout", "bin")));
-                using (var hc = new TestHostContext(this))
-                {
-                    hc.GetTrace().Info(_packageUrl);
-                    hc.GetTrace().Info(StringUtil.ConvertToJson(_trimmedPackages));
-
-                    //Arrange
-                    var updater = new Runner.Listener.SelfUpdaterV2();
-                    hc.SetSingleton<ITerminal>(_term.Object);
-                    hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                    hc.SetSingleton<IConfigurationStore>(_configStore.Object);
-                    hc.SetSingleton<IHttpClientHandlerFactory>(new HttpClientHandlerFactory());
-
-                    var p1 = new ProcessInvokerWrapper();
-                    p1.Initialize(hc);
-                    var p2 = new ProcessInvokerWrapper();
-                    p2.Initialize(hc);
-                    var p3 = new ProcessInvokerWrapper();
-                    p3.Initialize(hc);
-                    hc.EnqueueInstance<IProcessInvoker>(p1);
-                    hc.EnqueueInstance<IProcessInvoker>(p2);
-                    hc.EnqueueInstance<IProcessInvoker>(p3);
-                    updater.Initialize(hc);
-
-                    var message = new RunnerRefreshMessage()
-                    {
-                        TargetVersion = "2.999.0",
-                        OS = BuildConstants.RunnerPackage.PackageName,
-                        DownloadUrl = _packageUrl,
-                        SHA256Checksum = "badhash"
-                    };
-
-                    var ex = await Assert.ThrowsAsync<Exception>(() => updater.SelfUpdate(message, _jobDispatcher.Object, true, hc.RunnerShutdownToken));
-                    Assert.Contains("did not match expected Runner Hash", ex.Message);
-                }
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("RUNNER_L0_OVERRIDEBINDIR", null);
-            }
-        }
-    }
-}
-#endif

src/Test/L0/PackagesTrimL0.cs

@@ -273,29 +273,5 @@ namespace GitHub.Runner.Common.Tests
                 Assert.True(string.Equals(hashResult, File.ReadAllText(externalsHashFile).Trim()), $"Hash mismatch for externals. You might need to update `Misc/contentHash/externals/{BuildConstants.RunnerPackage.PackageName}` or check if `hashFiles.ts` ever changed recently.");
             }
         }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public Task RunnerLayoutParts_ContentHashFilesNoNewline()
-        {
-            using (TestHostContext hc = new(this))
-            {
-                Tracing trace = hc.GetTrace();
-
-                var dotnetRuntimeHashFile = Path.Combine(TestUtil.GetSrcPath(), $"Misc/contentHash/dotnetRuntime/{BuildConstants.RunnerPackage.PackageName}");
-                var dotnetRuntimeHash = File.ReadAllText(dotnetRuntimeHashFile);
-                trace.Info($"Current hash: {dotnetRuntimeHash}");
-
-                var externalsHashFile = Path.Combine(TestUtil.GetSrcPath(), $"Misc/contentHash/externals/{BuildConstants.RunnerPackage.PackageName}");
-                var externalsHash = File.ReadAllText(externalsHashFile);
-                trace.Info($"Current hash: {externalsHash}");
-
-                Assert.False(externalsHash.Any(x => char.IsWhiteSpace(x)), $"Found whitespace in externals hash file.");
-                Assert.False(dotnetRuntimeHash.Any(x => char.IsWhiteSpace(x)), $"Found whitespace in dotnet runtime hash file.");
-
-                return Task.CompletedTask;
-            }
-        }
     }
 }

src/Test/L0/TestUtil.cs

@@ -1,10 +1,21 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Text;
 using Xunit;
 using GitHub.Runner.Sdk;
-using System.Runtime.CompilerServices;
+using System.Linq;
 
 namespace GitHub.Runner.Common.Tests
 {
+    public enum LineEndingType
+    {
+        Native,
+        Linux = 0x__0A,
+        Windows = 0x0D0A
+    }
+
     public static class TestUtil
     {
         private const string Src = "src";
@@ -41,5 +52,24 @@ namespace GitHub.Runner.Common.Tests
             Assert.True(Directory.Exists(testDataDir));
             return testDataDir;
         }
+
+        public static void WriteContent(string path, string content, LineEndingType lineEnding = LineEndingType.Native)
+        {
+            WriteContent(path, Enumerable.Repeat(content, 1), lineEnding);
+        }
+
+        public static void WriteContent(string path, IEnumerable<string> content, LineEndingType lineEnding = LineEndingType.Native)
+        {
+            string newline = lineEnding switch
+            {
+                LineEndingType.Linux => "\n",
+                LineEndingType.Windows => "\r\n",
+                _ => Environment.NewLine,
+            };
+            var encoding = new UTF8Encoding(true); // Emit BOM
+            var contentStr = string.Join(newline, content);
+            File.WriteAllText(path, contentStr, encoding);
+        }
+
     }
 }

src/Test/L0/Util/WhichUtilL0.cs

@@ -212,210 +212,5 @@ namespace GitHub.Runner.Common.Tests.Util
             File.Delete(brokenSymlink);
             Environment.SetEnvironmentVariable(PathUtil.PathVariable, oldValue);
         }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void UseWhich2FindGit()
-        {
-            using (TestHostContext hc = new(this))
-            {
-                //Arrange
-                Tracing trace = hc.GetTrace();
-
-                // Act.
-                string gitPath = WhichUtil.Which2("git", trace: trace);
-
-                trace.Info($"Which(\"git\") returns: {gitPath ?? string.Empty}");
-
-                // Assert.
-                Assert.True(!string.IsNullOrEmpty(gitPath) && File.Exists(gitPath), $"Unable to find Git through: {nameof(WhichUtil.Which)}");
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void Which2ReturnsNullWhenNotFound()
-        {
-            using (TestHostContext hc = new(this))
-            {
-                //Arrange
-                Tracing trace = hc.GetTrace();
-
-                // Act.
-                string nosuch = WhichUtil.Which2("no-such-file-cf7e351f", trace: trace);
-
-                trace.Info($"result: {nosuch ?? string.Empty}");
-
-                // Assert.
-                Assert.True(string.IsNullOrEmpty(nosuch), "Path should not be resolved");
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void Which2ThrowsWhenRequireAndNotFound()
-        {
-            using (TestHostContext hc = new(this))
-            {
-                //Arrange
-                Tracing trace = hc.GetTrace();
-
-                // Act.
-                try
-                {
-                    WhichUtil.Which2("no-such-file-cf7e351f", require: true, trace: trace);
-                    throw new Exception("which should have thrown");
-                }
-                catch (FileNotFoundException ex)
-                {
-                    Assert.Equal("no-such-file-cf7e351f", ex.FileName);
-                }
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void Which2HandleFullyQualifiedPath()
-        {
-            using (TestHostContext hc = new(this))
-            {
-                //Arrange
-                Tracing trace = hc.GetTrace();
-
-                // Act.
-                var gitPath = WhichUtil.Which2("git", require: true, trace: trace);
-                var gitPath2 = WhichUtil.Which2(gitPath, require: true, trace: trace);
-
-                // Assert.
-                Assert.Equal(gitPath, gitPath2);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void Which2HandlesSymlinkToTargetFullPath()
-        {
-            // Arrange
-            using TestHostContext hc = new TestHostContext(this);
-            Tracing trace = hc.GetTrace();
-            string oldValue = Environment.GetEnvironmentVariable(PathUtil.PathVariable);
-#if OS_WINDOWS
-            string newValue = oldValue + @$";{Path.GetTempPath()}";
-            string symlinkName = $"symlink-{Guid.NewGuid()}";
-            string symlink = Path.GetTempPath() + $"{symlinkName}.exe";
-            string target = Path.GetTempPath() + $"target-{Guid.NewGuid()}.exe";
-#else
-            string newValue = oldValue + @$":{Path.GetTempPath()}";
-            string symlinkName = $"symlink-{Guid.NewGuid()}";
-            string symlink = Path.GetTempPath() + $"{symlinkName}";
-            string target = Path.GetTempPath() + $"target-{Guid.NewGuid()}";
-#endif
-
-            Environment.SetEnvironmentVariable(PathUtil.PathVariable, newValue);
-
-
-            using (File.Create(target))
-            {
-                File.CreateSymbolicLink(symlink, target);
-
-                // Act.
-                var result = WhichUtil.Which2(symlinkName, require: true, trace: trace);
-
-                // Assert
-                Assert.True(!string.IsNullOrEmpty(result) && File.Exists(result), $"Unable to find symlink through: {nameof(WhichUtil.Which)}");
-
-            }
-
-
-            // Cleanup
-            File.Delete(symlink);
-            File.Delete(target);
-            Environment.SetEnvironmentVariable(PathUtil.PathVariable, oldValue);
-
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void Which2HandlesSymlinkToTargetRelativePath()
-        {
-            // Arrange
-            using TestHostContext hc = new TestHostContext(this);
-            Tracing trace = hc.GetTrace();
-            string oldValue = Environment.GetEnvironmentVariable(PathUtil.PathVariable);
-#if OS_WINDOWS
-            string newValue = oldValue + @$";{Path.GetTempPath()}";
-            string symlinkName = $"symlink-{Guid.NewGuid()}";
-            string symlink = Path.GetTempPath() + $"{symlinkName}.exe";
-            string targetName = $"target-{Guid.NewGuid()}.exe";
-            string target = Path.GetTempPath() + targetName;
-#else
-            string newValue = oldValue + @$":{Path.GetTempPath()}";
-            string symlinkName = $"symlink-{Guid.NewGuid()}";
-            string symlink = Path.GetTempPath() + $"{symlinkName}";
-            string targetName = $"target-{Guid.NewGuid()}";
-            string target = Path.GetTempPath() + targetName;
-#endif
-            Environment.SetEnvironmentVariable(PathUtil.PathVariable, newValue);
-
-
-            using (File.Create(target))
-            {
-                File.CreateSymbolicLink(symlink, targetName);
-
-                // Act.
-                var result = WhichUtil.Which2(symlinkName, require: true, trace: trace);
-
-                // Assert
-                Assert.True(!string.IsNullOrEmpty(result) && File.Exists(result), $"Unable to find {symlinkName} through: {nameof(WhichUtil.Which)}");
-            }
-
-            // Cleanup
-            File.Delete(symlink);
-            File.Delete(target);
-            Environment.SetEnvironmentVariable(PathUtil.PathVariable, oldValue);
-
-        }
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public void Which2ThrowsWhenSymlinkBroken()
-        {
-            // Arrange
-            using TestHostContext hc = new TestHostContext(this);
-            Tracing trace = hc.GetTrace();
-            string oldValue = Environment.GetEnvironmentVariable(PathUtil.PathVariable);
-
-#if OS_WINDOWS
-            string newValue = oldValue + @$";{Path.GetTempPath()}";
-            string brokenSymlinkName = $"broken-symlink-{Guid.NewGuid()}";
-            string brokenSymlink = Path.GetTempPath() + $"{brokenSymlinkName}.exe";
-#else
-            string newValue = oldValue + @$":{Path.GetTempPath()}";
-            string brokenSymlinkName = $"broken-symlink-{Guid.NewGuid()}";
-            string brokenSymlink = Path.GetTempPath() + $"{brokenSymlinkName}";
-#endif
-
-
-            string target = "no-such-file-cf7e351f";
-            Environment.SetEnvironmentVariable(PathUtil.PathVariable, newValue);
-
-            File.CreateSymbolicLink(brokenSymlink, target);
-
-            // Act.
-            var exception = Assert.Throws<FileNotFoundException>(() => WhichUtil.Which2(brokenSymlinkName, require: true, trace: trace));
-
-            // Assert
-            Assert.Equal(brokenSymlinkName, exception.FileName);
-
-            // Cleanup
-            File.Delete(brokenSymlink);
-            Environment.SetEnvironmentVariable(PathUtil.PathVariable, oldValue);
-        }
     }
 }

src/Test/L0/Worker/ActionManagerL0.cs

@@ -96,63 +96,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadActionFromDotCom_ZipFileError()
-        {
-            try
-            {
-                // Arrange
-                Setup();
-                const string ActionName = "ownerName/sample-action";
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = ActionName,
-                            Ref = "main",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                // Create a corrupted ZIP file for testing
-                var tempDir = _hc.GetDirectory(WellKnownDirectory.Temp);
-                Directory.CreateDirectory(tempDir);
-                var archiveFile = Path.Combine(tempDir, Path.GetRandomFileName());
-                using (var fileStream = new FileStream(archiveFile, FileMode.Create))
-                {
-                    // Used Co-Pilot for magic bytes here. They represent the tar header and just need to be invalid for the CLI to break.
-                    var buffer = new byte[] { 0x50, 0x4B, 0x03, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00 };
-                    fileStream.Write(buffer, 0, buffer.Length);
-                }
-                using var stream = File.OpenRead(archiveFile);
-
-                string dotcomArchiveLink = GetLinkToActionArchive("https://api.github.com", ActionName, "main");
-                var mockClientHandler = new Mock<HttpClientHandler>();
-                mockClientHandler.Protected().Setup<Task<HttpResponseMessage>>("SendAsync", ItExpr.Is<HttpRequestMessage>(m => m.RequestUri == new Uri(dotcomArchiveLink)), ItExpr.IsAny<CancellationToken>())
-                    .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK) { Content = new StreamContent(stream) });
-
-                var mockHandlerFactory = new Mock<IHttpClientHandlerFactory>();
-                mockHandlerFactory.Setup(p => p.CreateClientHandler(It.IsAny<RunnerWebProxy>())).Returns(mockClientHandler.Object);
-                _hc.SetSingleton(mockHandlerFactory.Object);
-
-                _configurationStore.Object.GetSettings().IsHostedServer = true;
-
-                // Act + Assert
-                await Assert.ThrowsAsync<InvalidActionArchiveException>(async () => await _actionManager.PrepareActionsAsync(_ec.Object, actions));
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -293,118 +236,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadActionFromGraph_UseCache()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-                Directory.CreateDirectory(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "action_cache"));
-                Directory.CreateDirectory(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "action_cache", "actions_download-artifact"));
-                Directory.CreateDirectory(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "actions-download-artifact"));
-                Environment.SetEnvironmentVariable(Constants.Variables.Agent.ActionArchiveCacheDirectory, Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "action_cache"));
-
-                const string Content = @"
-# Container action
-name: '1ae80bcb-c1df-4362-bdaa-54f729c60281'
-description: 'Greet the world and record the time'
-author: 'GitHub'
-inputs:
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'node12'
-  main: 'task.js'
-";
-                await File.WriteAllTextAsync(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "actions-download-artifact", "action.yml"), Content);
-
-#if OS_WINDOWS
-                ZipFile.CreateFromDirectory(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "actions-download-artifact"), Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "action_cache", "actions_download-artifact", "master-sha.zip"), CompressionLevel.Fastest, true);
-#else
-                string tar = WhichUtil.Which("tar", require: true, trace: _hc.GetTrace());
-
-                // tar -xzf
-                using (var processInvoker = new ProcessInvokerWrapper())
-                {
-                    processInvoker.Initialize(_hc);
-                    processInvoker.OutputDataReceived += new EventHandler<ProcessDataReceivedEventArgs>((sender, args) =>
-                    {
-                        if (!string.IsNullOrEmpty(args.Data))
-                        {
-                            _hc.GetTrace().Info(args.Data);
-                        }
-                    });
-
-                    processInvoker.ErrorDataReceived += new EventHandler<ProcessDataReceivedEventArgs>((sender, args) =>
-                    {
-                        if (!string.IsNullOrEmpty(args.Data))
-                        {
-                            _hc.GetTrace().Error(args.Data);
-                        }
-                    });
-
-                    string cwd = Path.GetDirectoryName(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "actions-download-artifact"));
-                    string inputDirectory = Path.GetFileName(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "actions-download-artifact"));
-                    string archiveFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Temp), "action_cache", "actions_download-artifact", "master-sha.tar.gz");
-                    int exitCode = await processInvoker.ExecuteAsync(_hc.GetDirectory(WellKnownDirectory.Bin), tar, $"-czf \"{archiveFile}\" -C \"{cwd}\" \"{inputDirectory}\"", null, CancellationToken.None);
-                    if (exitCode != 0)
-                    {
-                        throw new NotSupportedException($"Can't use 'tar -czf' to create archive file: {archiveFile}. return code: {exitCode}.");
-                    }
-                }
-#endif
-                var actionId = Guid.NewGuid();
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = actionId,
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "actions/download-artifact",
-                            Ref = "master",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                _ec.Object.Global.Variables.Set("DistributedTask.UseActionArchiveCache", bool.TrueString);
-
-                //Act
-                await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert
-                var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "actions/download-artifact", "master.completed");
-                Assert.True(File.Exists(watermarkFile));
-
-                var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "actions/download-artifact", "master", "action.yml");
-                Assert.True(File.Exists(actionYamlFile));
-
-                _hc.GetTrace().Info(File.ReadAllText(actionYamlFile));
-
-                Assert.Contains("1ae80bcb-c1df-4362-bdaa-54f729c60281", File.ReadAllText(actionYamlFile));
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable(Constants.Variables.Agent.ActionArchiveCacheDirectory, null);
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -2384,7 +2215,6 @@ runs:
             _ec.Setup(x => x.ExpressionFunctions).Returns(new List<IFunctionInfo>());
             _ec.Object.Global.FileTable = new List<String>();
             _ec.Object.Global.Plan = new TaskOrchestrationPlanReference();
-            _ec.Object.Global.JobTelemetry = new List<JobTelemetry>();
             _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { _hc.GetTrace().Info($"[{tag}]{message}"); });
             _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<ExecutionContextLogOptions>())).Callback((Issue issue, ExecutionContextLogOptions logOptions) => { _hc.GetTrace().Info($"[{issue.Type}]{logOptions.LogMessageOverride ?? issue.Message}"); });
             _ec.Setup(x => x.GetGitHubContext("workspace")).Returns(Path.Combine(_workFolder, "actions", "actions"));
@@ -2407,8 +2237,6 @@ runs:
                         {
                             NameWithOwner = action.NameWithOwner,
                             Ref = action.Ref,
-                            ResolvedNameWithOwner = action.NameWithOwner,
-                            ResolvedSha = $"{action.Ref}-sha",
                             TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
                             ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
                         };
@@ -2428,8 +2256,6 @@ runs:
                         {
                             NameWithOwner = action.NameWithOwner,
                             Ref = action.Ref,
-                            ResolvedNameWithOwner = action.NameWithOwner,
-                            ResolvedSha = $"{action.Ref}-sha",
                             TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
                             ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
                         };

src/Test/L0/Worker/CreateStepSummaryCommandL0.cs

@@ -124,7 +124,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                     "",
                     "## This is more markdown content",
                 };
-                WriteContent(stepSummaryFile, content);
+                TestUtil.WriteContent(stepSummaryFile, content);
 
                 _createStepCommand.ProcessCommand(_executionContext.Object, stepSummaryFile, null);
                 _jobExecutionContext.Complete();
@@ -153,7 +153,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                     "",
                     "# GITHUB_TOKEN ghs_verysecuretoken",
                 };
-                WriteContent(stepSummaryFile, content);
+                TestUtil.WriteContent(stepSummaryFile, content);
 
                 _createStepCommand.ProcessCommand(_executionContext.Object, stepSummaryFile, null);
 
@@ -167,21 +167,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        private void WriteContent(
-            string path,
-            List<string> content,
-            string newline = null)
-        {
-            if (string.IsNullOrEmpty(newline))
-            {
-                newline = Environment.NewLine;
-            }
-
-            var encoding = new UTF8Encoding(true); // Emit BOM
-            var contentStr = string.Join(newline, content);
-            File.WriteAllText(path, contentStr, encoding);
-        }
-
         private TestHostContext Setup([CallerMemberName] string name = "")
         {
             var hostContext = new TestHostContext(this, name);

src/Test/L0/Worker/FileCommandTestBase.cs

@@ -0,0 +1,420 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using GitHub.Runner.Common.Util;
+using GitHub.Runner.Sdk;
+using GitHub.Runner.Worker;
+using Moq;
+using Xunit;
+using DTWebApi = GitHub.DistributedTask.WebApi;
+
+namespace GitHub.Runner.Common.Tests.Worker
+{
+    public abstract class FileCommandTestBase<T>
+        where T : IFileCommandExtension, new()
+    {
+
+        protected void TestDirectoryNotFound()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "directory-not-found", "env");
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(0, _store.Count);
+            }
+        }
+
+        protected void TestNotFound()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "file-not-found");
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(0, _store.Count);
+            }
+        }
+
+        protected void TestEmptyFile()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "empty-file");
+                var content = new List<string>();
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(0, _store.Count);
+            }
+        }
+
+        protected void TestSimple()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "simple");
+                var content = new List<string>
+                {
+                    "MY_KEY=MY VALUE",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(1, _store.Count);
+                Assert.Equal("MY VALUE", _store["MY_KEY"]);
+            }
+        }
+
+        protected void TestSimple_SkipEmptyLines()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "simple");
+                var content = new List<string>
+                {
+                    string.Empty,
+                    "MY_KEY=my value",
+                    string.Empty,
+                    "MY_KEY_2=my second value",
+                    string.Empty,
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(2, _store.Count);
+                Assert.Equal("my value", _store["MY_KEY"]);
+                Assert.Equal("my second value", _store["MY_KEY_2"]);
+            }
+        }
+
+        protected void TestSimple_EmptyValue()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "simple-empty-value");
+                var content = new List<string>
+                {
+                    "MY_KEY=",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(1, _store.Count);
+                Assert.Equal(string.Empty, _store["MY_KEY"]);
+            }
+        }
+
+        protected void TestSimple_MultipleValues()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "simple");
+                var content = new List<string>
+                {
+                    "MY_KEY=my value",
+                    "MY_KEY_2=",
+                    "MY_KEY_3=my third value",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(3, _store.Count);
+                Assert.Equal("my value", _store["MY_KEY"]);
+                Assert.Equal(string.Empty, _store["MY_KEY_2"]);
+                Assert.Equal("my third value", _store["MY_KEY_3"]);
+            }
+        }
+
+        protected void TestSimple_SpecialCharacters()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "simple");
+                var content = new List<string>
+                {
+                    "MY_KEY==abc",
+                    "MY_KEY_2=def=ghi",
+                    "MY_KEY_3=jkl=",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(3, _store.Count);
+                Assert.Equal("=abc", _store["MY_KEY"]);
+                Assert.Equal("def=ghi", _store["MY_KEY_2"]);
+                Assert.Equal("jkl=", _store["MY_KEY_3"]);
+            }
+        }
+
+        protected void TestHeredoc()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                var content = new List<string>
+                {
+                    "MY_KEY<<EOF",
+                    "line one",
+                    "line two",
+                    "line three",
+                    "EOF",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(1, _store.Count);
+                Assert.Equal($"line one{BREAK}line two{BREAK}line three", _store["MY_KEY"]);
+            }
+        }
+
+        protected void TestHeredoc_EmptyValue()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                var content = new List<string>
+                {
+                    "MY_KEY<<EOF",
+                    "EOF",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(1, _store.Count);
+                Assert.Equal(string.Empty, _store["MY_KEY"]);
+            }
+        }
+
+        protected void TestHeredoc_SkipEmptyLines()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                var content = new List<string>
+                {
+                    string.Empty,
+                    "MY_KEY<<EOF",
+                    "hello",
+                    "world",
+                    "EOF",
+                    string.Empty,
+                    "MY_KEY_2<<EOF",
+                    "HELLO",
+                    "AGAIN",
+                    "EOF",
+                    string.Empty,
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(2, _store.Count);
+                Assert.Equal($"hello{BREAK}world", _store["MY_KEY"]);
+                Assert.Equal($"HELLO{BREAK}AGAIN", _store["MY_KEY_2"]);
+            }
+        }
+
+        protected void TestHeredoc_EdgeCases()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                var content = new List<string>
+                {
+                    "MY_KEY_1<<EOF",
+                    "hello",
+                    string.Empty,
+                    "three",
+                    string.Empty,
+                    "EOF",
+                    "MY_KEY_2<<EOF",
+                    "hello=two",
+                    "EOF",
+                    "MY_KEY_3<<EOF",
+                    " EOF",
+                    "EOF",
+                    "MY_KEY_4<<EOF",
+                    "EOF EOF",
+                    "EOF",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(4, _store.Count);
+                Assert.Equal($"hello{BREAK}{BREAK}three{BREAK}", _store["MY_KEY_1"]);
+                Assert.Equal($"hello=two", _store["MY_KEY_2"]);
+                Assert.Equal($" EOF", _store["MY_KEY_3"]);
+                Assert.Equal($"EOF EOF", _store["MY_KEY_4"]);
+            }
+        }
+
+        protected void TestHeredoc_EndMarkerVariations(string validEndMarker)
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                string eof = validEndMarker;
+                var content = new List<string>
+                {
+                    $"MY_KEY_1<<{eof}",
+                    $"hello",
+                    $"one",
+                    $"{eof}",
+                    $"MY_KEY_2<<{eof}",
+                    $"hello=two",
+                    $"{eof}",
+                    $"MY_KEY_3<<{eof}",
+                    $" {eof}",
+                    $"{eof}",
+                    $"MY_KEY_4<<{eof}",
+                    $"{eof} {eof}",
+                    $"{eof}",
+                };
+                TestUtil.WriteContent(stateFile, content);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(4, _store.Count);
+                Assert.Equal($"hello{BREAK}one", _store["MY_KEY_1"]);
+                Assert.Equal($"hello=two", _store["MY_KEY_2"]);
+                Assert.Equal($" {eof}", _store["MY_KEY_3"]);
+                Assert.Equal($"{eof} {eof}", _store["MY_KEY_4"]);
+            }
+        }
+
+        protected void TestHeredoc_EqualBeforeMultilineIndicator()
+        {
+            using var hostContext = Setup();
+            var stateFile = Path.Combine(_rootDirectory, "heredoc");
+
+            // Define a hypothetical injectable payload that just happens to contain the '=' character.
+            string contrivedGitHubIssueTitle = "Issue 999:  Better handling for the `=` character";
+
+            // The docs recommend using randomly-generated EOF markers.
+            // Here's a randomly-generated base64 EOF marker that just happens to contain an '=' character.  ('=' is a padding character in base64.)
+            // see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+            string randomizedEOF = "khkIhPxsVA==";
+            var content = new List<string>
+            {
+                // In a real world scenario, "%INJECT%" might instead be something like "${{ github.event.issue.title }}"
+                $"PREFIX_%INJECT%<<{randomizedEOF}".Replace("%INJECT%", contrivedGitHubIssueTitle),
+                "RandomDataThatJustHappensToContainAnEquals=Character",
+                randomizedEOF,
+            };
+            TestUtil.WriteContent(stateFile, content);
+            var ex = Assert.Throws<Exception>(() => _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null));
+            Assert.StartsWith("Invalid format", ex.Message);
+        }
+
+        protected void TestHeredoc_MissingNewLine()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                string content = "MY_KEY<<EOF line one line two line three EOF";
+                TestUtil.WriteContent(stateFile, content);
+                var ex = Assert.Throws<Exception>(() => _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null));
+                Assert.Contains("Matching delimiter not found", ex.Message);
+            }
+        }
+
+        protected void TestHeredoc_MissingNewLineMultipleLines()
+        {
+            using (var hostContext = Setup())
+            {
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                string multilineFragment = @"line one
+                                             line two
+                                             line three";
+
+                // Note that the final EOF does not appear on it's own line.
+                string content = $"MY_KEY<<EOF {multilineFragment} EOF";
+                TestUtil.WriteContent(stateFile, content);
+                var ex = Assert.Throws<Exception>(() => _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null));
+                Assert.Contains("EOF marker missing new line", ex.Message);
+            }
+        }
+
+        protected void TestHeredoc_PreservesNewline()
+        {
+            using (var hostContext = Setup())
+            {
+                var newline = "\n";
+                var stateFile = Path.Combine(_rootDirectory, "heredoc");
+                var content = new List<string>
+                {
+                    "MY_KEY<<EOF",
+                    "hello",
+                    "world",
+                    "EOF",
+                };
+                TestUtil.WriteContent(stateFile, content, LineEndingType.Linux);
+                _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);
+                Assert.Equal(0, _issues.Count);
+                Assert.Equal(1, _store.Count);
+                Assert.Equal($"hello{newline}world", _store["MY_KEY"]);
+            }
+        }
+
+        protected TestHostContext Setup([CallerMemberName] string name = "")
+        {
+            _issues = new List<Tuple<DTWebApi.Issue, string>>();
+
+            var hostContext = new TestHostContext(this, name);
+
+            // Trace
+            _trace = hostContext.GetTrace();
+
+            // Directory for test data
+            var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
+            ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
+            Directory.CreateDirectory(workDirectory);
+            _rootDirectory = Path.Combine(workDirectory, nameof(T));
+            Directory.CreateDirectory(_rootDirectory);
+
+            // Execution context
+            _executionContext = new Mock<IExecutionContext>();
+            _executionContext.Setup(x => x.Global)
+                .Returns(new GlobalContext
+                {
+                    EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer),
+                    WriteDebug = true,
+                });
+            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<ExecutionContextLogOptions>()))
+                .Callback((DTWebApi.Issue issue, ExecutionContextLogOptions logOptions) =>
+                {
+                    var resolvedMessage = issue.Message;
+                    if (logOptions.WriteToLog && !string.IsNullOrEmpty(logOptions.LogMessageOverride))
+                    {
+                        resolvedMessage = logOptions.LogMessageOverride;
+                    }
+                    _issues.Add(new(issue, resolvedMessage));
+                    _trace.Info($"Issue '{issue.Type}': {resolvedMessage}");
+                });
+            _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
+                .Callback((string tag, string message) =>
+                {
+                    _trace.Info($"{tag}{message}");
+                });
+
+            _store = PostSetup();
+
+            _fileCmdExtension = new T();
+            _fileCmdExtension.Initialize(hostContext);
+
+            return hostContext;
+        }
+
+        protected abstract IDictionary<string, string> PostSetup();
+
+        protected static readonly string BREAK = Environment.NewLine;
+
+        protected IFileCommandExtension _fileCmdExtension { get; private set; }
+        protected Mock<IExecutionContext> _executionContext { get; private set; }
+        protected List<Tuple<DTWebApi.Issue, string>> _issues { get; private set; }
+        protected IDictionary<string, string> _store { get; private set; }
+        protected string _rootDirectory { get; private set; }
+        protected ITraceWriter _trace { get; private set; }
+    }
+}

src/Test/L0/Worker/SaveStateFileCommandL0.cs

@@ -1,44 +1,27 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Runtime.CompilerServices;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Container;
-using GitHub.Runner.Worker.Handlers;
-using Moq;
 using Xunit;
-using DTWebApi = GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Common.Tests.Worker
 {
-    public sealed class SaveStateFileCommandL0
+    public sealed class SaveStateFileCommandL0 : FileCommandTestBase<SaveStateFileCommand>
     {
-        private Mock<IExecutionContext> _executionContext;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
-        private string _rootDirectory;
-        private SaveStateFileCommand _saveStateFileCommand;
-        private Dictionary<string, string> _intraActionState;
-        private ITraceWriter _trace;
+
+        protected override IDictionary<string, string> PostSetup()
+        {
+            var intraActionState = new Dictionary<string, string>();
+            _executionContext.Setup(x => x.IntraActionState).Returns(intraActionState);
+            return intraActionState;
+        }
 
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_DirectoryNotFound()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "directory-not-found", "env");
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _intraActionState.Count);
-            }
+            base.TestDirectoryNotFound();
         }
 
         [Fact]
@@ -46,13 +29,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_NotFound()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "file-not-found");
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _intraActionState.Count);
-            }
+            base.TestNotFound();
         }
 
         [Fact]
@@ -60,15 +37,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_EmptyFile()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "empty-file");
-                var content = new List<string>();
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _intraActionState.Count);
-            }
+            base.TestEmptyFile();
         }
 
         [Fact]
@@ -76,19 +45,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Simple()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_STATE=MY VALUE",
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _intraActionState.Count);
-                Assert.Equal("MY VALUE", _intraActionState["MY_STATE"]);
-            }
+            base.TestSimple();
         }
 
         [Fact]
@@ -96,24 +53,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Simple_SkipEmptyLines()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    string.Empty,
-                    "MY_STATE=my value",
-                    string.Empty,
-                    "MY_STATE_2=my second value",
-                    string.Empty,
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(2, _intraActionState.Count);
-                Assert.Equal("my value", _intraActionState["MY_STATE"]);
-                Assert.Equal("my second value", _intraActionState["MY_STATE_2"]);
-            }
+            base.TestSimple_SkipEmptyLines();
         }
 
         [Fact]
@@ -121,19 +61,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Simple_EmptyValue()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple-empty-value");
-                var content = new List<string>
-                {
-                    "MY_STATE=",
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _intraActionState.Count);
-                Assert.Equal(string.Empty, _intraActionState["MY_STATE"]);
-            }
+            base.TestSimple_EmptyValue();
         }
 
         [Fact]
@@ -141,23 +69,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Simple_MultipleValues()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_STATE=my value",
-                    "MY_STATE_2=",
-                    "MY_STATE_3=my third value",
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(3, _intraActionState.Count);
-                Assert.Equal("my value", _intraActionState["MY_STATE"]);
-                Assert.Equal(string.Empty, _intraActionState["MY_STATE_2"]);
-                Assert.Equal("my third value", _intraActionState["MY_STATE_3"]);
-            }
+            base.TestSimple_MultipleValues();
         }
 
         [Fact]
@@ -165,23 +77,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Simple_SpecialCharacters()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_STATE==abc",
-                    "MY_STATE_2=def=ghi",
-                    "MY_STATE_3=jkl=",
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(3, _intraActionState.Count);
-                Assert.Equal("=abc", _intraActionState["MY_STATE"]);
-                Assert.Equal("def=ghi", _intraActionState["MY_STATE_2"]);
-                Assert.Equal("jkl=", _intraActionState["MY_STATE_3"]);
-            }
+            base.TestSimple_SpecialCharacters();
         }
 
         [Fact]
@@ -189,23 +85,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Heredoc()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_STATE<<EOF",
-                    "line one",
-                    "line two",
-                    "line three",
-                    "EOF",
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _intraActionState.Count);
-                Assert.Equal($"line one{Environment.NewLine}line two{Environment.NewLine}line three", _intraActionState["MY_STATE"]);
-            }
+            base.TestHeredoc();
         }
 
         [Fact]
@@ -213,20 +93,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Heredoc_EmptyValue()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_STATE<<EOF",
-                    "EOF",
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _intraActionState.Count);
-                Assert.Equal(string.Empty, _intraActionState["MY_STATE"]);
-            }
+            base.TestHeredoc_EmptyValue();
         }
 
         [Fact]
@@ -234,73 +101,52 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Heredoc_SkipEmptyLines()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    string.Empty,
-                    "MY_STATE<<EOF",
-                    "hello",
-                    "world",
-                    "EOF",
-                    string.Empty,
-                    "MY_STATE_2<<EOF",
-                    "HELLO",
-                    "AGAIN",
-                    "EOF",
-                    string.Empty,
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(2, _intraActionState.Count);
-                Assert.Equal($"hello{Environment.NewLine}world", _intraActionState["MY_STATE"]);
-                Assert.Equal($"HELLO{Environment.NewLine}AGAIN", _intraActionState["MY_STATE_2"]);
-            }
+            base.TestHeredoc_SkipEmptyLines();
         }
 
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public void SaveStateFileCommand_Heredoc_SpecialCharacters()
+        public void SaveStateFileCommand_Heredoc_EdgeCases()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_STATE<<=EOF",
-                    "hello",
-                    "one",
-                    "=EOF",
-                    "MY_STATE_2<<<EOF",
-                    "hello",
-                    "two",
-                    "<EOF",
-                    "MY_STATE_3<<EOF",
-                    "hello",
-                    string.Empty,
-                    "three",
-                    string.Empty,
-                    "EOF",
-                    "MY_STATE_4<<EOF",
-                    "hello=four",
-                    "EOF",
-                    "MY_STATE_5<<EOF",
-                    " EOF",
-                    "EOF",
-                };
-                WriteContent(stateFile, content);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(5, _intraActionState.Count);
-                Assert.Equal($"hello{Environment.NewLine}one", _intraActionState["MY_STATE"]);
-                Assert.Equal($"hello{Environment.NewLine}two", _intraActionState["MY_STATE_2"]);
-                Assert.Equal($"hello{Environment.NewLine}{Environment.NewLine}three{Environment.NewLine}", _intraActionState["MY_STATE_3"]);
-                Assert.Equal($"hello=four", _intraActionState["MY_STATE_4"]);
-                Assert.Equal($" EOF", _intraActionState["MY_STATE_5"]);
-            }
+            base.TestHeredoc_EdgeCases();
+        }
+
+        [Theory]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        // All of the following are not only valid, but quite plausible end markers.
+        // Most are derived straight from the example at https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+#pragma warning disable format
+        [InlineData("=EOF")][InlineData("==EOF")][InlineData("EO=F")][InlineData("EO==F")][InlineData("EOF=")][InlineData("EOF==")]
+        [InlineData("<EOF")][InlineData("<<EOF")][InlineData("EO<F")][InlineData("EO<<F")][InlineData("EOF<")][InlineData("EOF<<")]
+        [InlineData("+EOF")][InlineData("++EOF")][InlineData("EO+F")][InlineData("EO++F")][InlineData("EOF+")][InlineData("EOF++")]
+        [InlineData("/EOF")][InlineData("//EOF")][InlineData("EO/F")][InlineData("EO//F")][InlineData("EOF/")][InlineData("EOF//")]
+#pragma warning restore format
+        [InlineData("<<//++==")]
+        [InlineData("contrivedBase64==")]
+        [InlineData("khkIhPxsVA==")]
+        [InlineData("D+Y8zE/EOw==")]
+        [InlineData("wuOWG4S6FQ==")]
+        [InlineData("7wigCJ//iw==")]
+        [InlineData("uifTuYTs8K4=")]
+        [InlineData("M7N2ITg/04c=")]
+        [InlineData("Xhh+qp+Y6iM=")]
+        [InlineData("5tdblQajc/b+EGBZXo0w")]
+        [InlineData("jk/UMjIx/N0eVcQYOUfw")]
+        [InlineData("/n5lsw73Cwl35Hfuscdz")]
+        [InlineData("ZvnAEW+9O0tXp3Fmb3Oh")]
+        public void SaveStateFileCommand_Heredoc_EndMarkerVariations(string validEndMarker)
+        {
+            base.TestHeredoc_EndMarkerVariations(validEndMarker);
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void SaveStateFileCommand_Heredoc_EqualBeforeMultilineIndicator()
+        {
+            base.TestHeredoc_EqualBeforeMultilineIndicator();
         }
 
         [Fact]
@@ -308,21 +154,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Heredoc_MissingNewLine()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_STATE<<EOF",
-                    "line one",
-                    "line two",
-                    "line three",
-                    "EOF",
-                };
-                WriteContent(stateFile, content, " ");
-                var ex = Assert.Throws<Exception>(() => _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null));
-                Assert.Contains("Matching delimiter not found", ex.Message);
-            }
+            base.TestHeredoc_MissingNewLine();
         }
 
         [Fact]
@@ -330,21 +162,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Heredoc_MissingNewLineMultipleLines()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_STATE<<EOF",
-                    @"line one
-                    line two
-                    line three",
-                    "EOF",
-                };
-                WriteContent(stateFile, content, " ");
-                var ex = Assert.Throws<Exception>(() => _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null));
-                Assert.Contains("EOF marker missing new line", ex.Message);
-            }
+            base.TestHeredoc_MissingNewLineMultipleLines();
         }
 
 #if OS_WINDOWS
@@ -353,90 +171,9 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SaveStateFileCommand_Heredoc_PreservesNewline()
         {
-            using (var hostContext = Setup())
-            {
-                var newline = "\n";
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_STATE<<EOF",
-                    "hello",
-                    "world",
-                    "EOF",
-                };
-                WriteContent(stateFile, content, newline: newline);
-                _saveStateFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _intraActionState.Count);
-                Assert.Equal($"hello{newline}world", _intraActionState["MY_STATE"]);
-            }
+            base.TestHeredoc_PreservesNewline();
         }
 #endif
 
-        private void WriteContent(
-            string path,
-            List<string> content,
-            string newline = null)
-        {
-            if (string.IsNullOrEmpty(newline))
-            {
-                newline = Environment.NewLine;
-            }
-
-            var encoding = new UTF8Encoding(true); // Emit BOM
-            var contentStr = string.Join(newline, content);
-            File.WriteAllText(path, contentStr, encoding);
-        }
-
-        private TestHostContext Setup([CallerMemberName] string name = "")
-        {
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
-            _intraActionState = new Dictionary<string, string>();
-
-            var hostContext = new TestHostContext(this, name);
-
-            // Trace
-            _trace = hostContext.GetTrace();
-
-            // Directory for test data
-            var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
-            ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
-            Directory.CreateDirectory(workDirectory);
-            _rootDirectory = Path.Combine(workDirectory, nameof(SaveStateFileCommandL0));
-            Directory.CreateDirectory(_rootDirectory);
-
-            // Execution context
-            _executionContext = new Mock<IExecutionContext>();
-            _executionContext.Setup(x => x.Global)
-                .Returns(new GlobalContext
-                {
-                    EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer),
-                    WriteDebug = true,
-                });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<ExecutionContextLogOptions>()))
-                .Callback((DTWebApi.Issue issue, ExecutionContextLogOptions logOptions) =>
-                {
-                    var resolvedMessage = issue.Message;
-                    if (logOptions.WriteToLog && !string.IsNullOrEmpty(logOptions.LogMessageOverride))
-                    {
-                        resolvedMessage = logOptions.LogMessageOverride;
-                    }
-                    _issues.Add(new(issue, resolvedMessage));
-                    _trace.Info($"Issue '{issue.Type}': {resolvedMessage}");
-                });
-            _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
-                .Callback((string tag, string message) =>
-                {
-                    _trace.Info($"{tag}{message}");
-                });
-            _executionContext.Setup(x => x.IntraActionState)
-              .Returns(_intraActionState);
-
-            // SaveStateFileCommand
-            _saveStateFileCommand = new SaveStateFileCommand();
-            _saveStateFileCommand.Initialize(hostContext);
-
-            return hostContext;
-        }
     }
 }

src/Test/L0/Worker/SetEnvFileCommandL0.cs

@@ -1,43 +1,25 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Runtime.CompilerServices;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Container;
-using GitHub.Runner.Worker.Handlers;
-using Moq;
 using Xunit;
-using DTWebApi = GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Common.Tests.Worker
 {
-    public sealed class SetEnvFileCommandL0
+    public sealed class SetEnvFileCommandL0 : FileCommandTestBase<SetEnvFileCommand>
     {
-        private Mock<IExecutionContext> _executionContext;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
-        private string _rootDirectory;
-        private SetEnvFileCommand _setEnvFileCommand;
-        private ITraceWriter _trace;
+
+        protected override IDictionary<string, string> PostSetup()
+        {
+            return _executionContext.Object.Global.EnvironmentVariables;
+        }
 
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_DirectoryNotFound()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "directory-not-found", "env");
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _executionContext.Object.Global.EnvironmentVariables.Count);
-            }
+            base.TestDirectoryNotFound();
         }
 
         [Fact]
@@ -45,13 +27,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_NotFound()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "file-not-found");
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _executionContext.Object.Global.EnvironmentVariables.Count);
-            }
+            base.TestNotFound();
         }
 
         [Fact]
@@ -59,15 +35,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_EmptyFile()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "empty-file");
-                var content = new List<string>();
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _executionContext.Object.Global.EnvironmentVariables.Count);
-            }
+            base.TestEmptyFile();
         }
 
         [Fact]
@@ -75,19 +43,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Simple()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_ENV=MY VALUE",
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal("MY VALUE", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-            }
+            base.TestSimple();
         }
 
         [Fact]
@@ -95,24 +51,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Simple_SkipEmptyLines()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    string.Empty,
-                    "MY_ENV=my value",
-                    string.Empty,
-                    "MY_ENV_2=my second value",
-                    string.Empty,
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(2, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal("my value", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-                Assert.Equal("my second value", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_2"]);
-            }
+            base.TestSimple_SkipEmptyLines();
         }
 
         [Fact]
@@ -120,19 +59,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Simple_EmptyValue()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "simple-empty-value");
-                var content = new List<string>
-                {
-                    "MY_ENV=",
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal(string.Empty, _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-            }
+            base.TestSimple_EmptyValue();
         }
 
         [Fact]
@@ -140,23 +67,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Simple_MultipleValues()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_ENV=my value",
-                    "MY_ENV_2=",
-                    "MY_ENV_3=my third value",
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(3, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal("my value", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-                Assert.Equal(string.Empty, _executionContext.Object.Global.EnvironmentVariables["MY_ENV_2"]);
-                Assert.Equal("my third value", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_3"]);
-            }
+            base.TestSimple_MultipleValues();
         }
 
         [Fact]
@@ -164,64 +75,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Simple_SpecialCharacters()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_ENV==abc",
-                    "MY_ENV_2=def=ghi",
-                    "MY_ENV_3=jkl=",
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(3, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal("=abc", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-                Assert.Equal("def=ghi", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_2"]);
-                Assert.Equal("jkl=", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_3"]);
-            }
-        }
-
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void SetEnvFileCommand_BlockListItemsFiltered()
-        {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "NODE_OPTIONS=asdf",
-                };
-                WriteContent(stateFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(1, _issues.Count);
-                Assert.Equal(0, _executionContext.Object.Global.EnvironmentVariables.Count);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void SetEnvFileCommand_BlockListItemsFiltered_Heredoc()
-        {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "NODE_OPTIONS<<EOF",
-                    "asdf",
-                    "EOF",
-                };
-                WriteContent(stateFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(1, _issues.Count);
-                Assert.Equal(0, _executionContext.Object.Global.EnvironmentVariables.Count);
-            }
+            base.TestSimple_SpecialCharacters();
         }
 
         [Fact]
@@ -229,23 +83,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Heredoc()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_ENV<<EOF",
-                    "line one",
-                    "line two",
-                    "line three",
-                    "EOF",
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal($"line one{Environment.NewLine}line two{Environment.NewLine}line three", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-            }
+            base.TestHeredoc();
         }
 
         [Fact]
@@ -253,20 +91,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Heredoc_EmptyValue()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_ENV<<EOF",
-                    "EOF",
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal(string.Empty, _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-            }
+            base.TestHeredoc_EmptyValue();
         }
 
         [Fact]
@@ -274,73 +99,52 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Heredoc_SkipEmptyLines()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    string.Empty,
-                    "MY_ENV<<EOF",
-                    "hello",
-                    "world",
-                    "EOF",
-                    string.Empty,
-                    "MY_ENV_2<<EOF",
-                    "HELLO",
-                    "AGAIN",
-                    "EOF",
-                    string.Empty,
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(2, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal($"hello{Environment.NewLine}world", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-                Assert.Equal($"HELLO{Environment.NewLine}AGAIN", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_2"]);
-            }
+            base.TestHeredoc_SkipEmptyLines();
         }
 
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public void SetEnvFileCommand_Heredoc_SpecialCharacters()
+        public void SetEnvFileCommand_Heredoc_EdgeCases()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_ENV<<=EOF",
-                    "hello",
-                    "one",
-                    "=EOF",
-                    "MY_ENV_2<<<EOF",
-                    "hello",
-                    "two",
-                    "<EOF",
-                    "MY_ENV_3<<EOF",
-                    "hello",
-                    string.Empty,
-                    "three",
-                    string.Empty,
-                    "EOF",
-                    "MY_ENV_4<<EOF",
-                    "hello=four",
-                    "EOF",
-                    "MY_ENV_5<<EOF",
-                    " EOF",
-                    "EOF",
-                };
-                WriteContent(envFile, content);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(5, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal($"hello{Environment.NewLine}one", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-                Assert.Equal($"hello{Environment.NewLine}two", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_2"]);
-                Assert.Equal($"hello{Environment.NewLine}{Environment.NewLine}three{Environment.NewLine}", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_3"]);
-                Assert.Equal($"hello=four", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_4"]);
-                Assert.Equal($" EOF", _executionContext.Object.Global.EnvironmentVariables["MY_ENV_5"]);
-            }
+            base.TestHeredoc_EdgeCases();
+        }
+
+        [Theory]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        // All of the following are not only valid, but quite plausible end markers.
+        // Most are derived straight from the example at https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+#pragma warning disable format
+        [InlineData("=EOF")][InlineData("==EOF")][InlineData("EO=F")][InlineData("EO==F")][InlineData("EOF=")][InlineData("EOF==")]
+        [InlineData("<EOF")][InlineData("<<EOF")][InlineData("EO<F")][InlineData("EO<<F")][InlineData("EOF<")][InlineData("EOF<<")]
+        [InlineData("+EOF")][InlineData("++EOF")][InlineData("EO+F")][InlineData("EO++F")][InlineData("EOF+")][InlineData("EOF++")]
+        [InlineData("/EOF")][InlineData("//EOF")][InlineData("EO/F")][InlineData("EO//F")][InlineData("EOF/")][InlineData("EOF//")]
+#pragma warning restore format
+        [InlineData("<<//++==")]
+        [InlineData("contrivedBase64==")]
+        [InlineData("khkIhPxsVA==")]
+        [InlineData("D+Y8zE/EOw==")]
+        [InlineData("wuOWG4S6FQ==")]
+        [InlineData("7wigCJ//iw==")]
+        [InlineData("uifTuYTs8K4=")]
+        [InlineData("M7N2ITg/04c=")]
+        [InlineData("Xhh+qp+Y6iM=")]
+        [InlineData("5tdblQajc/b+EGBZXo0w")]
+        [InlineData("jk/UMjIx/N0eVcQYOUfw")]
+        [InlineData("/n5lsw73Cwl35Hfuscdz")]
+        [InlineData("ZvnAEW+9O0tXp3Fmb3Oh")]
+        public void SetEnvFileCommand_Heredoc_EndMarkerVariations(string validEndMarker)
+        {
+            base.TestHeredoc_EndMarkerVariations(validEndMarker);
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void SetEnvFileCommand_Heredoc_EqualBeforeMultilineIndicator()
+        {
+            base.TestHeredoc_EqualBeforeMultilineIndicator();
         }
 
         [Fact]
@@ -348,43 +152,15 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Heredoc_MissingNewLine()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_ENV<<EOF",
-                    "line one",
-                    "line two",
-                    "line three",
-                    "EOF",
-                };
-                WriteContent(envFile, content, " ");
-                var ex = Assert.Throws<Exception>(() => _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null));
-                Assert.Contains("Matching delimiter not found", ex.Message);
-            }
+            base.TestHeredoc_MissingNewLine();
         }
 
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public void SetEnvFileCommand_Heredoc_MissingNewLineMultipleLinesEnv()
+        public void SetEnvFileCommand_Heredoc_MissingNewLineMultipleLines()
         {
-            using (var hostContext = Setup())
-            {
-                var envFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_ENV<<EOF",
-                    @"line one
-                    line two
-                    line three",
-                    "EOF",
-                };
-                WriteContent(envFile, content, " ");
-                var ex = Assert.Throws<Exception>(() => _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null));
-                Assert.Contains("EOF marker missing new line", ex.Message);
-            }
+            base.TestHeredoc_MissingNewLineMultipleLines();
         }
 
 #if OS_WINDOWS
@@ -393,87 +169,9 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetEnvFileCommand_Heredoc_PreservesNewline()
         {
-            using (var hostContext = Setup())
-            {
-                var newline = "\n";
-                var envFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_ENV<<EOF",
-                    "hello",
-                    "world",
-                    "EOF",
-                };
-                WriteContent(envFile, content, newline: newline);
-                _setEnvFileCommand.ProcessCommand(_executionContext.Object, envFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _executionContext.Object.Global.EnvironmentVariables.Count);
-                Assert.Equal($"hello{newline}world", _executionContext.Object.Global.EnvironmentVariables["MY_ENV"]);
-            }
+            base.TestHeredoc_PreservesNewline();
         }
 #endif
 
-        private void WriteContent(
-            string path,
-            List<string> content,
-            string newline = null)
-        {
-            if (string.IsNullOrEmpty(newline))
-            {
-                newline = Environment.NewLine;
-            }
-
-            var encoding = new UTF8Encoding(true); // Emit BOM
-            var contentStr = string.Join(newline, content);
-            File.WriteAllText(path, contentStr, encoding);
-        }
-
-        private TestHostContext Setup([CallerMemberName] string name = "")
-        {
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
-
-            var hostContext = new TestHostContext(this, name);
-
-            // Trace
-            _trace = hostContext.GetTrace();
-
-            // Directory for test data
-            var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
-            ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
-            Directory.CreateDirectory(workDirectory);
-            _rootDirectory = Path.Combine(workDirectory, nameof(SetEnvFileCommandL0));
-            Directory.CreateDirectory(_rootDirectory);
-
-            // Execution context
-            _executionContext = new Mock<IExecutionContext>();
-            _executionContext.Setup(x => x.Global)
-                .Returns(new GlobalContext
-                {
-                    EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer),
-                    WriteDebug = true,
-                });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<ExecutionContextLogOptions>()))
-                .Callback((DTWebApi.Issue issue, ExecutionContextLogOptions logOptions) =>
-                {
-                    var resolvedMessage = issue.Message;
-                    if (logOptions.WriteToLog && !string.IsNullOrEmpty(logOptions.LogMessageOverride))
-                    {
-                        resolvedMessage = logOptions.LogMessageOverride;
-                    }
-                    _issues.Add(new(issue, resolvedMessage));
-                    _trace.Info($"Issue '{issue.Type}': {resolvedMessage}");
-                });
-            _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
-                .Callback((string tag, string message) =>
-                {
-                    _trace.Info($"{tag}{message}");
-                });
-
-            // SetEnvFileCommand
-            _setEnvFileCommand = new SetEnvFileCommand();
-            _setEnvFileCommand.Initialize(hostContext);
-
-            return hostContext;
-        }
     }
 }

src/Test/L0/Worker/SetOutputFileCommandL0.cs

@@ -1,44 +1,36 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Runtime.CompilerServices;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Container;
-using GitHub.Runner.Worker.Handlers;
 using Moq;
 using Xunit;
-using DTWebApi = GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Common.Tests.Worker
 {
-    public sealed class SetOutputFileCommandL0
+    public sealed class SetOutputFileCommandL0 : FileCommandTestBase<SetOutputFileCommand>
     {
-        private Mock<IExecutionContext> _executionContext;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
-        private Dictionary<string, string> _outputs;
-        private string _rootDirectory;
-        private SetOutputFileCommand _setOutputFileCommand;
-        private ITraceWriter _trace;
+
+        protected override IDictionary<string, string> PostSetup()
+        {
+            var outputs = new Dictionary<string, string>();
+            var reference = string.Empty;
+            _executionContext.Setup(x => x.SetOutput(It.IsAny<string>(), It.IsAny<string>(), out reference))
+              .Callback((string name, string value, out string reference) =>
+              {
+                  reference = value;
+                  outputs[name] = value;
+              });
+
+            return outputs;
+
+        }
 
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_DirectoryNotFound()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "directory-not-found", "env");
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _outputs.Count);
-            }
+            base.TestDirectoryNotFound();
         }
 
         [Fact]
@@ -46,13 +38,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_NotFound()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "file-not-found");
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _outputs.Count);
-            }
+            base.TestNotFound();
         }
 
         [Fact]
@@ -60,15 +46,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_EmptyFile()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "empty-file");
-                var content = new List<string>();
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(0, _outputs.Count);
-            }
+            base.TestEmptyFile();
         }
 
         [Fact]
@@ -76,19 +54,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Simple()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT=MY VALUE",
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _outputs.Count);
-                Assert.Equal("MY VALUE", _outputs["MY_OUTPUT"]);
-            }
+            base.TestSimple();
         }
 
         [Fact]
@@ -96,24 +62,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Simple_SkipEmptyLines()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    string.Empty,
-                    "MY_OUTPUT=my value",
-                    string.Empty,
-                    "MY_OUTPUT_2=my second value",
-                    string.Empty,
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(2, _outputs.Count);
-                Assert.Equal("my value", _outputs["MY_OUTPUT"]);
-                Assert.Equal("my second value", _outputs["MY_OUTPUT_2"]);
-            }
+            base.TestSimple_SkipEmptyLines();
         }
 
         [Fact]
@@ -121,19 +70,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Simple_EmptyValue()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple-empty-value");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT=",
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _outputs.Count);
-                Assert.Equal(string.Empty, _outputs["MY_OUTPUT"]);
-            }
+            base.TestSimple_EmptyValue();
         }
 
         [Fact]
@@ -141,23 +78,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Simple_MultipleValues()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT=my value",
-                    "MY_OUTPUT_2=",
-                    "MY_OUTPUT_3=my third value",
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(3, _outputs.Count);
-                Assert.Equal("my value", _outputs["MY_OUTPUT"]);
-                Assert.Equal(string.Empty, _outputs["MY_OUTPUT_2"]);
-                Assert.Equal("my third value", _outputs["MY_OUTPUT_3"]);
-            }
+            base.TestSimple_MultipleValues();
         }
 
         [Fact]
@@ -165,23 +86,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Simple_SpecialCharacters()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "simple");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT==abc",
-                    "MY_OUTPUT_2=def=ghi",
-                    "MY_OUTPUT_3=jkl=",
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(3, _outputs.Count);
-                Assert.Equal("=abc", _outputs["MY_OUTPUT"]);
-                Assert.Equal("def=ghi", _outputs["MY_OUTPUT_2"]);
-                Assert.Equal("jkl=", _outputs["MY_OUTPUT_3"]);
-            }
+            base.TestSimple_SpecialCharacters();
         }
 
         [Fact]
@@ -189,23 +94,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Heredoc()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT<<EOF",
-                    "line one",
-                    "line two",
-                    "line three",
-                    "EOF",
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _outputs.Count);
-                Assert.Equal($"line one{Environment.NewLine}line two{Environment.NewLine}line three", _outputs["MY_OUTPUT"]);
-            }
+            base.TestHeredoc();
         }
 
         [Fact]
@@ -213,20 +102,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Heredoc_EmptyValue()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT<<EOF",
-                    "EOF",
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _outputs.Count);
-                Assert.Equal(string.Empty, _outputs["MY_OUTPUT"]);
-            }
+            base.TestHeredoc_EmptyValue();
         }
 
         [Fact]
@@ -234,73 +110,52 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Heredoc_SkipEmptyLines()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    string.Empty,
-                    "MY_OUTPUT<<EOF",
-                    "hello",
-                    "world",
-                    "EOF",
-                    string.Empty,
-                    "MY_OUTPUT_2<<EOF",
-                    "HELLO",
-                    "AGAIN",
-                    "EOF",
-                    string.Empty,
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(2, _outputs.Count);
-                Assert.Equal($"hello{Environment.NewLine}world", _outputs["MY_OUTPUT"]);
-                Assert.Equal($"HELLO{Environment.NewLine}AGAIN", _outputs["MY_OUTPUT_2"]);
-            }
+            base.TestHeredoc_SkipEmptyLines();
         }
 
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public void SetOutputFileCommand_Heredoc_SpecialCharacters()
+        public void SetOutputFileCommand_Heredoc_EdgeCases()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT<<=EOF",
-                    "hello",
-                    "one",
-                    "=EOF",
-                    "MY_OUTPUT_2<<<EOF",
-                    "hello",
-                    "two",
-                    "<EOF",
-                    "MY_OUTPUT_3<<EOF",
-                    "hello",
-                    string.Empty,
-                    "three",
-                    string.Empty,
-                    "EOF",
-                    "MY_OUTPUT_4<<EOF",
-                    "hello=four",
-                    "EOF",
-                    "MY_OUTPUT_5<<EOF",
-                    " EOF",
-                    "EOF",
-                };
-                WriteContent(stateFile, content);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(5, _outputs.Count);
-                Assert.Equal($"hello{Environment.NewLine}one", _outputs["MY_OUTPUT"]);
-                Assert.Equal($"hello{Environment.NewLine}two", _outputs["MY_OUTPUT_2"]);
-                Assert.Equal($"hello{Environment.NewLine}{Environment.NewLine}three{Environment.NewLine}", _outputs["MY_OUTPUT_3"]);
-                Assert.Equal($"hello=four", _outputs["MY_OUTPUT_4"]);
-                Assert.Equal($" EOF", _outputs["MY_OUTPUT_5"]);
-            }
+            base.TestHeredoc_EdgeCases();
+        }
+
+        [Theory]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        // All of the following are not only valid, but quite plausible end markers.
+        // Most are derived straight from the example at https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+#pragma warning disable format
+        [InlineData("=EOF")][InlineData("==EOF")][InlineData("EO=F")][InlineData("EO==F")][InlineData("EOF=")][InlineData("EOF==")]
+        [InlineData("<EOF")][InlineData("<<EOF")][InlineData("EO<F")][InlineData("EO<<F")][InlineData("EOF<")][InlineData("EOF<<")]
+        [InlineData("+EOF")][InlineData("++EOF")][InlineData("EO+F")][InlineData("EO++F")][InlineData("EOF+")][InlineData("EOF++")]
+        [InlineData("/EOF")][InlineData("//EOF")][InlineData("EO/F")][InlineData("EO//F")][InlineData("EOF/")][InlineData("EOF//")]
+#pragma warning restore format
+        [InlineData("<<//++==")]
+        [InlineData("contrivedBase64==")]
+        [InlineData("khkIhPxsVA==")]
+        [InlineData("D+Y8zE/EOw==")]
+        [InlineData("wuOWG4S6FQ==")]
+        [InlineData("7wigCJ//iw==")]
+        [InlineData("uifTuYTs8K4=")]
+        [InlineData("M7N2ITg/04c=")]
+        [InlineData("Xhh+qp+Y6iM=")]
+        [InlineData("5tdblQajc/b+EGBZXo0w")]
+        [InlineData("jk/UMjIx/N0eVcQYOUfw")]
+        [InlineData("/n5lsw73Cwl35Hfuscdz")]
+        [InlineData("ZvnAEW+9O0tXp3Fmb3Oh")]
+        public void SetOutputFileCommand_Heredoc_EndMarkerVariations(string validEndMarker)
+        {
+            base.TestHeredoc_EndMarkerVariations(validEndMarker);
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void SetOutputFileCommand_Heredoc_EqualBeforeMultilineIndicator()
+        {
+            base.TestHeredoc_EqualBeforeMultilineIndicator();
         }
 
         [Fact]
@@ -308,21 +163,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Heredoc_MissingNewLine()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT<<EOF",
-                    "line one",
-                    "line two",
-                    "line three",
-                    "EOF",
-                };
-                WriteContent(stateFile, content, " ");
-                var ex = Assert.Throws<Exception>(() => _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null));
-                Assert.Contains("Matching delimiter not found", ex.Message);
-            }
+            base.TestHeredoc_MissingNewLine();
         }
 
         [Fact]
@@ -330,21 +171,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Heredoc_MissingNewLineMultipleLines()
         {
-            using (var hostContext = Setup())
-            {
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT<<EOF",
-                    @"line one
-                    line two
-                    line three",
-                    "EOF",
-                };
-                WriteContent(stateFile, content, " ");
-                var ex = Assert.Throws<Exception>(() => _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null));
-                Assert.Contains("EOF marker missing new line", ex.Message);
-            }
+            base.TestHeredoc_MissingNewLineMultipleLines();
         }
 
 #if OS_WINDOWS
@@ -353,96 +180,9 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void SetOutputFileCommand_Heredoc_PreservesNewline()
         {
-            using (var hostContext = Setup())
-            {
-                var newline = "\n";
-                var stateFile = Path.Combine(_rootDirectory, "heredoc");
-                var content = new List<string>
-                {
-                    "MY_OUTPUT<<EOF",
-                    "hello",
-                    "world",
-                    "EOF",
-                };
-                WriteContent(stateFile, content, newline: newline);
-                _setOutputFileCommand.ProcessCommand(_executionContext.Object, stateFile, null);
-                Assert.Equal(0, _issues.Count);
-                Assert.Equal(1, _outputs.Count);
-                Assert.Equal($"hello{newline}world", _outputs["MY_OUTPUT"]);
-            }
+            base.TestHeredoc_PreservesNewline();
         }
 #endif
 
-        private void WriteContent(
-            string path,
-            List<string> content,
-            string newline = null)
-        {
-            if (string.IsNullOrEmpty(newline))
-            {
-                newline = Environment.NewLine;
-            }
-
-            var encoding = new UTF8Encoding(true); // Emit BOM
-            var contentStr = string.Join(newline, content);
-            File.WriteAllText(path, contentStr, encoding);
-        }
-
-        private TestHostContext Setup([CallerMemberName] string name = "")
-        {
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
-            _outputs = new Dictionary<string, string>();
-
-            var hostContext = new TestHostContext(this, name);
-
-            // Trace
-            _trace = hostContext.GetTrace();
-
-            // Directory for test data
-            var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
-            ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
-            Directory.CreateDirectory(workDirectory);
-            _rootDirectory = Path.Combine(workDirectory, nameof(SetOutputFileCommandL0));
-            Directory.CreateDirectory(_rootDirectory);
-
-            // Execution context
-            _executionContext = new Mock<IExecutionContext>();
-            _executionContext.Setup(x => x.Global)
-                .Returns(new GlobalContext
-                {
-                    EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer),
-                    WriteDebug = true,
-                });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<ExecutionContextLogOptions>()))
-                .Callback((DTWebApi.Issue issue, ExecutionContextLogOptions logOptions) =>
-                {
-                    var resolvedMessage = issue.Message;
-                    if (logOptions.WriteToLog && !string.IsNullOrEmpty(logOptions.LogMessageOverride))
-                    {
-                        resolvedMessage = logOptions.LogMessageOverride;
-                    }
-                    _issues.Add(new(issue, resolvedMessage));
-                    _trace.Info($"Issue '{issue.Type}': {resolvedMessage}");
-                });
-            _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
-                .Callback((string tag, string message) =>
-                {
-                    _trace.Info($"{tag}{message}");
-                });
-
-            var reference = string.Empty;
-            _executionContext.Setup(x => x.SetOutput(It.IsAny<string>(), It.IsAny<string>(), out reference))
-              .Callback((string name, string value, out string reference) =>
-              {
-                  reference = value;
-                  _outputs[name] = value;
-              });
-
-            // SetOutputFileCommand
-            _setOutputFileCommand = new SetOutputFileCommand();
-            _setOutputFileCommand.Initialize(hostContext);
-
-            return hostContext;
-        }
     }
 }

src/Test/Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
@@ -18,7 +18,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-        <PackageReference Include="System.Buffers" Version="4.5.1" />
+        <PackageReference Include="System.Buffers" Version="4.3.0" />
         <PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0" />
         <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
         <PackageReference Include="Moq" Version="4.11.0" />

src/dev.sh

@@ -22,7 +22,7 @@ DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
 PACKAGE_DIR="$SCRIPT_DIR/../_package"
 PACKAGE_TRIMS_DIR="$SCRIPT_DIR/../_package_trims"
 DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="6.0.415"
+DOTNETSDK_VERSION="6.0.412"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)
 

src/global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.415"
+    "version": "6.0.412"
   }
-}
+}

src/runnerversion

@@ -1 +1 @@
-2.311.0
+2.308.0