Fix release workflow to use distinct artifact names

.devcontainer/devcontainer.json

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,13 +1,13 @@
 blank_issues_enabled: false
 contact_links:
   - name: 🛑 Request a feature in the runner application
-    url: https://github.com/orgs/community/discussions/categories/actions
-    about: If you have feature requests for GitHub Actions, please use the Actions section on the Github Product Feedback page.
+    url: https://github.com/orgs/community/discussions/categories/actions-and-packages
+    about: If you have feature requests for GitHub Actions, please use the Actions and Packages section on the Github Product Feedback page.
   - name: ✅ Support for GitHub Actions
     url: https://github.community/c/code-to-cloud/52
     about: If you have questions about GitHub Actions or need support writing workflows, please ask in the GitHub Community Support forum.
   - name: ✅ Feedback and suggestions for GitHub Actions
-    url: https://github.com/github/feedback/discussions/categories/actions
+    url: https://github.com/github/feedback/discussions/categories/actions-and-packages-feedback
     about: If you have feedback or suggestions about GitHub Actions, please open a discussion (or add to an existing one) in the GitHub Actions Feedback.  GitHub Actions Product Managers and Engineers monitor the feedback forum.
   - name: ‼️ GitHub Security Bug Bounty
     url: https://bounty.github.com/

.github/copilot-instructions.md

@@ -1,25 +0,0 @@
-## Making changes
-
-### Tests
-
-Whenever possible, changes should be accompanied by non-trivial tests that meaningfully exercise the core functionality of the new code being introduced.
-
-All tests are in the `Test/` directory at the repo root. Fast unit tests are in the `Test/L0` directory and by convention have the suffix `L0.cs`. For example: unit tests for a hypothetical `src/Runner.Worker/Foo.cs` would go in `src/Test/L0/Worker/FooL0.cs`.
-
-Run tests using this command:
-
-```sh
-cd src && ./dev.sh test
-```
-
-### Formatting
-
-After editing .cs files, always format the code using this command:
-
-```sh
-cd src && ./dev.sh format
-```
-
-### Feature Flags
-
-Wherever possible, all changes should be safeguarded by a feature flag; `Features` are declared in [Constants.cs](src/Runner.Common/Constants.cs).

.github/dependabot.yml

@@ -5,11 +5,6 @@ updates:
   schedule:
     interval: "daily" 
   target-branch: "main" 
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "daily" 
-  target-branch: "main" 
 - package-ecosystem: "nuget"
   directory: "/src"
   schedule:

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
           devScript: ./dev.sh
 
         - runtime: win-x64
-          os: windows-latest
+          os: windows-2019
           devScript: ./dev
 
         - runtime: win-arm64
@@ -50,7 +50,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
 
     # Build runner layout
     - name: Build & Layout Release
@@ -69,13 +69,13 @@ jobs:
     - name: Package Release
       if: github.event_name != 'pull_request'
       run: |
-        ${{ matrix.devScript }} package Release ${{ matrix.runtime }}
+        ${{ matrix.devScript }} package Release
       working-directory: src
 
     # Upload runner package tar.gz/zip as artifact
     - name: Publish Artifact
       if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v4
       with:
         name: runner-package-${{ matrix.runtime }}
         path: |

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

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

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

@@ -7,9 +7,9 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10
+      - 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) 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). 😃"
+          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"

.github/workflows/codeql.yml

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

.github/workflows/dependency-check.yml

@@ -1,211 +0,0 @@
-name: Dependency Status Check
-
-on:
-  workflow_dispatch:
-    inputs:
-      check_type:
-        description: "Type of dependency check"
-        required: false
-        default: "all"
-        type: choice
-        options:
-          - all
-          - node
-          - dotnet
-          - docker
-          - npm
-  schedule:
-    - cron: "0 11 * * 1" # Weekly on Monday at 11 AM
-
-jobs:
-  dependency-status:
-    runs-on: ubuntu-latest
-    outputs:
-      node20-status: ${{ steps.check-versions.outputs.node20-status }}
-      node24-status: ${{ steps.check-versions.outputs.node24-status }}
-      dotnet-status: ${{ steps.check-versions.outputs.dotnet-status }}
-      docker-status: ${{ steps.check-versions.outputs.docker-status }}
-      buildx-status: ${{ steps.check-versions.outputs.buildx-status }}
-      npm-vulnerabilities: ${{ steps.check-versions.outputs.npm-vulnerabilities }}
-      open-dependency-prs: ${{ steps.check-prs.outputs.open-dependency-prs }}
-    steps:
-      - uses: actions/checkout@v5
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: "20"
-
-      - name: Check dependency versions
-        id: check-versions
-        run: |
-          echo "## Dependency Status Report" >> $GITHUB_STEP_SUMMARY
-          echo "Generated on: $(date)" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-          # Check Node versions
-          if [[ "${{ github.event.inputs.check_type }}" == "all" || "${{ github.event.inputs.check_type }}" == "node" ]]; then
-            echo "### Node.js Versions" >> $GITHUB_STEP_SUMMARY
-            
-            VERSIONS_JSON=$(curl -s https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json)
-            LATEST_NODE20=$(echo "$VERSIONS_JSON" | jq -r '.[] | select(.version | startswith("20.")) | .version' | head -1)
-            LATEST_NODE24=$(echo "$VERSIONS_JSON" | jq -r '.[] | select(.version | startswith("24.")) | .version' | head -1)
-            
-            CURRENT_NODE20=$(grep "NODE20_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
-            CURRENT_NODE24=$(grep "NODE24_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
-            
-            NODE20_STATUS="✅ up-to-date"
-            NODE24_STATUS="✅ up-to-date"
-            
-            if [ "$CURRENT_NODE20" != "$LATEST_NODE20" ]; then
-              NODE20_STATUS="⚠️ outdated"
-            fi
-            
-            if [ "$CURRENT_NODE24" != "$LATEST_NODE24" ]; then
-              NODE24_STATUS="⚠️ outdated"
-            fi
-            
-            echo "| Version | Current | Latest | Status |" >> $GITHUB_STEP_SUMMARY
-            echo "|---------|---------|--------|--------|" >> $GITHUB_STEP_SUMMARY
-            echo "| Node 20 | $CURRENT_NODE20 | $LATEST_NODE20 | $NODE20_STATUS |" >> $GITHUB_STEP_SUMMARY
-            echo "| Node 24 | $CURRENT_NODE24 | $LATEST_NODE24 | $NODE24_STATUS |" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            
-            echo "node20-status=$NODE20_STATUS" >> $GITHUB_OUTPUT
-            echo "node24-status=$NODE24_STATUS" >> $GITHUB_OUTPUT
-          fi
-
-          # Check .NET version
-          if [[ "${{ github.event.inputs.check_type }}" == "all" || "${{ github.event.inputs.check_type }}" == "dotnet" ]]; then
-            echo "### .NET SDK Version" >> $GITHUB_STEP_SUMMARY
-            
-            current_dotnet_version=$(jq -r .sdk.version ./src/global.json)
-            current_major_minor=$(echo "$current_dotnet_version" | cut -d '.' -f 1,2)
-            latest_dotnet_version=$(curl -sb -H "Accept: application/json" "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$current_major_minor/latest.version")
-            
-            DOTNET_STATUS="✅ up-to-date"
-            if [ "$current_dotnet_version" != "$latest_dotnet_version" ]; then
-              DOTNET_STATUS="⚠️ outdated"
-            fi
-            
-            echo "| Component | Current | Latest | Status |" >> $GITHUB_STEP_SUMMARY
-            echo "|-----------|---------|--------|--------|" >> $GITHUB_STEP_SUMMARY
-            echo "| .NET SDK | $current_dotnet_version | $latest_dotnet_version | $DOTNET_STATUS |" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            
-            echo "dotnet-status=$DOTNET_STATUS" >> $GITHUB_OUTPUT
-          fi
-
-          # Check Docker versions
-          if [[ "${{ github.event.inputs.check_type }}" == "all" || "${{ github.event.inputs.check_type }}" == "docker" ]]; then
-            echo "### Docker Versions" >> $GITHUB_STEP_SUMMARY
-            
-            current_docker=$(grep "ARG DOCKER_VERSION=" ./images/Dockerfile | cut -d'=' -f2)
-            current_buildx=$(grep "ARG BUILDX_VERSION=" ./images/Dockerfile | cut -d'=' -f2)
-            
-            latest_docker=$(curl -s https://download.docker.com/linux/static/stable/x86_64/ | grep -o 'docker-[0-9]*\.[0-9]*\.[0-9]*\.tgz' | sort -V | tail -n 1 | sed 's/docker-\(.*\)\.tgz/\1/')
-            latest_buildx=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.tag_name' | sed 's/^v//')
-            
-            DOCKER_STATUS="✅ up-to-date"
-            BUILDX_STATUS="✅ up-to-date"
-            
-            if [ "$current_docker" != "$latest_docker" ]; then
-              DOCKER_STATUS="⚠️ outdated"
-            fi
-            
-            if [ "$current_buildx" != "$latest_buildx" ]; then
-              BUILDX_STATUS="⚠️ outdated"
-            fi
-            
-            echo "| Component | Current | Latest | Status |" >> $GITHUB_STEP_SUMMARY
-            echo "|-----------|---------|--------|--------|" >> $GITHUB_STEP_SUMMARY
-            echo "| Docker | $current_docker | $latest_docker | $DOCKER_STATUS |" >> $GITHUB_STEP_SUMMARY
-            echo "| Docker Buildx | $current_buildx | $latest_buildx | $BUILDX_STATUS |" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            
-            echo "docker-status=$DOCKER_STATUS" >> $GITHUB_OUTPUT
-            echo "buildx-status=$BUILDX_STATUS" >> $GITHUB_OUTPUT
-          fi
-
-          # Check npm vulnerabilities
-          if [[ "${{ github.event.inputs.check_type }}" == "all" || "${{ github.event.inputs.check_type }}" == "npm" ]]; then
-            echo "### NPM Security Audit" >> $GITHUB_STEP_SUMMARY
-            
-            cd src/Misc/expressionFunc/hashFiles
-            npm install --silent
-            
-            AUDIT_OUTPUT=""
-            AUDIT_EXIT_CODE=0
-            # Run npm audit and capture output and exit code
-            if ! AUDIT_OUTPUT=$(npm audit --json 2>&1); then
-              AUDIT_EXIT_CODE=$?
-            fi
-            
-            # Check if output is valid JSON
-            if echo "$AUDIT_OUTPUT" | jq . >/dev/null 2>&1; then
-              VULN_COUNT=$(echo "$AUDIT_OUTPUT" | jq '.metadata.vulnerabilities.total // 0')
-              # Ensure VULN_COUNT is a number
-              VULN_COUNT=$(echo "$VULN_COUNT" | grep -o '[0-9]*' | head -1)
-              VULN_COUNT=${VULN_COUNT:-0}
-              
-              NPM_STATUS="✅ no vulnerabilities"
-              if [ "$VULN_COUNT" -gt 0 ] 2>/dev/null; then
-                NPM_STATUS="⚠️ $VULN_COUNT vulnerabilities found"
-                
-                # Get vulnerability details
-                HIGH_VULNS=$(echo "$AUDIT_OUTPUT" | jq '.metadata.vulnerabilities.high // 0')
-                CRITICAL_VULNS=$(echo "$AUDIT_OUTPUT" | jq '.metadata.vulnerabilities.critical // 0')
-                
-                echo "| Severity | Count |" >> $GITHUB_STEP_SUMMARY
-                echo "|----------|-------|" >> $GITHUB_STEP_SUMMARY
-                echo "| Critical | $CRITICAL_VULNS |" >> $GITHUB_STEP_SUMMARY
-                echo "| High | $HIGH_VULNS |" >> $GITHUB_STEP_SUMMARY
-                echo "" >> $GITHUB_STEP_SUMMARY
-              else
-                echo "No npm vulnerabilities found ✅" >> $GITHUB_STEP_SUMMARY
-                echo "" >> $GITHUB_STEP_SUMMARY
-              fi
-            else
-              NPM_STATUS="❌ npm audit failed"
-              echo "npm audit failed to run or returned invalid JSON ❌" >> $GITHUB_STEP_SUMMARY
-              echo "Exit code: $AUDIT_EXIT_CODE" >> $GITHUB_STEP_SUMMARY
-              echo "Output: $AUDIT_OUTPUT" >> $GITHUB_STEP_SUMMARY
-              echo "" >> $GITHUB_STEP_SUMMARY
-            fi
-            
-            echo "npm-vulnerabilities=$NPM_STATUS" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check for open dependency PRs
-        id: check-prs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          echo "### Open Dependency PRs" >> $GITHUB_STEP_SUMMARY
-
-          # Get open PRs with dependency label
-          OPEN_PRS=$(gh pr list --label "dependencies" --state open --json number,title,url)
-          PR_COUNT=$(echo "$OPEN_PRS" | jq '. | length')
-
-          if [ "$PR_COUNT" -gt 0 ]; then
-            echo "Found $PR_COUNT open dependency PR(s):" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "$OPEN_PRS" | jq -r '.[] | "- [#\(.number)](\(.url)) \(.title)"' >> $GITHUB_STEP_SUMMARY
-          else
-            echo "No open dependency PRs found ✅" >> $GITHUB_STEP_SUMMARY
-          fi
-
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "open-dependency-prs=$PR_COUNT" >> $GITHUB_OUTPUT
-
-      - name: Summary
-        run: |
-          echo "### Summary" >> $GITHUB_STEP_SUMMARY
-          echo "- Check for open PRs with the \`dependency\` label before releases" >> $GITHUB_STEP_SUMMARY
-          echo "- Review and merge dependency updates regularly" >> $GITHUB_STEP_SUMMARY
-          echo "- Critical vulnerabilities should be addressed immediately" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Automated workflows run weekly to check for updates:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Node.js versions (Mondays at 6 AM)" >> $GITHUB_STEP_SUMMARY
-          echo "- NPM audit fix (Mondays at 7 AM)" >> $GITHUB_STEP_SUMMARY
-          echo "- .NET SDK updates (Mondays at midnight)" >> $GITHUB_STEP_SUMMARY
-          echo "- Docker/Buildx updates (Mondays at midnight)" >> $GITHUB_STEP_SUMMARY

.github/workflows/docker-buildx-upgrade.yml

@@ -1,166 +0,0 @@
-name: "Docker/Buildx Version Upgrade"
-
-on:
-  schedule:
-    - cron: "0 0 * * 1" # Run every Monday at midnight
-  workflow_dispatch: # Allow manual triggering
-
-jobs:
-  check-versions:
-    runs-on: ubuntu-latest
-    outputs:
-      DOCKER_SHOULD_UPDATE: ${{ steps.check_docker_version.outputs.SHOULD_UPDATE }}
-      DOCKER_LATEST_VERSION: ${{ steps.check_docker_version.outputs.LATEST_VERSION }}
-      DOCKER_CURRENT_VERSION: ${{ steps.check_docker_version.outputs.CURRENT_VERSION }}
-      BUILDX_SHOULD_UPDATE: ${{ steps.check_buildx_version.outputs.SHOULD_UPDATE }}
-      BUILDX_LATEST_VERSION: ${{ steps.check_buildx_version.outputs.LATEST_VERSION }}
-      BUILDX_CURRENT_VERSION: ${{ steps.check_buildx_version.outputs.CURRENT_VERSION }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Check Docker version
-        id: check_docker_version
-        shell: bash
-        run: |
-          # Extract current Docker version from Dockerfile
-          current_version=$(grep "ARG DOCKER_VERSION=" ./images/Dockerfile | cut -d'=' -f2)
-
-          # Fetch latest Docker Engine version from Docker's download site
-          # This gets the latest Linux static binary version which matches what's used in the Dockerfile
-          latest_version=$(curl -s https://download.docker.com/linux/static/stable/x86_64/ | grep -o 'docker-[0-9]*\.[0-9]*\.[0-9]*\.tgz' | sort -V | tail -n 1 | sed 's/docker-\(.*\)\.tgz/\1/')
-
-          # Extra check to ensure we got a valid version
-          if [[ ! $latest_version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "Failed to retrieve a valid Docker version"
-            exit 1
-          fi
-
-          should_update=0
-          [ "$current_version" != "$latest_version" ] && should_update=1
-
-          echo "CURRENT_VERSION=${current_version}" >> $GITHUB_OUTPUT
-          echo "LATEST_VERSION=${latest_version}" >> $GITHUB_OUTPUT
-          echo "SHOULD_UPDATE=${should_update}" >> $GITHUB_OUTPUT
-
-      - name: Check Buildx version
-        id: check_buildx_version
-        shell: bash
-        run: |
-          # Extract current Buildx version from Dockerfile
-          current_version=$(grep "ARG BUILDX_VERSION=" ./images/Dockerfile | cut -d'=' -f2)
-
-          # Fetch latest Buildx version
-          latest_version=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.tag_name' | sed 's/^v//')
-
-          should_update=0
-          [ "$current_version" != "$latest_version" ] && should_update=1
-
-          echo "CURRENT_VERSION=${current_version}" >> $GITHUB_OUTPUT
-          echo "LATEST_VERSION=${latest_version}" >> $GITHUB_OUTPUT
-          echo "SHOULD_UPDATE=${should_update}" >> $GITHUB_OUTPUT
-
-      - name: Create annotations for versions
-        run: |
-          docker_should_update="${{ steps.check_docker_version.outputs.SHOULD_UPDATE }}"
-          buildx_should_update="${{ steps.check_buildx_version.outputs.SHOULD_UPDATE }}"
-
-          # Show annotation if only Docker needs update
-          if [[ "$docker_should_update" == "1" && "$buildx_should_update" == "0" ]]; then
-            echo "::warning ::Docker version (${{ steps.check_docker_version.outputs.LATEST_VERSION }}) needs update but Buildx is current. Only updating when both need updates."
-          fi
-
-          # Show annotation if only Buildx needs update
-          if [[ "$docker_should_update" == "0" && "$buildx_should_update" == "1" ]]; then
-            echo "::warning ::Buildx version (${{ steps.check_buildx_version.outputs.LATEST_VERSION }}) needs update but Docker is current. Only updating when both need updates."
-          fi
-
-          # Show annotation when both are current
-          if [[ "$docker_should_update" == "0" && "$buildx_should_update" == "0" ]]; then
-            echo "::warning ::Latest Docker version is ${{ steps.check_docker_version.outputs.LATEST_VERSION }} and Buildx version is ${{ steps.check_buildx_version.outputs.LATEST_VERSION }}. No updates needed."
-          fi
-
-  update-versions:
-    permissions:
-      pull-requests: write
-      contents: write
-    needs: [check-versions]
-    if: ${{ needs.check-versions.outputs.DOCKER_SHOULD_UPDATE == 1 && needs.check-versions.outputs.BUILDX_SHOULD_UPDATE == 1 }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Update Docker version
-        shell: bash
-        run: |
-          latest_version="${{ needs.check-versions.outputs.DOCKER_LATEST_VERSION }}"
-          current_version="${{ needs.check-versions.outputs.DOCKER_CURRENT_VERSION }}"
-
-          # Update version in Dockerfile
-          sed -i "s/ARG DOCKER_VERSION=$current_version/ARG DOCKER_VERSION=$latest_version/g" ./images/Dockerfile
-
-      - name: Update Buildx version
-        shell: bash
-        run: |
-          latest_version="${{ needs.check-versions.outputs.BUILDX_LATEST_VERSION }}"
-          current_version="${{ needs.check-versions.outputs.BUILDX_CURRENT_VERSION }}"
-
-          # Update version in Dockerfile
-          sed -i "s/ARG BUILDX_VERSION=$current_version/ARG BUILDX_VERSION=$latest_version/g" ./images/Dockerfile
-
-      - name: Commit changes and create Pull Request
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Setup branch and commit information
-          branch_name="feature/docker-buildx-upgrade"
-          commit_message="Upgrade Docker to v${{ needs.check-versions.outputs.DOCKER_LATEST_VERSION }} and Buildx to v${{ needs.check-versions.outputs.BUILDX_LATEST_VERSION }}"
-          pr_title="Update Docker to v${{ needs.check-versions.outputs.DOCKER_LATEST_VERSION }} and Buildx to v${{ needs.check-versions.outputs.BUILDX_LATEST_VERSION }}"
-
-          # Configure git
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
-
-          # Create branch or switch to it if it exists
-          if git show-ref --quiet refs/remotes/origin/$branch_name; then
-            git fetch origin
-            git checkout -B "$branch_name" origin/$branch_name
-          else
-            git checkout -b "$branch_name"
-          fi
-
-          # Commit and push changes
-          git commit -a -m "$commit_message"
-          git push --force origin "$branch_name"
-
-          # Create PR body using here-doc for proper formatting
-          cat > pr_body.txt << 'EOF'
-          Automated Docker and Buildx version update:
-          
-          - Docker: ${{ needs.check-versions.outputs.DOCKER_CURRENT_VERSION }} → ${{ needs.check-versions.outputs.DOCKER_LATEST_VERSION }}
-          - Buildx: ${{ needs.check-versions.outputs.BUILDX_CURRENT_VERSION }} → ${{ needs.check-versions.outputs.BUILDX_LATEST_VERSION }}
-          
-          This update ensures we're using the latest stable Docker and Buildx versions for security and performance improvements.
-          
-          **Release notes:** https://docs.docker.com/engine/release-notes/
-          
-          **Next steps:**
-          - Review the version changes
-          - Verify container builds work as expected
-          - Test multi-platform builds if applicable
-          - Merge when ready
-          
-          ---
-          
-          Autogenerated by [Docker/Buildx Version Upgrade Workflow](https://github.com/actions/runner/blob/main/.github/workflows/docker-buildx-upgrade.yml)
-          EOF
-
-          # Create PR
-          gh pr create -B main -H "$branch_name" \
-            --title "$pr_title" \
-            --label "dependencies" \
-            --label "dependencies-weekly-check" \
-            --label "dependencies-not-dependabot" \
-            --label "docker" \
-            --body-file pr_body.txt

.github/workflows/dotnet-upgrade.yml

@@ -2,7 +2,7 @@ name: "DotNet SDK Upgrade"
 
 on:
   schedule:
-    - cron: "0 8 * * 1" # Weekly on Monday at 8 AM UTC (independent of Node.js/NPM)
+    - cron: '0 0 * * 1'
   workflow_dispatch:
 
 jobs:
@@ -15,7 +15,7 @@ jobs:
       DOTNET_CURRENT_MAJOR_MINOR_VERSION: ${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
       - name: Get current major minor version
         id: fetch_current_version
         shell: bash
@@ -51,7 +51,7 @@ jobs:
         run: echo "::error links::feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} https://github.com/actions/runner/tree/feature/dotnet-sdk-upgrade${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}::Branch feature/dotnetsdk-upgrade/${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} already exists. Please take a look and delete that branch if you wish to recreate"
       - name: Create a warning annotation if no need to update
         if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 0 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
-        run: echo "::warning ::Latest DotNet SDK patch is ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}, and we are on ${{ steps.fetch_current_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}. No need to update"
+        run: echo "::warning ::Latest DotNet SDK patch is ${{ steps.fetch_latest_version.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}, and we are on ${{ steps.fetch_latest_version.outputs.DOTNET_CURRENT_MAJOR_MINOR_PATCH_VERSION }}. No need to update"
       - name: Update patch version
         if: ${{ steps.fetch_latest_version.outputs.SHOULD_UPDATE == 1 && steps.fetch_latest_version.outputs.BRANCH_EXISTS == 0 }}
         shell: bash
@@ -89,14 +89,14 @@ jobs:
     if: ${{ needs.dotnet-update.outputs.SHOULD_UPDATE == 1 && needs.dotnet-update.outputs.BRANCH_EXISTS == 0 }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
       with:
         ref: feature/dotnetsdk-upgrade/${{ needs.dotnet-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.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} --title "Update dotnet sdk to latest version @${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}" --label "dependencies" --label "dependencies-weekly-check" --label "dependencies-not-dependabot" --label "dotnet" --body "
+        gh pr create -B main -H feature/dotnetsdk-upgrade/${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }} --title "Update dotnet sdk to latest version @${{ needs.dotnet-update.outputs.DOTNET_LATEST_MAJOR_MINOR_PATCH_VERSION }}" --body "
           https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${{ needs.dotnet-update.outputs.DOTNET_CURRENT_MAJOR_MINOR_VERSION }}/latest.version
           
             

.github/workflows/lint.yml

@@ -0,0 +1,24 @@
+name: Lint
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          # Ensure full list of changed files within `super-linter`
+          fetch-depth: 0
+      - name: Run linters
+        uses: github/super-linter@v4
+        env:
+          DEFAULT_BRANCH: ${{ github.base_ref }}
+          EDITORCONFIG_FILE_NAME: .editorconfig
+          LINTER_RULES_PATH: /src/
+          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_CSHARP: true

.github/workflows/node-upgrade.yml

@@ -1,194 +0,0 @@
-name: Auto Update Node Version
-
-on:
-  schedule:
-    - cron: "0 6 * * 1" # Weekly, every Monday
-  workflow_dispatch:
-
-jobs:
-  update-node:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: Get latest Node versions
-        id: node-versions
-        run: |
-          # Get latest Node.js releases from official GitHub releases
-          echo "Fetching latest Node.js releases..."
-
-          # Get latest v20.x release
-          LATEST_NODE20=$(curl -s https://api.github.com/repos/nodejs/node/releases | \
-            jq -r '.[] | select(.tag_name | startswith("v20.")) | .tag_name' | \
-            head -1 | sed 's/^v//')
-
-          # Get latest v24.x release  
-          LATEST_NODE24=$(curl -s https://api.github.com/repos/nodejs/node/releases | \
-            jq -r '.[] | select(.tag_name | startswith("v24.")) | .tag_name' | \
-            head -1 | sed 's/^v//')
-
-          echo "Found Node.js releases: 20=$LATEST_NODE20, 24=$LATEST_NODE24"
-
-          # Verify these versions are available in alpine_nodejs releases
-          echo "Verifying availability in alpine_nodejs..."
-          ALPINE_RELEASES=$(curl -s https://api.github.com/repos/actions/alpine_nodejs/releases | jq -r '.[].tag_name')
-
-          if ! echo "$ALPINE_RELEASES" | grep -q "^v$LATEST_NODE20$"; then
-            echo "::warning title=Node 20 Fallback::Node 20 version $LATEST_NODE20 not found in alpine_nodejs releases, using fallback"
-            # Fall back to latest available alpine_nodejs v20 release
-            LATEST_NODE20=$(echo "$ALPINE_RELEASES" | grep "^v20\." | head -1 | sed 's/^v//')
-            echo "Using latest available alpine_nodejs Node 20: $LATEST_NODE20"
-          fi
-
-          if ! echo "$ALPINE_RELEASES" | grep -q "^v$LATEST_NODE24$"; then
-            echo "::warning title=Node 24 Fallback::Node 24 version $LATEST_NODE24 not found in alpine_nodejs releases, using fallback"
-            # Fall back to latest available alpine_nodejs v24 release
-            LATEST_NODE24=$(echo "$ALPINE_RELEASES" | grep "^v24\." | head -1 | sed 's/^v//')
-            echo "Using latest available alpine_nodejs Node 24: $LATEST_NODE24"
-          fi
-
-          # Validate that we have non-empty version numbers
-          if [ -z "$LATEST_NODE20" ] || [ "$LATEST_NODE20" = "" ]; then
-            echo "::error title=Invalid Node 20 Version::Failed to determine valid Node 20 version. Got: '$LATEST_NODE20'"
-            echo "Available alpine_nodejs releases:"
-            echo "$ALPINE_RELEASES" | head -10
-            exit 1
-          fi
-
-          if [ -z "$LATEST_NODE24" ] || [ "$LATEST_NODE24" = "" ]; then
-            echo "::error title=Invalid Node 24 Version::Failed to determine valid Node 24 version. Got: '$LATEST_NODE24'"
-            echo "Available alpine_nodejs releases:"
-            echo "$ALPINE_RELEASES" | head -10
-            exit 1
-          fi
-
-          # Additional validation: ensure versions match expected format (x.y.z)
-          if ! echo "$LATEST_NODE20" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$'; then
-            echo "::error title=Invalid Node 20 Format::Node 20 version '$LATEST_NODE20' does not match expected format (x.y.z)"
-            exit 1
-          fi
-
-          if ! echo "$LATEST_NODE24" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$'; then
-            echo "::error title=Invalid Node 24 Format::Node 24 version '$LATEST_NODE24' does not match expected format (x.y.z)"
-            exit 1
-          fi
-
-          echo "✅ Validated Node versions: 20=$LATEST_NODE20, 24=$LATEST_NODE24"
-          echo "latest_node20=$LATEST_NODE20" >> $GITHUB_OUTPUT
-          echo "latest_node24=$LATEST_NODE24" >> $GITHUB_OUTPUT
-
-          # Check current versions in externals.sh
-          CURRENT_NODE20=$(grep "NODE20_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
-          CURRENT_NODE24=$(grep "NODE24_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
-
-          echo "current_node20=$CURRENT_NODE20" >> $GITHUB_OUTPUT
-          echo "current_node24=$CURRENT_NODE24" >> $GITHUB_OUTPUT
-
-          # Determine if updates are needed
-          NEEDS_UPDATE20="false"
-          NEEDS_UPDATE24="false"
-
-          if [ "$CURRENT_NODE20" != "$LATEST_NODE20" ]; then
-            NEEDS_UPDATE20="true"
-            echo "::notice title=Node 20 Update Available::Current: $CURRENT_NODE20 → Latest: $LATEST_NODE20"
-          fi
-
-          if [ "$CURRENT_NODE24" != "$LATEST_NODE24" ]; then
-            NEEDS_UPDATE24="true"
-            echo "::notice title=Node 24 Update Available::Current: $CURRENT_NODE24 → Latest: $LATEST_NODE24"
-          fi
-
-          if [ "$NEEDS_UPDATE20" == "false" ] && [ "$NEEDS_UPDATE24" == "false" ]; then
-            echo "::notice title=No Updates Needed::All Node.js versions are up to date"
-          fi
-
-          echo "needs_update20=$NEEDS_UPDATE20" >> $GITHUB_OUTPUT
-          echo "needs_update24=$NEEDS_UPDATE24" >> $GITHUB_OUTPUT
-
-      - name: Update externals.sh and create PR
-        if: steps.node-versions.outputs.needs_update20 == 'true' || steps.node-versions.outputs.needs_update24 == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Final validation before making changes
-          NODE20_VERSION="${{ steps.node-versions.outputs.latest_node20 }}"
-          NODE24_VERSION="${{ steps.node-versions.outputs.latest_node24 }}"
-          
-          echo "Final validation of versions before PR creation:"
-          echo "Node 20: '$NODE20_VERSION'"
-          echo "Node 24: '$NODE24_VERSION'"
-          
-          # Validate versions are not empty and match expected format
-          if [ -z "$NODE20_VERSION" ] || ! echo "$NODE20_VERSION" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$'; then
-            echo "::error title=Invalid Node 20 Version::Refusing to create PR with invalid Node 20 version: '$NODE20_VERSION'"
-            exit 1
-          fi
-          
-          if [ -z "$NODE24_VERSION" ] || ! echo "$NODE24_VERSION" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$'; then
-            echo "::error title=Invalid Node 24 Version::Refusing to create PR with invalid Node 24 version: '$NODE24_VERSION'"
-            exit 1
-          fi
-          
-          echo "✅ All versions validated successfully"
-
-          # Update the files
-          if [ "${{ steps.node-versions.outputs.needs_update20 }}" == "true" ]; then
-            sed -i 's/NODE20_VERSION="[^"]*"/NODE20_VERSION="'"$NODE20_VERSION"'"/' src/Misc/externals.sh
-          fi
-
-          if [ "${{ steps.node-versions.outputs.needs_update24 }}" == "true" ]; then
-            sed -i 's/NODE24_VERSION="[^"]*"/NODE24_VERSION="'"$NODE24_VERSION"'"/' src/Misc/externals.sh
-          fi
-
-          # Verify the changes were applied correctly
-          echo "Verifying changes in externals.sh:"
-          grep "NODE20_VERSION=" src/Misc/externals.sh
-          grep "NODE24_VERSION=" src/Misc/externals.sh
-          
-          # Ensure we actually have valid versions in the file
-          UPDATED_NODE20=$(grep "NODE20_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
-          UPDATED_NODE24=$(grep "NODE24_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
-          
-          if [ -z "$UPDATED_NODE20" ] || [ -z "$UPDATED_NODE24" ]; then
-            echo "::error title=Update Failed::Failed to properly update externals.sh"
-            echo "Updated Node 20: '$UPDATED_NODE20'"
-            echo "Updated Node 24: '$UPDATED_NODE24'"
-            exit 1
-          fi
-
-          # Configure git
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
-
-          # Create branch and commit changes
-          branch_name="chore/update-node"
-          git checkout -b "$branch_name"
-          git commit -a -m "chore: update Node versions (20: $NODE20_VERSION, 24: $NODE24_VERSION)"
-          git push --force origin "$branch_name"
-
-          # Create PR body using here-doc for proper formatting
-          cat > pr_body.txt << EOF
-          Automated Node.js version update:
-
-          - Node 20: ${{ steps.node-versions.outputs.current_node20 }} → $NODE20_VERSION
-          - Node 24: ${{ steps.node-versions.outputs.current_node24 }} → $NODE24_VERSION
-
-          This update ensures we're using the latest stable Node.js versions for security and performance improvements.
-
-          **Note**: When updating Node versions, remember to also create a new release of alpine_nodejs at the updated version following the instructions at: https://github.com/actions/alpine_nodejs
-
-          ---
-
-          Autogenerated by [Node Version Upgrade Workflow](https://github.com/actions/runner/blob/main/.github/workflows/node-upgrade.yml)
-          EOF
-
-          # Create PR
-          gh pr create -B main -H "$branch_name" \
-            --title "chore: update Node versions" \
-            --label "dependencies" \
-            --label "dependencies-weekly-check" \
-            --label "dependencies-not-dependabot" \
-            --label "node" \
-            --label "javascript" \
-            --body-file pr_body.txt
-
-          echo "::notice title=PR Created::Successfully created Node.js version update PR on branch $branch_name"

.github/workflows/npm-audit-typescript.yml

@@ -1,235 +0,0 @@
-name: NPM Audit Fix with TypeScript Auto-Fix
-
-on:
-  workflow_dispatch:
-
-jobs:
-  npm-audit-with-ts-fix:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: "20"
-      - name: NPM install and audit fix with TypeScript auto-repair
-        working-directory: src/Misc/expressionFunc/hashFiles
-        run: |
-          npm install
-
-          # Check for vulnerabilities first
-          echo "Checking for npm vulnerabilities..."
-          if npm audit --audit-level=moderate; then
-            echo "✅ No moderate or higher vulnerabilities found"
-            exit 0
-          fi
-
-          echo "⚠️ Vulnerabilities found, attempting npm audit fix..."
-
-          # Attempt audit fix and capture the result
-          if npm audit fix; then
-            echo "✅ npm audit fix completed successfully"
-            AUDIT_FIX_STATUS="success"
-          else
-            echo "⚠️ npm audit fix failed or had issues"
-            AUDIT_FIX_STATUS="failed"
-            
-            # Try audit fix with --force as a last resort for critical/high vulns only
-            echo "Checking if critical/high vulnerabilities remain..."
-            if ! npm audit --audit-level=high; then
-              echo "🚨 Critical/high vulnerabilities remain, attempting --force fix..."
-              if npm audit fix --force; then
-                echo "⚠️ npm audit fix --force completed (may have breaking changes)"
-                AUDIT_FIX_STATUS="force-fixed"
-              else
-                echo "❌ npm audit fix --force also failed"
-                AUDIT_FIX_STATUS="force-failed"
-              fi
-            else
-              echo "✅ Only moderate/low vulnerabilities remain after failed fix"
-              AUDIT_FIX_STATUS="partial-success"
-            fi
-          fi
-
-          echo "AUDIT_FIX_STATUS=$AUDIT_FIX_STATUS" >> $GITHUB_ENV
-
-          # Try to fix TypeScript issues automatically
-          echo "Attempting to fix TypeScript compatibility issues..."
-
-          # Check if build fails
-          if ! npm run build 2>/dev/null; then
-            echo "Build failed, attempting automated fixes..."
-            
-            # Common fix 1: Update @types/node to latest compatible version
-            echo "Trying to update @types/node to latest version..."
-            npm update @types/node
-            
-            # Common fix 2: If that doesn't work, try installing a specific known-good version
-            if ! npm run build 2>/dev/null; then
-              echo "Trying specific @types/node version..."
-              # Try Node 20 compatible version
-              npm install --save-dev @types/node@^20.0.0
-            fi
-            
-            # Common fix 3: Clear node_modules and reinstall if still failing
-            if ! npm run build 2>/dev/null; then
-              echo "Clearing node_modules and reinstalling..."
-              rm -rf node_modules package-lock.json
-              npm install
-              
-              # Re-run audit fix after clean install if it was successful before
-              if [[ "$AUDIT_FIX_STATUS" == "success" || "$AUDIT_FIX_STATUS" == "force-fixed" ]]; then
-                echo "Re-running npm audit fix after clean install..."
-                npm audit fix || echo "Audit fix failed on second attempt"
-              fi
-            fi
-            
-            # Common fix 4: Try updating TypeScript itself
-            if ! npm run build 2>/dev/null; then
-              echo "Trying to update TypeScript..."
-              npm update typescript
-            fi
-            
-            # Final check
-            if npm run build 2>/dev/null; then
-              echo "✅ Successfully fixed TypeScript issues automatically"
-            else
-              echo "⚠️ Could not automatically fix TypeScript issues"
-            fi
-          else
-            echo "✅ Build passes after audit fix"
-          fi
-
-      - name: Create PR if changes exist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          HUSKY: 0 # Disable husky hooks for automated commits
-        run: |
-          # Check if there are any changes
-          if [ -n "$(git status --porcelain)" ]; then
-            # Configure git
-            git config --global user.name "github-actions[bot]"
-            git config --global user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
-
-            # Create branch and commit changes
-            branch_name="chore/npm-audit-fix-with-ts-repair"
-            git checkout -b "$branch_name"
-            
-            # Commit with --no-verify to skip husky hooks
-            git commit -a -m "chore: npm audit fix with automated TypeScript compatibility fixes" --no-verify
-            git push --force origin "$branch_name"
-            
-            # Check final build status and gather info about what was changed
-            build_status="✅ Build passes"
-            fixes_applied=""
-            cd src/Misc/expressionFunc/hashFiles
-            
-            # Check what packages were updated
-            if git diff HEAD~1 package.json | grep -q "@types/node"; then
-              fixes_applied+="\n- Updated @types/node version for TypeScript compatibility"
-            fi
-            if git diff HEAD~1 package.json | grep -q "typescript"; then
-              fixes_applied+="\n- Updated TypeScript version"
-            fi
-            if git diff HEAD~1 package-lock.json | grep -q "resolved"; then
-              fixes_applied+="\n- Updated package dependencies via npm audit fix"
-            fi
-            
-            if ! npm run build 2>/dev/null; then
-              build_status="⚠️ Build fails - manual review required"
-            fi
-            cd - > /dev/null
-            
-            # Create enhanced PR body using here-doc for proper formatting
-            audit_status_msg=""
-            case "$AUDIT_FIX_STATUS" in
-              "success")
-                audit_status_msg="✅ **Audit Fix**: Completed successfully"
-                ;;
-              "partial-success")
-                audit_status_msg="⚠️ **Audit Fix**: Partial success (only moderate/low vulnerabilities remain)"
-                ;;
-              "force-fixed")
-                audit_status_msg="⚠️ **Audit Fix**: Completed with --force (may have breaking changes)"
-                ;;
-              "failed"|"force-failed")
-                audit_status_msg="❌ **Audit Fix**: Failed to resolve vulnerabilities"
-                ;;
-              *)
-                audit_status_msg="❓ **Audit Fix**: Status unknown"
-                ;;
-            esac
-            
-            if [[ "$build_status" == *"fails"* ]]; then
-              cat > pr_body.txt << EOF
-          Automated npm audit fix with TypeScript auto-repair for hashFiles dependencies.
-
-          **Build Status**: ⚠️ Build fails - manual review required
-          $audit_status_msg
-
-          This workflow attempts to automatically fix TypeScript compatibility issues that may arise from npm audit fixes.
-
-          ⚠️ **Manual Review Required**: The build is currently failing after automated fixes were attempted.
-
-          Common issues and solutions:
-          - Check for TypeScript version compatibility with Node.js types
-          - Review breaking changes in updated dependencies
-          - Consider pinning problematic dependency versions temporarily
-          - Review tsconfig.json for compatibility settings
-
-          **Automated Fix Strategy**:
-          1. Run npm audit fix with proper error handling
-          2. Update @types/node to latest compatible version
-          3. Try Node 20 specific @types/node version if needed
-          4. Clean reinstall dependencies if conflicts persist
-          5. Update TypeScript compiler if necessary
-
-          ---
-
-          Autogenerated by [NPM Audit Fix with TypeScript Auto-Fix Workflow](https://github.com/actions/runner/blob/main/.github/workflows/npm-audit-ts-fix.yml)
-          EOF
-            else
-              cat > pr_body.txt << EOF
-          Automated npm audit fix with TypeScript auto-repair for hashFiles dependencies.
-
-          **Build Status**: ✅ Build passes
-          $audit_status_msg
-
-          This workflow attempts to automatically fix TypeScript compatibility issues that may arise from npm audit fixes.
-
-          ✅ **Ready to Merge**: All automated fixes were successful and the build passes.
-
-          **Automated Fix Strategy**:
-          1. Run npm audit fix with proper error handling
-          2. Update @types/node to latest compatible version
-          3. Try Node 20 specific @types/node version if needed
-          4. Clean reinstall dependencies if conflicts persist
-          5. Update TypeScript compiler if necessary
-
-          ---
-
-          Autogenerated by [NPM Audit Fix with TypeScript Auto-Fix Workflow](https://github.com/actions/runner/blob/main/.github/workflows/npm-audit-ts-fix.yml)
-          EOF
-            fi
-            
-            if [ -n "$fixes_applied" ]; then
-              # Add the fixes applied section to the file
-              sed -i "/This workflow attempts/a\\
-          \\
-          **Automated Fixes Applied**:$fixes_applied" pr_body.txt
-            fi
-            
-            # Create PR with appropriate labels
-            labels="dependencies,dependencies-not-dependabot,typescript,npm,security"
-            if [[ "$build_status" == *"fails"* ]]; then
-              labels="dependencies,dependencies-not-dependabot,typescript,npm,security,needs-manual-review"
-            fi
-            
-            # Create PR
-            gh pr create -B main -H "$branch_name" \
-              --title "chore: npm audit fix with TypeScript auto-repair" \
-              --label "$labels" \
-              --body-file pr_body.txt
-          else
-            echo "No changes to commit"
-          fi

.github/workflows/npm-audit.yml

@@ -1,137 +0,0 @@
-name: NPM Audit Fix
-
-on:
-  schedule:
-    - cron: "0 7 * * 1" # Weekly on Monday at 7 AM UTC
-  workflow_dispatch:
-
-jobs:
-  npm-audit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: "20"
-          
-      - name: NPM install and audit fix
-        working-directory: src/Misc/expressionFunc/hashFiles
-        run: |
-          npm install
-          
-          # Check what vulnerabilities exist
-          echo "=== Checking current vulnerabilities ==="
-          npm audit || true
-          
-          # Apply audit fix --force to get security updates
-          echo "=== Applying npm audit fix --force ==="
-          npm audit fix --force
-          
-          # Test if build still works and set status
-          echo "=== Testing build compatibility ==="
-          if npm run all; then
-            echo "✅ Build successful after audit fix"
-            echo "AUDIT_FIX_STATUS=success" >> $GITHUB_ENV
-          else
-            echo "❌ Build failed after audit fix - will create PR with fix instructions"
-            echo "AUDIT_FIX_STATUS=build_failed" >> $GITHUB_ENV
-          fi
-          
-      - name: Create PR if changes exist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Check if there are any changes
-          if [ -n "$(git status --porcelain)" ]; then
-            # Configure git
-            git config --global user.name "github-actions[bot]"
-            git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            
-            # Create branch and commit changes
-            branch_name="chore/npm-audit-fix-$(date +%Y%m%d)"
-            git checkout -b "$branch_name"
-            git add .
-            git commit -m "chore: npm audit fix for hashFiles dependencies" --no-verify
-            git push origin "$branch_name"
-            
-            # Create PR body based on what actually happened
-            if [ "$AUDIT_FIX_STATUS" = "success" ]; then
-              cat > pr_body.txt << 'EOF'
-          Automated npm audit fix for security vulnerabilities in hashFiles dependencies.
-          
-          **✅ Full Fix Applied Successfully**
-          This update addresses npm security advisories and ensures dependencies are secure and up-to-date.
-          
-          **Changes made:**
-          - Applied `npm audit fix --force` to resolve security vulnerabilities
-          - Updated package-lock.json with security patches
-          - Verified build compatibility with `npm run all`
-          
-          **Next steps:**
-          - Review the dependency changes  
-          - Verify the hashFiles functionality still works as expected
-          - Merge when ready
-          
-          ---
-          
-          Autogenerated by [NPM Audit Fix Workflow](https://github.com/actions/runner/blob/main/.github/workflows/npm-audit.yml)
-          EOF
-            elif [ "$AUDIT_FIX_STATUS" = "build_failed" ]; then
-              cat > pr_body.txt << 'EOF'
-          Automated npm audit fix for security vulnerabilities in hashFiles dependencies.
-          
-          **⚠️ Security Fixes Applied - Build Issues Need Manual Resolution**
-          This update applies important security patches but causes build failures that require manual fixes.
-          
-          **Changes made:**
-          - Applied `npm audit fix --force` to resolve security vulnerabilities
-          - Updated package-lock.json with security patches
-          
-          **⚠️ Build Issues Detected:**
-          The build fails after applying security fixes, likely due to TypeScript compatibility issues with updated `@types/node`.
-          
-          **Required Manual Fixes:**
-          1. Review TypeScript compilation errors in the build output
-          2. Update TypeScript configuration if needed
-          3. Consider pinning `@types/node` to a compatible version
-          4. Run `npm run all` locally to verify fixes
-          
-          **Next steps:**
-          - **DO NOT merge until build issues are resolved**
-          - Apply manual fixes for TypeScript compatibility
-          - Test the hashFiles functionality still works as expected
-          - Merge when build passes
-          
-          ---
-          
-          Autogenerated by [NPM Audit Fix Workflow](https://github.com/actions/runner/blob/main/.github/workflows/npm-audit.yml)
-          EOF
-            else
-              # Fallback case
-              cat > pr_body.txt << 'EOF'
-          Automated npm audit attempted for security vulnerabilities in hashFiles dependencies.
-          
-          **ℹ️ No Changes Applied**
-          No security vulnerabilities were found or no changes were needed.
-          
-          ---
-          
-          Autogenerated by [NPM Audit Fix Workflow](https://github.com/actions/runner/blob/main/.github/workflows/npm-audit.yml)
-          EOF
-            fi
-            
-            # Create PR
-            gh pr create -B main -H "$branch_name" \
-              --title "chore: npm audit fix for hashFiles dependencies" \
-              --label "dependencies" \
-              --label "dependencies-weekly-check" \
-              --label "dependencies-not-dependabot" \
-              --label "npm" \
-              --label "typescript" \
-              --label "security" \
-              --body-file pr_body.txt
-          else
-            echo "✅ No changes to commit - npm audit fix did not modify any files"
-          fi

.github/workflows/publish-image.yml

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

.github/workflows/release.yml

@@ -11,15 +11,16 @@ jobs:
     if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
 
     # Make sure ./releaseVersion match ./src/runnerversion
     # Query GitHub release ensure version is not used
     - name: Check version
-      uses: actions/github-script@v8.0.0
+      uses: actions/github-script@0.3.0
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
+          const core = require('@actions/core')
           const fs = require('fs');
           const runnerVersion = fs.readFileSync('${{ github.workspace }}/src/runnerversion', 'utf8').replace(/\n$/g, '')
           const releaseVersion = fs.readFileSync('${{ github.workspace }}/releaseVersion', 'utf8').replace(/\n$/g, '')
@@ -29,7 +30,7 @@ jobs:
             return
           }
           try {
-            const release = await github.rest.repos.getReleaseByTag({
+            const release = await github.repos.getReleaseByTag({
               owner: '${{ github.event.repository.owner.name }}',
               repo: '${{ github.event.repository.name }}',
               tag: 'v' + runnerVersion
@@ -77,7 +78,7 @@ jobs:
           devScript: ./dev.sh
 
         - runtime: win-x64
-          os: windows-latest
+          os: windows-2019
           devScript: ./dev
 
         - runtime: win-arm64
@@ -86,7 +87,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
 
     # Build runner layout
     - name: Build & Layout Release
@@ -118,7 +119,7 @@ jobs:
     # Upload runner package tar.gz/zip as artifact.
     - name: Publish Artifact
       if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v4
       with:
         name: runner-packages-${{ matrix.runtime }}
         path: |
@@ -129,41 +130,41 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
 
     # Download runner package tar.gz/zip produced by 'build' job
     - name: Download Artifact (win-x64)
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v4
       with:
         name: runner-packages-win-x64
         path: ./
     - name: Download Artifact (win-arm64)
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v4
       with:
         name: runner-packages-win-arm64
         path: ./
     - name: Download Artifact (osx-x64)
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v4
       with:
         name: runner-packages-osx-x64
         path: ./
     - name: Download Artifact (osx-arm64)
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v4
       with:
         name: runner-packages-osx-arm64
         path: ./
     - name: Download Artifact (linux-x64)
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v4
       with:
         name: runner-packages-linux-x64
         path: ./
     - name: Download Artifact (linux-arm)
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v4
       with:
         name: runner-packages-linux-arm
         path: ./
     - name: Download Artifact (linux-arm64)
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v4
       with:
         name: runner-packages-linux-arm64
         path: ./
@@ -171,10 +172,11 @@ jobs:
     # Create ReleaseNote file
     - name: Create ReleaseNote
       id: releaseNote
-      uses: actions/github-script@v8.0.0
+      uses: actions/github-script@0.3.0
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
+          const core = require('@actions/core')
           const fs = require('fs');
           const runnerVersion = fs.readFileSync('${{ github.workspace }}/src/runnerversion', 'utf8').replace(/\n$/g, '')
           var releaseNote = fs.readFileSync('${{ github.workspace }}/releaseNote.md', 'utf8').replace(/<RUNNER_VERSION>/g, runnerVersion)
@@ -214,7 +216,7 @@ jobs:
 
     # Upload release assets (full runner packages)
     - name: Upload Release Asset (win-x64)
-      uses: actions/upload-release-asset@v1.0.2
+      uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -224,7 +226,7 @@ jobs:
         asset_content_type: application/octet-stream
 
     - name: Upload Release Asset (win-arm64)
-      uses: actions/upload-release-asset@v1.0.2
+      uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -234,7 +236,7 @@ jobs:
         asset_content_type: application/octet-stream
 
     - name: Upload Release Asset (linux-x64)
-      uses: actions/upload-release-asset@v1.0.2
+      uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -244,7 +246,7 @@ jobs:
         asset_content_type: application/octet-stream
 
     - name: Upload Release Asset (osx-x64)
-      uses: actions/upload-release-asset@v1.0.2
+      uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -254,7 +256,7 @@ jobs:
         asset_content_type: application/octet-stream
 
     - name: Upload Release Asset (osx-arm64)
-      uses: actions/upload-release-asset@v1.0.2
+      uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -264,7 +266,7 @@ jobs:
         asset_content_type: application/octet-stream
 
     - name: Upload Release Asset (linux-arm)
-      uses: actions/upload-release-asset@v1.0.2
+      uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -274,7 +276,7 @@ jobs:
         asset_content_type: application/octet-stream
 
     - name: Upload Release Asset (linux-arm64)
-      uses: actions/upload-release-asset@v1.0.2
+      uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -289,18 +291,16 @@ jobs:
     permissions:
       contents: read
       packages: write
-      id-token: write
-      attestations: write
     env:
       REGISTRY: ghcr.io
       IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Compute image version
         id: image
-        uses: actions/github-script@v8.0.0
+        uses: actions/github-script@v6
         with:
           script: |
             const fs = require('fs');
@@ -309,10 +309,10 @@ jobs:
             core.setOutput('version', runnerVersion);
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -320,7 +320,7 @@ jobs:
 
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v3
         with:
           context: ./images
           platforms: |
@@ -336,10 +336,3 @@ jobs:
             org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}
             org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }}
             org.opencontainers.image.licenses=MIT
-
-      - name: Generate attestation
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          subject-digest: ${{ steps.build-and-push.outputs.digest }}
-          push-to-registry: true

.github/workflows/stale-bot.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10
+      - 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."

.gitignore

@@ -26,5 +26,4 @@ _dotnetsdk
 TestResults
 TestLogs
 .DS_Store
-.mono
 **/*.DotSettings.user

.husky/pre-commit

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

README.md

@@ -20,20 +20,6 @@ Runner releases:
 
 ![linux](docs/res/linux_sm.png)  [Pre-reqs](docs/start/envlinux.md) | [Download](https://github.com/actions/runner/releases)
 
-### Note
+## Contribute
 
-Thank you for your interest in this GitHub repo, however, right now we are not taking contributions. 
-
-We continue to focus our resources on strategic areas that help our customers be successful while making developers' lives easier. While GitHub Actions remains a key part of this vision, we are allocating resources towards other areas of Actions and are not taking contributions to this repository at this time. The GitHub public roadmap is the best place to follow along for any updates on features we’re working on and what stage they’re in.
-
-We are taking the following steps to better direct requests related to GitHub Actions, including:
-
-1. We will be directing questions and support requests to our [Community Discussions area](https://github.com/orgs/community/discussions/categories/actions)
-
-2. High Priority bugs can be reported through Community Discussions or you can report these to our support team https://support.github.com/contact/bug-report.
-
-3. Security Issues should be handled as per our [security.md](security.md)
-
-We will still provide security updates for this project and fix major breaking changes during this time.
-
-You are welcome to still raise bugs in this repo.
+We accept contributions in the form of issues and pull requests. The runner typically requires changes across the entire system and we aim for issues in the runner to be entirely self contained and fixable here. Therefore, we will primarily handle bug issues opened in this repo and we kindly request you to create all feature and enhancement requests on the [GitHub Feedback](https://github.com/community/community/discussions/categories/actions-and-packages) page. [Read more about our guidelines here](docs/contribute.md) before contributing.

docs/adrs/0276-problem-matchers.md

@@ -250,42 +250,6 @@ Two problem matchers can be used:
 }
 ```
 
-#### Default from path
-
-The problem matcher can specify a `fromPath` property at the top level, which applies when a specific pattern doesn't provide a value for `fromPath`. This is useful for tools that don't include project file information in their output.
-
-For example, given the following compiler output that doesn't include project file information:
-
-```
-ClassLibrary.cs(16,24): warning CS0612: 'ClassLibrary.Helpers.MyHelper.Name' is obsolete
-```
-
-A problem matcher with a default from path can be used:
-
-```json
-{
-    "problemMatcher": [
-        {
-            "owner": "csc-minimal",
-            "fromPath": "ClassLibrary/ClassLibrary.csproj",
-            "pattern": [
-                {
-                    "regexp": "^(.+)\\((\\d+),(\\d+)\\): (error|warning) (.+): (.*)$",
-                    "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "severity": 4,
-                    "code": 5,
-                    "message": 6
-                }
-            ]
-        }
-    ]
-}
-```
-
-This ensures that the file is rooted to the correct path when there's not enough information in the error messages to extract a `fromPath`.
-
 #### Mitigate regular expression denial of service (ReDos)
 
 If a matcher exceeds a 1 second timeout when processing a line, retry up to two three times total.

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

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

docs/checks/nodejs.md

@@ -4,9 +4,9 @@
 
 Make sure the built-in node.js has access to GitHub.com or GitHub Enterprise Server.
 
-The runner carries its own copies of node.js executables under `<runner_root>/externals/node20/` and `<runner_root>/externals/node24/`.
+The runner carries its own copy of node.js executable under `<runner_root>/externals/node16/`.
 
-All javascript base Actions will get executed by the built-in `node` at either `<runner_root>/externals/node20/` or `<runner_root>/externals/node24/` depending on the version specified in the action's metadata.
+All javascript base Actions will get executed by the built-in `node` at `<runner_root>/externals/node16/`.
 
 > Not the `node` from `$PATH`
 

docs/dependency-management.md

@@ -1,217 +0,0 @@
-# Runner Dependency Management Process
-
-## Overview
-
-This document outlines the automated dependency management process for the GitHub Actions Runner, designed to ensure we maintain up-to-date and secure dependencies while providing predictable release cycles.
-
-## Release Schedule
-
-- **Monthly Runner Releases**: New runner versions are released monthly
-- **Weekly Dependency Checks**: Automated workflows check for dependency updates every Monday
-- **Security Patches**: Critical security vulnerabilities are addressed immediately outside the regular schedule
-
-## Automated Workflows
-
-**Note**: These workflows are implemented across separate PRs for easier review and independent deployment. Each workflow includes comprehensive error handling and security-focused vulnerability detection.
-
-### 1. Foundation Labels
-
-- **Workflow**: `.github/workflows/setup-labels.yml` (PR #4024)
-- **Purpose**: Creates consistent dependency labels for all automation workflows
-- **Labels**: `dependencies`, `security`, `typescript`, `needs-manual-review`
-- **Prerequisite**: Must be merged before other workflows for proper labeling
-
-### 2. Node.js Version Updates
-
-- **Workflow**: `.github/workflows/node-upgrade.yml`
-- **Schedule**: Mondays at 6:00 AM UTC
-- **Purpose**: Updates Node.js 20 and 24 versions in `src/Misc/externals.sh`
-- **Source**: [nodejs.org](https://nodejs.org) and [actions/alpine_nodejs](https://github.com/actions/alpine_nodejs)
-- **Priority**: First (NPM depends on current Node.js versions)
-
-### 3. NPM Security Audit
-
-- **Primary Workflow**: `.github/workflows/npm-audit.yml` ("NPM Audit Fix")
-  - **Schedule**: Mondays at 7:00 AM UTC
-  - **Purpose**: Automated security vulnerability detection and basic fixes
-  - **Location**: `src/Misc/expressionFunc/hashFiles/`
-  - **Features**: npm audit, security patch application, PR creation
-  - **Dependency**: Runs after Node.js updates for optimal compatibility
-
-- **Fallback Workflow**: `.github/workflows/npm-audit-typescript.yml` ("NPM Audit Fix with TypeScript Auto-Fix")
-  - **Trigger**: Manual dispatch only
-  - **Purpose**: Manual security audit with TypeScript compatibility fixes
-  - **Use Case**: When scheduled workflow fails or needs custom intervention
-  - **Features**: Enhanced TypeScript auto-repair, graduated security response
-  - **How to Use**:
-    1. If the scheduled "NPM Audit Fix" workflow fails, go to Actions tab
-    2. Select "NPM Audit Fix with TypeScript Auto-Fix" workflow
-    3. Click "Run workflow" and optionally specify fix level (auto/manual)
-    4. Review the generated PR for TypeScript compatibility issues
-
-### 4. .NET SDK Updates
-
-- **Workflow**: `.github/workflows/dotnet-upgrade.yml`
-- **Schedule**: Mondays at midnight UTC
-- **Purpose**: Updates .NET SDK and package versions with build validation
-- **Features**: Global.json updates, NuGet package management, compatibility checking
-- **Independence**: Runs independently of Node.js/NPM updates
-
-### 5. Docker/Buildx Updates
-
-- **Workflow**: `.github/workflows/docker-buildx-upgrade.yml` ("Docker/Buildx Version Upgrade")
-- **Schedule**: Mondays at midnight UTC
-- **Purpose**: Updates Docker and Docker Buildx versions with multi-platform validation
-- **Features**: Container security scanning, multi-architecture build testing
-- **Independence**: Runs independently of other dependency updates
-
-### 6. Dependency Monitoring
-
-- **Workflow**: `.github/workflows/dependency-check.yml` ("Dependency Status Check")
-- **Schedule**: Mondays at 11:00 AM UTC
-- **Purpose**: Comprehensive status report of all dependencies with security audit
-- **Features**: Multi-dependency checking, npm audit status, build validation, choice of specific component checks
-- **Summary**: Runs last to capture results from all morning dependency updates
-
-## Release Process Integration
-
-### Pre-Release Checklist
-
-Before each monthly runner release:
-
-1. **Check Dependency PRs**:
-
-   ```bash
-   # List all open dependency PRs
-   gh pr list --label "dependencies" --state open
-   
-   # List only automated weekly dependency updates
-   gh pr list --label "dependencies-weekly-check" --state open
-   
-   # List only custom dependency automation (not dependabot)
-   gh pr list --label "dependencies-not-dependabot" --state open
-   ```
-
-2. **Run Manual Dependency Check**:
-   - Go to Actions tab → "Dependency Status Check" → "Run workflow"
-   - Review the summary for any outdated dependencies
-
-3. **Review and Merge Updates**:
-   - Prioritize security-related updates
-   - Test dependency updates in development environment
-   - Merge approved dependency PRs
-
-### Vulnerability Response
-
-#### Critical Security Vulnerabilities
-
-- **Response Time**: Within 24 hours
-- **Process**:
-  1. Assess impact on runner security
-  2. Create hotfix branch if runner data security is affected
-  3. Expedite patch release if necessary
-  4. Document in security advisory if applicable
-
-#### Non-Critical Vulnerabilities
-
-- **Response Time**: Next monthly release
-- **Process**:
-  1. Evaluate if vulnerability affects runner functionality
-  2. Include fix in regular dependency update cycle
-  3. Document in release notes
-
-## Monitoring and Alerts
-
-### GitHub Actions Workflow Status
-
-- All dependency workflows create PRs with the `dependencies` label
-- Failed workflows should be investigated immediately
-- Weekly dependency status reports are generated automatically
-
-### Manual Checks
-
-You can manually trigger dependency checks:
-
-- **Full Status**: Run "Dependency Status Check" workflow
-- **Specific Component**: Use the dropdown to check individual dependencies
-
-## Dependency Labels
-
-All automated dependency PRs are tagged with labels for easy filtering and management:
-
-### Primary Labels
-
-- **`dependencies`**: All automated dependency-related PRs
-- **`dependencies-weekly-check`**: Automated weekly dependency updates from scheduled workflows
-- **`dependencies-not-dependabot`**: Custom dependency automation (not created by dependabot)
-- **`security`**: Security vulnerability fixes and patches  
-- **`typescript`**: TypeScript compatibility and type definition updates
-- **`needs-manual-review`**: Complex updates requiring human verification
-
-### Technology-Specific Labels
-
-- **`node`**: Node.js version updates
-- **`javascript`**: JavaScript runtime and tooling updates
-- **`npm`**: NPM package and security updates
-- **`dotnet`**: .NET SDK and NuGet package updates
-- **`docker`**: Docker and container tooling updates
-
-### Workflow-Specific Branches
-
-- **Node.js updates**: `chore/update-node` branch
-- **NPM security fixes**: `chore/npm-audit-fix-YYYYMMDD` and `chore/npm-audit-fix-with-ts-repair` branches
-- **NuGet/.NET updates**: `feature/dotnetsdk-upgrade/{version}` branches
-- **Docker updates**: `feature/docker-buildx-upgrade` branch
-
-## Special Considerations
-
-### Node.js Updates
-
-When updating Node.js versions, remember to:
-
-1. Create a corresponding release in [actions/alpine_nodejs](https://github.com/actions/alpine_nodejs)
-2. Follow the alpine_nodejs getting started guide
-3. Test container builds with new Node versions
-
-### .NET SDK Updates
-
-- Only patch versions are auto-updated within the same major.minor version
-- Major/minor version updates require manual review and testing
-
-### Docker Updates
-
-- Updates include both Docker Engine and Docker Buildx
-- Verify compatibility with runner container workflows
-
-## Troubleshooting
-
-### Common Issues
-
-1. **NPM Audit Workflow Fails**:
-   - Check if `package.json` exists in `src/Misc/expressionFunc/hashFiles/`
-   - Verify Node.js setup step succeeded
-
-2. **Version Detection Fails**:
-   - Check if upstream APIs are available
-   - Verify parsing logic for version extraction
-
-3. **PR Creation Fails**:
-   - Ensure `GITHUB_TOKEN` has sufficient permissions
-   - Check if branch already exists
-
-### Contact
-
-For questions about the dependency management process:
-
-- Create an issue with the `dependencies` label
-- Review existing dependency management workflows
-- Consult the runner team for security-related concerns
-
-## Metrics and KPIs
-
-Track these metrics to measure dependency management effectiveness:
-
-- Number of open dependency PRs at release time
-- Time to merge dependency updates
-- Number of security vulnerabilities by severity
-- Release cycle adherence (monthly target)

docs/start/envlinux.md

@@ -4,7 +4,7 @@
 
 ## Supported Distributions and Versions
 
-Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/reference/runners/self-hosted-runners#linux)."
+Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#linux)."
 
 ## Install .Net Core 3.x Linux Dependencies
 

docs/start/envosx.md

@@ -4,6 +4,6 @@
 
 ## Supported Versions
 
-Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/reference/runners/self-hosted-runners#macos)."
+Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#macos)."
 
 ## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore30)

docs/start/envwin.md

@@ -2,6 +2,6 @@
 
 ## Supported Versions
 
-Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/reference/runners/self-hosted-runners#windows)."
+Please see "[Supported architectures and operating systems for self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#windows)."
 
 ## [More .NET Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore30)

images/Dockerfile

@@ -1,12 +1,12 @@
 # Source: https://github.com/dotnet/dotnet-docker
-FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy AS build
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build
 
 ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
-ARG DOCKER_VERSION=29.0.1
-ARG BUILDX_VERSION=0.30.0
+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.1
+ARG DOCKER_VERSION=27.1.1
+ARG BUILDX_VERSION=0.16.2
 
 RUN apt update -y && apt install curl unzip -y
 
@@ -21,10 +21,6 @@ RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-c
     && unzip ./runner-container-hooks.zip -d ./k8s \
     && rm runner-container-hooks.zip
 
-RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-container-hooks/releases/download/v0.8.0/actions-runner-hooks-k8s-0.8.0.zip \
-    && unzip ./runner-container-hooks.zip -d ./k8s-novolume \
-    && rm runner-container-hooks.zip
-
 RUN export RUNNER_ARCH=${TARGETARCH} \
     && if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \
     && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
@@ -36,7 +32,7 @@ RUN export RUNNER_ARCH=${TARGETARCH} \
         "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \
     && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
 
-FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV RUNNER_MANUALLY_TRAP_SIG=1
@@ -51,18 +47,16 @@ RUN apt update -y \
 # Configure git-core/ppa based on guidance here:  https://git-scm.com/download/linux
 RUN add-apt-repository ppa:git-core/ppa \
     && apt update -y \
-    && apt install -y git \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /home/runner
+    && apt install -y --no-install-recommends git
 
 RUN adduser --disabled-password --gecos "" --uid 1001 runner \
     && groupadd docker --gid 123 \
     && usermod -aG sudo runner \
     && usermod -aG docker runner \
     && echo "%sudo   ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers \
-    && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers \
-    && chmod 777 /home/runner
+    && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers
+
+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

releaseNote.md

@@ -1,43 +1,17 @@
 ## What's Changed
-* Update safe_sleep.sh for bug when scheduler is paused for more than 1 second by @horner in https://github.com/actions/runner/pull/3157
-* Acknowledge runner request by @ericsciple in https://github.com/actions/runner/pull/3996
-* Update Docker to v28.3.3 and Buildx to v0.27.0 by @github-actions[bot] in https://github.com/actions/runner/pull/3999
-* Update dotnet sdk to latest version @8.0.413 by @github-actions[bot] in https://github.com/actions/runner/pull/4000
-* Bump actions/attest-build-provenance from 2 to 3 by @dependabot[bot] in https://github.com/actions/runner/pull/4002
-* Bump @typescript-eslint/eslint-plugin from 6.7.2 to 8.35.0 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/3920
-* Bump husky from 8.0.3 to 9.1.7 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/3842
-* Bump @vercel/ncc from 0.38.0 to 0.38.3 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/3841
-* Bump eslint-plugin-github from 4.10.0 to 4.10.2 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/3180
-* Bump typescript from 5.2.2 to 5.9.2 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/4007
-* chore: migrate Husky config from v8 to v9 format by @salmanmkc in https://github.com/actions/runner/pull/4003
-* Map RUNNER_TEMP for container action by @ericsciple in https://github.com/actions/runner/pull/4011
-* Break UseV2Flow into UseV2Flow and UseRunnerAdminFlow. by @TingluoHuang in https://github.com/actions/runner/pull/4013
-* Update Docker to v28.4.0 and Buildx to v0.28.0 by @github-actions[bot] in https://github.com/actions/runner/pull/4020
-* Bump node.js to latest version in runner. by @TingluoHuang in https://github.com/actions/runner/pull/4022
-* feat: add automated .NET dependency management workflow by @salmanmkc in https://github.com/actions/runner/pull/4028
-* feat: add automated Docker BuildX dependency management workflow by @salmanmkc in https://github.com/actions/runner/pull/4029
-* feat: add automated Node.js version management workflow by @salmanmkc in https://github.com/actions/runner/pull/4026
-* feat: add comprehensive NPM security management workflow by @salmanmkc in https://github.com/actions/runner/pull/4027
-* feat: add comprehensive dependency monitoring system by @salmanmkc in https://github.com/actions/runner/pull/4025
-* Use BrokerURL when using RunnerAdmin by @luketomlinson in https://github.com/actions/runner/pull/4044
-* Bump actions/github-script from 7.0.1 to 8.0.0 by @dependabot[bot] in https://github.com/actions/runner/pull/4016
-* Bump actions/stale from 9 to 10 by @dependabot[bot] in https://github.com/actions/runner/pull/4015
-* fix: prevent Node.js upgrade workflow from creating PRs with empty versions by @salmanmkc in https://github.com/actions/runner/pull/4055
-* chore: update Node versions by @github-actions[bot] in https://github.com/actions/runner/pull/4057
-* Bump actions/setup-node from 4 to 5 by @dependabot[bot] in https://github.com/actions/runner/pull/4037
-* Bump Azure.Storage.Blobs from 12.25.0 to 12.25.1 by @dependabot[bot] in https://github.com/actions/runner/pull/4058
-* Update Docker to v28.5.0 and Buildx to v0.29.1 by @github-actions[bot] in https://github.com/actions/runner/pull/4069
-* Bump github/codeql-action from 3 to 4 by @dependabot[bot] in https://github.com/actions/runner/pull/4072
-* chore: update Node versions by @github-actions[bot] in https://github.com/actions/runner/pull/4075
-* Include k8s novolume (version v0.8.0) by @nikola-jokic in https://github.com/actions/runner/pull/4063
-* Make sure runner-admin has both auth_url and auth_url_v2. by @TingluoHuang in https://github.com/actions/runner/pull/4066
-* Report job has infra failure to run-service by @TingluoHuang in https://github.com/actions/runner/pull/4073
-* Bump actions/setup-node from 5 to 6 by @dependabot[bot] in https://github.com/actions/runner/pull/4078
 
-## New Contributors
-* @horner made their first contribution in https://github.com/actions/runner/pull/3157
+- Adding Snapshot additional mapping tokens https://github.com/actions/runner/pull/3468
+- Create launch httpclient using the right handler and setting https://github.com/actions/runner/pull/3476
+- Fix missing default user-agent for jitconfig runner https://github.com/actions/runner/pull/3473
+- Cleanup back-compat code for interpreting Run Service status codes https://github.com/actions/runner/pull/3456
+- Add runner or worker to the useragent https://github.com/actions/runner/pull/3457
+- Handle Error Body in Responses from Broker https://github.com/actions/runner/pull/3454
+- Fix issues for composite actions (Run Service flow) https://github.com/actions/runner/pull/3446
+- Trace GitHub RequestId to log https://github.com/actions/runner/pull/3442
+- Add `jq`, `git`, `unzip` and `curl` to default packages installed https://github.com/actions/runner/pull/3056
+- Add pid to user-agent and session owner https://github.com/actions/runner/pull/3432
 
-**Full Changelog**: https://github.com/actions/runner/compare/v2.328.0...v2.329.0
+**Full Changelog**: https://github.com/actions/runner/compare/v2.319.1...v2.320.0
 
 _Note: Actions Runner follows a progressive release policy, so the latest release might not be available to your enterprise, organization, or repository yet.
 To confirm which version of the Actions Runner you should expect, please view the download instructions for your enterprise, organization, or repository.
@@ -59,7 +33,9 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ;
 [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
 ```
 
-## Windows arm64
+## [Pre-release] Windows arm64
+
+**Warning:** Windows arm64 runners are currently in preview status and use [unofficial versions of nodejs](https://unofficial-builds.nodejs.org/). They are not intended for production workflows.
 
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.
 

releaseVersion

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

src/Directory.Build.props

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

src/Misc/expressionFunc/hashFiles/package.json

@@ -10,7 +10,8 @@
     "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"
+    "prepare": "cd ../../../../ && husky install"
+
   },
   "repository": {
     "type": "git",
@@ -36,15 +37,15 @@
   },
   "devDependencies": {
     "@types/node": "^20.6.2",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
-    "@vercel/ncc": "^0.38.3",
+    "@vercel/ncc": "^0.38.0",
     "eslint": "^8.47.0",
-    "eslint-plugin-github": "^4.10.2",
+    "eslint-plugin-github": "^4.10.0",
     "eslint-plugin-prettier": "^5.0.0",
-    "husky": "^9.1.7",
-    "lint-staged": "^15.5.0",
     "prettier": "^3.0.3",
-    "typescript": "^5.9.2"
+    "typescript": "^5.2.2",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.0"
   }
 }

src/Misc/externals.sh

@@ -3,11 +3,13 @@ PACKAGERUNTIME=$1
 PRECACHE=$2
 
 NODE_URL=https://nodejs.org/dist
+UNOFFICIAL_NODE_URL=https://unofficial-builds.nodejs.org/download/release
 NODE_ALPINE_URL=https://github.com/actions/alpine_nodejs/releases/download
 # When you update Node versions you must also create a new release of alpine_nodejs at that updated version.
 # Follow the instructions here: https://github.com/actions/alpine_nodejs?tab=readme-ov-file#getting-started
-NODE20_VERSION="20.19.5"
-NODE24_VERSION="24.11.1"
+NODE16_VERSION="16.20.2"
+NODE20_VERSION="20.13.1"
+NODE16_UNOFFICIAL_VERSION="16.20.0" # used only for win-arm64, remove node16 unofficial version when official version is available
 
 get_abs_path() {
   # exploits the fact that pwd will print abs path when no args
@@ -138,10 +140,10 @@ function acquireExternalTool() {
 
 # Download the external tools only for Windows.
 if [[ "$PACKAGERUNTIME" == "win-x64" || "$PACKAGERUNTIME" == "win-x86" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.exe" node16/bin
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/$PACKAGERUNTIME/node.lib" node16/bin
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.exe" node20/bin
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.lib" node20/bin
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/$PACKAGERUNTIME/node.exe" node24/bin
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/$PACKAGERUNTIME/node.lib" node24/bin
     if [[ "$PRECACHE" != "" ]]; then
         acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
     fi
@@ -150,10 +152,10 @@ fi
 # Download the external tools only for Windows.
 if [[ "$PACKAGERUNTIME" == "win-arm64" ]]; then
     # todo: replace these with official release when available
+    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_UNOFFICIAL_VERSION}/$PACKAGERUNTIME/node.exe" node16/bin
+    acquireExternalTool "$UNOFFICIAL_NODE_URL/v${NODE16_UNOFFICIAL_VERSION}/$PACKAGERUNTIME/node.lib" node16/bin
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.exe" node20/bin
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/$PACKAGERUNTIME/node.lib" node20/bin
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/$PACKAGERUNTIME/node.exe" node24/bin
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/$PACKAGERUNTIME/node.lib" node24/bin
     if [[ "$PRECACHE" != "" ]]; then
         acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
     fi
@@ -161,29 +163,30 @@ fi
 
 # Download the external tools only for OSX.
 if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-darwin-x64.tar.gz" node16 fix_nested_dir
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-darwin-x64.tar.gz" node20 fix_nested_dir
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/node-v${NODE24_VERSION}-darwin-x64.tar.gz" node24 fix_nested_dir
 fi
 
 if [[ "$PACKAGERUNTIME" == "osx-arm64" ]]; then
     # node.js v12 doesn't support macOS on arm64.
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-darwin-arm64.tar.gz" node16 fix_nested_dir
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-darwin-arm64.tar.gz" node20 fix_nested_dir
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/node-v${NODE24_VERSION}-darwin-arm64.tar.gz" node24 fix_nested_dir
 fi
 
 # Download the external tools for Linux PACKAGERUNTIMEs.
 if [[ "$PACKAGERUNTIME" == "linux-x64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-x64.tar.gz" node16 fix_nested_dir
+    acquireExternalTool "$NODE_ALPINE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-alpine-x64.tar.gz" node16_alpine
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-x64.tar.gz" node20 fix_nested_dir
     acquireExternalTool "$NODE_ALPINE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-alpine-x64.tar.gz" node20_alpine
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/node-v${NODE24_VERSION}-linux-x64.tar.gz" node24 fix_nested_dir
-    acquireExternalTool "$NODE_ALPINE_URL/v${NODE24_VERSION}/node-v${NODE24_VERSION}-alpine-x64.tar.gz" node24_alpine
 fi
 
 if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-arm64.tar.gz" node16 fix_nested_dir
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-arm64.tar.gz" node20 fix_nested_dir
-    acquireExternalTool "$NODE_URL/v${NODE24_VERSION}/node-v${NODE24_VERSION}-linux-arm64.tar.gz" node24 fix_nested_dir
 fi
 
 if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-armv7l.tar.gz" node16 fix_nested_dir
     acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-armv7l.tar.gz" node20 fix_nested_dir
 fi

src/Misc/layoutbin/actions.runner.service.template

@@ -1,6 +1,6 @@
 [Unit]
 Description={{Description}}
-After=network-online.target
+After=network.target
 
 [Service]
 ExecStart={{RunnerRoot}}/runsvc.sh

src/Misc/layoutbin/hashFiles/index.js

@@ -3299,7 +3299,7 @@ function expand(str, isTop) {
   var isOptions = m.body.indexOf(',') >= 0;
   if (!isSequence && !isOptions) {
     // {a},b}
-    if (m.post.match(/,(?!,).*\}/)) {
+    if (m.post.match(/,.*\}/)) {
       str = m.pre + '{' + m.body + escClose + m.post;
       return expand(str);
     }

src/Misc/layoutbin/installdependencies.sh

@@ -110,7 +110,7 @@ then
             exit 1
         fi
 
-        apt_get_with_fallbacks libicu76 libicu75 libicu74 libicu73 libicu72 libicu71 libicu70 libicu69 libicu68 libicu67 libicu66 libicu65 libicu63 libicu60 libicu57 libicu55 libicu52
+        apt_get_with_fallbacks libicu72 libicu71 libicu70 libicu69 libicu68 libicu67 libicu66 libicu65 libicu63 libicu60 libicu57 libicu55 libicu52
         if [ $? -ne 0 ]
         then
             echo "'$apt_get' failed with exit code '$?'"

src/Misc/layoutbin/runsvc.sh

@@ -10,7 +10,7 @@ if [ -f ".path" ]; then
     echo ".path=${PATH}"
 fi
 
-nodever="node20"
+nodever=${GITHUB_ACTIONS_RUNNER_FORCED_NODE_VERSION:-node16}
 
 # insert anything to setup env when running as a service
 # run the host process which keep the listener alive

src/Misc/layoutbin/update.sh.template

@@ -123,7 +123,7 @@ fi
 # fix upgrade issue with macOS when running as a service
 attemptedtargetedfix=0
 currentplatform=$(uname | awk '{print tolower($0)}')
-if [[ "$currentplatform" == 'darwin'  && $restartinteractiverunner -eq 0 ]]; then
+if [[ "$currentplatform" == 'darwin'  && restartinteractiverunner -eq 0 ]]; then
     # We needed a fix for https://github.com/actions/runner/issues/743
     # We will recreate the ./externals/nodeXY/bin/node of the past runner version that launched the runnerlistener service
     # Otherwise mac gatekeeper kills the processes we spawn on creation as we are running a process with no backing file
@@ -135,15 +135,6 @@ if [[ "$currentplatform" == 'darwin'  && $restartinteractiverunner -eq 0 ]]; the
     then
         # inspect the open file handles to find the node process
         # we can't actually inspect the process using ps because it uses relative paths and doesn't follow symlinks
-        # Try finding node24 first, then fallback to earlier versions if needed
-        nodever="node24"
-        path=$(lsof -a -g "$procgroup" -F n | grep $nodever/bin/node | grep externals | tail -1 | cut -c2-)
-        if [[ $? -ne 0 || -z "$path" ]] # Fallback if RunnerService.js was started with node20
-        then
-            nodever="node20"
-            path=$(lsof -a -g "$procgroup" -F n | grep $nodever/bin/node | grep externals | tail -1 | cut -c2-)
-            if [[ $? -ne 0 || -z "$path" ]] # Fallback if RunnerService.js was started with node16
-            then
         nodever="node16"
         path=$(lsof -a -g "$procgroup" -F n | grep $nodever/bin/node | grep externals | tail -1 | cut -c2-)
         if [[ $? -ne 0 || -z "$path" ]] # Fallback if RunnerService.js was started with node12
@@ -151,8 +142,6 @@ if [[ "$currentplatform" == 'darwin'  && $restartinteractiverunner -eq 0 ]]; the
             nodever="node12"
             path=$(lsof -a -g "$procgroup" -F n | grep $nodever/bin/node | grep externals | tail -1 | cut -c2-)
         fi
-            fi
-        fi
         if [[ $? -eq 0 && -n "$path" ]]
         then
             # trim the last 5 characters of the path '/node'
@@ -189,19 +178,6 @@ if [[ "$currentplatform" == 'darwin'  && $restartinteractiverunner -eq 0 ]]; the
     fi
 fi
 
-# update runsvc.sh
-if [ -f "$rootfolder/runsvc.sh" ]
-then
-    date "+[%F %T-%4N] Update runsvc.sh" >> "$logfile" 2>&1
-    cat "$rootfolder/bin/runsvc.sh" > "$rootfolder/runsvc.sh"
-    if [ $? -ne 0 ]
-    then
-        date "+[%F %T-%4N] Can't update $rootfolder/runsvc.sh using $rootfolder/bin/runsvc.sh" >> "$logfile" 2>&1
-        mv -fv "$logfile" "$logfile.failed"
-        exit 1
-    fi
-fi
-
 date "+[%F %T-%4N] Update succeed" >> "$logfile"
 
 touch update.finished

src/Misc/layoutroot/safe_sleep.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 SECONDS=0
-while [[ $SECONDS -lt $1 ]]; do
+while [[ $SECONDS != $1 ]]; do
     :
 done

src/Runner.Common/AuthMigration.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace GitHub.Runner.Common
-{
-    public class AuthMigrationEventArgs : EventArgs
-    {
-        public AuthMigrationEventArgs(string trace)
-        {
-            Trace = trace;
-        }
-        public string Trace { get; private set; }
-    }
-}

src/Runner.Common/BrokerServer.cs

@@ -7,7 +7,6 @@ using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
-using GitHub.Services.WebApi;
 using Sdk.RSWebApi.Contracts;
 using Sdk.WebApi.WebApi.RawClient;
 
@@ -23,8 +22,6 @@ namespace GitHub.Runner.Common
 
         Task<TaskAgentMessage> GetRunnerMessageAsync(Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate, CancellationToken token);
 
-        Task AcknowledgeRunnerRequestAsync(string runnerRequestId, Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, CancellationToken token);
-
         Task UpdateConnectionIfNeeded(Uri serverUri, VssCredentials credentials);
 
         Task ForceRefreshConnection(VssCredentials credentials);
@@ -39,7 +36,6 @@ namespace GitHub.Runner.Common
 
         public async Task ConnectAsync(Uri serverUri, VssCredentials credentials)
         {
-            Trace.Entering();
             _brokerUri = serverUri;
 
             _connection = VssUtil.CreateRawConnection(serverUri, credentials);
@@ -69,17 +65,10 @@ namespace GitHub.Runner.Common
             var brokerSession = RetryRequest<TaskAgentMessage>(
                 async () => await _brokerHttpClient.GetRunnerMessageAsync(sessionId, version, status, os, architecture, disableUpdate, cancellationToken), cancellationToken, shouldRetry: ShouldRetryException);
 
+
             return brokerSession;
         }
 
-        public async Task AcknowledgeRunnerRequestAsync(string runnerRequestId, Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-
-            // No retries
-            await _brokerHttpClient.AcknowledgeRunnerRequestAsync(runnerRequestId, sessionId, version, status, os, architecture, cancellationToken);
-        }
-
         public async Task DeleteSessionAsync(CancellationToken cancellationToken)
         {
             CheckConnection();
@@ -97,18 +86,13 @@ namespace GitHub.Runner.Common
         }
 
         public Task ForceRefreshConnection(VssCredentials credentials)
-        {
-            if (!string.IsNullOrEmpty(_brokerUri?.AbsoluteUri))
         {
             return ConnectAsync(_brokerUri, credentials);
         }
 
-            return Task.CompletedTask;
-        }
-
         public bool ShouldRetryException(Exception ex)
         {
-            if (ex is AccessDeniedException || ex is RunnerNotFoundException || ex is HostedRunnerDeprovisionedException)
+            if (ex is AccessDeniedException ade)
             {
                 return false;
             }

src/Runner.Common/ConfigurationStore.cs

@@ -1,10 +1,10 @@
-using System;
+using GitHub.Runner.Sdk;
+using System;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
-using GitHub.Runner.Sdk;
 
 namespace GitHub.Runner.Common
 {
@@ -53,9 +53,6 @@ namespace GitHub.Runner.Common
         [DataMember(EmitDefaultValue = false)]
         public bool UseV2Flow { get; set; }
 
-        [DataMember(EmitDefaultValue = false)]
-        public bool UseRunnerAdminFlow { get; set; }
-
         [DataMember(EmitDefaultValue = false)]
         public string ServerUrlV2 { get; set; }
 
@@ -64,20 +61,8 @@ namespace GitHub.Runner.Common
         {
             get
             {
-                // If the value has been explicitly set, return it.
-                if (_isHostedServer.HasValue)
-                {
-                    return _isHostedServer.Value;
-                }
-
-                // Otherwise, try to infer it from the GitHubUrl.
-                if (!string.IsNullOrEmpty(GitHubUrl))
-                {
-                    return UrlUtil.IsHostedServer(new UriBuilder(GitHubUrl));
-                }
-
-                // Default to true since Hosted runners likely don't have this property set.
-                return true;
+                // Old runners do not have this property. Hosted runners likely don't have this property either.
+                return _isHostedServer ?? true;
             }
 
             set
@@ -131,15 +116,11 @@ namespace GitHub.Runner.Common
         bool IsConfigured();
         bool IsServiceConfigured();
         bool HasCredentials();
-        bool IsMigratedConfigured();
         CredentialData GetCredentials();
         CredentialData GetMigratedCredentials();
         RunnerSettings GetSettings();
-        RunnerSettings GetMigratedSettings();
         void SaveCredential(CredentialData credential);
-        void SaveMigratedCredential(CredentialData credential);
         void SaveSettings(RunnerSettings settings);
-        void SaveMigratedSettings(RunnerSettings settings);
         void DeleteCredential();
         void DeleteMigratedCredential();
         void DeleteSettings();
@@ -149,7 +130,6 @@ namespace GitHub.Runner.Common
     {
         private string _binPath;
         private string _configFilePath;
-        private string _migratedConfigFilePath;
         private string _credFilePath;
         private string _migratedCredFilePath;
         private string _serviceConfigFilePath;
@@ -157,7 +137,6 @@ namespace GitHub.Runner.Common
         private CredentialData _creds;
         private CredentialData _migratedCreds;
         private RunnerSettings _settings;
-        private RunnerSettings _migratedSettings;
 
         public override void Initialize(IHostContext hostContext)
         {
@@ -175,9 +154,6 @@ namespace GitHub.Runner.Common
             _configFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Runner);
             Trace.Info("ConfigFilePath: {0}", _configFilePath);
 
-            _migratedConfigFilePath = hostContext.GetConfigFile(WellKnownConfigFile.MigratedRunner);
-            Trace.Info("MigratedConfigFilePath: {0}", _migratedConfigFilePath);
-
             _credFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Credentials);
             Trace.Info("CredFilePath: {0}", _credFilePath);
 
@@ -193,7 +169,7 @@ namespace GitHub.Runner.Common
         public bool HasCredentials()
         {
             Trace.Info("HasCredentials()");
-            bool credsStored = new FileInfo(_credFilePath).Exists || new FileInfo(_migratedCredFilePath).Exists;
+            bool credsStored = (new FileInfo(_credFilePath)).Exists || (new FileInfo(_migratedCredFilePath)).Exists;
             Trace.Info("stored {0}", credsStored);
             return credsStored;
         }
@@ -201,7 +177,7 @@ namespace GitHub.Runner.Common
         public bool IsConfigured()
         {
             Trace.Info("IsConfigured()");
-            bool configured = new FileInfo(_configFilePath).Exists || new FileInfo(_migratedConfigFilePath).Exists;
+            bool configured = new FileInfo(_configFilePath).Exists;
             Trace.Info("IsConfigured: {0}", configured);
             return configured;
         }
@@ -209,19 +185,11 @@ namespace GitHub.Runner.Common
         public bool IsServiceConfigured()
         {
             Trace.Info("IsServiceConfigured()");
-            bool serviceConfigured = new FileInfo(_serviceConfigFilePath).Exists;
+            bool serviceConfigured = (new FileInfo(_serviceConfigFilePath)).Exists;
             Trace.Info($"IsServiceConfigured: {serviceConfigured}");
             return serviceConfigured;
         }
 
-        public bool IsMigratedConfigured()
-        {
-            Trace.Info("IsMigratedConfigured()");
-            bool configured = new FileInfo(_migratedConfigFilePath).Exists;
-            Trace.Info("IsMigratedConfigured: {0}", configured);
-            return configured;
-        }
-
         public CredentialData GetCredentials()
         {
             if (_creds == null)
@@ -261,25 +229,6 @@ namespace GitHub.Runner.Common
             return _settings;
         }
 
-        public RunnerSettings GetMigratedSettings()
-        {
-            if (_migratedSettings == null)
-            {
-                RunnerSettings configuredSettings = null;
-                if (File.Exists(_migratedConfigFilePath))
-                {
-                    string json = File.ReadAllText(_migratedConfigFilePath, Encoding.UTF8);
-                    Trace.Info($"Read migrated setting file: {json.Length} chars");
-                    configuredSettings = StringUtil.ConvertFromJson<RunnerSettings>(json);
-                }
-
-                ArgUtil.NotNull(configuredSettings, nameof(configuredSettings));
-                _migratedSettings = configuredSettings;
-            }
-
-            return _migratedSettings;
-        }
-
         public void SaveCredential(CredentialData credential)
         {
             Trace.Info("Saving {0} credential @ {1}", credential.Scheme, _credFilePath);
@@ -295,21 +244,6 @@ namespace GitHub.Runner.Common
             File.SetAttributes(_credFilePath, File.GetAttributes(_credFilePath) | FileAttributes.Hidden);
         }
 
-        public void SaveMigratedCredential(CredentialData credential)
-        {
-            Trace.Info("Saving {0} migrated credential @ {1}", credential.Scheme, _migratedCredFilePath);
-            if (File.Exists(_migratedCredFilePath))
-            {
-                // Delete existing credential file first, since the file is hidden and not able to overwrite.
-                Trace.Info("Delete exist runner migrated credential file.");
-                IOUtil.DeleteFile(_migratedCredFilePath);
-            }
-
-            IOUtil.SaveObject(credential, _migratedCredFilePath);
-            Trace.Info("Migrated Credentials Saved.");
-            File.SetAttributes(_migratedCredFilePath, File.GetAttributes(_migratedCredFilePath) | FileAttributes.Hidden);
-        }
-
         public void SaveSettings(RunnerSettings settings)
         {
             Trace.Info("Saving runner settings.");
@@ -325,21 +259,6 @@ namespace GitHub.Runner.Common
             File.SetAttributes(_configFilePath, File.GetAttributes(_configFilePath) | FileAttributes.Hidden);
         }
 
-        public void SaveMigratedSettings(RunnerSettings settings)
-        {
-            Trace.Info("Saving runner migrated settings");
-            if (File.Exists(_migratedConfigFilePath))
-            {
-                // Delete existing settings file first, since the file is hidden and not able to overwrite.
-                Trace.Info("Delete exist runner migrated settings file.");
-                IOUtil.DeleteFile(_migratedConfigFilePath);
-            }
-
-            IOUtil.SaveObject(settings, _migratedConfigFilePath);
-            Trace.Info("Migrated Settings Saved.");
-            File.SetAttributes(_migratedConfigFilePath, File.GetAttributes(_migratedConfigFilePath) | FileAttributes.Hidden);
-        }
-
         public void DeleteCredential()
         {
             IOUtil.Delete(_credFilePath, default(CancellationToken));
@@ -354,12 +273,6 @@ namespace GitHub.Runner.Common
         public void DeleteSettings()
         {
             IOUtil.Delete(_configFilePath, default(CancellationToken));
-            IOUtil.Delete(_migratedConfigFilePath, default(CancellationToken));
-        }
-
-        public void DeleteMigratedSettings()
-        {
-            IOUtil.Delete(_migratedConfigFilePath, default(CancellationToken));
         }
     }
 }

src/Runner.Common/Constants.cs

@@ -18,7 +18,6 @@ namespace GitHub.Runner.Common
     public enum WellKnownConfigFile
     {
         Runner,
-        MigratedRunner,
         Credentials,
         MigratedCredentials,
         RSACredentials,
@@ -155,40 +154,15 @@ namespace GitHub.Runner.Common
                 public const int RunnerUpdating = 3;
                 public const int RunOnceRunnerUpdating = 4;
                 public const int SessionConflict = 5;
-                // Temporary error code to indicate that the runner configuration has been refreshed
-                // and the runner should be restarted. This is a temporary code and will be removed in the future after
-                // the runner is migrated to runner admin.
-                public const int RunnerConfigurationRefreshed = 6;
             }
 
             public static class Features
             {
                 public static readonly string DiskSpaceWarning = "runner.diskspace.warning";
+                public static readonly string Node16Warning = "DistributedTask.AddWarningToNode16Action";
                 public static readonly string LogTemplateErrorsAsDebugMessages = "DistributedTask.LogTemplateErrorsAsDebugMessages";
                 public static readonly string UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate";
                 public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks";
-                public static readonly string AddCheckRunIdToJobContext = "actions_add_check_run_id_to_job_context";
-                public static readonly string DisplayHelpfulActionsDownloadErrors = "actions_display_helpful_actions_download_errors";
-                public static readonly string ContainerActionRunnerTemp = "actions_container_action_runner_temp";
-                public static readonly string SnapshotPreflightHostedRunnerCheck = "actions_snapshot_preflight_hosted_runner_check";
-                public static readonly string SnapshotPreflightImageGenPoolCheck = "actions_snapshot_preflight_image_gen_pool_check";
-                public static readonly string CompareWorkflowParser = "actions_runner_compare_workflow_parser";
-            }
-            
-            // Node version migration related constants
-            public static class NodeMigration
-            {
-                // Node versions
-                public static readonly string Node20 = "node20";
-                public static readonly string Node24 = "node24";
-                
-                // Environment variables for controlling node version selection
-                public static readonly string ForceNode24Variable = "FORCE_JAVASCRIPT_ACTIONS_TO_NODE24";
-                public static readonly string AllowUnsecureNodeVersionVariable = "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION";
-                
-                // Feature flags for controlling the migration phases
-                public static readonly string UseNode24ByDefaultFlag = "actions.runner.usenode24bydefault";
-                public static readonly string RequireNode24Flag = "actions.runner.requirenode24";
             }
 
             public static readonly string InternalTelemetryIssueDataKey = "_internal_telemetry";
@@ -202,6 +176,14 @@ namespace GitHub.Runner.Common
             public static readonly string UnsupportedStopCommandTokenDisabled = "You cannot use a endToken that is an empty string, the string 'pause-logging', or another workflow command. For more information see: https://docs.github.com/actions/learn-github-actions/workflow-commands-for-github-actions#example-stopping-and-starting-workflow-commands or opt into insecure command execution by setting the `ACTIONS_ALLOW_UNSECURE_STOPCOMMAND_TOKENS` environment variable to `true`.";
             public static readonly string UnsupportedSummarySize = "$GITHUB_STEP_SUMMARY upload aborted, supports content up to a size of {0}k, got {1}k. For more information see: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-markdown-summary";
             public static readonly string SummaryUploadError = "$GITHUB_STEP_SUMMARY upload aborted, an error occurred when uploading the summary. For more information see: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-markdown-summary";
+            public static readonly string DetectedNodeAfterEndOfLifeMessage = "Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: {0}. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.";
+            public static readonly string DeprecatedNodeDetectedAfterEndOfLifeActions = "DeprecatedNodeActionsMessageWarnings";
+            public static readonly string DeprecatedNodeVersion = "node16";
+            public static readonly string EnforcedNode12DetectedAfterEndOfLife = "The following actions uses node12 which is deprecated and will be forced to run on node16: {0}. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/";
+            public static readonly string EnforcedNode12DetectedAfterEndOfLifeEnvVariable = "Node16ForceActionsWarnings";
+            public static readonly string EnforcedNode16DetectedAfterEndOfLife = "The following actions use a deprecated Node.js version and will be forced to run on node20: {0}. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/";
+            public static readonly string EnforcedNode16DetectedAfterEndOfLifeEnvVariable = "Node20ForceActionsWarnings";
+
         }
 
         public static class RunnerEvent
@@ -272,17 +254,20 @@ namespace GitHub.Runner.Common
                 public static readonly string RequireJobContainer = "ACTIONS_RUNNER_REQUIRE_JOB_CONTAINER";
                 public static readonly string RunnerDebug = "ACTIONS_RUNNER_DEBUG";
                 public static readonly string StepDebug = "ACTIONS_STEP_DEBUG";
+                public static readonly string AllowActionsUseUnsecureNodeVersion = "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION";
+                public static readonly string ManualForceActionsToNode20 = "FORCE_JAVASCRIPT_ACTIONS_TO_NODE20";
             }
 
             public static class Agent
             {
                 public static readonly string ToolsDirectory = "agent.ToolsDirectory";
 
-                // Set this env var to "nodeXY" to downgrade the node version for internal functions (e.g hashfiles). This does NOT affect the version of node actions.
+                // Set this env var to "node12" to downgrade the node version for internal functions (e.g hashfiles). This does NOT affect the version of node actions.
                 public static readonly string ForcedInternalNodeVersion = "ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION";
                 public static readonly string ForcedActionsNodeVersion = "ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION";
                 public static readonly string PrintLogToStdout = "ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT";
                 public static readonly string ActionArchiveCacheDirectory = "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE";
+                public static readonly string ManualForceActionsToNode20 = "FORCE_JAVASCRIPT_ACTIONS_TO_NODE20";
             }
 
             public static class System
@@ -295,6 +280,10 @@ namespace GitHub.Runner.Common
                 public static readonly string PhaseDisplayName = "system.phaseDisplayName";
                 public static readonly string JobRequestType = "system.jobRequestType";
                 public static readonly string OrchestrationId = "system.orchestrationId";
+                public static readonly string TestDotNet8Compatibility = "system.testDotNet8Compatibility";
+                public static readonly string DotNet8CompatibilityOutputLength = "system.dotNet8CompatibilityOutputLength";
+                public static readonly string DotNet8CompatibilityOutputPattern = "system.dotNet8CompatibilityOutputPattern";
+                public static readonly string DotNet8CompatibilityWarning = "system.dotNet8CompatibilityWarning";
             }
         }
 

src/Runner.Common/HostContext.cs

@@ -15,7 +15,6 @@ using System.Threading.Tasks;
 using GitHub.DistributedTask.Logging;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
-using GitHub.Services.WebApi.Jwt;
 
 namespace GitHub.Runner.Common
 {
@@ -38,11 +37,6 @@ namespace GitHub.Runner.Common
         void ShutdownRunner(ShutdownReason reason);
         void WritePerfCounter(string counter);
         void LoadDefaultUserAgents();
-
-        bool AllowAuthMigration { get; }
-        void EnableAuthMigration(string trace);
-        void DeferAuthMigration(TimeSpan deferred, string trace);
-        event EventHandler<AuthMigrationEventArgs> AuthMigrationChanged;
     }
 
     public enum StartupType
@@ -76,21 +70,12 @@ namespace GitHub.Runner.Common
         private RunnerWebProxy _webProxy = new();
         private string _hostType = string.Empty;
 
-        // disable auth migration by default
-        private readonly ManualResetEventSlim _allowAuthMigration = new ManualResetEventSlim(false);
-        private DateTime _deferredAuthMigrationTime = DateTime.MaxValue;
-        private readonly object _authMigrationLock = new object();
-        private CancellationTokenSource _authMigrationAutoReenableTaskCancellationTokenSource = new();
-        private Task _authMigrationAutoReenableTask;
-
         public event EventHandler Unloading;
-        public event EventHandler<AuthMigrationEventArgs> AuthMigrationChanged;
         public CancellationToken RunnerShutdownToken => _runnerShutdownTokenSource.Token;
         public ShutdownReason RunnerShutdownReason { get; private set; }
         public ISecretMasker SecretMasker => _secretMasker;
         public List<ProductInfoHeaderValue> UserAgents => _userAgents;
         public RunnerWebProxy WebProxy => _webProxy;
-        public bool AllowAuthMigration => _allowAuthMigration.IsSet;
         public HostContext(string hostType, string logFile = null)
         {
             // Validate args.
@@ -222,71 +207,6 @@ namespace GitHub.Runner.Common
             LoadDefaultUserAgents();
         }
 
-        // marked as internal for testing
-        internal async Task AuthMigrationAuthReenableAsync(TimeSpan refreshInterval, CancellationToken token)
-        {
-            try
-            {
-                while (!token.IsCancellationRequested)
-                {
-                    _trace.Verbose($"Auth migration defer timer is set to expire at {_deferredAuthMigrationTime.ToString("O")}. AllowAuthMigration: {_allowAuthMigration.IsSet}.");
-                    await Task.Delay(refreshInterval, token);
-                    if (!_allowAuthMigration.IsSet && DateTime.UtcNow > _deferredAuthMigrationTime)
-                    {
-                        _trace.Info($"Auth migration defer timer expired. Allowing auth migration.");
-                        EnableAuthMigration("Auth migration defer timer expired.");
-                    }
-                }
-            }
-            catch (TaskCanceledException)
-            {
-                // Task was cancelled, exit the loop.
-            }
-            catch (Exception ex)
-            {
-                _trace.Info("Error in auth migration reenable task.");
-                _trace.Error(ex);
-            }
-        }
-
-        public void EnableAuthMigration(string trace)
-        {
-            _allowAuthMigration.Set();
-
-            lock (_authMigrationLock)
-            {
-                if (_authMigrationAutoReenableTask == null)
-                {
-                    var refreshIntervalInMS = 60 * 1000;
-#if DEBUG
-                    // For L0, we will refresh faster
-                    if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("_GITHUB_ACTION_AUTH_MIGRATION_REFRESH_INTERVAL")))
-                    {
-                        refreshIntervalInMS = int.Parse(Environment.GetEnvironmentVariable("_GITHUB_ACTION_AUTH_MIGRATION_REFRESH_INTERVAL"));
-                    }
-#endif
-                    _authMigrationAutoReenableTask = AuthMigrationAuthReenableAsync(TimeSpan.FromMilliseconds(refreshIntervalInMS), _authMigrationAutoReenableTaskCancellationTokenSource.Token);
-                }
-            }
-
-            _trace.Info($"Enable auth migration at {DateTime.UtcNow.ToString("O")}.");
-            AuthMigrationChanged?.Invoke(this, new AuthMigrationEventArgs(trace));
-        }
-
-        public void DeferAuthMigration(TimeSpan deferred, string trace)
-        {
-            _allowAuthMigration.Reset();
-
-            // defer migration for a while
-            lock (_authMigrationLock)
-            {
-                _deferredAuthMigrationTime = DateTime.UtcNow.Add(deferred);
-            }
-
-            _trace.Info($"Disabled auth migration until {_deferredAuthMigrationTime.ToString("O")}.");
-            AuthMigrationChanged?.Invoke(this, new AuthMigrationEventArgs(trace));
-        }
-
         public void LoadDefaultUserAgents()
         {
             if (string.IsNullOrEmpty(WebProxy.HttpProxyAddress) && string.IsNullOrEmpty(WebProxy.HttpsProxyAddress))
@@ -307,36 +227,6 @@ namespace GitHub.Runner.Common
                 {
                     _userAgents.Add(new ProductInfoHeaderValue("ClientId", clientId));
                 }
-
-                // for Hosted runner, we can pull orchestrationId from JWT claims of the runner listening token.
-                if (credData != null &&
-                    credData.Scheme == Constants.Configuration.OAuthAccessToken &&
-                    credData.Data.TryGetValue(Constants.Runner.CommandLine.Args.Token, out var accessToken) &&
-                    !string.IsNullOrEmpty(accessToken))
-                {
-                    try
-                    {
-                        var jwt = JsonWebToken.Create(accessToken);
-                        var claims = jwt.ExtractClaims();
-                        var orchestrationId = claims.FirstOrDefault(x => string.Equals(x.Type, "orch_id", StringComparison.OrdinalIgnoreCase))?.Value;
-                        if (string.IsNullOrEmpty(orchestrationId))
-                        {
-                            // fallback to orchid for C# actions-service
-                            orchestrationId = claims.FirstOrDefault(x => string.Equals(x.Type, "orchid", StringComparison.OrdinalIgnoreCase))?.Value;
-                        }
-
-                        if (!string.IsNullOrEmpty(orchestrationId))
-                        {
-                            _trace.Info($"Pull OrchestrationId {orchestrationId} from runner JWT claims");
-                            _userAgents.Insert(0, new ProductInfoHeaderValue("OrchestrationId", orchestrationId));
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        _trace.Error("Fail to extract OrchestrationId from runner JWT claims");
-                        _trace.Error(ex);
-                    }
-                }
             }
 
             var runnerFile = GetConfigFile(WellKnownConfigFile.Runner);
@@ -453,12 +343,6 @@ namespace GitHub.Runner.Common
                         ".runner");
                     break;
 
-                case WellKnownConfigFile.MigratedRunner:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Root),
-                        ".runner_migrated");
-                    break;
-
                 case WellKnownConfigFile.Credentials:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Root),
@@ -659,18 +543,6 @@ namespace GitHub.Runner.Common
                     _loadContext.Unloading -= LoadContext_Unloading;
                     _loadContext = null;
                 }
-
-                if (_authMigrationAutoReenableTask != null)
-                {
-                    _authMigrationAutoReenableTaskCancellationTokenSource?.Cancel();
-                }
-
-                if (_authMigrationAutoReenableTaskCancellationTokenSource != null)
-                {
-                    _authMigrationAutoReenableTaskCancellationTokenSource?.Dispose();
-                    _authMigrationAutoReenableTaskCancellationTokenSource = null;
-                }
-
                 _httpTraceSubscription?.Dispose();
                 _diagListenerSubscription?.Dispose();
                 _traceManager?.Dispose();
@@ -757,7 +629,7 @@ namespace GitHub.Runner.Common
                     payload[0] = Enum.Parse(typeof(GitHub.Services.Common.VssCredentialsType), ((int)payload[0]).ToString());
                 }
 
-                if (payload.Length > 0 && !string.IsNullOrEmpty(eventData.Message))
+                if (payload.Length > 0)
                 {
                     message = String.Format(eventData.Message.Replace("%n", Environment.NewLine), payload);
                 }

src/Runner.Common/LaunchServer.cs

@@ -15,7 +15,7 @@ namespace GitHub.Runner.Common
     {
         void InitializeLaunchClient(Uri uri, string token);
 
-        Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList, CancellationToken cancellationToken, bool displayHelpfulActionsDownloadErrors);
+        Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList, CancellationToken cancellationToken);
     }
 
     public sealed class LaunchServer : RunnerService, ILaunchServer
@@ -42,17 +42,13 @@ namespace GitHub.Runner.Common
         }
 
         public Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList,
-            CancellationToken cancellationToken, bool displayHelpfulActionsDownloadErrors)
+            CancellationToken cancellationToken)
         {
             if (_launchClient != null)
-            {
-                if (!displayHelpfulActionsDownloadErrors)
             {
                 return _launchClient.GetResolveActionsDownloadInfoAsync(planId, jobId, actionReferenceList,
                     cancellationToken: cancellationToken);
             }
-                return _launchClient.GetResolveActionsDownloadInfoAsyncV2(planId, jobId, actionReferenceList, cancellationToken);
-            }
 
             throw new InvalidOperationException("Launch client is not initialized.");
         }

src/Runner.Common/RunServer.cs

@@ -18,7 +18,7 @@ namespace GitHub.Runner.Common
     {
         Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
 
-        Task<AgentJobRequestMessage> GetJobMessageAsync(string id, string billingOwnerId, CancellationToken token);
+        Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken token);
 
         Task CompleteJobAsync(
             Guid planId,
@@ -28,9 +28,6 @@ namespace GitHub.Runner.Common
             IList<StepResult> stepResults,
             IList<Annotation> jobAnnotations,
             string environmentUrl,
-            IList<Telemetry> telemetry,
-            string billingOwnerId,
-            string infrastructureFailureCategory,
             CancellationToken token);
 
         Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken token);
@@ -60,11 +57,11 @@ namespace GitHub.Runner.Common
             }
         }
 
-        public Task<AgentJobRequestMessage> GetJobMessageAsync(string id, string billingOwnerId, CancellationToken cancellationToken)
+        public Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken cancellationToken)
         {
             CheckConnection();
             return RetryRequest<AgentJobRequestMessage>(
-                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, VarUtil.OS, billingOwnerId, cancellationToken), cancellationToken,
+                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, VarUtil.OS, cancellationToken), cancellationToken,
                 shouldRetry: ex =>
                     ex is not TaskOrchestrationJobNotFoundException &&          // HTTP status 404
                     ex is not TaskOrchestrationJobAlreadyAcquiredException &&   // HTTP status 409
@@ -79,26 +76,18 @@ namespace GitHub.Runner.Common
             IList<StepResult> stepResults,
             IList<Annotation> jobAnnotations,
             string environmentUrl,
-            IList<Telemetry> telemetry,
-            string billingOwnerId,
-            string infrastructureFailureCategory,
             CancellationToken cancellationToken)
         {
             CheckConnection();
             return RetryRequest(
-                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, telemetry, billingOwnerId, infrastructureFailureCategory, cancellationToken), cancellationToken,
-                shouldRetry: ex =>
-                    ex is not VssUnauthorizedException &&               // HTTP status 401
-                    ex is not TaskOrchestrationJobNotFoundException);   // HTTP status 404
+                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, environmentUrl, cancellationToken), cancellationToken);
         }
 
         public Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken cancellationToken)
         {
             CheckConnection();
             return RetryRequest<RenewJobResponse>(
-                async () => await _runServiceHttpClient.RenewJobAsync(requestUri, planId, jobId, cancellationToken), cancellationToken,
-                shouldRetry: ex =>
-                    ex is not TaskOrchestrationJobNotFoundException);   // HTTP status 404
+                async () => await _runServiceHttpClient.RenewJobAsync(requestUri, planId, jobId, cancellationToken), cancellationToken);
         }
     }
 }

src/Runner.Common/Runner.Common.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
   </PropertyGroup>
 
@@ -15,11 +15,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
+    <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" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Common/RunnerDotcomServer.cs

@@ -19,7 +19,6 @@ namespace GitHub.Runner.Common
 
         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 DeleteRunnerAsync(string githubUrl, string githubToken, ulong runnerId);
         Task<List<TaskAgentPool>> GetRunnerGroupsAsync(string githubUrl, string githubToken);
     }
 
@@ -44,15 +43,89 @@ namespace GitHub.Runner.Common
 
         public async Task<List<TaskAgent>> GetRunnerByNameAsync(string githubUrl, string githubToken, string agentName)
         {
-            var githubApiUrl = $"{GetEntityUrl(githubUrl)}/runners?name={Uri.EscapeDataString(agentName)}";
+            var githubApiUrl = "";
+            var gitHubUrlBuilder = new UriBuilder(githubUrl);
+            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
+            if (path.Length == 1)
+            {
+                // org runner
+                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                }
+                else
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                }
+            }
+            else if (path.Length == 2)
+            {
+                // repo or enterprise runner.
+                if (!string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase))
+                {
+                    return null;
+                }
+
+                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                }
+                else
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runners?name={Uri.EscapeDataString(agentName)}";
+                }
+            }
+            else
+            {
+                throw new ArgumentException($"'{githubUrl}' should point to an org or enterprise.");
+            }
+
             var runnersList = await RetryRequest<ListRunnersResponse>(githubApiUrl, githubToken, RequestType.Get, 3, "Failed to get agents pools");
+
             return runnersList.ToTaskAgents();
         }
 
         public async Task<List<TaskAgentPool>> GetRunnerGroupsAsync(string githubUrl, string githubToken)
         {
-            var githubApiUrl = $"{GetEntityUrl(githubUrl)}/runner-groups";
+            var githubApiUrl = "";
+            var gitHubUrlBuilder = new UriBuilder(githubUrl);
+            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
+            if (path.Length == 1)
+            {
+                // org runner
+                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions/runner-groups";
+                }
+                else
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runner-groups";
+                }
+            }
+            else if (path.Length == 2)
+            {
+                // repo or enterprise runner.
+                if (!string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase))
+                {
+                    return null;
+                }
+
+                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runner-groups";
+                }
+                else
+                {
+                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runner-groups";
+                }
+            }
+            else
+            {
+                throw new ArgumentException($"'{githubUrl}' should point to an org or enterprise.");
+            }
+
             var agentPools = await RetryRequest<RunnerGroupList>(githubApiUrl, githubToken, RequestType.Get, 3, "Failed to get agents pools");
+
             return agentPools?.ToAgentPoolList();
         }
 
@@ -103,12 +176,6 @@ namespace GitHub.Runner.Common
             return await RetryRequest<DistributedTask.WebApi.Runner>(githubApiUrl, githubToken, RequestType.Post, 3, "Failed to add agent", body);
         }
 
-        public async Task DeleteRunnerAsync(string githubUrl, string githubToken, ulong runnerId)
-        {
-            var githubApiUrl = $"{GetEntityUrl(githubUrl)}/runners/{runnerId}";
-            await RetryRequest<DistributedTask.WebApi.Runner>(githubApiUrl, githubToken, RequestType.Delete, 3, "Failed to delete agent");
-        }
-
         private async Task<T> RetryRequest<T>(string githubApiUrl, string githubToken, RequestType requestType, int maxRetryAttemptsCount = 5, string errorMessage = null, StringContent body = null)
         {
             int retry = 0;
@@ -125,22 +192,13 @@ namespace GitHub.Runner.Common
                     try
                     {
                         HttpResponseMessage response = null;
-                        switch (requestType)
+                        if (requestType == RequestType.Get)
                         {
-                            case RequestType.Get:
                             response = await httpClient.GetAsync(githubApiUrl);
-                                break;
-                            case RequestType.Post:
+                        }
+                        else
+                        {
                             response = await httpClient.PostAsync(githubApiUrl, body);
-                                break;
-                            case RequestType.Patch:
-                                response = await httpClient.PatchAsync(githubApiUrl, body);
-                                break;
-                            case RequestType.Delete:
-                                response = await httpClient.DeleteAsync(githubApiUrl);
-                                break;
-                            default:
-                                throw new ArgumentOutOfRangeException(nameof(requestType), requestType, null);
                         }
 
                         if (response != null)
@@ -175,61 +233,5 @@ namespace GitHub.Runner.Common
                 await Task.Delay(backOff);
             }
         }
-
-        private string GetEntityUrl(string githubUrl)
-        {
-            var githubApiUrl = "";
-            var gitHubUrlBuilder = new UriBuilder(githubUrl);
-            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
-            var isOrgRunner = path.Length == 1;
-            var isRepoOrEnterpriseRunner = path.Length == 2;
-            var isRepoRunner = isRepoOrEnterpriseRunner && !string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase);
-
-            if (isOrgRunner)
-            {
-                // org runner
-                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions";
-                }
-                else
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions";
-                }
-            }
-            else if (isRepoOrEnterpriseRunner)
-            {
-                // Repository Runner
-                if (isRepoRunner)
-                {
-                    if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/repos/{path[0]}/{path[1]}/actions";
-                    }
-                    else
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/repos/{path[0]}/{path[1]}/actions";
-                    }
-                }
-                else
-                {
-                    // Enterprise Runner
-                    if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions";
-                    }
-                    else
-                    {
-                        githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions";
-                    }
-                }
-            }
-            else
-            {
-                throw new ArgumentException($"'{githubUrl}' should point to an org or enterprise.");
-            }
-
-            return githubApiUrl;
-        }
     }
 }

src/Runner.Common/RunnerServer.cs

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

src/Runner.Common/RunnerService.cs

@@ -70,8 +70,7 @@ namespace GitHub.Runner.Common
 
         protected async Task RetryRequest(Func<Task> func,
             CancellationToken cancellationToken,
-            int maxAttempts = 5,
-            Func<Exception, bool> shouldRetry = null
+            int maxRetryAttemptsCount = 5
         )
         {
             async Task<Unit> wrappedFunc()
@@ -79,31 +78,31 @@ namespace GitHub.Runner.Common
                 await func();
                 return Unit.Value;
             }
-            await RetryRequest<Unit>(wrappedFunc, cancellationToken, maxAttempts, shouldRetry);
+            await RetryRequest<Unit>(wrappedFunc, cancellationToken, maxRetryAttemptsCount);
         }
 
         protected async Task<T> RetryRequest<T>(Func<Task<T>> func,
             CancellationToken cancellationToken,
-            int maxAttempts = 5,
+            int maxRetryAttemptsCount = 5,
             Func<Exception, bool> shouldRetry = null
         )
         {
-            var attempt = 0;
+            var retryCount = 0;
             while (true)
             {
-                attempt++;
+                retryCount++;
                 cancellationToken.ThrowIfCancellationRequested();
                 try
                 {
                     return await func();
                 }
                 // TODO: Add handling of non-retriable exceptions: https://github.com/github/actions-broker/issues/122
-                catch (Exception ex) when (attempt < maxAttempts && (shouldRetry == null || shouldRetry(ex)))
+                catch (Exception ex) when (retryCount < maxRetryAttemptsCount && (shouldRetry == null || shouldRetry(ex)))
                 {
                     Trace.Error("Catch exception during request");
                     Trace.Error(ex);
                     var backOff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(15));
-                    Trace.Warning($"Back off {backOff.TotalSeconds} seconds before next retry. {maxAttempts - attempt} attempt left.");
+                    Trace.Warning($"Back off {backOff.TotalSeconds} seconds before next retry. {maxRetryAttemptsCount - retryCount} attempt left.");
                     await Task.Delay(backOff, cancellationToken);
                 }
             }

src/Runner.Common/Util/NodeUtil.cs

@@ -1,35 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using GitHub.Runner.Sdk;
 
 namespace GitHub.Runner.Common.Util
 {
     public static class NodeUtil
     {
-        /// <summary>
-        /// Represents details about an environment variable, including its value and source
-        /// </summary>
-        private class EnvironmentVariableInfo
-        {
-            /// <summary>
-            /// Gets or sets whether the value evaluates to true
-            /// </summary>
-            public bool IsTrue { get; set; }
-
-            /// <summary>
-            /// Gets or sets whether the value came from the workflow environment
-            /// </summary>
-            public bool FromWorkflow { get; set; }
-
-            /// <summary>
-            /// Gets or sets whether the value came from the system environment
-            /// </summary>
-            public bool FromSystem { get; set; }
-        }
-
-        private const string _defaultNodeVersion = "node20";
-        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node20" });
+        private const string _defaultNodeVersion = "node16";
+        public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node16", "node20" });
         public static string GetInternalNodeVersion()
         {
             var forcedInternalNodeVersion = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ForcedInternalNodeVersion);
@@ -41,122 +18,5 @@ namespace GitHub.Runner.Common.Util
             }
             return _defaultNodeVersion;
         }
-        /// <summary>
-        /// Determines the appropriate Node version for Actions to use
-        /// </summary>
-        /// <param name="workflowEnvironment">Optional dictionary containing workflow-level environment variables</param>
-        /// <param name="useNode24ByDefault">Feature flag indicating if Node 24 should be the default</param>
-        /// <param name="requireNode24">Feature flag indicating if Node 24 is required</param>
-        /// <returns>The Node version to use (node20 or node24) and warning message if both env vars are set</returns>
-        public static (string nodeVersion, string warningMessage) DetermineActionsNodeVersion(
-            IDictionary<string, string> workflowEnvironment = null,
-            bool useNode24ByDefault = false,
-            bool requireNode24 = false)
-        {
-            // Phase 3: Always use Node 24 regardless of environment variables
-            if (requireNode24)
-            {
-                return (Constants.Runner.NodeMigration.Node24, null);
-            }
-            
-            // Get environment variable details with source information
-            var forceNode24Details = GetEnvironmentVariableDetails(
-                Constants.Runner.NodeMigration.ForceNode24Variable, workflowEnvironment);
-
-            var allowUnsecureNodeDetails = GetEnvironmentVariableDetails(
-                Constants.Runner.NodeMigration.AllowUnsecureNodeVersionVariable, workflowEnvironment);
-
-            bool forceNode24 = forceNode24Details.IsTrue;
-            bool allowUnsecureNode = allowUnsecureNodeDetails.IsTrue;
-            string warningMessage = null;
-
-            // Check if both flags are set from the same source
-            bool bothFromWorkflow = forceNode24Details.IsTrue && allowUnsecureNodeDetails.IsTrue &&
-                                   forceNode24Details.FromWorkflow && allowUnsecureNodeDetails.FromWorkflow;
-
-            bool bothFromSystem = forceNode24Details.IsTrue && allowUnsecureNodeDetails.IsTrue &&
-                                 forceNode24Details.FromSystem && allowUnsecureNodeDetails.FromSystem;
-
-            // Handle the case when both are set in the same source
-            if (bothFromWorkflow || bothFromSystem)
-            {
-                string source = bothFromWorkflow ? "workflow" : "system";
-                string defaultVersion = useNode24ByDefault ? Constants.Runner.NodeMigration.Node24 : Constants.Runner.NodeMigration.Node20;
-                warningMessage = $"Both {Constants.Runner.NodeMigration.ForceNode24Variable} and {Constants.Runner.NodeMigration.AllowUnsecureNodeVersionVariable} environment variables are set to true in the {source} environment. This is likely a configuration error. Using the default Node version: {defaultVersion}.";
-                return (defaultVersion, warningMessage);
-            }
-
-            // Phase 2: Node 24 is the default
-            if (useNode24ByDefault)
-            {
-                if (allowUnsecureNode)
-                {
-                    return (Constants.Runner.NodeMigration.Node20, null);
-                }
-
-                return (Constants.Runner.NodeMigration.Node24, null);
-            }
-
-            // Phase 1: Node 20 is the default
-            if (forceNode24)
-            {
-                return (Constants.Runner.NodeMigration.Node24, null);
-            }
-
-            return (Constants.Runner.NodeMigration.Node20, null);
-        }
-
-        /// <summary>
-        /// Checks if Node24 is requested but running on ARM32 Linux, and determines if fallback is needed.
-        /// </summary>
-        /// <param name="preferredVersion">The preferred Node version</param>
-        /// <returns>A tuple containing the adjusted node version and an optional warning message</returns>
-        public static (string nodeVersion, string warningMessage) CheckNodeVersionForLinuxArm32(string preferredVersion)
-        {
-            if (string.Equals(preferredVersion, Constants.Runner.NodeMigration.Node24, StringComparison.OrdinalIgnoreCase) &&
-                Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.Arm) &&
-                Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
-            {
-                return (Constants.Runner.NodeMigration.Node20, "Node 24 is not supported on Linux ARM32 platforms. Falling back to Node 20.");
-            }
-
-            return (preferredVersion, null);
-        }
-
-        /// <summary>
-        /// Gets detailed information about an environment variable from both workflow and system environments
-        /// </summary>
-        /// <param name="variableName">The name of the environment variable</param>
-        /// <param name="workflowEnvironment">Optional dictionary containing workflow-level environment variables</param>
-        /// <returns>An EnvironmentVariableInfo object containing details about the variable from both sources</returns>
-        private static EnvironmentVariableInfo GetEnvironmentVariableDetails(string variableName, IDictionary<string, string> workflowEnvironment)
-        {
-            var info = new EnvironmentVariableInfo();
-
-            // Check workflow environment
-            bool foundInWorkflow = false;
-            string workflowValue = null;
-
-            if (workflowEnvironment != null && workflowEnvironment.TryGetValue(variableName, out workflowValue))
-            {
-                foundInWorkflow = true;
-                info.FromWorkflow = true;
-                info.IsTrue = StringUtil.ConvertToBoolean(workflowValue); // Workflow value takes precedence for the boolean value
-            }
-
-            // Also check system environment
-            string systemValue = Environment.GetEnvironmentVariable(variableName);
-            bool foundInSystem = !string.IsNullOrEmpty(systemValue);
-
-            info.FromSystem = foundInSystem;
-
-            // If not found in workflow, use system values
-            if (!foundInWorkflow)
-            {
-                info.IsTrue = StringUtil.ConvertToBoolean(systemValue);
-            }
-
-            return info;
-        }
     }
 }

src/Runner.Listener/BrokerMessageListener.cs

@@ -9,12 +9,11 @@ using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
+using GitHub.Runner.Common.Util;
 using GitHub.Services.OAuth;
-using GitHub.Services.WebApi;
 
 namespace GitHub.Runner.Listener
 {
@@ -23,67 +22,34 @@ namespace GitHub.Runner.Listener
         private RunnerSettings _settings;
         private ITerminal _term;
         private TimeSpan _getNextMessageRetryInterval;
-        private TaskAgentStatus _runnerStatus = TaskAgentStatus.Online;
+        private TaskAgentStatus runnerStatus = TaskAgentStatus.Online;
         private CancellationTokenSource _getMessagesTokenSource;
         private VssCredentials _creds;
-        private VssCredentials _credsV2;
         private TaskAgentSession _session;
-        private IRunnerServer _runnerServer;
         private IBrokerServer _brokerServer;
-        private ICredentialManager _credMgr;
         private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new();
         private bool _accessTokenRevoked = false;
         private readonly TimeSpan _sessionCreationRetryInterval = TimeSpan.FromSeconds(30);
         private readonly TimeSpan _sessionConflictRetryLimit = TimeSpan.FromMinutes(4);
         private readonly TimeSpan _clockSkewRetryLimit = TimeSpan.FromMinutes(30);
-        private bool _needRefreshCredsV2 = false;
-        private bool _handlerInitialized = false;
-        private bool _isMigratedSettings = false;
-        private const int _maxMigratedSettingsRetries = 3;
-        private int _migratedSettingsRetryCount = 0;
 
-        public BrokerMessageListener()
-        {
-        }
-
-        public BrokerMessageListener(RunnerSettings settings, bool isMigratedSettings = false)
-        {
-            _settings = settings;
-            _isMigratedSettings = isMigratedSettings;
-        }
 
         public override void Initialize(IHostContext hostContext)
         {
             base.Initialize(hostContext);
 
             _term = HostContext.GetService<ITerminal>();
-            _runnerServer = HostContext.GetService<IRunnerServer>();
             _brokerServer = HostContext.GetService<IBrokerServer>();
-            _credMgr = HostContext.GetService<ICredentialManager>();
         }
 
         public async Task<CreateSessionResult> CreateSessionAsync(CancellationToken token)
         {
             Trace.Entering();
 
-            // Load settings if not provided through constructor
-            if (_settings == null)
-            {
+            // Settings
             var configManager = HostContext.GetService<IConfigurationManager>();
             _settings = configManager.LoadSettings();
-                Trace.Info("Settings loaded from config manager");
-            }
-            else
-            {
-                Trace.Info("Using provided settings");
-                if (_isMigratedSettings)
-                {
-                    Trace.Info("Using migrated settings from .runner_migrated");
-                }
-            }
-
-            var serverUrlV2 = _settings.ServerUrlV2;
-            var serverUrl = _settings.ServerUrl;
+            var serverUrl = _settings.ServerUrlV2;
             Trace.Info(_settings);
 
             if (string.IsNullOrEmpty(_settings.ServerUrlV2))
@@ -93,7 +59,8 @@ namespace GitHub.Runner.Listener
 
             // Create connection.
             Trace.Info("Loading Credentials");
-            _creds = _credMgr.LoadCredentials(allowAuthUrlV2: false);
+            var credMgr = HostContext.GetService<ICredentialManager>();
+            _creds = credMgr.LoadCredentials();
 
             var agent = new TaskAgentReference
             {
@@ -116,18 +83,9 @@ namespace GitHub.Runner.Listener
                 try
                 {
                     Trace.Info("Connecting to the Broker Server...");
-                    _credsV2 = _credMgr.LoadCredentials(allowAuthUrlV2: true);
-                    await _brokerServer.ConnectAsync(new Uri(serverUrlV2), _credsV2);
+                    await _brokerServer.ConnectAsync(new Uri(serverUrl), _creds);
                     Trace.Info("VssConnection created");
 
-                    if (!string.IsNullOrEmpty(serverUrl) &&
-                        !string.Equals(serverUrl, serverUrlV2, StringComparison.OrdinalIgnoreCase))
-                    {
-                        Trace.Info("Connecting to the Runner server...");
-                        await _runnerServer.ConnectAsync(new Uri(serverUrl), _creds);
-                        Trace.Info("VssConnection created");
-                    }
-
                     _term.WriteLine();
                     _term.WriteSuccessMessage("Connected to GitHub");
                     _term.WriteLine();
@@ -142,13 +100,6 @@ namespace GitHub.Runner.Listener
                         encounteringError = false;
                     }
 
-                    if (!_handlerInitialized)
-                    {
-                        // Register event handler for auth migration state change
-                        HostContext.AuthMigrationChanged += HandleAuthMigrationChanged;
-                        _handlerInitialized = true;
-                    }
-
                     return CreateSessionResult.Success;
                 }
                 catch (OperationCanceledException) when (token.IsCancellationRequested)
@@ -167,22 +118,7 @@ namespace GitHub.Runner.Listener
                     Trace.Error("Catch exception during create session.");
                     Trace.Error(ex);
 
-                    // If using migrated settings, limit the number of retries before returning failure
-                    if (_isMigratedSettings)
-                    {
-                        _migratedSettingsRetryCount++;
-                        Trace.Warning($"Migrated settings retry {_migratedSettingsRetryCount} of {_maxMigratedSettingsRetries}");
-                        
-                        if (_migratedSettingsRetryCount >= _maxMigratedSettingsRetries)
-                        {
-                            Trace.Warning("Reached maximum retry attempts for migrated settings. Returning failure to try default settings.");
-                            return CreateSessionResult.Failure;
-                        }
-                    }
-
-                    if (!HostContext.AllowAuthMigration &&
-                        ex is VssOAuthTokenRequestException vssOAuthEx &&
-                        _credsV2.Federated is VssOAuthCredential vssOAuthCred)
+                    if (ex is VssOAuthTokenRequestException vssOAuthEx && _creds.Federated is VssOAuthCredential vssOAuthCred)
                     {
                         // "invalid_client" means the runner registration has been deleted from the server.
                         if (string.Equals(vssOAuthEx.Error, "invalid_client", StringComparison.OrdinalIgnoreCase))
@@ -194,7 +130,7 @@ namespace GitHub.Runner.Listener
                         // Check whether we get 401 because the runner registration already removed by the service.
                         // If the runner registration get deleted, we can't exchange oauth token.
                         Trace.Error("Test oauth app registration.");
-                        var oauthTokenProvider = new VssOAuthTokenProvider(vssOAuthCred, new Uri(serverUrlV2));
+                        var oauthTokenProvider = new VssOAuthTokenProvider(vssOAuthCred, new Uri(serverUrl));
                         var authError = await oauthTokenProvider.ValidateCredentialAsync(token);
                         if (string.Equals(authError, "invalid_client", StringComparison.OrdinalIgnoreCase))
                         {
@@ -203,8 +139,7 @@ namespace GitHub.Runner.Listener
                         }
                     }
 
-                    if (!HostContext.AllowAuthMigration &&
-                        !IsSessionCreationExceptionRetriable(ex))
+                    if (!IsSessionCreationExceptionRetriable(ex))
                     {
                         _term.WriteError($"Failed to create session. {ex.Message}");
                         if (ex is TaskAgentSessionConflictException)
@@ -214,12 +149,6 @@ namespace GitHub.Runner.Listener
                         return CreateSessionResult.Failure;
                     }
 
-                    if (HostContext.AllowAuthMigration)
-                    {
-                        Trace.Info("Disable migration mode for 60 minutes.");
-                        HostContext.DeferAuthMigration(TimeSpan.FromMinutes(60), $"Session creation failed with exception: {ex}");
-                    }
-
                     if (!encounteringError) //print the message only on the first error
                     {
                         _term.WriteError($"{DateTime.UtcNow:u}: Runner connect error: {ex.Message}. Retrying until reconnected.");
@@ -236,11 +165,6 @@ namespace GitHub.Runner.Listener
         {
             if (_session != null && _session.SessionId != Guid.Empty)
             {
-                if (_handlerInitialized)
-                {
-                    HostContext.AuthMigrationChanged -= HandleAuthMigrationChanged;
-                }
-
                 if (!_accessTokenRevoked)
                 {
                     using (var ts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
@@ -258,7 +182,7 @@ namespace GitHub.Runner.Listener
         public void OnJobStatus(object sender, JobStatusEventArgs e)
         {
             Trace.Info("Received job status event. JobState: {0}", e.Status);
-            _runnerStatus = e.Status;
+            runnerStatus = e.Status;
             try
             {
                 _getMessagesTokenSource?.Cancel();
@@ -283,15 +207,8 @@ namespace GitHub.Runner.Listener
                 _getMessagesTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token);
                 try
                 {
-                    if (_needRefreshCredsV2)
-                    {
-                        Trace.Info("Refreshing broker connection.");
-                        await RefreshBrokerConnectionAsync();
-                        _needRefreshCredsV2 = false;
-                    }
-
                     message = await _brokerServer.GetRunnerMessageAsync(_session.SessionId,
-                                                                        _runnerStatus,
+                                                                        runnerStatus,
                                                                         BuildConstants.RunnerPackage.Version,
                                                                         VarUtil.OS,
                                                                         VarUtil.OSArchitecture,
@@ -320,16 +237,7 @@ namespace GitHub.Runner.Listener
                     Trace.Info("Runner OAuth token has been revoked. Unable to pull message.");
                     throw;
                 }
-                catch (HostedRunnerDeprovisionedException)
-                {
-                    Trace.Info("Hosted runner has been deprovisioned.");
-                    throw;
-                }
-                catch (AccessDeniedException e) when (e.ErrorCode == 1 && !HostContext.AllowAuthMigration)
-                {
-                    throw;
-                }
-                catch (RunnerNotFoundException) when (!HostContext.AllowAuthMigration)
+                catch (AccessDeniedException e) when (e.ErrorCode == 1)
                 {
                     throw;
                 }
@@ -338,8 +246,7 @@ namespace GitHub.Runner.Listener
                     Trace.Error("Catch exception during get next message.");
                     Trace.Error(ex);
 
-                    if (!HostContext.AllowAuthMigration &&
-                        !IsGetNextMessageExceptionRetriable(ex))
+                    if (!IsGetNextMessageExceptionRetriable(ex))
                     {
                         throw new NonRetryableException("Get next message failed with non-retryable error.", ex);
                     }
@@ -370,12 +277,6 @@ namespace GitHub.Runner.Listener
                             encounteringError = true;
                         }
 
-                        if (HostContext.AllowAuthMigration)
-                        {
-                            Trace.Info("Disable migration mode for 60 minutes.");
-                            HostContext.DeferAuthMigration(TimeSpan.FromMinutes(60), $"Get next message failed with exception: {ex}");
-                        }
-
                         // re-create VssConnection before next retry
                         await RefreshBrokerConnectionAsync();
 
@@ -407,7 +308,7 @@ namespace GitHub.Runner.Listener
             }
         }
 
-        public async Task RefreshListenerTokenAsync()
+        public async Task RefreshListenerTokenAsync(CancellationToken cancellationToken)
         {
             await RefreshBrokerConnectionAsync();
         }
@@ -417,28 +318,12 @@ namespace GitHub.Runner.Listener
             await Task.CompletedTask;
         }
 
-        public async Task AcknowledgeMessageAsync(string runnerRequestId, CancellationToken cancellationToken)
-        {
-            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(5)); // Short timeout
-            using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
-            Trace.Info($"Acknowledging runner request '{runnerRequestId}'.");
-            await _brokerServer.AcknowledgeRunnerRequestAsync(
-                runnerRequestId,
-                _session.SessionId,
-                _runnerStatus,
-                BuildConstants.RunnerPackage.Version,
-                VarUtil.OS,
-                VarUtil.OSArchitecture,
-                linkedCts.Token);
-        }
-
         private bool IsGetNextMessageExceptionRetriable(Exception ex)
         {
             if (ex is TaskAgentNotFoundException ||
                 ex is TaskAgentPoolNotFoundException ||
                 ex is TaskAgentSessionExpiredException ||
                 ex is AccessDeniedException ||
-                ex is RunnerNotFoundException ||
                 ex is VssUnauthorizedException)
             {
                 Trace.Info($"Non-retriable exception: {ex.Message}");
@@ -525,16 +410,17 @@ namespace GitHub.Runner.Listener
 
         private async Task RefreshBrokerConnectionAsync()
         {
-            Trace.Info("Reload credentials.");
-            _credsV2 = _credMgr.LoadCredentials(allowAuthUrlV2: true);
-            await _brokerServer.ConnectAsync(new Uri(_settings.ServerUrlV2), _credsV2);
-            Trace.Info("Connection to Broker Server recreated.");
+            var configManager = HostContext.GetService<IConfigurationManager>();
+            _settings = configManager.LoadSettings();
+
+            if (string.IsNullOrEmpty(_settings.ServerUrlV2))
+            {
+                throw new InvalidOperationException("ServerUrlV2 is not set");
             }
 
-        private void HandleAuthMigrationChanged(object sender, EventArgs e)
-        {
-            Trace.Info($"Auth migration changed. Current allow auth migration state: {HostContext.AllowAuthMigration}");
-            _needRefreshCredsV2 = true;
+            var credMgr = HostContext.GetService<ICredentialManager>();
+            VssCredentials creds = credMgr.LoadCredentials();
+            await _brokerServer.ConnectAsync(new Uri(_settings.ServerUrlV2), creds);
         }
     }
 }

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -25,7 +25,6 @@ namespace GitHub.Runner.Listener.Configuration
         Task UnconfigureAsync(CommandSettings command);
         void DeleteLocalRunnerConfig();
         RunnerSettings LoadSettings();
-        RunnerSettings LoadMigratedSettings();
     }
 
     public sealed class ConfigurationManager : RunnerService, IConfigurationManager
@@ -67,22 +66,6 @@ namespace GitHub.Runner.Listener.Configuration
             return settings;
         }
 
-        public RunnerSettings LoadMigratedSettings()
-        {
-            Trace.Info(nameof(LoadMigratedSettings));
-
-            // Check if migrated settings file exists
-            if (!_store.IsMigratedConfigured())
-            {
-                throw new NonRetryableException("No migrated configuration found.");
-            }
-
-            RunnerSettings settings = _store.GetMigratedSettings();
-            Trace.Info("Migrated Settings Loaded");
-
-            return settings;
-        }
-
         public async Task ConfigureAsync(CommandSettings command)
         {
             _term.WriteLine();
@@ -144,7 +127,7 @@ namespace GitHub.Runner.Listener.Configuration
                     runnerSettings.ServerUrl = inputUrl;
                     // Get the credentials
                     credProvider = GetCredentialProvider(command, runnerSettings.ServerUrl);
-                    creds = credProvider.GetVssCredentials(HostContext, allowAuthUrlV2: false);
+                    creds = credProvider.GetVssCredentials(HostContext);
                     Trace.Info("legacy vss cred retrieved");
                 }
                 else
@@ -153,8 +136,8 @@ namespace GitHub.Runner.Listener.Configuration
                     registerToken = await GetRunnerTokenAsync(command, inputUrl, "registration");
                     GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
                     runnerSettings.ServerUrl = authResult.TenantUrl;
-                    runnerSettings.UseRunnerAdminFlow = authResult.UseRunnerAdminFlow;
-                    Trace.Info($"Using runner-admin flow: {runnerSettings.UseRunnerAdminFlow}");
+                    runnerSettings.UseV2Flow = authResult.UseV2Flow;
+                    Trace.Info($"Using V2 flow: {runnerSettings.UseV2Flow}");
                     creds = authResult.ToVssCredentials();
                     Trace.Info("cred retrieved via GitHub auth");
                 }
@@ -211,7 +194,7 @@ namespace GitHub.Runner.Listener.Configuration
             string poolName = null;
             TaskAgentPool agentPool = null;
             List<TaskAgentPool> agentPools;
-            if (runnerSettings.UseRunnerAdminFlow)
+            if (runnerSettings.UseV2Flow)
             {
                 agentPools = await _dotcomServer.GetRunnerGroupsAsync(runnerSettings.GitHubUrl, registerToken);
             }
@@ -259,7 +242,7 @@ namespace GitHub.Runner.Listener.Configuration
                 var userLabels = command.GetLabels();
                 _term.WriteLine();
                 List<TaskAgent> agents;
-                if (runnerSettings.UseRunnerAdminFlow)
+                if (runnerSettings.UseV2Flow)
                 {
                     agents = await _dotcomServer.GetRunnerByNameAsync(runnerSettings.GitHubUrl, registerToken, runnerSettings.AgentName);
                 }
@@ -280,11 +263,10 @@ namespace GitHub.Runner.Listener.Configuration
 
                         try
                         {
-                            if (runnerSettings.UseRunnerAdminFlow)
+                            if (runnerSettings.UseV2Flow)
                             {
                                 var runner = await _dotcomServer.ReplaceRunnerAsync(runnerSettings.PoolId, agent, runnerSettings.GitHubUrl, registerToken, publicKeyXML);
                                 runnerSettings.ServerUrlV2 = runner.RunnerAuthorization.ServerUrl;
-                                runnerSettings.UseV2Flow = true; // if we are using runner admin, we also need to hit broker
 
                                 agent.Id = runner.Id;
                                 agent.Authorization = new TaskAgentAuthorization()
@@ -292,13 +274,6 @@ namespace GitHub.Runner.Listener.Configuration
                                     AuthorizationUrl = runner.RunnerAuthorization.AuthorizationUrl,
                                     ClientId = new Guid(runner.RunnerAuthorization.ClientId)
                                 };
-
-                                if (!string.IsNullOrEmpty(runner.RunnerAuthorization.LegacyAuthorizationUrl?.AbsoluteUri))
-                                {
-                                    agent.Authorization.AuthorizationUrl = runner.RunnerAuthorization.LegacyAuthorizationUrl;
-                                    agent.Properties["EnableAuthMigrationByDefault"] = true;
-                                    agent.Properties["AuthorizationUrlV2"] = runner.RunnerAuthorization.AuthorizationUrl.AbsoluteUri;
-                                }
                             }
                             else
                             {
@@ -338,11 +313,10 @@ namespace GitHub.Runner.Listener.Configuration
 
                     try
                     {
-                        if (runnerSettings.UseRunnerAdminFlow)
+                        if (runnerSettings.UseV2Flow)
                         {
                             var runner = await _dotcomServer.AddRunnerAsync(runnerSettings.PoolId, agent, runnerSettings.GitHubUrl, registerToken, publicKeyXML);
                             runnerSettings.ServerUrlV2 = runner.RunnerAuthorization.ServerUrl;
-                            runnerSettings.UseV2Flow = true; // if we are using runner admin, we also need to hit broker
 
                             agent.Id = runner.Id;
                             agent.Authorization = new TaskAgentAuthorization()
@@ -350,13 +324,6 @@ namespace GitHub.Runner.Listener.Configuration
                                 AuthorizationUrl = runner.RunnerAuthorization.AuthorizationUrl,
                                 ClientId = new Guid(runner.RunnerAuthorization.ClientId)
                             };
-
-                            if (!string.IsNullOrEmpty(runner.RunnerAuthorization.LegacyAuthorizationUrl?.AbsoluteUri))
-                            {
-                                agent.Authorization.AuthorizationUrl = runner.RunnerAuthorization.LegacyAuthorizationUrl;
-                                agent.Properties["EnableAuthMigrationByDefault"] = true;
-                                agent.Properties["AuthorizationUrlV2"] = runner.RunnerAuthorization.AuthorizationUrl.AbsoluteUri;
-                            }
                         }
                         else
                         {
@@ -399,46 +366,25 @@ namespace GitHub.Runner.Listener.Configuration
                     {
                         { "clientId", agent.Authorization.ClientId.ToString("D") },
                         { "authorizationUrl", agent.Authorization.AuthorizationUrl.AbsoluteUri },
-                        { "requireFipsCryptography", agent.Properties.GetValue("RequireFipsCryptography", true).ToString() }
+                        { "requireFipsCryptography", agent.Properties.GetValue("RequireFipsCryptography", false).ToString() }
                     },
                 };
 
-                if (agent.Properties.GetValue("EnableAuthMigrationByDefault", false) &&
-                    agent.Properties.TryGetValue<string>("AuthorizationUrlV2", out var authUrlV2) &&
-                    !string.IsNullOrEmpty(authUrlV2))
-                {
-                    credentialData.Data["enableAuthMigrationByDefault"] = "true";
-                    credentialData.Data["authorizationUrlV2"] = authUrlV2;
-                }
-
                 // Save the negotiated OAuth credential data
                 _store.SaveCredential(credentialData);
             }
             else
             {
+
                 throw new NotSupportedException("Message queue listen OAuth token.");
             }
 
-            // allow the server to override the serverUrlV2 and useV2Flow
-            if (agent.Properties.TryGetValue("ServerUrlV2", out string serverUrlV2) &&
-                !string.IsNullOrEmpty(serverUrlV2))
-            {
-                Trace.Info($"Service enforced serverUrlV2: {serverUrlV2}");
-                runnerSettings.ServerUrlV2 = serverUrlV2;
-            }
-
-            if (agent.Properties.TryGetValue("UseV2Flow", out bool useV2Flow) && useV2Flow)
-            {
-                Trace.Info($"Service enforced useV2Flow: {useV2Flow}");
-                runnerSettings.UseV2Flow = useV2Flow;
-            }
-
             // Testing agent connection, detect any potential connection issue, like local clock skew that cause OAuth token expired.
 
-            if (!runnerSettings.UseV2Flow && !runnerSettings.UseRunnerAdminFlow)
+            if (!runnerSettings.UseV2Flow)
             {
                 var credMgr = HostContext.GetService<ICredentialManager>();
-                VssCredentials credential = credMgr.LoadCredentials(allowAuthUrlV2: false);
+                VssCredentials credential = credMgr.LoadCredentials();
                 try
                 {
                     await _runnerServer.ConnectAsync(new Uri(runnerSettings.ServerUrl), credential);
@@ -552,14 +498,6 @@ namespace GitHub.Runner.Listener.Configuration
                 if (isConfigured && hasCredentials)
                 {
                     RunnerSettings settings = _store.GetSettings();
-
-                    if (settings.UseRunnerAdminFlow)
-                    {
-                        var deletionToken = await GetRunnerTokenAsync(command, settings.GitHubUrl, "remove");
-                        await _dotcomServer.DeleteRunnerAsync(settings.GitHubUrl, deletionToken, settings.AgentId);
-                    }
-                    else
-                    {
                     var credentialManager = HostContext.GetService<ICredentialManager>();
 
                     // Get the credentials
@@ -567,7 +505,7 @@ namespace GitHub.Runner.Listener.Configuration
                     if (string.IsNullOrEmpty(settings.GitHubUrl))
                     {
                         var credProvider = GetCredentialProvider(command, settings.ServerUrl);
-                            creds = credProvider.GetVssCredentials(HostContext, allowAuthUrlV2: false);
+                        creds = credProvider.GetVssCredentials(HostContext);
                         Trace.Info("legacy vss cred retrieved");
                     }
                     else
@@ -591,12 +529,11 @@ namespace GitHub.Runner.Listener.Configuration
                     else
                     {
                         await _runnerServer.DeleteAgentAsync(settings.AgentId);
-                        }
-                    }
 
                         _term.WriteLine();
                         _term.WriteSuccessMessage("Runner removed successfully");
                     }
+                }
                 else
                 {
                     _term.WriteLine("Cannot connect to server, because config files are missing. Skipping removing runner from the server.");

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -13,7 +13,7 @@ namespace GitHub.Runner.Listener.Configuration
     public interface ICredentialManager : IRunnerService
     {
         ICredentialProvider GetCredentialProvider(string credType);
-        VssCredentials LoadCredentials(bool allowAuthUrlV2);
+        VssCredentials LoadCredentials();
     }
 
     public class CredentialManager : RunnerService, ICredentialManager
@@ -40,7 +40,7 @@ namespace GitHub.Runner.Listener.Configuration
             return creds;
         }
 
-        public VssCredentials LoadCredentials(bool allowAuthUrlV2)
+        public VssCredentials LoadCredentials()
         {
             IConfigurationStore store = HostContext.GetService<IConfigurationStore>();
 
@@ -51,16 +51,21 @@ namespace GitHub.Runner.Listener.Configuration
 
             CredentialData credData = store.GetCredentials();
             var migratedCred = store.GetMigratedCredentials();
-            if (migratedCred != null &&
-                migratedCred.Scheme == Constants.Configuration.OAuth)
+            if (migratedCred != null)
             {
                 credData = migratedCred;
+
+                // Re-write .credentials with Token URL
+                store.SaveCredential(credData);
+
+                // Delete .credentials_migrated
+                store.DeleteMigratedCredential();
             }
 
             ICredentialProvider credProv = GetCredentialProvider(credData.Scheme);
             credProv.CredentialData = credData;
 
-            VssCredentials creds = credProv.GetVssCredentials(HostContext, allowAuthUrlV2);
+            VssCredentials creds = credProv.GetVssCredentials(HostContext);
 
             return creds;
         }
@@ -89,7 +94,7 @@ namespace GitHub.Runner.Listener.Configuration
         public string Token { get; set; }
 
         [DataMember(Name = "use_v2_flow")]
-        public bool UseRunnerAdminFlow { get; set; }
+        public bool UseV2Flow { get; set; }
 
         public VssCredentials ToVssCredentials()
         {

src/Runner.Listener/Configuration/CredentialProvider.cs

@@ -1,7 +1,7 @@
 using System;
+using GitHub.Services.Common;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
 using GitHub.Services.OAuth;
 
 namespace GitHub.Runner.Listener.Configuration
@@ -10,7 +10,7 @@ namespace GitHub.Runner.Listener.Configuration
     {
         Boolean RequireInteractive { get; }
         CredentialData CredentialData { get; set; }
-        VssCredentials GetVssCredentials(IHostContext context, bool allowAuthUrlV2);
+        VssCredentials GetVssCredentials(IHostContext context);
         void EnsureCredential(IHostContext context, CommandSettings command, string serverUrl);
     }
 
@@ -25,7 +25,7 @@ namespace GitHub.Runner.Listener.Configuration
         public virtual Boolean RequireInteractive => false;
         public CredentialData CredentialData { get; set; }
 
-        public abstract VssCredentials GetVssCredentials(IHostContext context, bool allowAuthUrlV2);
+        public abstract VssCredentials GetVssCredentials(IHostContext context);
         public abstract void EnsureCredential(IHostContext context, CommandSettings command, string serverUrl);
     }
 
@@ -33,7 +33,7 @@ namespace GitHub.Runner.Listener.Configuration
     {
         public OAuthAccessTokenCredential() : base(Constants.Configuration.OAuthAccessToken) { }
 
-        public override VssCredentials GetVssCredentials(IHostContext context, bool allowAuthUrlV2)
+        public override VssCredentials GetVssCredentials(IHostContext context)
         {
             ArgUtil.NotNull(context, nameof(context));
             Tracing trace = context.GetTrace(nameof(OAuthAccessTokenCredential));

src/Runner.Listener/Configuration/OAuthCredential.cs

@@ -22,18 +22,10 @@ namespace GitHub.Runner.Listener.Configuration
             // Nothing to verify here
         }
 
-        public override VssCredentials GetVssCredentials(IHostContext context, bool allowAuthUrlV2)
+        public override VssCredentials GetVssCredentials(IHostContext context)
         {
             var clientId = this.CredentialData.Data.GetValueOrDefault("clientId", null);
             var authorizationUrl = this.CredentialData.Data.GetValueOrDefault("authorizationUrl", null);
-            var authorizationUrlV2 = this.CredentialData.Data.GetValueOrDefault("authorizationUrlV2", null);
-
-            if (allowAuthUrlV2 &&
-                !string.IsNullOrEmpty(authorizationUrlV2) &&
-                context.AllowAuthMigration)
-            {
-                authorizationUrl = authorizationUrlV2;
-            }
 
             // For back compat with .credential file that doesn't has 'oauthEndpointUrl' section
             var oauthEndpointUrl = this.CredentialData.Data.GetValueOrDefault("oauthEndpointUrl", authorizationUrl);

src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs

@@ -1,5 +1,4 @@
 #if OS_WINDOWS
-#pragma warning disable CA1416
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
@@ -85,5 +84,4 @@ namespace GitHub.Runner.Listener.Configuration
         }
     }
 }
-#pragma warning restore CA1416
 #endif

src/Runner.Listener/JobDispatcher.cs

@@ -110,12 +110,7 @@ namespace GitHub.Runner.Listener
             {
                 var jwt = JsonWebToken.Create(accessToken);
                 var claims = jwt.ExtractClaims();
-                orchestrationId = claims.FirstOrDefault(x => string.Equals(x.Type, "orch_id", StringComparison.OrdinalIgnoreCase))?.Value;
-                if (string.IsNullOrEmpty(orchestrationId))
-                {
                 orchestrationId = claims.FirstOrDefault(x => string.Equals(x.Type, "orchid", StringComparison.OrdinalIgnoreCase))?.Value;
-                }
-
                 if (!string.IsNullOrEmpty(orchestrationId))
                 {
                     Trace.Info($"Pull OrchestrationId {orchestrationId} from JWT claims");
@@ -550,8 +545,6 @@ namespace GitHub.Runner.Listener
                                     detailInfo = string.Join(Environment.NewLine, workerOutput);
                                     Trace.Info($"Return code {returnCode} indicate worker encounter an unhandled exception or app crash, attach worker stdout/stderr to JobRequest result.");
 
-                                    try
-                                    {
                                     var jobServer = await InitializeJobServerAsync(systemConnection);
                                     var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
                                     unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
@@ -576,12 +569,6 @@ namespace GitHub.Runner.Listener
                                             throw new NotSupportedException($"JobServer type '{jobServer.GetType().Name}' is not supported.");
                                     }
                                 }
-                                    catch (Exception ex)
-                                    {
-                                        Trace.Error($"Catch exception during log worker process unhandled exception.");
-                                        Trace.Error(ex);
-                                    }
-                                }
 
                                 TaskResult result = TaskResultUtil.TranslateFromReturnCode(returnCode);
                                 Trace.Info($"finish job request for job {message.JobId} with result: {result}");
@@ -1211,7 +1198,7 @@ namespace GitHub.Runner.Listener
                     jobAnnotations.Add(annotation.Value);
                 }
 
-                await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, environmentUrl: null, telemetry: null, billingOwnerId: message.BillingOwnerId, infrastructureFailureCategory: null, CancellationToken.None);
+                await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, environmentUrl: null, CancellationToken.None);
             }
             catch (Exception ex)
             {

src/Runner.Listener/MessageListener.cs

@@ -32,9 +32,8 @@ namespace GitHub.Runner.Listener
         Task DeleteSessionAsync();
         Task<TaskAgentMessage> GetNextMessageAsync(CancellationToken token);
         Task DeleteMessageAsync(TaskAgentMessage message);
-        Task AcknowledgeMessageAsync(string runnerRequestId, CancellationToken cancellationToken);
 
-        Task RefreshListenerTokenAsync();
+        Task RefreshListenerTokenAsync(CancellationToken token);
         void OnJobStatus(object sender, JobStatusEventArgs e);
     }
 
@@ -45,7 +44,6 @@ namespace GitHub.Runner.Listener
         private ITerminal _term;
         private IRunnerServer _runnerServer;
         private IBrokerServer _brokerServer;
-        private ICredentialManager _credMgr;
         private TaskAgentSession _session;
         private TimeSpan _getNextMessageRetryInterval;
         private bool _accessTokenRevoked = false;
@@ -53,12 +51,11 @@ namespace GitHub.Runner.Listener
         private readonly TimeSpan _sessionConflictRetryLimit = TimeSpan.FromMinutes(4);
         private readonly TimeSpan _clockSkewRetryLimit = TimeSpan.FromMinutes(30);
         private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new();
-        private TaskAgentStatus _runnerStatus = TaskAgentStatus.Online;
+        private TaskAgentStatus runnerStatus = TaskAgentStatus.Online;
         private CancellationTokenSource _getMessagesTokenSource;
         private VssCredentials _creds;
-        private VssCredentials _credsV2;
-        private bool _needRefreshCredsV2 = false;
-        private bool _handlerInitialized = false;
+
+        private bool _isBrokerSession = false;
 
         public override void Initialize(IHostContext hostContext)
         {
@@ -67,7 +64,6 @@ namespace GitHub.Runner.Listener
             _term = HostContext.GetService<ITerminal>();
             _runnerServer = HostContext.GetService<IRunnerServer>();
             _brokerServer = hostContext.GetService<IBrokerServer>();
-            _credMgr = hostContext.GetService<ICredentialManager>();
         }
 
         public async Task<CreateSessionResult> CreateSessionAsync(CancellationToken token)
@@ -82,7 +78,8 @@ namespace GitHub.Runner.Listener
 
             // Create connection.
             Trace.Info("Loading Credentials");
-            _creds = _credMgr.LoadCredentials(allowAuthUrlV2: false);
+            var credMgr = HostContext.GetService<ICredentialManager>();
+            _creds = credMgr.LoadCredentials();
 
             var agent = new TaskAgentReference
             {
@@ -116,6 +113,16 @@ namespace GitHub.Runner.Listener
                                                         _settings.PoolId,
                                                         taskAgentSession,
                                                         token);
+
+                    if (_session.BrokerMigrationMessage != null)
+                    {
+                        Trace.Info("Runner session is in migration mode: Creating Broker session with BrokerBaseUrl: {0}", _session.BrokerMigrationMessage.BrokerBaseUrl);
+
+                        await _brokerServer.UpdateConnectionIfNeeded(_session.BrokerMigrationMessage.BrokerBaseUrl, _creds);
+                        _session = await _brokerServer.CreateSessionAsync(taskAgentSession, token);
+                        _isBrokerSession = true;
+                    }
+
                     Trace.Info($"Session created.");
                     if (encounteringError)
                     {
@@ -124,13 +131,6 @@ namespace GitHub.Runner.Listener
                         encounteringError = false;
                     }
 
-                    if (!_handlerInitialized)
-                    {
-                        Trace.Info("Registering AuthMigrationChanged event handler.");
-                        HostContext.AuthMigrationChanged += HandleAuthMigrationChanged;
-                        _handlerInitialized = true;
-                    }
-
                     return CreateSessionResult.Success;
                 }
                 catch (OperationCanceledException) when (token.IsCancellationRequested)
@@ -196,16 +196,16 @@ namespace GitHub.Runner.Listener
         {
             if (_session != null && _session.SessionId != Guid.Empty)
             {
-                if (_handlerInitialized)
-                {
-                    HostContext.AuthMigrationChanged -= HandleAuthMigrationChanged;
-                }
-
                 if (!_accessTokenRevoked)
                 {
                     using (var ts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
                     {
                         await _runnerServer.DeleteAgentSessionAsync(_settings.PoolId, _session.SessionId, ts.Token);
+
+                        if (_isBrokerSession)
+                        {
+                            await _brokerServer.DeleteSessionAsync(ts.Token);
+                        }
                     }
                 }
                 else
@@ -218,7 +218,7 @@ namespace GitHub.Runner.Listener
         public void OnJobStatus(object sender, JobStatusEventArgs e)
         {
             Trace.Info("Received job status event. JobState: {0}", e.Status);
-            _runnerStatus = e.Status;
+            runnerStatus = e.Status;
             try
             {
                 _getMessagesTokenSource?.Cancel();
@@ -251,7 +251,7 @@ namespace GitHub.Runner.Listener
                     message = await _runnerServer.GetAgentMessageAsync(_settings.PoolId,
                                                                 _session.SessionId,
                                                                 _lastMessageId,
-                                                                _runnerStatus,
+                                                                runnerStatus,
                                                                 BuildConstants.RunnerPackage.Version,
                                                                 VarUtil.OS,
                                                                 VarUtil.OSArchitecture,
@@ -261,21 +261,16 @@ namespace GitHub.Runner.Listener
                     // Decrypt the message body if the session is using encryption
                     message = DecryptMessage(message);
 
+
                     if (message != null && message.MessageType == BrokerMigrationMessage.MessageType)
                     {
+                        Trace.Info("BrokerMigration message received. Polling Broker for messages...");
+
                         var migrationMessage = JsonUtility.FromString<BrokerMigrationMessage>(message.Body);
 
-                        _credsV2 = _credMgr.LoadCredentials(allowAuthUrlV2: true);
-                        await _brokerServer.UpdateConnectionIfNeeded(migrationMessage.BrokerBaseUrl, _credsV2);
-                        if (_needRefreshCredsV2)
-                        {
-                            Trace.Info("Refreshing credentials for V2.");
-                            await _brokerServer.ForceRefreshConnection(_credsV2);
-                            _needRefreshCredsV2 = false;
-                        }
-
+                        await _brokerServer.UpdateConnectionIfNeeded(migrationMessage.BrokerBaseUrl, _creds);
                         message = await _brokerServer.GetRunnerMessageAsync(_session.SessionId,
-                                                                        _runnerStatus,
+                                                                        runnerStatus,
                                                                         BuildConstants.RunnerPackage.Version,
                                                                         VarUtil.OS,
                                                                         VarUtil.OSArchitecture,
@@ -311,16 +306,7 @@ namespace GitHub.Runner.Listener
                     _accessTokenRevoked = true;
                     throw;
                 }
-                catch (HostedRunnerDeprovisionedException)
-                {
-                    Trace.Info("Hosted runner has been deprovisioned.");
-                    throw;
-                }
-                catch (AccessDeniedException e) when (e.ErrorCode == 1 && !HostContext.AllowAuthMigration)
-                {
-                    throw;
-                }
-                catch (RunnerNotFoundException) when (!HostContext.AllowAuthMigration)
+                catch (AccessDeniedException e) when (e.ErrorCode == 1)
                 {
                     throw;
                 }
@@ -329,19 +315,12 @@ namespace GitHub.Runner.Listener
                     Trace.Error("Catch exception during get next message.");
                     Trace.Error(ex);
 
-                    // clear out potential message for broker migration,
-                    // in case the exception is thrown from get message from broker-listener.
-                    message = null;
-
                     // don't retry if SkipSessionRecover = true, DT service will delete agent session to stop agent from taking more jobs.
-                    if (!HostContext.AllowAuthMigration &&
-                        ex is TaskAgentSessionExpiredException &&
-                        !_settings.SkipSessionRecover && (await CreateSessionAsync(token) == CreateSessionResult.Success))
+                    if (ex is TaskAgentSessionExpiredException && !_settings.SkipSessionRecover && (await CreateSessionAsync(token) == CreateSessionResult.Success))
                     {
                         Trace.Info($"{nameof(TaskAgentSessionExpiredException)} received, recovered by recreate session.");
                     }
-                    else if (!HostContext.AllowAuthMigration &&
-                            !IsGetNextMessageExceptionRetriable(ex))
+                    else if (!IsGetNextMessageExceptionRetriable(ex))
                     {
                         throw;
                     }
@@ -368,12 +347,6 @@ namespace GitHub.Runner.Listener
                             encounteringError = true;
                         }
 
-                        if (HostContext.AllowAuthMigration)
-                        {
-                            Trace.Info("Disable migration mode for 60 minutes.");
-                            HostContext.DeferAuthMigration(TimeSpan.FromMinutes(60), $"Get next message failed with exception: {ex}");
-                        }
-
                         // re-create VssConnection before next retry
                         await _runnerServer.RefreshConnectionAsync(RunnerConnectionType.MessageQueue, TimeSpan.FromSeconds(60));
 
@@ -431,26 +404,10 @@ namespace GitHub.Runner.Listener
             }
         }
 
-        public async Task RefreshListenerTokenAsync()
+        public async Task RefreshListenerTokenAsync(CancellationToken cancellationToken)
         {
             await _runnerServer.RefreshConnectionAsync(RunnerConnectionType.MessageQueue, TimeSpan.FromSeconds(60));
-            _credsV2 = _credMgr.LoadCredentials(allowAuthUrlV2: true);
-            await _brokerServer.ForceRefreshConnection(_credsV2);
-        }
-
-        public async Task AcknowledgeMessageAsync(string runnerRequestId, CancellationToken cancellationToken)
-        {
-            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(5)); // Short timeout
-            using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
-            Trace.Info($"Acknowledging runner request '{runnerRequestId}'.");
-            await _brokerServer.AcknowledgeRunnerRequestAsync(
-                runnerRequestId,
-                _session.SessionId,
-                _runnerStatus,
-                BuildConstants.RunnerPackage.Version,
-                VarUtil.OS,
-                VarUtil.OSArchitecture,
-                linkedCts.Token);
+            await _brokerServer.ForceRefreshConnection(_creds);
         }
 
         private TaskAgentMessage DecryptMessage(TaskAgentMessage message)
@@ -502,7 +459,6 @@ namespace GitHub.Runner.Listener
                 ex is TaskAgentPoolNotFoundException ||
                 ex is TaskAgentSessionExpiredException ||
                 ex is AccessDeniedException ||
-                ex is RunnerNotFoundException ||
                 ex is VssUnauthorizedException)
             {
                 Trace.Info($"Non-retriable exception: {ex.Message}");
@@ -569,8 +525,7 @@ namespace GitHub.Runner.Listener
             }
             else if (ex is TaskAgentPoolNotFoundException ||
                      ex is AccessDeniedException ||
-                     ex is VssUnauthorizedException ||
-                     (ex is VssOAuthTokenRequestException oauthEx && oauthEx.Error != "server_error"))
+                     ex is VssUnauthorizedException)
             {
                 Trace.Info($"Non-retriable exception: {ex.Message}");
                 return false;
@@ -581,11 +536,5 @@ namespace GitHub.Runner.Listener
                 return true;
             }
         }
-
-        private void HandleAuthMigrationChanged(object sender, EventArgs e)
-        {
-            Trace.Info($"Auth migration changed. Current allow auth migration state: {HostContext.AllowAuthMigration}");
-            _needRefreshCredsV2 = true;
-        }
     }
 }

src/Runner.Listener/Program.cs

@@ -7,7 +7,6 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Services.WebApi;
 
 namespace GitHub.Runner.Listener
 {
@@ -145,12 +144,6 @@ namespace GitHub.Runner.Listener
                 trace.Error(e);
                 return Constants.Runner.ReturnCode.TerminatedError;
             }
-            catch (RunnerNotFoundException e)
-            {
-                terminal.WriteError($"An error occurred: {e.Message}");
-                trace.Error(e);
-                return Constants.Runner.ReturnCode.TerminatedError;
-            }
             catch (Exception e)
             {
                 terminal.WriteError($"An error occurred: {e.Message}");

src/Runner.Listener/Runner.Listener.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
     <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
@@ -19,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.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" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Listener/Runner.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
-using System.Security.Claims;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,9 +14,7 @@ using GitHub.Runner.Common.Util;
 using GitHub.Runner.Listener.Check;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
-using GitHub.Services.OAuth;
 using GitHub.Services.WebApi;
-using GitHub.Services.WebApi.Jwt;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Listener
@@ -35,14 +31,6 @@ namespace GitHub.Runner.Listener
         private ITerminal _term;
         private bool _inConfigStage;
         private ManualResetEvent _completedCommand = new(false);
-        private readonly ConcurrentQueue<string> _authMigrationTelemetries = new();
-        private Task _authMigrationTelemetryTask;
-        private readonly object _authMigrationTelemetryLock = new();
-        private Task _authMigrationClaimsCheckTask;
-        private readonly object _authMigrationClaimsCheckLock = new();
-        private IRunnerServer _runnerServer;
-        private CancellationTokenSource _authMigrationTelemetryTokenSource = new();
-        private CancellationTokenSource _authMigrationClaimsCheckTokenSource = new();
 
         // <summary>
         // Helps avoid excessive calls to Run Service when encountering non-retriable errors from /acquirejob.
@@ -63,7 +51,6 @@ namespace GitHub.Runner.Listener
             base.Initialize(hostContext);
             _term = HostContext.GetService<ITerminal>();
             _acquireJobThrottler = HostContext.CreateService<IErrorThrottler>();
-            _runnerServer = HostContext.GetService<IRunnerServer>();
         }
 
         public async Task<int> ExecuteCommand(CommandSettings command)
@@ -79,8 +66,6 @@ namespace GitHub.Runner.Listener
                 //register a SIGTERM handler
                 HostContext.Unloading += Runner_Unloading;
 
-                HostContext.AuthMigrationChanged += HandleAuthMigrationChanged;
-
                 // TODO Unit test to cover this logic
                 Trace.Info(nameof(ExecuteCommand));
                 var configManager = HostContext.GetService<IConfigurationManager>();
@@ -243,12 +228,10 @@ namespace GitHub.Runner.Listener
                             var configFile = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), config.Key);
                             var configContent = Convert.FromBase64String(config.Value);
 #if OS_WINDOWS
-#pragma warning disable CA1416
                             if (configFile == HostContext.GetConfigFile(WellKnownConfigFile.RSACredentials))
                             {
                                 configContent = ProtectedData.Protect(configContent, null, DataProtectionScope.LocalMachine);
                             }
-#pragma warning restore CA1416
 #endif
                             File.WriteAllBytes(configFile, configContent);
                             File.SetAttributes(configFile, File.GetAttributes(configFile) | FileAttributes.Hidden);
@@ -315,17 +298,8 @@ namespace GitHub.Runner.Listener
                         _term.WriteLine("https://docs.github.com/en/actions/hosting-your-own-runners/autoscaling-with-self-hosted-runners#using-ephemeral-runners-for-autoscaling", ConsoleColor.Yellow);
                     }
 
-                    var cred = store.GetCredentials();
-                    if (cred != null &&
-                        cred.Scheme == Constants.Configuration.OAuth &&
-                        cred.Data.ContainsKey("EnableAuthMigrationByDefault"))
-                    {
-                        Trace.Info("Enable auth migration by default.");
-                        HostContext.EnableAuthMigration("EnableAuthMigrationByDefault");
-                    }
-
                     // Run the runner interactively or as service
-                    return await ExecuteRunnerAsync(settings, command.RunOnce || settings.Ephemeral);
+                    return await RunAsync(settings, command.RunOnce || settings.Ephemeral);
                 }
                 else
                 {
@@ -335,9 +309,6 @@ namespace GitHub.Runner.Listener
             }
             finally
             {
-                _authMigrationClaimsCheckTokenSource?.Cancel();
-                _authMigrationTelemetryTokenSource?.Cancel();
-                HostContext.AuthMigrationChanged -= HandleAuthMigrationChanged;
                 _term.CancelKeyPress -= CtrlCHandler;
                 HostContext.Unloading -= Runner_Unloading;
                 _completedCommand.Set();
@@ -387,12 +358,12 @@ namespace GitHub.Runner.Listener
             }
         }
 
-        private IMessageListener GetMessageListener(RunnerSettings settings, bool isMigratedSettings = false)
+        private IMessageListener GetMesageListener(RunnerSettings settings)
         {
             if (settings.UseV2Flow)
             {
                 Trace.Info($"Using BrokerMessageListener");
-                var brokerListener = new BrokerMessageListener(settings, isMigratedSettings);
+                var brokerListener = new BrokerMessageListener();
                 brokerListener.Initialize(HostContext);
                 return brokerListener;
             }
@@ -406,56 +377,7 @@ namespace GitHub.Runner.Listener
             try
             {
                 Trace.Info(nameof(RunAsync));
-                
-                // First try using migrated settings if available
-                var configManager = HostContext.GetService<IConfigurationManager>();
-                RunnerSettings migratedSettings = null;
-                
-                try 
-                {
-                    migratedSettings = configManager.LoadMigratedSettings();
-                    Trace.Info("Loaded migrated settings from .runner_migrated file");
-                    Trace.Info(migratedSettings);
-                }
-                catch (Exception ex)
-                {
-                    // If migrated settings file doesn't exist or can't be loaded, we'll use the provided settings
-                    Trace.Info($"Failed to load migrated settings: {ex.Message}");
-                }
-                
-                bool usedMigratedSettings = false;
-                
-                if (migratedSettings != null)
-                {
-                    // Try to create session with migrated settings first
-                    Trace.Info("Attempting to create session using migrated settings");
-                    _listener = GetMessageListener(migratedSettings, isMigratedSettings: true);
-                    
-                    try
-                    {
-                        CreateSessionResult createSessionResult = await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken);
-                        if (createSessionResult == CreateSessionResult.Success)
-                        {
-                            Trace.Info("Successfully created session with migrated settings");
-                            settings = migratedSettings; // Use migrated settings for the rest of the process
-                            usedMigratedSettings = true;
-                        }
-                        else
-                        {
-                            Trace.Warning($"Failed to create session with migrated settings: {createSessionResult}");
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Error($"Exception when creating session with migrated settings: {ex}");
-                    }
-                }
-                
-                // If migrated settings weren't used or session creation failed, use original settings
-                if (!usedMigratedSettings)
-                {
-                    Trace.Info("Falling back to original .runner settings");
-                    _listener = GetMessageListener(settings);
+                _listener = GetMesageListener(settings);
                 CreateSessionResult createSessionResult = await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken);
                 if (createSessionResult == CreateSessionResult.SessionConflict)
                 {
@@ -465,7 +387,6 @@ namespace GitHub.Runner.Listener
                 {
                     return Constants.Runner.ReturnCode.TerminatedError;
                 }
-                }
 
                 HostContext.WritePerfCounter("SessionCreated");
 
@@ -478,8 +399,6 @@ namespace GitHub.Runner.Listener
                 // Should we try to cleanup ephemeral runners
                 bool runOnceJobCompleted = false;
                 bool skipSessionDeletion = false;
-                bool restartSession = false; // Flag to indicate session restart
-                bool restartSessionPending = false;
                 try
                 {
                     var notification = HostContext.GetService<IJobNotification>();
@@ -495,15 +414,6 @@ namespace GitHub.Runner.Listener
 
                     while (!HostContext.RunnerShutdownToken.IsCancellationRequested)
                     {
-                        // Check if we need to restart the session and can do so (job dispatcher not busy)
-                        if (restartSessionPending && !jobDispatcher.Busy)
-                        {
-                            Trace.Info("Pending session restart detected and job dispatcher is not busy. Restarting session now.");
-                            messageQueueLoopTokenSource.Cancel();
-                            restartSession = true;
-                            break;
-                        }
-                        
                         TaskAgentMessage message = null;
                         bool skipMessageDeletion = false;
                         try
@@ -654,45 +564,25 @@ namespace GitHub.Runner.Listener
                                 else
                                 {
                                     var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
-
-                                    // Acknowledge (best-effort)
-                                    if (messageRef.ShouldAcknowledge) // Temporary feature flag
-                                    {
-                                        try
-                                        {
-                                            await _listener.AcknowledgeMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
-                                        }
-                                        catch (Exception ex)
-                                        {
-                                            Trace.Error($"Best-effort acknowledge failed for request '{messageRef.RunnerRequestId}'");
-                                            Trace.Error(ex);
-                                        }
-                                    }
-
                                     Pipelines.AgentJobRequestMessage jobRequestMessage = null;
+
+                                    // Create connection
+                                    var credMgr = HostContext.GetService<ICredentialManager>();
+                                    var creds = credMgr.LoadCredentials();
+
                                     if (string.IsNullOrEmpty(messageRef.RunServiceUrl))
                                     {
-                                        // Connect
-                                        var credMgr = HostContext.GetService<ICredentialManager>();
-                                        var creds = credMgr.LoadCredentials(allowAuthUrlV2: false);
                                         var actionsRunServer = HostContext.CreateService<IActionsRunServer>();
                                         await actionsRunServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
-
-                                        // Get job message
                                         jobRequestMessage = await actionsRunServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
                                     }
                                     else
                                     {
-                                        // Connect
-                                        var credMgr = HostContext.GetService<ICredentialManager>();
-                                        var credsV2 = credMgr.LoadCredentials(allowAuthUrlV2: true);
                                         var runServer = HostContext.CreateService<IRunServer>();
-                                        await runServer.ConnectAsync(new Uri(messageRef.RunServiceUrl), credsV2);
-
-                                        // Get job message
+                                        await runServer.ConnectAsync(new Uri(messageRef.RunServiceUrl), creds);
                                         try
                                         {
-                                            jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageRef.BillingOwnerId, messageQueueLoopTokenSource.Token);
+                                            jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
                                             _acquireJobThrottler.Reset();
                                         }
                                         catch (Exception ex) when (
@@ -707,21 +597,11 @@ namespace GitHub.Runner.Listener
                                         catch (Exception ex)
                                         {
                                             Trace.Error($"Caught exception from acquiring job message: {ex}");
-
-                                            if (HostContext.AllowAuthMigration)
-                                            {
-                                                Trace.Info("Disable migration mode for 60 minutes.");
-                                                HostContext.DeferAuthMigration(TimeSpan.FromMinutes(60), $"Acquire job failed with exception: {ex}");
-                                            }
-
                                             continue;
                                         }
                                     }
 
-                                    // Dispatch
                                     jobDispatcher.Run(jobRequestMessage, runOnce);
-
-                                    // Run once?
                                     if (runOnce)
                                     {
                                         Trace.Info("One time used runner received job message.");
@@ -751,29 +631,7 @@ namespace GitHub.Runner.Listener
                             else if (string.Equals(message.MessageType, TaskAgentMessageTypes.ForceTokenRefresh))
                             {
                                 Trace.Info("Received ForceTokenRefreshMessage");
-                                await _listener.RefreshListenerTokenAsync();
-                            }
-                            else if (string.Equals(message.MessageType, RunnerRefreshConfigMessage.MessageType))
-                            {
-                                var runnerRefreshConfigMessage = JsonUtility.FromString<RunnerRefreshConfigMessage>(message.Body);
-                                Trace.Info($"Received RunnerRefreshConfigMessage for '{runnerRefreshConfigMessage.ConfigType}' config file");
-                                var configUpdater = HostContext.GetService<IRunnerConfigUpdater>();
-                                await configUpdater.UpdateRunnerConfigAsync(
-                                    runnerQualifiedId: runnerRefreshConfigMessage.RunnerQualifiedId,
-                                    configType: runnerRefreshConfigMessage.ConfigType,
-                                    serviceType: runnerRefreshConfigMessage.ServiceType,
-                                    configRefreshUrl: runnerRefreshConfigMessage.ConfigRefreshUrl);
-
-                                // Set flag to schedule session restart if ConfigType is "runner"
-                                if (string.Equals(runnerRefreshConfigMessage.ConfigType, "runner", StringComparison.OrdinalIgnoreCase))
-                                {
-                                    Trace.Info("Runner configuration was updated. Session restart has been scheduled");
-                                    restartSessionPending = true;
-                                }
-                                else
-                                {
-                                    Trace.Info($"No session restart needed for config type: {runnerRefreshConfigMessage.ConfigType}");
-                                }
+                                await _listener.RefreshListenerTokenAsync(messageQueueLoopTokenSource.Token);
                             }
                             else
                             {
@@ -828,243 +686,19 @@ namespace GitHub.Runner.Listener
 
                     if (settings.Ephemeral && runOnceJobCompleted)
                     {
+                        var configManager = HostContext.GetService<IConfigurationManager>();
                         configManager.DeleteLocalRunnerConfig();
                     }
                 }
-
-                // After cleanup, check if we need to restart the session
-                if (restartSession)
-                {
-                    Trace.Info("Restarting runner session after config update...");
-                    return Constants.Runner.ReturnCode.RunnerConfigurationRefreshed;
-                }
             }
             catch (TaskAgentAccessTokenExpiredException)
             {
                 Trace.Info("Runner OAuth token has been revoked. Shutting down.");
             }
-            catch (HostedRunnerDeprovisionedException)
-            {
-                Trace.Info("Hosted runner has been deprovisioned. Shutting down.");
-            }
 
             return Constants.Runner.ReturnCode.Success;
         }
 
-        private async Task<int> ExecuteRunnerAsync(RunnerSettings settings, bool runOnce)
-        {
-            int returnCode = Constants.Runner.ReturnCode.Success;
-            bool restart = false;
-            do
-            {
-                restart = false;
-                returnCode = await RunAsync(settings, runOnce);
-                
-                if (returnCode == Constants.Runner.ReturnCode.RunnerConfigurationRefreshed)
-                {
-                    Trace.Info("Runner configuration was refreshed, restarting session...");
-                    // Reload settings in case they changed
-                    var configManager = HostContext.GetService<IConfigurationManager>();
-                    settings = configManager.LoadSettings();
-                    restart = true;
-                }
-            } while (restart);
-
-            return returnCode;
-        }
-
-        private void HandleAuthMigrationChanged(object sender, AuthMigrationEventArgs e)
-        {
-            Trace.Verbose("Handle AuthMigrationChanged in Runner");
-            _authMigrationTelemetries.Enqueue($"{DateTime.UtcNow.ToString("O")}: {e.Trace}");
-
-            // only start the telemetry reporting task once auth migration is changed (enabled or disabled)
-            lock (_authMigrationTelemetryLock)
-            {
-                if (_authMigrationTelemetryTask == null)
-                {
-                    _authMigrationTelemetryTask = ReportAuthMigrationTelemetryAsync(_authMigrationTelemetryTokenSource.Token);
-                }
-            }
-
-            // only start the claims check task once auth migration is changed (enabled or disabled)
-            lock (_authMigrationClaimsCheckLock)
-            {
-                if (_authMigrationClaimsCheckTask == null)
-                {
-                    _authMigrationClaimsCheckTask = CheckOAuthTokenClaimsAsync(_authMigrationClaimsCheckTokenSource.Token);
-                }
-            }
-        }
-
-        private async Task CheckOAuthTokenClaimsAsync(CancellationToken token)
-        {
-            string[] expectedClaims =
-            [
-                "owner_id",
-                "runner_id",
-                "runner_group_id",
-                "scale_set_id",
-                "is_ephemeral",
-                "labels"
-            ];
-
-            try
-            {
-                var credMgr = HostContext.GetService<ICredentialManager>();
-                while (!token.IsCancellationRequested)
-                {
-                    try
-                    {
-                        await HostContext.Delay(TimeSpan.FromMinutes(100), token);
-                    }
-                    catch (TaskCanceledException)
-                    {
-                        // Ignore cancellation
-                    }
-
-                    if (token.IsCancellationRequested)
-                    {
-                        break;
-                    }
-
-                    if (!HostContext.AllowAuthMigration)
-                    {
-                        Trace.Info("Skip checking oauth token claims since auth migration is disabled.");
-                        continue;
-                    }
-
-                    var baselineCred = credMgr.LoadCredentials(allowAuthUrlV2: false);
-                    var authV2Cred = credMgr.LoadCredentials(allowAuthUrlV2: true);
-
-                    if (!(baselineCred.Federated is VssOAuthCredential baselineVssOAuthCred) ||
-                        !(authV2Cred.Federated is VssOAuthCredential vssOAuthCredV2) ||
-                        baselineVssOAuthCred == null ||
-                        vssOAuthCredV2 == null)
-                    {
-                        Trace.Info("Skip checking oauth token claims for non-oauth credentials");
-                        continue;
-                    }
-
-                    if (string.Equals(baselineVssOAuthCred.AuthorizationUrl.AbsoluteUri, vssOAuthCredV2.AuthorizationUrl.AbsoluteUri, StringComparison.OrdinalIgnoreCase))
-                    {
-                        Trace.Info("Skip checking oauth token claims for same authorization url");
-                        continue;
-                    }
-
-                    var baselineProvider = baselineVssOAuthCred.GetTokenProvider(baselineVssOAuthCred.AuthorizationUrl);
-                    var v2Provider = vssOAuthCredV2.GetTokenProvider(vssOAuthCredV2.AuthorizationUrl);
-                    try
-                    {
-                        using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
-                        using (var requestTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token, timeoutTokenSource.Token))
-                        {
-                            var baselineToken = await baselineProvider.GetTokenAsync(null, requestTokenSource.Token);
-                            var v2Token = await v2Provider.GetTokenAsync(null, requestTokenSource.Token);
-                            if (baselineToken is VssOAuthAccessToken baselineAccessToken &&
-                                v2Token is VssOAuthAccessToken v2AccessToken &&
-                                !string.IsNullOrEmpty(baselineAccessToken.Value) &&
-                                !string.IsNullOrEmpty(v2AccessToken.Value))
-                            {
-                                var baselineJwt = JsonWebToken.Create(baselineAccessToken.Value);
-                                var baselineClaims = baselineJwt.ExtractClaims();
-                                var v2Jwt = JsonWebToken.Create(v2AccessToken.Value);
-                                var v2Claims = v2Jwt.ExtractClaims();
-
-                                // Log extracted claims for debugging
-                                Trace.Verbose($"Baseline token expected claims: {string.Join(", ", baselineClaims
-                                    .Where(c => expectedClaims.Contains(c.Type.ToLowerInvariant()))
-                                    .Select(c => $"{c.Type}:{c.Value}"))}");
-                                Trace.Verbose($"V2 token expected claims: {string.Join(", ", v2Claims
-                                    .Where(c => expectedClaims.Contains(c.Type.ToLowerInvariant()))
-                                    .Select(c => $"{c.Type}:{c.Value}"))}");
-
-                                foreach (var claim in expectedClaims)
-                                {
-                                    // if baseline has the claim, v2 should have it too with exactly same value.
-                                    if (baselineClaims.FirstOrDefault(c => c.Type.ToLowerInvariant() == claim) is Claim baselineClaim &&
-                                        !string.IsNullOrEmpty(baselineClaim?.Value))
-                                    {
-                                        var v2Claim = v2Claims.FirstOrDefault(c => c.Type.ToLowerInvariant() == claim);
-                                        if (v2Claim?.Value != baselineClaim.Value)
-                                        {
-                                            Trace.Info($"Token Claim mismatch between two issuers. Expected: {baselineClaim.Type}:{baselineClaim.Value}. Actual: {v2Claim?.Type ?? "Empty"}:{v2Claim?.Value ?? "Empty"}");
-                                            HostContext.DeferAuthMigration(TimeSpan.FromMinutes(60), $"Expected claim {baselineClaim.Type}:{baselineClaim.Value} does not match {v2Claim?.Type ?? "Empty"}:{v2Claim?.Value ?? "Empty"}");
-                                            break;
-                                        }
-                                    }
-                                }
-
-                                Trace.Info("OAuth token claims check passed.");
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Error("Failed to fetch and check OAuth token claims.");
-                        Trace.Error(ex);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Trace.Error("Failed to check OAuth token claims in background.");
-                Trace.Error(ex);
-            }
-        }
-
-        private async Task ReportAuthMigrationTelemetryAsync(CancellationToken token)
-        {
-            var configManager = HostContext.GetService<IConfigurationManager>();
-            var runnerSettings = configManager.LoadSettings();
-
-            while (!token.IsCancellationRequested)
-            {
-                try
-                {
-                    await HostContext.Delay(TimeSpan.FromSeconds(60), token);
-                }
-                catch (TaskCanceledException)
-                {
-                    // Ignore cancellation
-                }
-
-                Trace.Verbose("Checking for auth migration telemetry to report");
-                while (_authMigrationTelemetries.TryDequeue(out var telemetry))
-                {
-                    Trace.Verbose($"Reporting auth migration telemetry: {telemetry}");
-                    if (runnerSettings != null)
-                    {
-                        try
-                        {
-                            using (var tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
-                            {
-                                await _runnerServer.UpdateAgentUpdateStateAsync(runnerSettings.PoolId, runnerSettings.AgentId, "RefreshConfig", telemetry, tokenSource.Token);
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.Error("Failed to report auth migration telemetry.");
-                            Trace.Error(ex);
-                            _authMigrationTelemetries.Enqueue(telemetry);
-                        }
-                    }
-
-                    if (!token.IsCancellationRequested)
-                    {
-                        try
-                        {
-                            await HostContext.Delay(TimeSpan.FromSeconds(10), token);
-                        }
-                        catch (TaskCanceledException)
-                        {
-                            // Ignore cancellation
-                        }
-                    }
-                }
-            }
-        }
-
         private void PrintUsage(CommandSettings command)
         {
             string separator;

src/Runner.Listener/RunnerConfigUpdater.cs

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

src/Runner.Listener/RunnerJobRequestRef.cs

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

src/Runner.PluginHost/Runner.PluginHost.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
     <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>

src/Runner.Plugins/Runner.Plugins.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
   </PropertyGroup>
 

src/Runner.Sdk/Runner.Sdk.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
   </PropertyGroup>
 
@@ -15,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
+    <PackageReference Include="System.Threading.Channels" Version="4.4.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Sdk/Util/UrlUtil.cs

@@ -60,15 +60,5 @@ namespace GitHub.Runner.Sdk
             }
             return string.Empty;
         }
-
-        public static string GetVssRequestId(HttpResponseHeaders headers)
-        {
-            if (headers != null &&
-                headers.TryGetValues("x-vss-e2eid", out var headerValues))
-            {
-                return headerValues.FirstOrDefault();
-            }
-            return string.Empty;
-        }
     }
 }

src/Runner.Sdk/Util/VssUtil.cs

@@ -38,7 +38,6 @@ namespace GitHub.Runner.Sdk
             if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY")))
             {
                 VssClientHttpRequestSettings.Default.ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
-                RawClientHttpRequestSettings.Default.ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
             }
 
             var rawHeaderValues = new List<ProductInfoHeaderValue>();

src/Runner.Service/Windows/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
 </configuration>

src/Runner.Service/Windows/RunnerService.csproj

@@ -18,7 +18,7 @@
       <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(PackageRuntime)' != 'win-arm64' ">
-      <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+      <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

src/Runner.Worker/ActionManager.cs

@@ -111,7 +111,7 @@ namespace GitHub.Runner.Worker
             {
                 // Log the error and fail the PrepareActionsAsync Initialization.
                 Trace.Error($"Caught exception from PrepareActionsAsync Initialization: {ex}");
-                executionContext.InfrastructureError(ex.Message, category: "resolve_action");
+                executionContext.InfrastructureError(ex.Message);
                 executionContext.Result = TaskResult.Failed;
                 throw;
             }
@@ -119,7 +119,7 @@ namespace GitHub.Runner.Worker
             {
                 // Log the error and fail the PrepareActionsAsync Initialization.
                 Trace.Error($"Caught exception from PrepareActionsAsync Initialization: {ex}");
-                executionContext.InfrastructureError(ex.Message, category: "invalid_action_download");
+                executionContext.InfrastructureError(ex.Message);
                 executionContext.Result = TaskResult.Failed;
                 throw;
             }
@@ -378,7 +378,7 @@ namespace GitHub.Runner.Worker
                 string dockerFileLowerCase = Path.Combine(actionDirectory, "dockerfile");
                 if (File.Exists(manifestFile) || File.Exists(manifestFileYaml))
                 {
-                    var manifestManager = HostContext.GetService<IActionManifestManagerWrapper>();
+                    var manifestManager = HostContext.GetService<IActionManifestManager>();
                     if (File.Exists(manifestFile))
                     {
                         definition.Data = manifestManager.Load(executionContext, manifestFile);
@@ -688,8 +688,7 @@ namespace GitHub.Runner.Worker
                 {
                     if (MessageUtil.IsRunServiceJob(executionContext.Global.Variables.Get(Constants.Variables.System.JobRequestType)))
                     {
-                        var displayHelpfulActionsDownloadErrors = executionContext.Global.Variables.GetBoolean(Constants.Runner.Features.DisplayHelpfulActionsDownloadErrors) ?? false;
-                        actionDownloadInfos = await launchServer.ResolveActionsDownloadInfoAsync(executionContext.Global.Plan.PlanId, executionContext.Root.Id, new WebApi.ActionReferenceList { Actions = actionReferences }, executionContext.CancellationToken, displayHelpfulActionsDownloadErrors);
+                        actionDownloadInfos = await launchServer.ResolveActionsDownloadInfoAsync(executionContext.Global.Plan.PlanId, executionContext.Root.Id, new WebApi.ActionReferenceList { Actions = actionReferences }, executionContext.CancellationToken);
                     }
                     else
                     {
@@ -776,20 +775,8 @@ namespace GitHub.Runner.Worker
                 // make sure we get a clean folder ready to use.
                 IOUtil.DeleteDirectory(destDirectory, executionContext.CancellationToken);
                 Directory.CreateDirectory(destDirectory);
-
-                if (downloadInfo.PackageDetails != null)
-                {
-                    executionContext.Output($"##[group]Download immutable action package '{downloadInfo.NameWithOwner}@{downloadInfo.Ref}'");
-                    executionContext.Output($"Version: {downloadInfo.PackageDetails.Version}");
-                    executionContext.Output($"Digest: {downloadInfo.PackageDetails.ManifestDigest}");
-                    executionContext.Output($"Source commit SHA: {downloadInfo.ResolvedSha}");
-                    executionContext.Output("##[endgroup]");
-                }
-                else
-                {
                 executionContext.Output($"Download action repository '{downloadInfo.NameWithOwner}@{downloadInfo.Ref}' (SHA:{downloadInfo.ResolvedSha})");
             }
-            }
 
             //download and extract action in a temp folder and rename it on success
             string tempDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Actions), "_temp_" + Guid.NewGuid());
@@ -964,7 +951,7 @@ namespace GitHub.Runner.Worker
             if (File.Exists(actionManifest) || File.Exists(actionManifestYaml))
             {
                 executionContext.Debug($"action.yml for action: '{actionManifest}'.");
-                var manifestManager = HostContext.GetService<IActionManifestManagerWrapper>();
+                var manifestManager = HostContext.GetService<IActionManifestManager>();
                 ActionDefinitionData actionDefinitionData = null;
                 if (File.Exists(actionManifest))
                 {

src/Runner.Worker/ActionManifestManager.cs

@@ -2,29 +2,29 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-using System.Reflection;
-using System.Linq;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
-using GitHub.Actions.WorkflowParser;
-using GitHub.Actions.WorkflowParser.Conversion;
-using GitHub.Actions.WorkflowParser.ObjectTemplating;
-using GitHub.Actions.WorkflowParser.ObjectTemplating.Schema;
-using GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens;
-using GitHub.Actions.Expressions.Data;
+using System.Reflection;
+using GitHub.DistributedTask.Pipelines.ObjectTemplating;
+using GitHub.DistributedTask.ObjectTemplating.Schema;
+using GitHub.DistributedTask.ObjectTemplating;
+using GitHub.DistributedTask.ObjectTemplating.Tokens;
+using GitHub.DistributedTask.Pipelines.ContextData;
+using System.Linq;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Worker
 {
     [ServiceLocator(Default = typeof(ActionManifestManager))]
     public interface IActionManifestManager : IRunnerService
     {
-        public ActionDefinitionDataNew Load(IExecutionContext executionContext, string manifestFile);
+        ActionDefinitionData Load(IExecutionContext executionContext, string manifestFile);
 
-        DictionaryExpressionData EvaluateCompositeOutputs(IExecutionContext executionContext, TemplateToken token, IDictionary<string, ExpressionData> extraExpressionValues);
+        DictionaryContextData EvaluateCompositeOutputs(IExecutionContext executionContext, TemplateToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
 
-        List<string> EvaluateContainerArguments(IExecutionContext executionContext, SequenceToken token, IDictionary<string, ExpressionData> extraExpressionValues);
+        List<string> EvaluateContainerArguments(IExecutionContext executionContext, SequenceToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
 
-        Dictionary<string, string> EvaluateContainerEnvironment(IExecutionContext executionContext, MappingToken token, IDictionary<string, ExpressionData> extraExpressionValues);
+        Dictionary<string, string> EvaluateContainerEnvironment(IExecutionContext executionContext, MappingToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
 
         string EvaluateDefaultInput(IExecutionContext executionContext, string inputName, TemplateToken token);
     }
@@ -50,10 +50,10 @@ namespace GitHub.Runner.Worker
             Trace.Info($"Load schema file with definitions: {StringUtil.ConvertToJson(_actionManifestSchema.Definitions.Keys)}");
         }
 
-        public ActionDefinitionDataNew Load(IExecutionContext executionContext, string manifestFile)
+        public ActionDefinitionData Load(IExecutionContext executionContext, string manifestFile)
         {
             var templateContext = CreateTemplateContext(executionContext);
-            ActionDefinitionDataNew actionDefinition = new();
+            ActionDefinitionData actionDefinition = new();
 
             // Clean up file name real quick
             // Instead of using Regex which can be computationally expensive, 
@@ -160,21 +160,21 @@ namespace GitHub.Runner.Worker
             return actionDefinition;
         }
 
-        public DictionaryExpressionData EvaluateCompositeOutputs(
+        public DictionaryContextData EvaluateCompositeOutputs(
             IExecutionContext executionContext,
             TemplateToken token,
-            IDictionary<string, ExpressionData> extraExpressionValues)
+            IDictionary<string, PipelineContextData> extraExpressionValues)
         {
-            DictionaryExpressionData result = null;
+            var result = default(DictionaryContextData);
 
             if (token != null)
             {
                 var templateContext = CreateTemplateContext(executionContext, extraExpressionValues);
                 try
                 {
-                    token = TemplateEvaluator.Evaluate(templateContext, "outputs", token, 0, null);
+                    token = TemplateEvaluator.Evaluate(templateContext, "outputs", token, 0, null, omitHeader: true);
                     templateContext.Errors.Check();
-                    result = token.ToExpressionData().AssertDictionary("composite outputs");
+                    result = token.ToContextData().AssertDictionary("composite outputs");
                 }
                 catch (Exception ex) when (!(ex is TemplateValidationException))
                 {
@@ -184,13 +184,13 @@ namespace GitHub.Runner.Worker
                 templateContext.Errors.Check();
             }
 
-            return result ?? new DictionaryExpressionData();
+            return result ?? new DictionaryContextData();
         }
 
         public List<string> EvaluateContainerArguments(
             IExecutionContext executionContext,
             SequenceToken token,
-            IDictionary<string, ExpressionData> extraExpressionValues)
+            IDictionary<string, PipelineContextData> extraExpressionValues)
         {
             var result = new List<string>();
 
@@ -199,7 +199,7 @@ namespace GitHub.Runner.Worker
                 var templateContext = CreateTemplateContext(executionContext, extraExpressionValues);
                 try
                 {
-                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "container-runs-args", token, 0, null);
+                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "container-runs-args", token, 0, null, omitHeader: true);
                     templateContext.Errors.Check();
 
                     Trace.Info($"Arguments evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
@@ -229,7 +229,7 @@ namespace GitHub.Runner.Worker
         public Dictionary<string, string> EvaluateContainerEnvironment(
             IExecutionContext executionContext,
             MappingToken token,
-            IDictionary<string, ExpressionData> extraExpressionValues)
+            IDictionary<string, PipelineContextData> extraExpressionValues)
         {
             var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
@@ -238,7 +238,7 @@ namespace GitHub.Runner.Worker
                 var templateContext = CreateTemplateContext(executionContext, extraExpressionValues);
                 try
                 {
-                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "container-runs-env", token, 0, null);
+                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "container-runs-env", token, 0, null, omitHeader: true);
                     templateContext.Errors.Check();
 
                     Trace.Info($"Environments evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
@@ -281,7 +281,7 @@ namespace GitHub.Runner.Worker
                 var templateContext = CreateTemplateContext(executionContext);
                 try
                 {
-                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "input-default-context", token, 0, null);
+                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "input-default-context", token, 0, null, omitHeader: true);
                     templateContext.Errors.Check();
 
                     Trace.Info($"Input '{inputName}': default value evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
@@ -303,7 +303,7 @@ namespace GitHub.Runner.Worker
 
         private TemplateContext CreateTemplateContext(
             IExecutionContext executionContext,
-            IDictionary<string, ExpressionData> extraExpressionValues = null)
+            IDictionary<string, PipelineContextData> extraExpressionValues = null)
         {
             var result = new TemplateContext
             {
@@ -314,17 +314,13 @@ namespace GitHub.Runner.Worker
                     maxEvents: 1000000,
                     maxBytes: 10 * 1024 * 1024),
                 Schema = _actionManifestSchema,
-                // TODO: Switch to real tracewriter for cutover
-                TraceWriter = new GitHub.Actions.WorkflowParser.ObjectTemplating.EmptyTraceWriter(),
+                TraceWriter = executionContext.ToTemplateTraceWriter(),
             };
 
             // Expression values from execution context
             foreach (var pair in executionContext.ExpressionValues)
             {
-                // Convert old PipelineContextData to new ExpressionData
-                var json = StringUtil.ConvertToJson(pair.Value, Newtonsoft.Json.Formatting.None);
-                var newValue = StringUtil.ConvertFromJson<GitHub.Actions.Expressions.Data.ExpressionData>(json);
-                result.ExpressionValues[pair.Key] = newValue;
+                result.ExpressionValues[pair.Key] = pair.Value;
             }
 
             // Extra expression values
@@ -336,19 +332,10 @@ namespace GitHub.Runner.Worker
                 }
             }
 
-            // Expression functions
-            foreach (var func in executionContext.ExpressionFunctions)
+            // Expression functions from execution context
+            foreach (var item in executionContext.ExpressionFunctions)
             {
-                GitHub.Actions.Expressions.IFunctionInfo newFunc = func.Name switch
-                {
-                    "always" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewAlwaysFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "cancelled" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewCancelledFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "failure" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewFailureFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "success" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewSuccessFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "hashFiles" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewHashFilesFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    _ => throw new NotSupportedException($"Expression function '{func.Name}' is not supported in ActionManifestManager")
-                };
-                result.ExpressionFunctions.Add(newFunc);
+                result.ExpressionFunctions.Add(item);
             }
 
             // Add the file table from the Execution Context
@@ -381,7 +368,7 @@ namespace GitHub.Runner.Worker
             var postToken = default(StringToken);
             var postEntrypointToken = default(StringToken);
             var postIfToken = default(StringToken);
-            var steps = default(List<GitHub.Actions.WorkflowParser.IStep>);
+            var steps = default(List<Pipelines.Step>);
 
             foreach (var run in runsMapping)
             {
@@ -429,7 +416,7 @@ namespace GitHub.Runner.Worker
                         break;
                     case "steps":
                         var stepsToken = run.Value.AssertSequence("steps");
-                        steps = WorkflowTemplateConverter.ConvertToSteps(templateContext, stepsToken);
+                        steps = PipelineTemplateConverter.ConvertToSteps(templateContext, stepsToken);
                         templateContext.Errors.Check();
                         break;
                     default:
@@ -448,7 +435,7 @@ namespace GitHub.Runner.Worker
                     }
                     else
                     {
-                        return new ContainerActionExecutionDataNew()
+                        return new ContainerActionExecutionData()
                         {
                             Image = imageToken.Value,
                             Arguments = argsToken,
@@ -463,8 +450,7 @@ namespace GitHub.Runner.Worker
                 }
                 else if (string.Equals(usingToken.Value, "node12", StringComparison.OrdinalIgnoreCase) ||
                          string.Equals(usingToken.Value, "node16", StringComparison.OrdinalIgnoreCase) ||
-                         string.Equals(usingToken.Value, "node20", StringComparison.OrdinalIgnoreCase) ||
-                         string.Equals(usingToken.Value, "node24", StringComparison.OrdinalIgnoreCase))
+                         string.Equals(usingToken.Value, "node20", StringComparison.OrdinalIgnoreCase))
                 {
                     if (string.IsNullOrEmpty(mainToken?.Value))
                     {
@@ -491,11 +477,11 @@ namespace GitHub.Runner.Worker
                     }
                     else
                     {
-                        return new CompositeActionExecutionDataNew()
+                        return new CompositeActionExecutionData()
                         {
-                            Steps = steps,
-                            PreSteps = new List<GitHub.Actions.WorkflowParser.IStep>(),
-                            PostSteps = new Stack<GitHub.Actions.WorkflowParser.IStep>(),
+                            Steps = steps.Cast<Pipelines.ActionStep>().ToList(),
+                            PreSteps = new List<Pipelines.ActionStep>(),
+                            PostSteps = new Stack<Pipelines.ActionStep>(),
                             InitCondition = "always()",
                             CleanupCondition = "always()",
                             Outputs = outputs
@@ -504,7 +490,7 @@ namespace GitHub.Runner.Worker
                 }
                 else
                 {
-                    throw new ArgumentOutOfRangeException($"'using: {usingToken.Value}' is not supported, use 'docker', 'node12', 'node16', 'node20' or 'node24' instead.");
+                    throw new ArgumentOutOfRangeException($"'using: {usingToken.Value}' is not supported, use 'docker', 'node12', 'node16' or 'node20' instead.");
                 }
             }
             else if (pluginToken != null)
@@ -515,12 +501,12 @@ namespace GitHub.Runner.Worker
                 };
             }
 
-            throw new NotSupportedException("Missing 'using' value. 'using' requires 'composite', 'docker', 'node12', 'node16', 'node20' or 'node24'.");
+            throw new NotSupportedException("Missing 'using' value. 'using' requires 'composite', 'docker', 'node12', 'node16' or 'node20'.");
         }
 
         private void ConvertInputs(
             TemplateToken inputsToken,
-            ActionDefinitionDataNew actionDefinition)
+            ActionDefinitionData actionDefinition)
         {
             actionDefinition.Inputs = new MappingToken(null, null, null);
             var inputsMapping = inputsToken.AssertMapping("inputs");
@@ -555,49 +541,5 @@ namespace GitHub.Runner.Worker
             }
         }
     }
-
-    public sealed class ActionDefinitionDataNew
-    {
-        public string Name { get; set; }
-
-        public string Description { get; set; }
-
-        public MappingToken Inputs { get; set; }
-
-        public ActionExecutionData Execution { get; set; }
-
-        public Dictionary<String, String> Deprecated { get; set; }
-    }
-
-    public sealed class ContainerActionExecutionDataNew : ActionExecutionData
-    {
-        public override ActionExecutionType ExecutionType => ActionExecutionType.Container;
-
-        public override bool HasPre => !string.IsNullOrEmpty(Pre);
-        public override bool HasPost => !string.IsNullOrEmpty(Post);
-
-        public string Image { get; set; }
-
-        public string EntryPoint { get; set; }
-
-        public SequenceToken Arguments { get; set; }
-
-        public MappingToken Environment { get; set; }
-
-        public string Pre { get; set; }
-
-        public string Post { get; set; }
-    }
-
-    public sealed class CompositeActionExecutionDataNew : ActionExecutionData
-    {
-        public override ActionExecutionType ExecutionType => ActionExecutionType.Composite;
-        public override bool HasPre => PreSteps.Count > 0;
-        public override bool HasPost => PostSteps.Count > 0;
-        public List<GitHub.Actions.WorkflowParser.IStep> PreSteps { get; set; }
-        public List<GitHub.Actions.WorkflowParser.IStep> Steps { get; set; }
-        public Stack<GitHub.Actions.WorkflowParser.IStep> PostSteps { get; set; }
-        public MappingToken Outputs { get; set; }
-    }
 }
 

src/Runner.Worker/ActionManifestManagerLegacy.cs

@@ -1,546 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using GitHub.Runner.Common;
-using GitHub.Runner.Sdk;
-using System.Reflection;
-using GitHub.DistributedTask.Pipelines.ObjectTemplating;
-using GitHub.DistributedTask.ObjectTemplating.Schema;
-using GitHub.DistributedTask.ObjectTemplating;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using System.Linq;
-using Pipelines = GitHub.DistributedTask.Pipelines;
-
-namespace GitHub.Runner.Worker
-{
-    [ServiceLocator(Default = typeof(ActionManifestManagerLegacy))]
-    public interface IActionManifestManagerLegacy : IRunnerService
-    {
-        ActionDefinitionData Load(IExecutionContext executionContext, string manifestFile);
-
-        DictionaryContextData EvaluateCompositeOutputs(IExecutionContext executionContext, TemplateToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
-
-        List<string> EvaluateContainerArguments(IExecutionContext executionContext, SequenceToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
-
-        Dictionary<string, string> EvaluateContainerEnvironment(IExecutionContext executionContext, MappingToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
-
-        string EvaluateDefaultInput(IExecutionContext executionContext, string inputName, TemplateToken token);
-    }
-
-    public sealed class ActionManifestManagerLegacy : RunnerService, IActionManifestManagerLegacy
-    {
-        private TemplateSchema _actionManifestSchema;
-        public override void Initialize(IHostContext hostContext)
-        {
-            base.Initialize(hostContext);
-
-            var assembly = Assembly.GetExecutingAssembly();
-            var json = default(string);
-            using (var stream = assembly.GetManifestResourceStream("GitHub.Runner.Worker.action_yaml.json"))
-            using (var streamReader = new StreamReader(stream))
-            {
-                json = streamReader.ReadToEnd();
-            }
-
-            var objectReader = new JsonObjectReader(null, json);
-            _actionManifestSchema = TemplateSchema.Load(objectReader);
-            ArgUtil.NotNull(_actionManifestSchema, nameof(_actionManifestSchema));
-            Trace.Info($"Load schema file with definitions: {StringUtil.ConvertToJson(_actionManifestSchema.Definitions.Keys)}");
-        }
-
-        public ActionDefinitionData Load(IExecutionContext executionContext, string manifestFile)
-        {
-            var templateContext = CreateTemplateContext(executionContext);
-            ActionDefinitionData actionDefinition = new();
-
-            // Clean up file name real quick
-            // Instead of using Regex which can be computationally expensive, 
-            // we can just remove the # of characters from the fileName according to the length of the basePath
-            string basePath = HostContext.GetDirectory(WellKnownDirectory.Actions);
-            string fileRelativePath = manifestFile;
-            if (manifestFile.Contains(basePath))
-            {
-                fileRelativePath = manifestFile.Remove(0, basePath.Length + 1);
-            }
-
-            try
-            {
-                var token = default(TemplateToken);
-
-                // Get the file ID
-                var fileId = templateContext.GetFileId(fileRelativePath);
-
-                // Add this file to the FileTable in executionContext if it hasn't been added already
-                // we use > since fileID is 1 indexed
-                if (fileId > executionContext.Global.FileTable.Count)
-                {
-                    executionContext.Global.FileTable.Add(fileRelativePath);
-                }
-
-                // Read the file
-                var fileContent = File.ReadAllText(manifestFile);
-                using (var stringReader = new StringReader(fileContent))
-                {
-                    var yamlObjectReader = new YamlObjectReader(fileId, stringReader);
-                    token = TemplateReader.Read(templateContext, "action-root", yamlObjectReader, fileId, out _);
-                }
-
-                var actionMapping = token.AssertMapping("action manifest root");
-                var actionOutputs = default(MappingToken);
-                var actionRunValueToken = default(TemplateToken);
-
-                foreach (var actionPair in actionMapping)
-                {
-                    var propertyName = actionPair.Key.AssertString($"action.yml property key");
-
-                    switch (propertyName.Value)
-                    {
-                        case "name":
-                            actionDefinition.Name = actionPair.Value.AssertString("name").Value;
-                            break;
-
-                        case "outputs":
-                            actionOutputs = actionPair.Value.AssertMapping("outputs");
-                            break;
-
-                        case "description":
-                            actionDefinition.Description = actionPair.Value.AssertString("description").Value;
-                            break;
-
-                        case "inputs":
-                            ConvertInputs(actionPair.Value, actionDefinition);
-                            break;
-
-                        case "runs":
-                            // Defer runs token evaluation to after for loop to ensure that order of outputs doesn't matter.
-                            actionRunValueToken = actionPair.Value;
-                            break;
-
-                        default:
-                            Trace.Info($"Ignore action property {propertyName}.");
-                            break;
-                    }
-                }
-
-                // Evaluate Runs Last
-                if (actionRunValueToken != null)
-                {
-                    actionDefinition.Execution = ConvertRuns(executionContext, templateContext, actionRunValueToken, fileRelativePath, actionOutputs);
-                }
-            }
-            catch (Exception ex)
-            {
-                Trace.Error(ex);
-                templateContext.Errors.Add(ex);
-            }
-
-            if (templateContext.Errors.Count > 0)
-            {
-                foreach (var error in templateContext.Errors)
-                {
-                    Trace.Error($"Action.yml load error: {error.Message}");
-                    executionContext.Error(error.Message);
-                }
-
-                throw new ArgumentException($"Failed to load {fileRelativePath}");
-            }
-
-            if (actionDefinition.Execution == null)
-            {
-                executionContext.Debug($"Loaded action.yml file: {StringUtil.ConvertToJson(actionDefinition)}");
-                throw new ArgumentException($"Top level 'runs:' section is required for {fileRelativePath}");
-            }
-            else
-            {
-                Trace.Info($"Loaded action.yml file: {StringUtil.ConvertToJson(actionDefinition)}");
-            }
-
-            return actionDefinition;
-        }
-
-        public DictionaryContextData EvaluateCompositeOutputs(
-            IExecutionContext executionContext,
-            TemplateToken token,
-            IDictionary<string, PipelineContextData> extraExpressionValues)
-        {
-            var result = default(DictionaryContextData);
-
-            if (token != null)
-            {
-                var templateContext = CreateTemplateContext(executionContext, extraExpressionValues);
-                try
-                {
-                    token = TemplateEvaluator.Evaluate(templateContext, "outputs", token, 0, null, omitHeader: true);
-                    templateContext.Errors.Check();
-                    result = token.ToContextData().AssertDictionary("composite outputs");
-                }
-                catch (Exception ex) when (!(ex is TemplateValidationException))
-                {
-                    templateContext.Errors.Add(ex);
-                }
-
-                templateContext.Errors.Check();
-            }
-
-            return result ?? new DictionaryContextData();
-        }
-
-        public List<string> EvaluateContainerArguments(
-            IExecutionContext executionContext,
-            SequenceToken token,
-            IDictionary<string, PipelineContextData> extraExpressionValues)
-        {
-            var result = new List<string>();
-
-            if (token != null)
-            {
-                var templateContext = CreateTemplateContext(executionContext, extraExpressionValues);
-                try
-                {
-                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "container-runs-args", token, 0, null, omitHeader: true);
-                    templateContext.Errors.Check();
-
-                    Trace.Info($"Arguments evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
-
-                    // Sequence
-                    var args = evaluateResult.AssertSequence("container args");
-
-                    foreach (var arg in args)
-                    {
-                        var str = arg.AssertString("container arg").Value;
-                        result.Add(str);
-                        Trace.Info($"Add argument {str}");
-                    }
-                }
-                catch (Exception ex) when (!(ex is TemplateValidationException))
-                {
-                    Trace.Error(ex);
-                    templateContext.Errors.Add(ex);
-                }
-
-                templateContext.Errors.Check();
-            }
-
-            return result;
-        }
-
-        public Dictionary<string, string> EvaluateContainerEnvironment(
-            IExecutionContext executionContext,
-            MappingToken token,
-            IDictionary<string, PipelineContextData> extraExpressionValues)
-        {
-            var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            if (token != null)
-            {
-                var templateContext = CreateTemplateContext(executionContext, extraExpressionValues);
-                try
-                {
-                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "container-runs-env", token, 0, null, omitHeader: true);
-                    templateContext.Errors.Check();
-
-                    Trace.Info($"Environments evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
-
-                    // Mapping
-                    var mapping = evaluateResult.AssertMapping("container env");
-
-                    foreach (var pair in mapping)
-                    {
-                        // Literal key
-                        var key = pair.Key.AssertString("container env key");
-
-                        // Literal value
-                        var value = pair.Value.AssertString("container env value");
-                        result[key.Value] = value.Value;
-
-                        Trace.Info($"Add env {key} = {value}");
-                    }
-                }
-                catch (Exception ex) when (!(ex is TemplateValidationException))
-                {
-                    Trace.Error(ex);
-                    templateContext.Errors.Add(ex);
-                }
-
-                templateContext.Errors.Check();
-            }
-
-            return result;
-        }
-
-        public string EvaluateDefaultInput(
-            IExecutionContext executionContext,
-            string inputName,
-            TemplateToken token)
-        {
-            string result = "";
-            if (token != null)
-            {
-                var templateContext = CreateTemplateContext(executionContext);
-                try
-                {
-                    var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "input-default-context", token, 0, null, omitHeader: true);
-                    templateContext.Errors.Check();
-
-                    Trace.Info($"Input '{inputName}': default value evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
-
-                    // String
-                    result = evaluateResult.AssertString($"default value for input '{inputName}'").Value;
-                }
-                catch (Exception ex) when (!(ex is TemplateValidationException))
-                {
-                    Trace.Error(ex);
-                    templateContext.Errors.Add(ex);
-                }
-
-                templateContext.Errors.Check();
-            }
-
-            return result;
-        }
-
-        private TemplateContext CreateTemplateContext(
-            IExecutionContext executionContext,
-            IDictionary<string, PipelineContextData> extraExpressionValues = null)
-        {
-            var result = new TemplateContext
-            {
-                CancellationToken = CancellationToken.None,
-                Errors = new TemplateValidationErrors(10, int.MaxValue), // Don't truncate error messages otherwise we might not scrub secrets correctly
-                Memory = new TemplateMemory(
-                    maxDepth: 100,
-                    maxEvents: 1000000,
-                    maxBytes: 10 * 1024 * 1024),
-                Schema = _actionManifestSchema,
-                TraceWriter = executionContext.ToTemplateTraceWriter(),
-            };
-
-            // Expression values from execution context
-            foreach (var pair in executionContext.ExpressionValues)
-            {
-                result.ExpressionValues[pair.Key] = pair.Value;
-            }
-
-            // Extra expression values
-            if (extraExpressionValues?.Count > 0)
-            {
-                foreach (var pair in extraExpressionValues)
-                {
-                    result.ExpressionValues[pair.Key] = pair.Value;
-                }
-            }
-
-            // Expression functions from execution context
-            foreach (var item in executionContext.ExpressionFunctions)
-            {
-                result.ExpressionFunctions.Add(item);
-            }
-
-            // Add the file table from the Execution Context
-            for (var i = 0; i < executionContext.Global.FileTable.Count; i++)
-            {
-                result.GetFileId(executionContext.Global.FileTable[i]);
-            }
-
-            return result;
-        }
-
-        private ActionExecutionData ConvertRuns(
-            IExecutionContext executionContext,
-            TemplateContext templateContext,
-            TemplateToken inputsToken,
-            String fileRelativePath,
-            MappingToken outputs = null)
-        {
-            var runsMapping = inputsToken.AssertMapping("runs");
-            var usingToken = default(StringToken);
-            var imageToken = default(StringToken);
-            var argsToken = default(SequenceToken);
-            var entrypointToken = default(StringToken);
-            var envToken = default(MappingToken);
-            var mainToken = default(StringToken);
-            var pluginToken = default(StringToken);
-            var preToken = default(StringToken);
-            var preEntrypointToken = default(StringToken);
-            var preIfToken = default(StringToken);
-            var postToken = default(StringToken);
-            var postEntrypointToken = default(StringToken);
-            var postIfToken = default(StringToken);
-            var steps = default(List<Pipelines.Step>);
-
-            foreach (var run in runsMapping)
-            {
-                var runsKey = run.Key.AssertString("runs key").Value;
-                switch (runsKey)
-                {
-                    case "using":
-                        usingToken = run.Value.AssertString("using");
-                        break;
-                    case "image":
-                        imageToken = run.Value.AssertString("image");
-                        break;
-                    case "args":
-                        argsToken = run.Value.AssertSequence("args");
-                        break;
-                    case "entrypoint":
-                        entrypointToken = run.Value.AssertString("entrypoint");
-                        break;
-                    case "env":
-                        envToken = run.Value.AssertMapping("env");
-                        break;
-                    case "main":
-                        mainToken = run.Value.AssertString("main");
-                        break;
-                    case "plugin":
-                        pluginToken = run.Value.AssertString("plugin");
-                        break;
-                    case "post":
-                        postToken = run.Value.AssertString("post");
-                        break;
-                    case "post-entrypoint":
-                        postEntrypointToken = run.Value.AssertString("post-entrypoint");
-                        break;
-                    case "post-if":
-                        postIfToken = run.Value.AssertString("post-if");
-                        break;
-                    case "pre":
-                        preToken = run.Value.AssertString("pre");
-                        break;
-                    case "pre-entrypoint":
-                        preEntrypointToken = run.Value.AssertString("pre-entrypoint");
-                        break;
-                    case "pre-if":
-                        preIfToken = run.Value.AssertString("pre-if");
-                        break;
-                    case "steps":
-                        var stepsToken = run.Value.AssertSequence("steps");
-                        steps = PipelineTemplateConverter.ConvertToSteps(templateContext, stepsToken);
-                        templateContext.Errors.Check();
-                        break;
-                    default:
-                        Trace.Info($"Ignore run property {runsKey}.");
-                        break;
-                }
-            }
-
-            if (usingToken != null)
-            {
-                if (string.Equals(usingToken.Value, "docker", StringComparison.OrdinalIgnoreCase))
-                {
-                    if (string.IsNullOrEmpty(imageToken?.Value))
-                    {
-                        throw new ArgumentNullException($"You are using a Container Action but an image is not provided in {fileRelativePath}.");
-                    }
-                    else
-                    {
-                        return new ContainerActionExecutionData()
-                        {
-                            Image = imageToken.Value,
-                            Arguments = argsToken,
-                            EntryPoint = entrypointToken?.Value,
-                            Environment = envToken,
-                            Pre = preEntrypointToken?.Value,
-                            InitCondition = preIfToken?.Value ?? "always()",
-                            Post = postEntrypointToken?.Value,
-                            CleanupCondition = postIfToken?.Value ?? "always()"
-                        };
-                    }
-                }
-                else if (string.Equals(usingToken.Value, "node12", StringComparison.OrdinalIgnoreCase) ||
-                         string.Equals(usingToken.Value, "node16", StringComparison.OrdinalIgnoreCase) ||
-                         string.Equals(usingToken.Value, "node20", StringComparison.OrdinalIgnoreCase) ||
-                         string.Equals(usingToken.Value, "node24", StringComparison.OrdinalIgnoreCase))
-                {
-                    if (string.IsNullOrEmpty(mainToken?.Value))
-                    {
-                        throw new ArgumentNullException($"You are using a JavaScript Action but there is not an entry JavaScript file provided in {fileRelativePath}.");
-                    }
-                    else
-                    {
-                        return new NodeJSActionExecutionData()
-                        {
-                            NodeVersion = usingToken.Value,
-                            Script = mainToken.Value,
-                            Pre = preToken?.Value,
-                            InitCondition = preIfToken?.Value ?? "always()",
-                            Post = postToken?.Value,
-                            CleanupCondition = postIfToken?.Value ?? "always()"
-                        };
-                    }
-                }
-                else if (string.Equals(usingToken.Value, "composite", StringComparison.OrdinalIgnoreCase))
-                {
-                    if (steps == null)
-                    {
-                        throw new ArgumentNullException($"You are using a composite action but there are no steps provided in {fileRelativePath}.");
-                    }
-                    else
-                    {
-                        return new CompositeActionExecutionData()
-                        {
-                            Steps = steps.Cast<Pipelines.ActionStep>().ToList(),
-                            PreSteps = new List<Pipelines.ActionStep>(),
-                            PostSteps = new Stack<Pipelines.ActionStep>(),
-                            InitCondition = "always()",
-                            CleanupCondition = "always()",
-                            Outputs = outputs
-                        };
-                    }
-                }
-                else
-                {
-                    throw new ArgumentOutOfRangeException($"'using: {usingToken.Value}' is not supported, use 'docker', 'node12', 'node16', 'node20' or 'node24' instead.");
-                }
-            }
-            else if (pluginToken != null)
-            {
-                return new PluginActionExecutionData()
-                {
-                    Plugin = pluginToken.Value
-                };
-            }
-
-            throw new NotSupportedException("Missing 'using' value. 'using' requires 'composite', 'docker', 'node12', 'node16', 'node20' or 'node24'.");
-        }
-
-        private void ConvertInputs(
-            TemplateToken inputsToken,
-            ActionDefinitionData actionDefinition)
-        {
-            actionDefinition.Inputs = new MappingToken(null, null, null);
-            var inputsMapping = inputsToken.AssertMapping("inputs");
-            foreach (var input in inputsMapping)
-            {
-                bool hasDefault = false;
-                var inputName = input.Key.AssertString("input name");
-                var inputMetadata = input.Value.AssertMapping("input metadata");
-                foreach (var metadata in inputMetadata)
-                {
-                    var metadataName = metadata.Key.AssertString("input metadata").Value;
-                    if (string.Equals(metadataName, "default", StringComparison.OrdinalIgnoreCase))
-                    {
-                        hasDefault = true;
-                        actionDefinition.Inputs.Add(inputName, metadata.Value);
-                    }
-                    else if (string.Equals(metadataName, "deprecationMessage", StringComparison.OrdinalIgnoreCase))
-                    {
-                        if (actionDefinition.Deprecated == null)
-                        {
-                            actionDefinition.Deprecated = new Dictionary<String, String>();
-                        }
-                        var message = metadata.Value.AssertString("input deprecationMessage");
-                        actionDefinition.Deprecated.Add(inputName.Value, message.Value);
-                    }
-                }
-
-                if (!hasDefault)
-                {
-                    actionDefinition.Inputs.Add(inputName, new StringToken(null, null, null, string.Empty));
-                }
-            }
-        }
-    }
-}
-

src/Runner.Worker/ActionManifestManagerWrapper.cs

@@ -1,701 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GitHub.Actions.WorkflowParser;
-using GitHub.DistributedTask.Pipelines;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
-using GitHub.Runner.Sdk;
-using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
-
-namespace GitHub.Runner.Worker
-{
-    [ServiceLocator(Default = typeof(ActionManifestManagerWrapper))]
-    public interface IActionManifestManagerWrapper : IRunnerService
-    {
-        ActionDefinitionData Load(IExecutionContext executionContext, string manifestFile);
-
-        DictionaryContextData EvaluateCompositeOutputs(IExecutionContext executionContext, TemplateToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
-
-        List<string> EvaluateContainerArguments(IExecutionContext executionContext, SequenceToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
-
-        Dictionary<string, string> EvaluateContainerEnvironment(IExecutionContext executionContext, MappingToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
-
-        string EvaluateDefaultInput(IExecutionContext executionContext, string inputName, TemplateToken token);
-    }
-
-    public sealed class ActionManifestManagerWrapper : RunnerService, IActionManifestManagerWrapper
-    {
-        private IActionManifestManagerLegacy _legacyManager;
-        private IActionManifestManager _newManager;
-
-        public override void Initialize(IHostContext hostContext)
-        {
-            base.Initialize(hostContext);
-            _legacyManager = hostContext.GetService<IActionManifestManagerLegacy>();
-            _newManager = hostContext.GetService<IActionManifestManager>();
-        }
-
-        public ActionDefinitionData Load(IExecutionContext executionContext, string manifestFile)
-        {
-            return EvaluateAndCompare(
-                executionContext,
-                "Load",
-                () => _legacyManager.Load(executionContext, manifestFile),
-                () => ConvertToLegacyActionDefinitionData(_newManager.Load(executionContext, manifestFile)),
-                (legacyResult, newResult) => CompareActionDefinition(legacyResult, newResult));
-        }
-
-        public DictionaryContextData EvaluateCompositeOutputs(
-            IExecutionContext executionContext,
-            TemplateToken token,
-            IDictionary<string, PipelineContextData> extraExpressionValues)
-        {
-            return EvaluateAndCompare(
-                executionContext,
-                "EvaluateCompositeOutputs",
-                () => _legacyManager.EvaluateCompositeOutputs(executionContext, token, extraExpressionValues),
-                () => ConvertToLegacyContextData<DictionaryContextData>(_newManager.EvaluateCompositeOutputs(executionContext, ConvertToNewToken(token), ConvertToNewExpressionValues(extraExpressionValues))),
-                (legacyResult, newResult) => CompareDictionaryContextData(legacyResult, newResult));
-        }
-
-        public List<string> EvaluateContainerArguments(
-            IExecutionContext executionContext,
-            SequenceToken token,
-            IDictionary<string, PipelineContextData> extraExpressionValues)
-        {
-            return EvaluateAndCompare(
-                executionContext,
-                "EvaluateContainerArguments",
-                () => _legacyManager.EvaluateContainerArguments(executionContext, token, extraExpressionValues),
-                () => _newManager.EvaluateContainerArguments(executionContext, ConvertToNewToken(token) as GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.SequenceToken, ConvertToNewExpressionValues(extraExpressionValues)),
-                (legacyResult, newResult) => CompareLists(legacyResult, newResult, "ContainerArguments"));
-        }
-
-        public Dictionary<string, string> EvaluateContainerEnvironment(
-            IExecutionContext executionContext,
-            MappingToken token,
-            IDictionary<string, PipelineContextData> extraExpressionValues)
-        {
-            return EvaluateAndCompare(
-                executionContext,
-                "EvaluateContainerEnvironment",
-                () => _legacyManager.EvaluateContainerEnvironment(executionContext, token, extraExpressionValues),
-                () => _newManager.EvaluateContainerEnvironment(executionContext, ConvertToNewToken(token) as GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.MappingToken, ConvertToNewExpressionValues(extraExpressionValues)),
-                (legacyResult, newResult) => {
-                    var trace = HostContext.GetTrace(nameof(ActionManifestManagerWrapper));
-                    return CompareDictionaries(trace, legacyResult, newResult, "ContainerEnvironment");
-                });
-        }
-
-        public string EvaluateDefaultInput(
-            IExecutionContext executionContext,
-            string inputName,
-            TemplateToken token)
-        {
-            return EvaluateAndCompare(
-                executionContext,
-                "EvaluateDefaultInput",
-                () => _legacyManager.EvaluateDefaultInput(executionContext, inputName, token),
-                () => _newManager.EvaluateDefaultInput(executionContext, inputName, ConvertToNewToken(token)),
-                (legacyResult, newResult) => string.Equals(legacyResult, newResult, StringComparison.Ordinal));
-        }
-
-        // Conversion helper methods
-        private ActionDefinitionData ConvertToLegacyActionDefinitionData(ActionDefinitionDataNew newData)
-        {
-            if (newData == null)
-            {
-                return null;
-            }
-
-            return new ActionDefinitionData
-            {
-                Name = newData.Name,
-                Description = newData.Description,
-                Inputs = ConvertToLegacyToken<MappingToken>(newData.Inputs),
-                Deprecated = newData.Deprecated,
-                Execution = ConvertToLegacyExecution(newData.Execution)
-            };
-        }
-
-        private ActionExecutionData ConvertToLegacyExecution(ActionExecutionData execution)
-        {
-            if (execution == null)
-            {
-                return null;
-            }
-
-            // Handle different execution types
-            if (execution is ContainerActionExecutionDataNew containerNew)
-            {
-                return new ContainerActionExecutionData
-                {
-                    Image = containerNew.Image,
-                    EntryPoint = containerNew.EntryPoint,
-                    Arguments = ConvertToLegacyToken<SequenceToken>(containerNew.Arguments),
-                    Environment = ConvertToLegacyToken<MappingToken>(containerNew.Environment),
-                    Pre = containerNew.Pre,
-                    Post = containerNew.Post,
-                    InitCondition = containerNew.InitCondition,
-                    CleanupCondition = containerNew.CleanupCondition
-                };
-            }
-            else if (execution is CompositeActionExecutionDataNew compositeNew)
-            {
-                return new CompositeActionExecutionData
-                {
-                    Steps = ConvertToLegacySteps(compositeNew.Steps),
-                    Outputs = ConvertToLegacyToken<MappingToken>(compositeNew.Outputs)
-                };
-            }
-            else
-            {
-                // For NodeJS and Plugin execution, they don't use new token types, so just return as-is
-                return execution;
-            }
-        }
-
-        private List<GitHub.DistributedTask.Pipelines.ActionStep> ConvertToLegacySteps(List<GitHub.Actions.WorkflowParser.IStep> newSteps)
-        {
-            if (newSteps == null)
-            {
-                return null;
-            }
-
-            // Serialize new steps and deserialize to old steps
-            var json = StringUtil.ConvertToJson(newSteps, Newtonsoft.Json.Formatting.None);
-            return StringUtil.ConvertFromJson<List<GitHub.DistributedTask.Pipelines.ActionStep>>(json);
-        }
-
-        private T ConvertToLegacyToken<T>(GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.TemplateToken newToken) where T : TemplateToken
-        {
-            if (newToken == null)
-            {
-                return null;
-            }
-
-            // Serialize and deserialize to convert between token types
-            var json = StringUtil.ConvertToJson(newToken, Newtonsoft.Json.Formatting.None);
-            return StringUtil.ConvertFromJson<T>(json);
-        }
-
-        private GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.TemplateToken ConvertToNewToken(TemplateToken legacyToken)
-        {
-            if (legacyToken == null)
-            {
-                return null;
-            }
-
-            var json = StringUtil.ConvertToJson(legacyToken, Newtonsoft.Json.Formatting.None);
-            return StringUtil.ConvertFromJson<GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.TemplateToken>(json);
-        }
-
-        private IDictionary<string, GitHub.Actions.Expressions.Data.ExpressionData> ConvertToNewExpressionValues(IDictionary<string, PipelineContextData> legacyValues)
-        {
-            if (legacyValues == null)
-            {
-                return null;
-            }
-
-            var json = StringUtil.ConvertToJson(legacyValues, Newtonsoft.Json.Formatting.None);
-            return StringUtil.ConvertFromJson<IDictionary<string, GitHub.Actions.Expressions.Data.ExpressionData>>(json);
-        }
-
-        private T ConvertToLegacyContextData<T>(GitHub.Actions.Expressions.Data.ExpressionData newData) where T : PipelineContextData
-        {
-            if (newData == null)
-            {
-                return null;
-            }
-
-            var json = StringUtil.ConvertToJson(newData, Newtonsoft.Json.Formatting.None);
-            return StringUtil.ConvertFromJson<T>(json);
-        }
-
-        // Comparison helper methods
-        private TLegacy EvaluateAndCompare<TLegacy, TNew>(
-            IExecutionContext context,
-            string methodName,
-            Func<TLegacy> legacyEvaluator,
-            Func<TNew> newEvaluator,
-            Func<TLegacy, TNew, bool> resultComparer)
-        {
-            // Legacy only?
-            if (!((context.Global.Variables.GetBoolean(Constants.Runner.Features.CompareWorkflowParser) ?? false)
-                || StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("ACTIONS_RUNNER_COMPARE_WORKFLOW_PARSER"))))
-            {
-                return legacyEvaluator();
-            }
-
-            var trace = HostContext.GetTrace(nameof(ActionManifestManagerWrapper));
-
-            // Legacy evaluator
-            var legacyException = default(Exception);
-            var legacyResult = default(TLegacy);
-            try
-            {
-                legacyResult = legacyEvaluator();
-            }
-            catch (Exception ex)
-            {
-                legacyException = ex;
-            }
-
-            // Compare with new evaluator
-            try
-            {
-                ArgUtil.NotNull(context, nameof(context));
-                trace.Info(methodName);
-
-                // New evaluator
-                var newException = default(Exception);
-                var newResult = default(TNew);
-                try
-                {
-                    newResult = newEvaluator();
-                }
-                catch (Exception ex)
-                {
-                    newException = ex;
-                }
-
-                // Compare results or exceptions
-                if (legacyException != null || newException != null)
-                {
-                    // Either one or both threw exceptions - compare them
-                    if (!CompareExceptions(trace, legacyException, newException))
-                    {
-                        trace.Info($"{methodName} exception mismatch");
-                        RecordMismatch(context, $"{methodName}");
-                    }
-                }
-                else
-                {
-                    // Both succeeded - compare results
-                    // Skip comparison if new implementation returns null (not yet implemented)
-                    if (newResult != null && !resultComparer(legacyResult, newResult))
-                    {
-                        trace.Info($"{methodName} mismatch");
-                        RecordMismatch(context, $"{methodName}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                trace.Info($"Comparison failed: {ex.Message}");
-                RecordComparisonError(context, $"{methodName}: {ex.Message}");
-            }
-
-            // Re-throw legacy exception if any
-            if (legacyException != null)
-            {
-                throw legacyException;
-            }
-
-            return legacyResult;
-        }
-
-        private void RecordMismatch(IExecutionContext context, string methodName)
-        {
-            if (!context.Global.HasActionManifestMismatch)
-            {
-                context.Global.HasActionManifestMismatch = true;
-                var telemetry = new JobTelemetry { Type = JobTelemetryType.General, Message = $"ActionManifestMismatch: {methodName}" };
-                context.Global.JobTelemetry.Add(telemetry);
-            }
-        }
-
-        private void RecordComparisonError(IExecutionContext context, string errorDetails)
-        {
-            if (!context.Global.HasActionManifestMismatch)
-            {
-                context.Global.HasActionManifestMismatch = true;
-                var telemetry = new JobTelemetry { Type = JobTelemetryType.General, Message = $"ActionManifestComparisonError: {errorDetails}" };
-                context.Global.JobTelemetry.Add(telemetry);
-            }
-        }
-
-        private bool CompareActionDefinition(ActionDefinitionData legacyResult, ActionDefinitionData newResult)
-        {
-            var trace = HostContext.GetTrace(nameof(ActionManifestManagerWrapper));
-            if (legacyResult == null && newResult == null)
-            {
-                return true;
-            }
-
-            if (legacyResult == null || newResult == null)
-            {
-                trace.Info($"CompareActionDefinition mismatch - one result is null (legacy={legacyResult == null}, new={newResult == null})");
-                return false;
-            }
-
-            if (!string.Equals(legacyResult.Name, newResult.Name, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareActionDefinition mismatch - Name differs (legacy='{legacyResult.Name}', new='{newResult.Name}')");
-                return false;
-            }
-
-            if (!string.Equals(legacyResult.Description, newResult.Description, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareActionDefinition mismatch - Description differs (legacy='{legacyResult.Description}', new='{newResult.Description}')");
-                return false;
-            }
-
-            // Compare Inputs token
-            var legacyInputsJson = legacyResult.Inputs != null ? StringUtil.ConvertToJson(legacyResult.Inputs) : null;
-            var newInputsJson = newResult.Inputs != null ? StringUtil.ConvertToJson(newResult.Inputs) : null;
-            if (!string.Equals(legacyInputsJson, newInputsJson, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareActionDefinition mismatch - Inputs differ");
-                return false;
-            }
-
-            // Compare Deprecated
-            if (!CompareDictionaries(trace, legacyResult.Deprecated, newResult.Deprecated, "Deprecated"))
-            {
-                return false;
-            }
-
-            // Compare Execution
-            if (!CompareExecution(trace, legacyResult.Execution, newResult.Execution))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareExecution(Tracing trace, ActionExecutionData legacy, ActionExecutionData newExecution)
-        {
-            if (legacy == null && newExecution == null)
-            {
-                return true;
-            }
-
-            if (legacy == null || newExecution == null)
-            {
-                trace.Info($"CompareExecution mismatch - one is null (legacy={legacy == null}, new={newExecution == null})");
-                return false;
-            }
-
-            if (legacy.GetType() != newExecution.GetType())
-            {
-                trace.Info($"CompareExecution mismatch - different types (legacy={legacy.GetType().Name}, new={newExecution.GetType().Name})");
-                return false;
-            }
-
-            // Compare based on type
-            if (legacy is NodeJSActionExecutionData legacyNode && newExecution is NodeJSActionExecutionData newNode)
-            {
-                return CompareNodeJSExecution(trace, legacyNode, newNode);
-            }
-            else if (legacy is ContainerActionExecutionData legacyContainer && newExecution is ContainerActionExecutionData newContainer)
-            {
-                return CompareContainerExecution(trace, legacyContainer, newContainer);
-            }
-            else if (legacy is CompositeActionExecutionData legacyComposite && newExecution is CompositeActionExecutionData newComposite)
-            {
-                return CompareCompositeExecution(trace, legacyComposite, newComposite);
-            }
-            else if (legacy is PluginActionExecutionData legacyPlugin && newExecution is PluginActionExecutionData newPlugin)
-            {
-                return ComparePluginExecution(trace, legacyPlugin, newPlugin);
-            }
-
-            return true;
-        }
-
-        private bool CompareNodeJSExecution(Tracing trace, NodeJSActionExecutionData legacy, NodeJSActionExecutionData newExecution)
-        {
-            if (!string.Equals(legacy.NodeVersion, newExecution.NodeVersion, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareNodeJSExecution mismatch - NodeVersion differs (legacy='{legacy.NodeVersion}', new='{newExecution.NodeVersion}')");
-                return false;
-            }
-
-            if (!string.Equals(legacy.Script, newExecution.Script, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareNodeJSExecution mismatch - Script differs (legacy='{legacy.Script}', new='{newExecution.Script}')");
-                return false;
-            }
-
-            if (!string.Equals(legacy.Pre, newExecution.Pre, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareNodeJSExecution mismatch - Pre differs");
-                return false;
-            }
-
-            if (!string.Equals(legacy.Post, newExecution.Post, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareNodeJSExecution mismatch - Post differs");
-                return false;
-            }
-
-            if (!string.Equals(legacy.InitCondition, newExecution.InitCondition, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareNodeJSExecution mismatch - InitCondition differs");
-                return false;
-            }
-
-            if (!string.Equals(legacy.CleanupCondition, newExecution.CleanupCondition, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareNodeJSExecution mismatch - CleanupCondition differs");
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareContainerExecution(Tracing trace, ContainerActionExecutionData legacy, ContainerActionExecutionData newExecution)
-        {
-            if (!string.Equals(legacy.Image, newExecution.Image, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareContainerExecution mismatch - Image differs");
-                return false;
-            }
-
-            if (!string.Equals(legacy.EntryPoint, newExecution.EntryPoint, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareContainerExecution mismatch - EntryPoint differs");
-                return false;
-            }
-
-            // Compare Arguments token
-            var legacyArgsJson = legacy.Arguments != null ? StringUtil.ConvertToJson(legacy.Arguments) : null;
-            var newArgsJson = newExecution.Arguments != null ? StringUtil.ConvertToJson(newExecution.Arguments) : null;
-            if (!string.Equals(legacyArgsJson, newArgsJson, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareContainerExecution mismatch - Arguments differ");
-                return false;
-            }
-
-            // Compare Environment token
-            var legacyEnvJson = legacy.Environment != null ? StringUtil.ConvertToJson(legacy.Environment) : null;
-            var newEnvJson = newExecution.Environment != null ? StringUtil.ConvertToJson(newExecution.Environment) : null;
-            if (!string.Equals(legacyEnvJson, newEnvJson, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareContainerExecution mismatch - Environment differs");
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareCompositeExecution(Tracing trace, CompositeActionExecutionData legacy, CompositeActionExecutionData newExecution)
-        {
-            // Compare Steps
-            if (legacy.Steps?.Count != newExecution.Steps?.Count)
-            {
-                trace.Info($"CompareCompositeExecution mismatch - Steps.Count differs (legacy={legacy.Steps?.Count}, new={newExecution.Steps?.Count})");
-                return false;
-            }
-
-            // Compare Outputs token
-            var legacyOutputsJson = legacy.Outputs != null ? StringUtil.ConvertToJson(legacy.Outputs) : null;
-            var newOutputsJson = newExecution.Outputs != null ? StringUtil.ConvertToJson(newExecution.Outputs) : null;
-            if (!string.Equals(legacyOutputsJson, newOutputsJson, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareCompositeExecution mismatch - Outputs differ");
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool ComparePluginExecution(Tracing trace, PluginActionExecutionData legacy, PluginActionExecutionData newExecution)
-        {
-            if (!string.Equals(legacy.Plugin, newExecution.Plugin, StringComparison.Ordinal))
-            {
-                trace.Info($"ComparePluginExecution mismatch - Plugin differs");
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareDictionaryContextData(DictionaryContextData legacy, DictionaryContextData newData)
-        {
-            var trace = HostContext.GetTrace(nameof(ActionManifestManagerWrapper));
-            if (legacy == null && newData == null)
-            {
-                return true;
-            }
-
-            if (legacy == null || newData == null)
-            {
-                trace.Info($"CompareDictionaryContextData mismatch - one is null (legacy={legacy == null}, new={newData == null})");
-                return false;
-            }
-
-            var legacyJson = StringUtil.ConvertToJson(legacy);
-            var newJson = StringUtil.ConvertToJson(newData);
-
-            if (!string.Equals(legacyJson, newJson, StringComparison.Ordinal))
-            {
-                trace.Info($"CompareDictionaryContextData mismatch");
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareLists(IList<string> legacyList, IList<string> newList, string fieldName)
-        {
-            var trace = HostContext.GetTrace(nameof(ActionManifestManagerWrapper));
-            if (legacyList == null && newList == null)
-            {
-                return true;
-            }
-
-            if (legacyList == null || newList == null)
-            {
-                trace.Info($"CompareLists mismatch - {fieldName} - one is null (legacy={legacyList == null}, new={newList == null})");
-                return false;
-            }
-
-            if (legacyList.Count != newList.Count)
-            {
-                trace.Info($"CompareLists mismatch - {fieldName}.Count differs (legacy={legacyList.Count}, new={newList.Count})");
-                return false;
-            }
-
-            for (int i = 0; i < legacyList.Count; i++)
-            {
-                if (!string.Equals(legacyList[i], newList[i], StringComparison.Ordinal))
-                {
-                    trace.Info($"CompareLists mismatch - {fieldName}[{i}] differs (legacy='{legacyList[i]}', new='{newList[i]}')");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool CompareDictionaries(Tracing trace, IDictionary<string, string> legacyDict, IDictionary<string, string> newDict, string fieldName)
-        {
-            if (legacyDict == null && newDict == null)
-            {
-                return true;
-            }
-
-            if (legacyDict == null || newDict == null)
-            {
-                trace.Info($"CompareDictionaries mismatch - {fieldName} - one is null (legacy={legacyDict == null}, new={newDict == null})");
-                return false;
-            }
-
-            if (legacyDict is Dictionary<string, string> legacyTypedDict && newDict is Dictionary<string, string> newTypedDict)
-            {
-                if (!object.Equals(legacyTypedDict.Comparer, newTypedDict.Comparer))
-                {
-                    trace.Info($"CompareDictionaries mismatch - {fieldName} - different comparers (legacy={legacyTypedDict.Comparer.GetType().Name}, new={newTypedDict.Comparer.GetType().Name})");
-                    return false;
-                }
-            }
-
-            if (legacyDict.Count != newDict.Count)
-            {
-                trace.Info($"CompareDictionaries mismatch - {fieldName}.Count differs (legacy={legacyDict.Count}, new={newDict.Count})");
-                return false;
-            }
-
-            foreach (var kvp in legacyDict)
-            {
-                if (!newDict.TryGetValue(kvp.Key, out var newValue))
-                {
-                    trace.Info($"CompareDictionaries mismatch - {fieldName} - key '{kvp.Key}' missing in new result");
-                    return false;
-                }
-
-                if (!string.Equals(kvp.Value, newValue, StringComparison.Ordinal))
-                {
-                    trace.Info($"CompareDictionaries mismatch - {fieldName}['{kvp.Key}'] differs (legacy='{kvp.Value}', new='{newValue}')");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool CompareExceptions(Tracing trace, Exception legacyException, Exception newException)
-        {
-            if (legacyException == null && newException == null)
-            {
-                return true;
-            }
-
-            if (legacyException == null || newException == null)
-            {
-                trace.Info($"CompareExceptions mismatch - one exception is null (legacy={legacyException == null}, new={newException == null})");
-                return false;
-            }
-
-            // Compare exception messages recursively (including inner exceptions)
-            var legacyMessages = GetExceptionMessages(legacyException);
-            var newMessages = GetExceptionMessages(newException);
-
-            if (legacyMessages.Count != newMessages.Count)
-            {
-                trace.Info($"CompareExceptions mismatch - different number of exception messages (legacy={legacyMessages.Count}, new={newMessages.Count})");
-                return false;
-            }
-
-            for (int i = 0; i < legacyMessages.Count; i++)
-            {
-                if (!string.Equals(legacyMessages[i], newMessages[i], StringComparison.Ordinal))
-                {
-                    trace.Info($"CompareExceptions mismatch - exception messages differ at level {i} (legacy='{legacyMessages[i]}', new='{newMessages[i]}')");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private IList<string> GetExceptionMessages(Exception ex)
-        {
-            var trace = HostContext.GetTrace(nameof(ActionManifestManagerWrapper));
-            var messages = new List<string>();
-            var toProcess = new Queue<Exception>();
-            toProcess.Enqueue(ex);
-            int count = 0;
-
-            while (toProcess.Count > 0 && count < 50)
-            {
-                var current = toProcess.Dequeue();
-                if (current == null) continue;
-
-                messages.Add(current.Message);
-                count++;
-
-                // Special handling for AggregateException - enqueue all inner exceptions
-                if (current is AggregateException aggregateEx)
-                {
-                    foreach (var innerEx in aggregateEx.InnerExceptions)
-                    {
-                        if (innerEx != null && count < 50)
-                        {
-                            toProcess.Enqueue(innerEx);
-                        }
-                    }
-                }
-                else if (current.InnerException != null)
-                {
-                    toProcess.Enqueue(current.InnerException);
-                }
-
-                // Failsafe: if we have too many exceptions, stop and return what we have
-                if (count >= 50)
-                {
-                    trace.Info("CompareExceptions failsafe triggered - too many exceptions (50+)");
-                    break;
-                }
-            }
-
-            return messages;
-        }
-    }
-}

src/Runner.Worker/ActionRunner.cs

@@ -206,7 +206,7 @@ namespace GitHub.Runner.Worker
             // Merge the default inputs from the definition
             if (definition.Data?.Inputs != null)
             {
-                var manifestManager = HostContext.GetService<IActionManifestManagerWrapper>();
+                var manifestManager = HostContext.GetService<IActionManifestManager>();
                 foreach (var input in definition.Data.Inputs)
                 {
                     string key = input.Key.AssertString("action input name").Value;

src/Runner.Worker/ExecutionContext.cs

@@ -508,9 +508,6 @@ namespace GitHub.Runner.Worker
                     Status = _record.State,
                     Number = _record.Order,
                     Name = _record.Name,
-                    ActionName = StepTelemetry?.Action,
-                    Ref = StepTelemetry?.Ref,
-                    Type = StepTelemetry?.Type,
                     StartedAt = _record.StartTime,
                     CompletedAt = _record.FinishTime,
                     Annotations = new List<Annotation>()
@@ -522,10 +519,6 @@ namespace GitHub.Runner.Worker
                     if (annotation != null)
                     {
                         stepResult.Annotations.Add(annotation.Value);
-                        if (annotation.Value.IsInfrastructureIssue && string.IsNullOrEmpty(Global.InfrastructureFailureCategory))
-                        {
-                            Global.InfrastructureFailureCategory = issue.Category;
-                        }
                     }
                 });
 
@@ -819,6 +812,11 @@ namespace GitHub.Runner.Worker
 
             Global.Variables = new Variables(HostContext, variables);
 
+            if (Global.Variables.GetBoolean("DistributedTask.ForceInternalNodeVersionOnRunnerTo16") ?? false)
+            {
+                Environment.SetEnvironmentVariable(Constants.Variables.Agent.ForcedInternalNodeVersion, "node16");
+            }
+
             // Environment variables shared across all actions
             Global.EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer);
 
@@ -866,21 +864,7 @@ namespace GitHub.Runner.Worker
 
             ExpressionValues["secrets"] = Global.Variables.ToSecretsContext();
             ExpressionValues["runner"] = new RunnerContext();
-
-            Trace.Info("Initializing Job context");
-            var jobContext = new JobContext();
-            if (Global.Variables.GetBoolean(Constants.Runner.Features.AddCheckRunIdToJobContext) ?? false)
-            {
-                ExpressionValues.TryGetValue("job", out var jobDictionary);
-                if (jobDictionary != null)
-                {
-                    foreach (var pair in jobDictionary.AssertDictionary("job"))
-                    {
-                        jobContext[pair.Key] = pair.Value;
-                    }
-                }
-            }
-            ExpressionValues["job"] = jobContext;
+            ExpressionValues["job"] = new JobContext();
 
             Trace.Info("Initialize GitHub context");
             var githubAccessToken = new StringContextData(Global.Variables.Get("system.github.token"));
@@ -1306,14 +1290,10 @@ namespace GitHub.Runner.Worker
             UpdateGlobalStepsContext();
         }
 
-        internal IPipelineTemplateEvaluator ToPipelineTemplateEvaluatorInternal(ObjectTemplating.ITraceWriter traceWriter = null)
-        {
-            return new PipelineTemplateEvaluatorWrapper(HostContext, this, traceWriter);
-        }
-
         private static void NoOp()
         {
         }
+
     }
 
     // The Error/Warning/etc methods are created as extension methods to simplify unit testing.
@@ -1343,9 +1323,9 @@ namespace GitHub.Runner.Worker
         }
 
         // Do not add a format string overload. See comment on ExecutionContext.Write().
-        public static void InfrastructureError(this IExecutionContext context, string message, string category = null)
+        public static void InfrastructureError(this IExecutionContext context, string message)
         {
-            var issue = new Issue() { Type = IssueType.Error, Message = message, IsInfrastructureIssue = true, Category = category };
+            var issue = new Issue() { Type = IssueType.Error, Message = message, IsInfrastructureIssue = true };
             context.AddIssue(issue, ExecutionContextLogOptions.Default);
         }
 
@@ -1394,15 +1374,8 @@ namespace GitHub.Runner.Worker
             return new[] { new KeyValuePair<string, object>(nameof(IExecutionContext), context) };
         }
 
-        public static IPipelineTemplateEvaluator ToPipelineTemplateEvaluator(this IExecutionContext context, ObjectTemplating.ITraceWriter traceWriter = null)
+        public static PipelineTemplateEvaluator ToPipelineTemplateEvaluator(this IExecutionContext context, ObjectTemplating.ITraceWriter traceWriter = null)
         {
-            // Create wrapper?
-            if ((context.Global.Variables.GetBoolean(Constants.Runner.Features.CompareWorkflowParser) ?? false) || StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("ACTIONS_RUNNER_COMPARE_WORKFLOW_PARSER")))
-            {
-                return (context as ExecutionContext).ToPipelineTemplateEvaluatorInternal(traceWriter);
-            }
-
-            // Legacy
             if (traceWriter == null)
             {
                 traceWriter = context.ToTemplateTraceWriter();

src/Runner.Worker/Expressions/AlwaysFunction.cs

@@ -22,13 +22,4 @@ namespace GitHub.Runner.Worker.Expressions
             return true;
         }
     }
-
-    public sealed class NewAlwaysFunction : GitHub.Actions.Expressions.Sdk.Function
-    {
-        protected override Object EvaluateCore(GitHub.Actions.Expressions.Sdk.EvaluationContext context, out GitHub.Actions.Expressions.Sdk.ResultMemory resultMemory)
-        {
-            resultMemory = null;
-            return true;
-        }
-    }
 }

src/Runner.Worker/Expressions/CancelledFunction.cs

@@ -28,18 +28,4 @@ namespace GitHub.Runner.Worker.Expressions
             return jobStatus == ActionResult.Cancelled;
         }
     }
-
-    public sealed class NewCancelledFunction : GitHub.Actions.Expressions.Sdk.Function
-    {
-        protected sealed override object EvaluateCore(GitHub.Actions.Expressions.Sdk.EvaluationContext evaluationContext, out GitHub.Actions.Expressions.Sdk.ResultMemory resultMemory)
-        {
-            resultMemory = null;
-            var templateContext = evaluationContext.State as GitHub.Actions.WorkflowParser.ObjectTemplating.TemplateContext;
-            ArgUtil.NotNull(templateContext, nameof(templateContext));
-            var executionContext = templateContext.State[nameof(IExecutionContext)] as IExecutionContext;
-            ArgUtil.NotNull(executionContext, nameof(executionContext));
-            ActionResult jobStatus = executionContext.JobContext.Status ?? ActionResult.Success;
-            return jobStatus == ActionResult.Cancelled;
-        }
-    }
 }

src/Runner.Worker/Expressions/FailureFunction.cs

@@ -39,29 +39,4 @@ namespace GitHub.Runner.Worker.Expressions
             }
         }
     }
-
-    public sealed class NewFailureFunction : GitHub.Actions.Expressions.Sdk.Function
-    {
-        protected sealed override object EvaluateCore(GitHub.Actions.Expressions.Sdk.EvaluationContext evaluationContext, out GitHub.Actions.Expressions.Sdk.ResultMemory resultMemory)
-        {
-            resultMemory = null;
-            var templateContext = evaluationContext.State as GitHub.Actions.WorkflowParser.ObjectTemplating.TemplateContext;
-            ArgUtil.NotNull(templateContext, nameof(templateContext));
-            var executionContext = templateContext.State[nameof(IExecutionContext)] as IExecutionContext;
-            ArgUtil.NotNull(executionContext, nameof(executionContext));
-
-            // Decide based on 'action_status' for composite MAIN steps and 'job.status' for pre, post and job-level steps
-            var isCompositeMainStep = executionContext.IsEmbedded && executionContext.Stage == ActionRunStage.Main;
-            if (isCompositeMainStep)
-            {
-                ActionResult actionStatus = EnumUtil.TryParse<ActionResult>(executionContext.GetGitHubContext("action_status")) ?? ActionResult.Success;
-                return actionStatus == ActionResult.Failure;
-            }
-            else
-            {
-                ActionResult jobStatus = executionContext.JobContext.Status ?? ActionResult.Success;
-                return jobStatus == ActionResult.Failure;
-            }
-        }
-    }
 }

src/Runner.Worker/Expressions/HashFilesFunction.cs

@@ -143,137 +143,4 @@ namespace GitHub.Runner.Worker.Expressions
             }
         }
     }
-
-    public sealed class NewHashFilesFunction : GitHub.Actions.Expressions.Sdk.Function
-    {
-        private const int _hashFileTimeoutSeconds = 120;
-
-        protected sealed override Object EvaluateCore(
-            GitHub.Actions.Expressions.Sdk.EvaluationContext context,
-            out GitHub.Actions.Expressions.Sdk.ResultMemory resultMemory)
-        {
-            resultMemory = null;
-            var templateContext = context.State as GitHub.Actions.WorkflowParser.ObjectTemplating.TemplateContext;
-            ArgUtil.NotNull(templateContext, nameof(templateContext));
-            templateContext.ExpressionValues.TryGetValue(PipelineTemplateConstants.GitHub, out var githubContextData);
-            ArgUtil.NotNull(githubContextData, nameof(githubContextData));
-            var githubContext = githubContextData as GitHub.Actions.Expressions.Data.DictionaryExpressionData;
-            ArgUtil.NotNull(githubContext, nameof(githubContext));
-
-            if (!githubContext.TryGetValue(PipelineTemplateConstants.HostWorkspace, out var workspace))
-            {
-                githubContext.TryGetValue(PipelineTemplateConstants.Workspace, out workspace);
-            }
-            ArgUtil.NotNull(workspace, nameof(workspace));
-
-            var workspaceData = workspace as GitHub.Actions.Expressions.Data.StringExpressionData;
-            ArgUtil.NotNull(workspaceData, nameof(workspaceData));
-
-            string githubWorkspace = workspaceData.Value;
-
-            bool followSymlink = false;
-            List<string> patterns = new();
-            var firstParameter = true;
-            foreach (var parameter in Parameters)
-            {
-                var parameterString = parameter.Evaluate(context).ConvertToString();
-                if (firstParameter)
-                {
-                    firstParameter = false;
-                    if (parameterString.StartsWith("--"))
-                    {
-                        if (string.Equals(parameterString, "--follow-symbolic-links", StringComparison.OrdinalIgnoreCase))
-                        {
-                            followSymlink = true;
-                            continue;
-                        }
-                        else
-                        {
-                            throw new ArgumentOutOfRangeException($"Invalid glob option {parameterString}, avaliable option: '--follow-symbolic-links'.");
-                        }
-                    }
-                }
-
-                patterns.Add(parameterString);
-            }
-
-            context.Trace.Info($"Search root directory: '{githubWorkspace}'");
-            context.Trace.Info($"Search pattern: '{string.Join(", ", patterns)}'");
-
-            string binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            string runnerRoot = new DirectoryInfo(binDir).Parent.FullName;
-
-            string node = Path.Combine(runnerRoot, "externals", NodeUtil.GetInternalNodeVersion(), "bin", $"node{IOUtil.ExeExtension}");
-            string hashFilesScript = Path.Combine(binDir, "hashFiles");
-            var hashResult = string.Empty;
-            var p = new ProcessInvoker(new NewHashFilesTrace(context.Trace));
-            p.ErrorDataReceived += ((_, data) =>
-            {
-                if (!string.IsNullOrEmpty(data.Data) && data.Data.StartsWith("__OUTPUT__") && data.Data.EndsWith("__OUTPUT__"))
-                {
-                    hashResult = data.Data.Substring(10, data.Data.Length - 20);
-                    context.Trace.Info($"Hash result: '{hashResult}'");
-                }
-                else
-                {
-                    context.Trace.Info(data.Data);
-                }
-            });
-
-            p.OutputDataReceived += ((_, data) =>
-            {
-                context.Trace.Info(data.Data);
-            });
-
-            var env = new Dictionary<string, string>();
-            if (followSymlink)
-            {
-                env["followSymbolicLinks"] = "true";
-            }
-            env["patterns"] = string.Join(Environment.NewLine, patterns);
-
-            using (var tokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(_hashFileTimeoutSeconds)))
-            {
-                try
-                {
-                    int exitCode = p.ExecuteAsync(workingDirectory: githubWorkspace,
-                                                  fileName: node,
-                                                  arguments: $"\"{hashFilesScript.Replace("\"", "\\\"")}\"",
-                                                  environment: env,
-                                                  requireExitCodeZero: false,
-                                                  cancellationToken: tokenSource.Token).GetAwaiter().GetResult();
-
-                    if (exitCode != 0)
-                    {
-                        throw new InvalidOperationException($"hashFiles('{ExpressionUtility.StringEscape(string.Join(", ", patterns))}') failed. Fail to hash files under directory '{githubWorkspace}'");
-                    }
-                }
-                catch (OperationCanceledException) when (tokenSource.IsCancellationRequested)
-                {
-                    throw new TimeoutException($"hashFiles('{ExpressionUtility.StringEscape(string.Join(", ", patterns))}') couldn't finish within {_hashFileTimeoutSeconds} seconds.");
-                }
-
-                return hashResult;
-            }
-        }
-
-        private sealed class NewHashFilesTrace : ITraceWriter
-        {
-            private GitHub.Actions.Expressions.ITraceWriter _trace;
-
-            public NewHashFilesTrace(GitHub.Actions.Expressions.ITraceWriter trace)
-            {
-                _trace = trace;
-            }
-            public void Info(string message)
-            {
-                _trace.Info(message);
-            }
-
-            public void Verbose(string message)
-            {
-                _trace.Info(message);
-            }
-        }
-    }
 }

src/Runner.Worker/Expressions/SuccessFunction.cs

@@ -39,29 +39,4 @@ namespace GitHub.Runner.Worker.Expressions
             }
         }
     }
-
-    public sealed class NewSuccessFunction : GitHub.Actions.Expressions.Sdk.Function
-    {
-        protected sealed override object EvaluateCore(GitHub.Actions.Expressions.Sdk.EvaluationContext evaluationContext, out GitHub.Actions.Expressions.Sdk.ResultMemory resultMemory)
-        {
-            resultMemory = null;
-            var templateContext = evaluationContext.State as GitHub.Actions.WorkflowParser.ObjectTemplating.TemplateContext;
-            ArgUtil.NotNull(templateContext, nameof(templateContext));
-            var executionContext = templateContext.State[nameof(IExecutionContext)] as IExecutionContext;
-            ArgUtil.NotNull(executionContext, nameof(executionContext));
-
-            // Decide based on 'action_status' for composite MAIN steps and 'job.status' for pre, post and job-level steps
-            var isCompositeMainStep = executionContext.IsEmbedded && executionContext.Stage == ActionRunStage.Main;
-            if (isCompositeMainStep)
-            {
-                ActionResult actionStatus = EnumUtil.TryParse<ActionResult>(executionContext.GetGitHubContext("action_status")) ?? ActionResult.Success;
-                return actionStatus == ActionResult.Success;
-            }
-            else
-            {
-                ActionResult jobStatus = executionContext.JobContext.Status ?? ActionResult.Success;
-                return jobStatus == ActionResult.Success;
-            }
-        }
-    }
 }

src/Runner.Worker/FeatureManager.cs

@@ -11,10 +11,5 @@ namespace GitHub.Runner.Worker
             var isContainerHooksPathSet = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(Constants.Hooks.ContainerHooksPath));
             return isContainerHookFeatureFlagSet && isContainerHooksPathSet;
         }
-
-        public static bool IsContainerActionRunnerTempEnabled(Variables variables)
-        {
-            return variables?.GetBoolean(Constants.Runner.Features.ContainerActionRunnerTemp) ?? false;
-        }
     }
 }

src/Runner.Worker/GlobalContext.cs

@@ -27,9 +27,6 @@ namespace GitHub.Runner.Worker
         public StepsContext StepsContext { get; set; }
         public Variables Variables { get; set; }
         public bool WriteDebug { get; set; }
-        public string InfrastructureFailureCategory { get; set; }
         public JObject ContainerHookState { get; set; }
-        public bool HasTemplateEvaluatorMismatch { get; set; }
-        public bool HasActionManifestMismatch { get; set; }
     }
 }

src/Runner.Worker/Handlers/CompositeActionHandler.cs

@@ -187,7 +187,7 @@ namespace GitHub.Runner.Worker.Handlers
             if (Data.Outputs != null)
             {
                 // Evaluate the outputs in the steps context to easily retrieve the values
-                var actionManifestManager = HostContext.GetService<IActionManifestManagerWrapper>();
+                var actionManifestManager = HostContext.GetService<IActionManifestManager>();
 
                 // Format ExpressionValues to Dictionary<string, PipelineContextData>
                 var evaluateContext = new Dictionary<string, PipelineContextData>(StringComparer.OrdinalIgnoreCase);

src/Runner.Worker/Handlers/ContainerActionHandler.cs

@@ -135,7 +135,7 @@ namespace GitHub.Runner.Worker.Handlers
             var extraExpressionValues = new Dictionary<string, PipelineContextData>(StringComparer.OrdinalIgnoreCase);
             extraExpressionValues["inputs"] = inputsContext;
 
-            var manifestManager = HostContext.GetService<IActionManifestManagerWrapper>();
+            var manifestManager = HostContext.GetService<IActionManifestManager>();
             if (Data.Arguments != null)
             {
                 container.ContainerEntryPointArgs = "";
@@ -191,19 +191,11 @@ namespace GitHub.Runner.Worker.Handlers
             ArgUtil.Directory(tempWorkflowDirectory, nameof(tempWorkflowDirectory));
 
             container.MountVolumes.Add(new MountVolume("/var/run/docker.sock", "/var/run/docker.sock"));
-            if (FeatureManager.IsContainerActionRunnerTempEnabled(ExecutionContext.Global.Variables))
-            {
-                container.MountVolumes.Add(new MountVolume(tempDirectory, "/github/runner_temp"));
-            }
             container.MountVolumes.Add(new MountVolume(tempHomeDirectory, "/github/home"));
             container.MountVolumes.Add(new MountVolume(tempWorkflowDirectory, "/github/workflow"));
             container.MountVolumes.Add(new MountVolume(tempFileCommandDirectory, "/github/file_commands"));
             container.MountVolumes.Add(new MountVolume(defaultWorkingDirectory, "/github/workspace"));
 
-            if (FeatureManager.IsContainerActionRunnerTempEnabled(ExecutionContext.Global.Variables))
-            {
-                container.AddPathTranslateMapping(tempDirectory, "/github/runner_temp");
-            }
             container.AddPathTranslateMapping(tempHomeDirectory, "/github/home");
             container.AddPathTranslateMapping(tempWorkflowDirectory, "/github/workflow");
             container.AddPathTranslateMapping(tempFileCommandDirectory, "/github/file_commands");

src/Runner.Worker/Handlers/HandlerFactory.cs

@@ -57,44 +57,72 @@ namespace GitHub.Runner.Worker.Handlers
                 handler = HostContext.CreateService<INodeScriptActionHandler>();
                 var nodeData = data as NodeJSActionExecutionData;
 
-                // With node12 EoL in 04/2022 and node16 EoL in 09/23, we want to execute all JS actions using node20
-                // With node20 EoL approaching, we're preparing to migrate to node24
-                if (string.Equals(nodeData.NodeVersion, "node12", StringComparison.InvariantCultureIgnoreCase) ||
-                    string.Equals(nodeData.NodeVersion, "node16", StringComparison.InvariantCultureIgnoreCase))
+                // With node12 EoL in 04/2022, we want to be able to uniformly upgrade all JS actions to node16 from the server
+                if (string.Equals(nodeData.NodeVersion, "node12", StringComparison.InvariantCultureIgnoreCase))
                 {
-                    nodeData.NodeVersion = Common.Constants.Runner.NodeMigration.Node20;
+                    var repoAction = action as Pipelines.RepositoryPathReference;
+                    if (repoAction != null)
+                    {
+                        var warningActions = new HashSet<string>();
+                        if (executionContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
+                        {
+                            warningActions = StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings);
                         }
 
-                // Check if node20 was explicitly specified in the action
-                // We don't modify if node24 was explicitly specified
-                if (string.Equals(nodeData.NodeVersion, Constants.Runner.NodeMigration.Node20, StringComparison.InvariantCultureIgnoreCase))
+                        string repoActionFullName;
+                        if (string.IsNullOrEmpty(repoAction.Name))
                         {
-                    bool useNode24ByDefault = executionContext.Global.Variables?.GetBoolean(Constants.Runner.NodeMigration.UseNode24ByDefaultFlag) ?? false;
-                    bool requireNode24 = executionContext.Global.Variables?.GetBoolean(Constants.Runner.NodeMigration.RequireNode24Flag) ?? false;
-
-                    var (nodeVersion, configWarningMessage) = NodeUtil.DetermineActionsNodeVersion(environment, useNode24ByDefault, requireNode24);
-                    var (finalNodeVersion, platformWarningMessage) = NodeUtil.CheckNodeVersionForLinuxArm32(nodeVersion);
-                    nodeData.NodeVersion = finalNodeVersion;
-
-                    if (!string.IsNullOrEmpty(configWarningMessage))
+                            repoActionFullName = repoAction.Path; // local actions don't have a 'Name'
+                        }
+                        else
                         {
-                        executionContext.Warning(configWarningMessage);
+                            repoActionFullName = $"{repoAction.Name}/{repoAction.Path ?? string.Empty}".TrimEnd('/') + $"@{repoAction.Ref}";
                         }
 
-                    if (!string.IsNullOrEmpty(platformWarningMessage))
-                    {
-                        executionContext.Warning(platformWarningMessage);
+                        warningActions.Add(repoActionFullName);
+                        executionContext.Global.Variables.Set("Node16ForceActionsWarnings", StringUtil.ConvertToJson(warningActions));
+                    }
+                    nodeData.NodeVersion = "node16";
                 }
 
-                    // Show information about Node 24 migration in Phase 2
-                    if (useNode24ByDefault && !requireNode24 && string.Equals(finalNodeVersion, Constants.Runner.NodeMigration.Node24, StringComparison.OrdinalIgnoreCase))
+                var localForceActionsToNode20 = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Agent.ManualForceActionsToNode20));
+                executionContext.Global.EnvironmentVariables.TryGetValue(Constants.Variables.Actions.ManualForceActionsToNode20, out var workflowForceActionsToNode20);
+                var enforceNode20Locally = !string.IsNullOrWhiteSpace(workflowForceActionsToNode20) ? StringUtil.ConvertToBoolean(workflowForceActionsToNode20) : localForceActionsToNode20;
+                if (string.Equals(nodeData.NodeVersion, "node16")
+                && ((executionContext.Global.Variables.GetBoolean("DistributedTask.ForceGithubJavascriptActionsToNode20") ?? false) || enforceNode20Locally))
                 {
-                        string infoMessage = "Node 20 is being deprecated. This workflow is running with Node 24 by default. " +
-                                             "If you need to temporarily use Node 20, you can set the ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true environment variable.";
-                        executionContext.Output(infoMessage);
-                    }
+                    executionContext.Global.EnvironmentVariables.TryGetValue(Constants.Variables.Actions.AllowActionsUseUnsecureNodeVersion, out var workflowOptOut);
+                    var isWorkflowOptOutSet = !string.IsNullOrWhiteSpace(workflowOptOut);
+                    var isLocalOptOut = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Actions.AllowActionsUseUnsecureNodeVersion));
+                    bool isOptOut = isWorkflowOptOutSet ? StringUtil.ConvertToBoolean(workflowOptOut) : isLocalOptOut;
+
+                    if (!isOptOut)
+                    {
+                        var repoAction = action as Pipelines.RepositoryPathReference;
+                        if (repoAction != null)
+                        {
+                            var warningActions = new HashSet<string>();
+                            if (executionContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, out var node20ForceWarnings))
+                            {
+                                warningActions = StringUtil.ConvertFromJson<HashSet<string>>(node20ForceWarnings);
                             }
 
+                            string repoActionFullName;
+                            if (string.IsNullOrEmpty(repoAction.Name))
+                            {
+                                repoActionFullName = repoAction.Path; // local actions don't have a 'Name'
+                            }
+                            else
+                            {
+                                repoActionFullName = $"{repoAction.Name}/{repoAction.Path ?? string.Empty}".TrimEnd('/') + $"@{repoAction.Ref}";
+                            }
+
+                            warningActions.Add(repoActionFullName);
+                            executionContext.Global.Variables.Set(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, StringUtil.ConvertToJson(warningActions));
+                        }
+                        nodeData.NodeVersion = "node20";
+                    }
+                }
                 (handler as INodeScriptActionHandler).Data = nodeData;
             }
             else if (data.ExecutionType == ActionExecutionType.Script)

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -72,11 +72,6 @@ namespace GitHub.Runner.Worker.Handlers
                 Environment["ACTIONS_RESULTS_URL"] = resultsUrl;
             }
 
-            if (ExecutionContext.Global.Variables.GetBoolean("actions_uses_cache_service_v2") ?? false)
-            {
-                Environment["ACTIONS_CACHE_SERVICE_V2"] = bool.TrueString;
-            }
-
             // Resolve the target script.
             string target = null;
             if (stage == ActionRunStage.Main)
@@ -110,6 +105,23 @@ namespace GitHub.Runner.Worker.Handlers
                 workingDirectory = HostContext.GetDirectory(WellKnownDirectory.Work);
             }
 
+            if (string.Equals(Data.NodeVersion, "node12", StringComparison.OrdinalIgnoreCase) &&
+                Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.Arm64))
+            {
+                ExecutionContext.Output($"The node12 is not supported. Use node16 instead.");
+                Data.NodeVersion = "node16";
+            }
+
+            string forcedNodeVersion = System.Environment.GetEnvironmentVariable(Constants.Variables.Agent.ForcedActionsNodeVersion);
+            if (forcedNodeVersion == "node16" && Data.NodeVersion != "node16")
+            {
+                Data.NodeVersion = "node16";
+            }
+
+            if (forcedNodeVersion == "node20" && Data.NodeVersion != "node20")
+            {
+                Data.NodeVersion = "node20";
+            }
             var nodeRuntimeVersion = await StepHost.DetermineNodeRuntimeVersion(ExecutionContext, Data.NodeVersion);
             ExecutionContext.StepTelemetry.Type = nodeRuntimeVersion;
             string file = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");
@@ -131,6 +143,28 @@ namespace GitHub.Runner.Worker.Handlers
             // Remove environment variable that may cause conflicts with the node within the runner.
             Environment.Remove("NODE_ICU_DATA"); // https://github.com/actions/runner/issues/795
 
+            if (string.Equals(Data.NodeVersion, Constants.Runner.DeprecatedNodeVersion, StringComparison.OrdinalIgnoreCase) && (ExecutionContext.Global.Variables.GetBoolean(Constants.Runner.Features.Node16Warning) ?? false))
+            {
+                var repoAction = Action as RepositoryPathReference;
+                var warningActions = new HashSet<string>();
+                if (ExecutionContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
+                {
+                    warningActions = StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings);
+                }
+
+                if (string.IsNullOrEmpty(repoAction.Name))
+                {
+                    // local actions don't have a 'Name'
+                    warningActions.Add(repoAction.Path);
+                }
+                else
+                {
+                    warningActions.Add($"{repoAction.Name}/{repoAction.Path ?? string.Empty}".TrimEnd('/') + $"@{repoAction.Ref}");
+                }
+
+                ExecutionContext.Global.Variables.Set(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, StringUtil.ConvertToJson(warningActions));
+            }
+
             using (var stdoutManager = new OutputManager(ExecutionContext, ActionCommandManager))
             using (var stderrManager = new OutputManager(ExecutionContext, ActionCommandManager))
             {

src/Runner.Worker/Handlers/StepHost.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using GitHub.DistributedTask.Pipelines.ContextData;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,6 +9,7 @@ using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using System.Linq;
 using GitHub.Runner.Worker.Container.ContainerHooks;
+using System.IO;
 using System.Threading.Channels;
 
 namespace GitHub.Runner.Worker.Handlers
@@ -58,14 +60,7 @@ namespace GitHub.Runner.Worker.Handlers
 
         public Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext, string preferredVersion)
         {
-            // Use NodeUtil to check if Node24 is requested but we're on ARM32 Linux
-            var (nodeVersion, warningMessage) = Common.Util.NodeUtil.CheckNodeVersionForLinuxArm32(preferredVersion);
-            if (!string.IsNullOrEmpty(warningMessage))
-            {
-                executionContext.Warning(warningMessage);
-            }
-            
-            return Task.FromResult(nodeVersion);
+            return Task.FromResult<string>(preferredVersion);
         }
 
         public async Task<int> ExecuteAsync(IExecutionContext context,
@@ -142,12 +137,8 @@ namespace GitHub.Runner.Worker.Handlers
 
         public async Task<string> DetermineNodeRuntimeVersion(IExecutionContext executionContext, string preferredVersion)
         {
-            // Use NodeUtil to check if Node24 is requested but we're on ARM32 Linux
-            var (nodeExternal, warningMessage) = Common.Util.NodeUtil.CheckNodeVersionForLinuxArm32(preferredVersion);
-            if (!string.IsNullOrEmpty(warningMessage))
-            {
-                executionContext.Warning(warningMessage);
-            }
+            // Optimistically use the default
+            string nodeExternal = preferredVersion;
 
             if (FeatureManager.IsContainerHooksEnabled(executionContext.Global.Variables))
             {
@@ -273,14 +264,7 @@ namespace GitHub.Runner.Worker.Handlers
 
         private string CheckPlatformForAlpineContainer(IExecutionContext executionContext, string preferredVersion)
         {
-            // Use NodeUtil to check if Node24 is requested but we're on ARM32 Linux
-            var (nodeExternal, warningMessage) = Common.Util.NodeUtil.CheckNodeVersionForLinuxArm32(preferredVersion);
-            if (!string.IsNullOrEmpty(warningMessage))
-            {
-                executionContext.Warning(warningMessage);
-            }
-
-            // Check for Alpine container compatibility
+            string nodeExternal = preferredVersion;
             if (!Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.X64))
             {
                 var os = Constants.Runner.Platform.ToString();

src/Runner.Worker/IssueMatcher.cs

@@ -21,7 +21,6 @@ namespace GitHub.Runner.Worker
     public sealed class IssueMatcher
     {
         private string _defaultSeverity;
-        private string _defaultFromPath;
         private string _owner;
         private IssuePattern[] _patterns;
         private IssueMatch[] _state;
@@ -30,7 +29,6 @@ namespace GitHub.Runner.Worker
         {
             _owner = config.Owner;
             _defaultSeverity = config.Severity;
-            _defaultFromPath = config.FromPath;
             _patterns = config.Patterns.Select(x => new IssuePattern(x, timeout)).ToArray();
             Reset();
         }
@@ -61,19 +59,6 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        public string DefaultFromPath
-        {
-            get
-            {
-                if (_defaultFromPath == null)
-                {
-                    _defaultFromPath = string.Empty;
-                }
-
-                return _defaultFromPath;
-            }
-        }
-
         public IssueMatch Match(string line)
         {
             // Single pattern
@@ -84,7 +69,7 @@ namespace GitHub.Runner.Worker
 
                 if (regexMatch.Success)
                 {
-                    return new IssueMatch(null, pattern, regexMatch.Groups, DefaultSeverity, DefaultFromPath);
+                    return new IssueMatch(null, pattern, regexMatch.Groups, DefaultSeverity);
                 }
 
                 return null;
@@ -125,7 +110,7 @@ namespace GitHub.Runner.Worker
                                 }
 
                                 // Return
-                                return new IssueMatch(runningMatch, pattern, regexMatch.Groups, DefaultSeverity, DefaultFromPath);
+                                return new IssueMatch(runningMatch, pattern, regexMatch.Groups, DefaultSeverity);
                             }
                             // Not the last pattern
                             else
@@ -199,7 +184,7 @@ namespace GitHub.Runner.Worker
 
     public sealed class IssueMatch
     {
-        public IssueMatch(IssueMatch runningMatch, IssuePattern pattern, GroupCollection groups, string defaultSeverity = null, string defaultFromPath = null)
+        public IssueMatch(IssueMatch runningMatch, IssuePattern pattern, GroupCollection groups, string defaultSeverity = null)
         {
             File = runningMatch?.File ?? GetValue(groups, pattern.File);
             Line = runningMatch?.Line ?? GetValue(groups, pattern.Line);
@@ -213,11 +198,6 @@ namespace GitHub.Runner.Worker
             {
                 Severity = defaultSeverity;
             }
-
-            if (string.IsNullOrEmpty(FromPath) && !string.IsNullOrEmpty(defaultFromPath))
-            {
-                FromPath = defaultFromPath;
-            }
         }
 
         public string File { get; }
@@ -302,9 +282,6 @@ namespace GitHub.Runner.Worker
         [DataMember(Name = "pattern")]
         private IssuePatternConfig[] _patterns;
 
-        [DataMember(Name = "fromPath")]
-        private string _fromPath;
-
         public string Owner
         {
             get
@@ -341,24 +318,6 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        public string FromPath
-        {
-            get
-            {
-                if (_fromPath == null)
-                {
-                    _fromPath = string.Empty;
-                }
-
-                return _fromPath;
-            }
-
-            set
-            {
-                _fromPath = value;
-            }
-        }
-
         public IssuePatternConfig[] Patterns
         {
             get

src/Runner.Worker/JobContext.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.Pipelines.ContextData;
+using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Common;
 
@@ -56,31 +56,5 @@ namespace GitHub.Runner.Worker
                 }
             }
         }
-
-        public double? CheckRunId
-        {
-            get
-            {
-                if (this.TryGetValue("check_run_id", out var value) && value is NumberContextData number)
-                {
-                    return number.Value;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            set
-            {
-                if (value.HasValue)
-                {
-                    this["check_run_id"] = new NumberContextData(value.Value);
-                }
-                else
-                {
-                    this["check_run_id"] = null;
-                }
-            }
-        }
     }
 }

src/Runner.Worker/JobExtension.cs

@@ -17,7 +17,6 @@ using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
-using Newtonsoft.Json;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Worker
@@ -43,13 +42,11 @@ namespace GitHub.Runner.Worker
     public sealed class JobExtension : RunnerService, IJobExtension
     {
         private readonly HashSet<string> _existingProcesses = new(StringComparer.OrdinalIgnoreCase);
-        private readonly List<Task<CheckResult>> _connectivityCheckTasks = new();
+        private readonly List<Task<string>> _connectivityCheckTasks = new();
         private bool _processCleanup;
         private string _processLookupId = $"github_{Guid.NewGuid()}";
         private CancellationTokenSource _diskSpaceCheckToken = new();
         private Task _diskSpaceCheckTask = null;
-        private CancellationTokenSource _serviceConnectivityCheckToken = new();
-        private Task _serviceConnectivityCheckTask = null;
 
         // Download all required actions.
         // Make sure all condition inputs are valid.
@@ -130,6 +127,10 @@ namespace GitHub.Runner.Worker
                         }
                     }
 
+                    // Check OS warning
+                    var osWarningChecker = HostContext.GetService<IOSWarningChecker>();
+                    await osWarningChecker.CheckOSAsync(context);
+
                     try
                     {
                         var tokenPermissions = jobContext.Global.Variables.Get("system.github.token.permissions") ?? "";
@@ -400,10 +401,6 @@ namespace GitHub.Runner.Worker
                     if (snapshotRequest != null)
                     {
                         var snapshotOperationProvider = HostContext.GetService<ISnapshotOperationProvider>();
-                        // Check that that runner is capable of taking a snapshot
-                        snapshotOperationProvider.RunSnapshotPreflightChecks(context);
-
-                        // Add postjob step to write snapshot file
                         jobContext.RegisterPostJobStep(new JobExtensionRunner(
                             runAsync: (executionContext, _) => snapshotOperationProvider.CreateSnapshotRequestAsync(executionContext, snapshotRequest),
                             condition: snapshotRequest.Condition,
@@ -461,14 +458,11 @@ namespace GitHub.Runner.Worker
                         {
                             foreach (var checkUrl in checkUrls)
                             {
-                                _connectivityCheckTasks.Add(CheckConnectivity(checkUrl, accessToken: string.Empty, timeoutInSeconds: 5, token: CancellationToken.None));
+                                _connectivityCheckTasks.Add(CheckConnectivity(checkUrl));
                             }
                         }
                     }
 
-                    Trace.Info($"Start checking service connectivity in background.");
-                    _serviceConnectivityCheckTask = CheckServiceConnectivityAsync(context, _serviceConnectivityCheckToken.Token);
-
                     return steps;
                 }
                 catch (OperationCanceledException ex) when (jobContext.CancellationToken.IsCancellationRequested)
@@ -702,7 +696,7 @@ namespace GitHub.Runner.Worker
                             {
                                 var result = await check;
                                 Trace.Info($"Connectivity check result: {result}");
-                                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"{result.EndpointUrl}: {result.StatusCode}" });
+                                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = result });
                             }
                         }
                         catch (Exception ex)
@@ -712,22 +706,6 @@ namespace GitHub.Runner.Worker
                             context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"Fail to check server connectivity. {ex.Message}" });
                         }
                     }
-
-                    // Collect service connectivity check result
-                    if (_serviceConnectivityCheckTask != null)
-                    {
-                        _serviceConnectivityCheckToken.Cancel();
-                        try
-                        {
-                            await _serviceConnectivityCheckTask;
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.Error($"Fail to check service connectivity.");
-                            Trace.Error(ex);
-                            context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = $"Fail to check service connectivity. {ex.Message}" });
-                        }
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -743,13 +721,11 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        private async Task<CheckResult> CheckConnectivity(string endpointUrl, string accessToken, int timeoutInSeconds, CancellationToken token)
+        private async Task<string> CheckConnectivity(string endpointUrl)
         {
             Trace.Info($"Check server connectivity for {endpointUrl}.");
-            CheckResult result = new CheckResult() { EndpointUrl = endpointUrl };
-            var stopwatch = Stopwatch.StartNew();
-            using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutInSeconds)))
-            using (var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token, timeoutTokenSource.Token))
+            string result = string.Empty;
+            using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
             {
                 try
                 {
@@ -757,44 +733,21 @@ namespace GitHub.Runner.Worker
                     using (var httpClient = new HttpClient(httpClientHandler))
                     {
                         httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
-                        if (!string.IsNullOrEmpty(accessToken))
-                        {
-                            httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {accessToken}");
+                        var response = await httpClient.GetAsync(endpointUrl, timeoutTokenSource.Token);
+                        result = $"{endpointUrl}: {response.StatusCode}";
                     }
-
-                        var response = await httpClient.GetAsync(endpointUrl, linkedTokenSource.Token);
-                        result.StatusCode = $"{response.StatusCode}";
-
-                        var githubRequestId = UrlUtil.GetGitHubRequestId(response.Headers);
-                        var vssRequestId = UrlUtil.GetVssRequestId(response.Headers);
-                        if (!string.IsNullOrEmpty(githubRequestId))
-                        {
-                            result.RequestId = githubRequestId;
-                        }
-                        else if (!string.IsNullOrEmpty(vssRequestId))
-                        {
-                            result.RequestId = vssRequestId;
-                        }
-                    }
-                }
-                catch (Exception ex) when (ex is OperationCanceledException && token.IsCancellationRequested)
-                {
-                    Trace.Error($"Request canceled during connectivity check: {ex}");
-                    result.StatusCode = "canceled";
                 }
                 catch (Exception ex) when (ex is OperationCanceledException && timeoutTokenSource.IsCancellationRequested)
                 {
                     Trace.Error($"Request timeout during connectivity check: {ex}");
-                    result.StatusCode = "timeout";
+                    result = $"{endpointUrl}: timeout";
                 }
                 catch (Exception ex)
                 {
                     Trace.Error($"Catch exception during connectivity check: {ex}");
-                    result.StatusCode = $"{ex.Message}";
+                    result = $"{endpointUrl}: {ex.Message}";
                 }
             }
-            stopwatch.Stop();
-            result.DurationInMs = (int)stopwatch.ElapsedMilliseconds;
 
             return result;
         }
@@ -832,84 +785,6 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        private async Task CheckServiceConnectivityAsync(IExecutionContext context, CancellationToken token)
-        {
-            var connectionTest = context.Global.Variables.Get(WellKnownDistributedTaskVariables.RunnerServiceConnectivityTest);
-            if (string.IsNullOrEmpty(connectionTest))
-            {
-                return;
-            }
-
-            ServiceConnectivityCheckInput checkConnectivityInfo;
-            try
-            {
-                checkConnectivityInfo = StringUtil.ConvertFromJson<ServiceConnectivityCheckInput>(connectionTest);
-            }
-            catch (Exception ex)
-            {
-                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.General, Message = $"Fail to parse JSON. {ex.Message}" });
-                return;
-            }
-
-            if (checkConnectivityInfo == null)
-            {
-                return;
-            }
-
-            // make sure interval is at least 10 seconds
-            checkConnectivityInfo.IntervalInSecond = Math.Max(10, checkConnectivityInfo.IntervalInSecond);
-
-            var systemConnection = context.Global.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
-            var accessToken = systemConnection.Authorization.Parameters[EndpointAuthorizationParameters.AccessToken];
-
-            var testResult = new ServiceConnectivityCheckResult();
-            while (!token.IsCancellationRequested)
-            {
-                foreach (var endpoint in checkConnectivityInfo.Endpoints)
-                {
-                    if (string.IsNullOrEmpty(endpoint.Key) || string.IsNullOrEmpty(endpoint.Value))
-                    {
-                        continue;
-                    }
-
-                    if (!testResult.EndpointsResult.ContainsKey(endpoint.Key))
-                    {
-                        testResult.EndpointsResult[endpoint.Key] = new List<string>();
-                    }
-
-                    try
-                    {
-                        var result = await CheckConnectivity(endpoint.Value, accessToken: accessToken, timeoutInSeconds: checkConnectivityInfo.RequestTimeoutInSecond, token);
-                        testResult.EndpointsResult[endpoint.Key].Add($"{result.StartTime:s}: {result.StatusCode} - {result.RequestId} - {result.DurationInMs}ms");
-                        if (!testResult.HasFailure &&
-                            result.StatusCode != "OK" &&
-                            result.StatusCode != "canceled")
-                        {
-                            // track if any endpoint is not reachable
-                            testResult.HasFailure = true;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        testResult.EndpointsResult[endpoint.Key].Add($"{DateTime.UtcNow:s}: {ex.Message}");
-                    }
-                }
-
-                try
-                {
-                    await Task.Delay(TimeSpan.FromSeconds(checkConnectivityInfo.IntervalInSecond), token);
-                }
-                catch (TaskCanceledException)
-                {
-                    // ignore
-                }
-            }
-
-            var telemetryData = StringUtil.ConvertToJson(testResult, Formatting.None);
-            Trace.Verbose($"Connectivity check result: {telemetryData}");
-            context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.ConnectivityCheck, Message = telemetryData });
-        }
-
         private Dictionary<int, Process> SnapshotProcesses()
         {
             Dictionary<int, Process> snapshot = new();
@@ -941,23 +816,5 @@ namespace GitHub.Runner.Worker
                 throw new ArgumentException("Jobs without a job container are forbidden on this runner, please add a 'container:' to your job or contact your self-hosted runner administrator.");
             }
         }
-
-        private class CheckResult
-        {
-            public CheckResult()
-            {
-                StartTime = DateTime.UtcNow;
-            }
-
-            public string EndpointUrl { get; set; }
-
-            public DateTime StartTime { get; set; }
-
-            public string StatusCode { get; set; }
-
-            public string RequestId { get; set; }
-
-            public int DurationInMs { get; set; }
-        }
     }
 }

src/Runner.Worker/JobRunner.cs

@@ -15,7 +15,6 @@ using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
-using Sdk.RSWebApi.Contracts;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Worker
@@ -50,11 +49,7 @@ namespace GitHub.Runner.Worker
             if (message.Variables.TryGetValue(Constants.Variables.System.OrchestrationId, out VariableValue orchestrationId) &&
                 !string.IsNullOrEmpty(orchestrationId.Value))
             {
-                if (!HostContext.UserAgents.Any(x => string.Equals(x.Product?.Name, "OrchestrationId", StringComparison.OrdinalIgnoreCase)))
-                {
-                    // make the orchestration id the first item in the user-agent header to avoid get truncated in server log.
-                    HostContext.UserAgents.Insert(0, new ProductInfoHeaderValue("OrchestrationId", orchestrationId.Value));
-                }
+                HostContext.UserAgents.Add(new ProductInfoHeaderValue("OrchestrationId", orchestrationId.Value));
 
                 // make sure orchestration id is in the user-agent header.
                 VssUtil.InitializeVssClientSettings(HostContext.UserAgents, HostContext.WebProxy);
@@ -283,14 +278,26 @@ namespace GitHub.Runner.Worker
         {
             jobContext.Debug($"Finishing: {message.JobDisplayName}");
             TaskResult result = jobContext.Complete(taskResult);
-
-            var jobQueueTelemetry = await ShutdownQueue(throwOnFailure: false);
-            // include any job telemetry from the background upload process.
-            if (jobQueueTelemetry?.Count > 0)
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
             {
-                jobContext.Global.JobTelemetry.AddRange(jobQueueTelemetry);
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.DetectedNodeAfterEndOfLifeMessage, actions));
             }
 
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode12DetectedAfterEndOfLife, actions));
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, out var node20ForceWarnings) && (jobContext.Global.Variables.GetBoolean("DistributedTask.ForceGithubJavascriptActionsToNode20") ?? false))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node20ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode16DetectedAfterEndOfLife, actions));
+            }
+
+            await ShutdownQueue(throwOnFailure: false);
+
             // Make sure to clean temp after file upload since they may be pending fileupload still use the TEMP dir.
             _tempDirectoryManager?.CleanupTempDirectory();
 
@@ -307,13 +314,6 @@ namespace GitHub.Runner.Worker
                 environmentUrl = urlStringToken.Value;
             }
 
-            // Get telemetry
-            IList<Telemetry> telemetry = null;
-            if (jobContext.Global.JobTelemetry.Count > 0)
-            {
-                telemetry = jobContext.Global.JobTelemetry.Select(x => new Telemetry { Type = x.Type.ToString(), Message = x.Message, }).ToList();
-            }
-
             Trace.Info($"Raising job completed against run service");
             var completeJobRetryLimit = 5;
             var exceptions = new List<Exception>();
@@ -321,23 +321,9 @@ namespace GitHub.Runner.Worker
             {
                 try
                 {
-                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, jobContext.Global.JobAnnotations, environmentUrl, telemetry, billingOwnerId: message.BillingOwnerId, infrastructureFailureCategory: jobContext.Global.InfrastructureFailureCategory, default);
+                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, jobContext.JobOutputs, jobContext.Global.StepsResult, jobContext.Global.JobAnnotations, environmentUrl, default);
                     return result;
                 }
-                catch (VssUnauthorizedException ex)
-                {
-                    Trace.Error($"Catch exception while attempting to complete job {message.JobId}, job request {message.RequestId}.");
-                    Trace.Error(ex);
-                    exceptions.Add(ex);
-                    break;
-                }
-                catch (TaskOrchestrationJobNotFoundException ex)
-                {
-                    Trace.Error($"Catch exception while attempting to complete job {message.JobId}, job request {message.RequestId}.");
-                    Trace.Error(ex);
-                    exceptions.Add(ex);
-                    break;
-                }
                 catch (Exception ex)
                 {
                     Trace.Error($"Catch exception while attempting to complete job {message.JobId}, job request {message.RequestId}.");
@@ -360,14 +346,74 @@ namespace GitHub.Runner.Worker
 
             if (_runnerSettings.DisableUpdate == true)
             {
-                await WarningOutdatedRunnerAsync(jobContext, message, result);
+                try
+                {
+                    var currentVersion = new PackageVersion(BuildConstants.RunnerPackage.Version);
+                    ServiceEndpoint systemConnection = message.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
+                    VssCredentials serverCredential = VssUtil.GetVssCredential(systemConnection);
+
+                    var runnerServer = HostContext.GetService<IRunnerServer>();
+                    await runnerServer.ConnectAsync(systemConnection.Url, serverCredential);
+                    var serverPackages = await runnerServer.GetPackagesAsync("agent", BuildConstants.RunnerPackage.PackageName, 5, includeToken: false, cancellationToken: CancellationToken.None);
+                    if (serverPackages.Count > 0)
+                    {
+                        serverPackages = serverPackages.OrderByDescending(x => x.Version).ToList();
+                        Trace.Info($"Newer packages {StringUtil.ConvertToJson(serverPackages.Select(x => x.Version.ToString()))}");
+
+                        var warnOnFailedJob = false; // any minor/patch version behind.
+                        var warnOnOldRunnerVersion = false; // >= 2 minor version behind
+                        if (serverPackages.Any(x => x.Version.CompareTo(currentVersion) > 0))
+                        {
+                            Trace.Info($"Current runner version {currentVersion} is behind the latest runner version {serverPackages[0].Version}.");
+                            warnOnFailedJob = true;
+                        }
+
+                        if (serverPackages.Where(x => x.Version.Major == currentVersion.Major && x.Version.Minor > currentVersion.Minor).Count() > 1)
+                        {
+                            Trace.Info($"Current runner version {currentVersion} is way behind the latest runner version {serverPackages[0].Version}.");
+                            warnOnOldRunnerVersion = true;
+                        }
+
+                        if (result == TaskResult.Failed && warnOnFailedJob)
+                        {
+                            jobContext.Warning($"This job failure may be caused by using an out of date self-hosted runner. You are currently using runner version {currentVersion}. Please update to the latest version {serverPackages[0].Version}");
+                        }
+                        else if (warnOnOldRunnerVersion)
+                        {
+                            jobContext.Warning($"This self-hosted runner is currently using runner version {currentVersion}. This version is out of date. Please update to the latest version {serverPackages[0].Version}");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // Ignore any error since suggest runner update is best effort.
+                    Trace.Error($"Caught exception during runner version check: {ex}");
+                }
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.DeprecatedNodeDetectedAfterEndOfLifeActions, out var deprecatedNodeWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(deprecatedNodeWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.DetectedNodeAfterEndOfLifeMessage, actions));
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode12DetectedAfterEndOfLifeEnvVariable, out var node16ForceWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node16ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode12DetectedAfterEndOfLife, actions));
+            }
+
+            if (jobContext.Global.Variables.TryGetValue(Constants.Runner.EnforcedNode16DetectedAfterEndOfLifeEnvVariable, out var node20ForceWarnings))
+            {
+                var actions = string.Join(", ", StringUtil.ConvertFromJson<HashSet<string>>(node20ForceWarnings));
+                jobContext.Warning(string.Format(Constants.Runner.EnforcedNode16DetectedAfterEndOfLife, actions));
             }
 
             try
             {
                 var jobQueueTelemetry = await ShutdownQueue(throwOnFailure: true);
                 // include any job telemetry from the background upload process.
-                if (jobQueueTelemetry?.Count > 0)
+                if (jobQueueTelemetry.Count > 0)
                 {
                     jobContext.Global.JobTelemetry.AddRange(jobQueueTelemetry);
                 }
@@ -495,52 +541,5 @@ namespace GitHub.Runner.Worker
 
             return Array.Empty<JobTelemetry>();
         }
-
-        private async Task WarningOutdatedRunnerAsync(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, TaskResult result)
-        {
-            try
-            {
-                var currentVersion = new PackageVersion(BuildConstants.RunnerPackage.Version);
-                ServiceEndpoint systemConnection = message.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
-                VssCredentials serverCredential = VssUtil.GetVssCredential(systemConnection);
-
-                var runnerServer = HostContext.GetService<IRunnerServer>();
-                await runnerServer.ConnectAsync(systemConnection.Url, serverCredential);
-                var serverPackages = await runnerServer.GetPackagesAsync("agent", BuildConstants.RunnerPackage.PackageName, 5, includeToken: false, cancellationToken: CancellationToken.None);
-                if (serverPackages.Count > 0)
-                {
-                    serverPackages = serverPackages.OrderByDescending(x => x.Version).ToList();
-                    Trace.Info($"Newer packages {StringUtil.ConvertToJson(serverPackages.Select(x => x.Version.ToString()))}");
-
-                    var warnOnFailedJob = false; // any minor/patch version behind.
-                    var warnOnOldRunnerVersion = false; // >= 2 minor version behind
-                    if (serverPackages.Any(x => x.Version.CompareTo(currentVersion) > 0))
-                    {
-                        Trace.Info($"Current runner version {currentVersion} is behind the latest runner version {serverPackages[0].Version}.");
-                        warnOnFailedJob = true;
-                    }
-
-                    if (serverPackages.Where(x => x.Version.Major == currentVersion.Major && x.Version.Minor > currentVersion.Minor).Count() > 1)
-                    {
-                        Trace.Info($"Current runner version {currentVersion} is way behind the latest runner version {serverPackages[0].Version}.");
-                        warnOnOldRunnerVersion = true;
-                    }
-
-                    if (result == TaskResult.Failed && warnOnFailedJob)
-                    {
-                        jobContext.Warning($"This job failure may be caused by using an out of date version of GitHub runner on your self-hosted runner. You are currently using GitHub runner version {currentVersion}. Please update to the latest version {serverPackages[0].Version}");
-                    }
-                    else if (warnOnOldRunnerVersion)
-                    {
-                        jobContext.Warning($"This self-hosted runner is currently using runner version {currentVersion}. This version is out of date. Please update to the latest version {serverPackages[0].Version}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                // Ignore any error since suggest runner update is best effort.
-                Trace.Error($"Caught exception during runner version check: {ex}");
-            }
-        }
     }
 }

src/Runner.Worker/OSWarningChecker.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Common;
+using GitHub.Runner.Sdk;
+
+namespace GitHub.Runner.Worker
+{
+    [ServiceLocator(Default = typeof(OSWarningChecker))]
+    public interface IOSWarningChecker : IRunnerService
+    {
+        Task CheckOSAsync(IExecutionContext context);
+    }
+
+    public sealed class OSWarningChecker : RunnerService, IOSWarningChecker
+    {
+        private static TimeSpan s_regexTimeout = TimeSpan.FromSeconds(1);
+
+        public async Task CheckOSAsync(IExecutionContext context)
+        {
+            ArgUtil.NotNull(context, nameof(context));
+            if (!context.Global.Variables.System_TestDotNet8Compatibility)
+            {
+                return;
+            }
+
+            context.Output("Testing runner upgrade compatibility");
+            List<string> output = new();
+            object outputLock = new();
+            try
+            {
+                using (var process = HostContext.CreateService<IProcessInvoker>())
+                {
+                    process.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                    {
+                        if (!string.IsNullOrEmpty(stdout.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                output.Add(stdout.Data);
+                                Trace.Info(stdout.Data);
+                            }
+                        }
+                    };
+
+                    process.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
+                    {
+                        if (!string.IsNullOrEmpty(stderr.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                output.Add(stderr.Data);
+                                Trace.Error(stderr.Data);
+                            }
+                        }
+                    };
+
+                    using (var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(10)))
+                    {
+                        int exitCode = await process.ExecuteAsync(
+                            workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
+                            fileName: Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Bin), "testDotNet8Compatibility", $"TestDotNet8Compatibility{IOUtil.ExeExtension}"),
+                            arguments: string.Empty,
+                            environment: null,
+                            cancellationToken: cancellationTokenSource.Token);
+
+                        var outputStr = string.Join("\n", output).Trim();
+                        if (exitCode != 0 || !string.Equals(outputStr, "Hello from .NET 8!", StringComparison.Ordinal))
+                        {
+                            var pattern = context.Global.Variables.System_DotNet8CompatibilityOutputPattern;
+                            if (!string.IsNullOrEmpty(pattern))
+                            {
+                                var regex = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant, s_regexTimeout);
+                                if (!regex.IsMatch(outputStr))
+                                {
+                                    return;
+                                }
+                            }
+
+                            var warningMessage = context.Global.Variables.System_DotNet8CompatibilityWarning;
+                            if (!string.IsNullOrEmpty(warningMessage))
+                            {
+                                context.Warning(warningMessage);
+                            }
+
+                            context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.General, Message = $".NET 8 OS compatibility test failed with exit code '{exitCode}' and output: {GetShortOutput(context, output)}" });
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Trace.Error("An error occurred while testing .NET 8 compatibility'");
+                Trace.Error(ex);
+                context.Global.JobTelemetry.Add(new JobTelemetry() { Type = JobTelemetryType.General, Message = $".NET 8 OS compatibility test encountered exception type '{ex.GetType().FullName}', message: '{ex.Message}', process output: '{GetShortOutput(context, output)}'" });
+            }
+        }
+
+        private static string GetShortOutput(IExecutionContext context, List<string> output)
+        {
+            var length = context.Global.Variables.System_DotNet8CompatibilityOutputLength ?? 200;
+            var outputStr = string.Join("\n", output).Trim();
+            return outputStr.Length > length ? string.Concat(outputStr.Substring(0, length), "[...]") : outputStr;
+        }
+    }
+}

src/Runner.Worker/PipelineTemplateEvaluatorWrapper.cs

@@ -1,679 +0,0 @@
-using System;
-using System.Collections.Generic;
-using GitHub.Actions.WorkflowParser;
-using GitHub.DistributedTask.Expressions2;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.Pipelines;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.DistributedTask.Pipelines.ObjectTemplating;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
-using GitHub.Runner.Sdk;
-using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
-
-namespace GitHub.Runner.Worker
-{
-    internal sealed class PipelineTemplateEvaluatorWrapper : IPipelineTemplateEvaluator
-    {
-        private PipelineTemplateEvaluator _legacyEvaluator;
-        private WorkflowTemplateEvaluator _newEvaluator;
-        private IExecutionContext _context;
-        private Tracing _trace;
-
-        public PipelineTemplateEvaluatorWrapper(
-            IHostContext hostContext,
-            IExecutionContext context,
-            ObjectTemplating.ITraceWriter traceWriter = null)
-        {
-            ArgUtil.NotNull(hostContext, nameof(hostContext));
-            ArgUtil.NotNull(context, nameof(context));
-            _context = context;
-            _trace = hostContext.GetTrace(nameof(PipelineTemplateEvaluatorWrapper));
-
-            if (traceWriter == null)
-            {
-                traceWriter = context.ToTemplateTraceWriter();
-            }
-
-            // Legacy evaluator
-            var schema = PipelineTemplateSchemaFactory.GetSchema();
-            _legacyEvaluator = new PipelineTemplateEvaluator(traceWriter, schema, context.Global.FileTable)
-            {
-                MaxErrorMessageLength = int.MaxValue, // Don't truncate error messages otherwise we might not scrub secrets correctly
-            };
-
-            // New evaluator
-            var newTraceWriter = new GitHub.Actions.WorkflowParser.ObjectTemplating.EmptyTraceWriter();
-            _newEvaluator = new WorkflowTemplateEvaluator(newTraceWriter, context.Global.FileTable, features: null)
-            {
-                MaxErrorMessageLength = int.MaxValue, // Don't truncate error messages otherwise we might not scrub secrets correctly
-            };
-        }
-
-        public bool EvaluateStepContinueOnError(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateStepContinueOnError",
-                () => _legacyEvaluator.EvaluateStepContinueOnError(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateStepContinueOnError(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                (legacyResult, newResult) => legacyResult == newResult);
-        }
-
-        public string EvaluateStepDisplayName(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateStepDisplayName",
-                () => _legacyEvaluator.EvaluateStepDisplayName(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateStepName(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                (legacyResult, newResult) => string.Equals(legacyResult, newResult, StringComparison.Ordinal));
-        }
-
-        public Dictionary<string, string> EvaluateStepEnvironment(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions,
-            StringComparer keyComparer)
-        {
-            return EvaluateAndCompare(
-                "EvaluateStepEnvironment",
-                () => _legacyEvaluator.EvaluateStepEnvironment(token, contextData, expressionFunctions, keyComparer),
-                () => _newEvaluator.EvaluateStepEnvironment(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions), keyComparer),
-                CompareStepEnvironment);
-        }
-
-        public bool EvaluateStepIf(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions,
-            IEnumerable<KeyValuePair<string, object>> expressionState)
-        {
-            return EvaluateAndCompare(
-                "EvaluateStepIf",
-                () => _legacyEvaluator.EvaluateStepIf(token, contextData, expressionFunctions, expressionState),
-                () => _newEvaluator.EvaluateStepIf(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions), expressionState),
-                (legacyResult, newResult) => legacyResult == newResult);
-        }
-
-        public Dictionary<string, string> EvaluateStepInputs(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateStepInputs",
-                () => _legacyEvaluator.EvaluateStepInputs(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateStepInputs(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                (legacyResult, newResult) => CompareDictionaries(legacyResult, newResult, "StepInputs"));
-        }
-
-        public int EvaluateStepTimeout(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateStepTimeout",
-                () => _legacyEvaluator.EvaluateStepTimeout(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateStepTimeout(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                (legacyResult, newResult) => legacyResult == newResult);
-        }
-
-        public GitHub.DistributedTask.Pipelines.JobContainer EvaluateJobContainer(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateJobContainer",
-                () => _legacyEvaluator.EvaluateJobContainer(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateJobContainer(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                CompareJobContainer);
-        }
-
-        public Dictionary<string, string> EvaluateJobOutput(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateJobOutput",
-                () => _legacyEvaluator.EvaluateJobOutput(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateJobOutputs(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                (legacyResult, newResult) => CompareDictionaries(legacyResult, newResult, "JobOutput"));
-        }
-
-        public TemplateToken EvaluateEnvironmentUrl(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateEnvironmentUrl",
-                () => _legacyEvaluator.EvaluateEnvironmentUrl(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateJobEnvironmentUrl(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                CompareEnvironmentUrl);
-        }
-
-        public Dictionary<string, string> EvaluateJobDefaultsRun(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateJobDefaultsRun",
-                () => _legacyEvaluator.EvaluateJobDefaultsRun(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateJobDefaultsRun(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                (legacyResult, newResult) => CompareDictionaries(legacyResult, newResult, "JobDefaultsRun"));
-        }
-
-        public IList<KeyValuePair<string, GitHub.DistributedTask.Pipelines.JobContainer>> EvaluateJobServiceContainers(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateJobServiceContainers",
-                () => _legacyEvaluator.EvaluateJobServiceContainers(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateJobServiceContainers(ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                (legacyResult, newResult) => CompareJobServiceContainers(legacyResult, newResult));
-        }
-
-        public GitHub.DistributedTask.Pipelines.Snapshot EvaluateJobSnapshotRequest(
-            TemplateToken token,
-            DictionaryContextData contextData,
-            IList<IFunctionInfo> expressionFunctions)
-        {
-            return EvaluateAndCompare(
-                "EvaluateJobSnapshotRequest",
-                () => _legacyEvaluator.EvaluateJobSnapshotRequest(token, contextData, expressionFunctions),
-                () => _newEvaluator.EvaluateSnapshot(string.Empty, ConvertToken(token), ConvertData(contextData), ConvertFunctions(expressionFunctions)),
-                CompareSnapshot);
-        }
-
-        private void RecordMismatch(string methodName)
-        {
-            if (!_context.Global.HasTemplateEvaluatorMismatch)
-            {
-                _context.Global.HasTemplateEvaluatorMismatch = true;
-                var telemetry = new JobTelemetry { Type = JobTelemetryType.General, Message = $"TemplateEvaluatorMismatch: {methodName}" };
-                _context.Global.JobTelemetry.Add(telemetry);
-            }
-        }
-
-        private void RecordComparisonError(string errorDetails)
-        {
-            if (!_context.Global.HasTemplateEvaluatorMismatch)
-            {
-                _context.Global.HasTemplateEvaluatorMismatch = true;
-                var telemetry = new JobTelemetry { Type = JobTelemetryType.General, Message = $"TemplateEvaluatorComparisonError: {errorDetails}" };
-                _context.Global.JobTelemetry.Add(telemetry);
-            }
-        }
-
-        private TLegacy EvaluateAndCompare<TLegacy, TNew>(
-            string methodName,
-            Func<TLegacy> legacyEvaluator,
-            Func<TNew> newEvaluator,
-            Func<TLegacy, TNew, bool> resultComparer)
-        {
-            // Legacy evaluator
-            var legacyException = default(Exception);
-            var legacyResult = default(TLegacy);
-            try
-            {
-                legacyResult = legacyEvaluator();
-            }
-            catch (Exception ex)
-            {
-                legacyException = ex;
-            }
-
-            // Compare with new evaluator
-            try
-            {
-                ArgUtil.NotNull(_context, nameof(_context));
-                ArgUtil.NotNull(_newEvaluator, nameof(_newEvaluator));
-                _trace.Info(methodName);
-
-                // New evaluator
-                var newException = default(Exception);
-                var newResult = default(TNew);
-                try
-                {
-                    newResult = newEvaluator();
-                }
-                catch (Exception ex)
-                {
-                    newException = ex;
-                }
-
-                // Compare results or exceptions
-                if (legacyException != null || newException != null)
-                {
-                    // Either one or both threw exceptions - compare them
-                    if (!CompareExceptions(legacyException, newException))
-                    {
-                        _trace.Info($"{methodName} exception mismatch");
-                        RecordMismatch($"{methodName}");
-                    }
-                }
-                else
-                {
-                    // Both succeeded - compare results
-                    if (!resultComparer(legacyResult, newResult))
-                    {
-                        _trace.Info($"{methodName} mismatch");
-                        RecordMismatch($"{methodName}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _trace.Info($"Comparison failed: {ex.Message}");
-                RecordComparisonError($"{methodName}: {ex.Message}");
-            }
-
-            // Re-throw legacy exception if any
-            if (legacyException != null)
-            {
-                throw legacyException;
-            }
-
-            return legacyResult;
-        }
-
-        private GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.TemplateToken ConvertToken(
-            GitHub.DistributedTask.ObjectTemplating.Tokens.TemplateToken token)
-        {
-            if (token == null)
-            {
-                return null;
-            }
-
-            var json = StringUtil.ConvertToJson(token, Newtonsoft.Json.Formatting.None);
-            return StringUtil.ConvertFromJson<GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.TemplateToken>(json);
-        }
-
-        private GitHub.Actions.Expressions.Data.DictionaryExpressionData ConvertData(
-            GitHub.DistributedTask.Pipelines.ContextData.DictionaryContextData contextData)
-        {
-            if (contextData == null)
-            {
-                return null;
-            }
-
-            var json = StringUtil.ConvertToJson(contextData, Newtonsoft.Json.Formatting.None);
-            return StringUtil.ConvertFromJson<GitHub.Actions.Expressions.Data.DictionaryExpressionData>(json);
-        }
-
-        private IList<GitHub.Actions.Expressions.IFunctionInfo> ConvertFunctions(
-            IList<GitHub.DistributedTask.Expressions2.IFunctionInfo> expressionFunctions)
-        {
-            if (expressionFunctions == null)
-            {
-                return null;
-            }
-
-            var result = new List<GitHub.Actions.Expressions.IFunctionInfo>();
-            foreach (var func in expressionFunctions)
-            {
-                GitHub.Actions.Expressions.IFunctionInfo newFunc = func.Name switch
-                {
-                    "always" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewAlwaysFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "cancelled" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewCancelledFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "failure" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewFailureFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "success" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewSuccessFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    "hashFiles" => new GitHub.Actions.Expressions.FunctionInfo<Expressions.NewHashFilesFunction>(func.Name, func.MinParameters, func.MaxParameters),
-                    _ => throw new NotSupportedException($"Expression function '{func.Name}' is not supported for conversion")
-                };
-                result.Add(newFunc);
-            }
-            return result;
-        }
-
-        private bool CompareStepEnvironment(
-            Dictionary<string, string> legacyResult,
-            Dictionary<string, string> newResult)
-        {
-            return CompareDictionaries(legacyResult, newResult, "StepEnvironment");
-        }
-
-        private bool CompareEnvironmentUrl(
-            TemplateToken legacyResult,
-            GitHub.Actions.WorkflowParser.ObjectTemplating.Tokens.TemplateToken newResult)
-        {
-            var legacyJson = legacyResult != null ? Newtonsoft.Json.JsonConvert.SerializeObject(legacyResult, Newtonsoft.Json.Formatting.None) : null;
-            var newJson = newResult != null ? Newtonsoft.Json.JsonConvert.SerializeObject(newResult, Newtonsoft.Json.Formatting.None) : null;
-            return legacyJson == newJson;
-        }
-
-        private bool CompareJobContainer(
-            GitHub.DistributedTask.Pipelines.JobContainer legacyResult,
-            GitHub.Actions.WorkflowParser.JobContainer newResult)
-        {
-            if (legacyResult == null && newResult == null)
-            {
-                return true;
-            }
-
-            if (legacyResult == null || newResult == null)
-            {
-                _trace.Info($"CompareJobContainer mismatch - one result is null (legacy={legacyResult == null}, new={newResult == null})");
-                return false;
-            }
-
-            if (!string.Equals(legacyResult.Image, newResult.Image, StringComparison.Ordinal))
-            {
-                _trace.Info($"CompareJobContainer mismatch - Image differs (legacy='{legacyResult.Image}', new='{newResult.Image}')");
-                return false;
-            }
-
-            if (!string.Equals(legacyResult.Options, newResult.Options, StringComparison.Ordinal))
-            {
-                _trace.Info($"CompareJobContainer mismatch - Options differs (legacy='{legacyResult.Options}', new='{newResult.Options}')");
-                return false;
-            }
-
-            if (!CompareDictionaries(legacyResult.Environment, newResult.Environment, "Environment"))
-            {
-                return false;
-            }
-
-            if (!CompareLists(legacyResult.Volumes, newResult.Volumes, "Volumes"))
-            {
-                return false;
-            }
-
-            if (!CompareLists(legacyResult.Ports, newResult.Ports, "Ports"))
-            {
-                return false;
-            }
-
-            if (!CompareCredentials(legacyResult.Credentials, newResult.Credentials))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareCredentials(
-            GitHub.DistributedTask.Pipelines.ContainerRegistryCredentials legacyCreds,
-            GitHub.Actions.WorkflowParser.ContainerRegistryCredentials newCreds)
-        {
-            if (legacyCreds == null && newCreds == null)
-            {
-                return true;
-            }
-
-            if (legacyCreds == null || newCreds == null)
-            {
-                _trace.Info($"CompareCredentials mismatch - one is null (legacy={legacyCreds == null}, new={newCreds == null})");
-                return false;
-            }
-
-            if (!string.Equals(legacyCreds.Username, newCreds.Username, StringComparison.Ordinal))
-            {
-                _trace.Info($"CompareCredentials mismatch - Credentials.Username differs (legacy='{legacyCreds.Username}', new='{newCreds.Username}')");
-                return false;
-            }
-
-            if (!string.Equals(legacyCreds.Password, newCreds.Password, StringComparison.Ordinal))
-            {
-                _trace.Info($"CompareCredentials mismatch - Credentials.Password differs");
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareLists(IList<string> legacyList, IList<string> newList, string fieldName)
-        {
-            if (legacyList == null && newList == null)
-            {
-                return true;
-            }
-
-            if (legacyList == null || newList == null)
-            {
-                _trace.Info($"CompareLists mismatch - {fieldName} - one is null (legacy={legacyList == null}, new={newList == null})");
-                return false;
-            }
-
-            if (legacyList.Count != newList.Count)
-            {
-                _trace.Info($"CompareLists mismatch - {fieldName}.Count differs (legacy={legacyList.Count}, new={newList.Count})");
-                return false;
-            }
-
-            for (int i = 0; i < legacyList.Count; i++)
-            {
-                if (!string.Equals(legacyList[i], newList[i], StringComparison.Ordinal))
-                {
-                    _trace.Info($"CompareLists mismatch - {fieldName}[{i}] differs (legacy='{legacyList[i]}', new='{newList[i]}')");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool CompareDictionaries(IDictionary<string, string> legacyDict, IDictionary<string, string> newDict, string fieldName)
-        {
-            if (legacyDict == null && newDict == null)
-            {
-                return true;
-            }
-
-            if (legacyDict == null || newDict == null)
-            {
-                _trace.Info($"CompareDictionaries mismatch - {fieldName} - one is null (legacy={legacyDict == null}, new={newDict == null})");
-                return false;
-            }
-
-            if (legacyDict is Dictionary<String, String> legacyTypedDict && newDict is Dictionary<String, String> newTypedDict)
-            {
-                if (!object.Equals(legacyTypedDict.Comparer, newTypedDict.Comparer))
-                {
-                    _trace.Info($"CompareDictionaries mismatch - {fieldName} - different comparers (legacy={legacyTypedDict.Comparer.GetType().Name}, new={newTypedDict.Comparer.GetType().Name})");
-                    return false;
-                }
-            }
-
-            if (legacyDict.Count != newDict.Count)
-            {
-                _trace.Info($"CompareDictionaries mismatch - {fieldName}.Count differs (legacy={legacyDict.Count}, new={newDict.Count})");
-                return false;
-            }
-
-            foreach (var kvp in legacyDict)
-            {
-                if (!newDict.TryGetValue(kvp.Key, out var newValue))
-                {
-                    _trace.Info($"CompareDictionaries mismatch - {fieldName} - key '{kvp.Key}' missing in new result");
-                    return false;
-                }
-
-                if (!string.Equals(kvp.Value, newValue, StringComparison.Ordinal))
-                {
-                    _trace.Info($"CompareDictionaries mismatch - {fieldName}['{kvp.Key}'] differs (legacy='{kvp.Value}', new='{newValue}')");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool CompareJobServiceContainers(
-            IList<KeyValuePair<string, GitHub.DistributedTask.Pipelines.JobContainer>> legacyResult,
-            IList<KeyValuePair<string, GitHub.Actions.WorkflowParser.JobContainer>> newResult)
-        {
-            if (legacyResult == null && newResult == null)
-            {
-                return true;
-            }
-
-            if (legacyResult == null || newResult == null)
-            {
-                _trace.Info($"CompareJobServiceContainers mismatch - one result is null (legacy={legacyResult == null}, new={newResult == null})");
-                return false;
-            }
-
-            if (legacyResult.Count != newResult.Count)
-            {
-                _trace.Info($"CompareJobServiceContainers mismatch - ServiceContainers.Count differs (legacy={legacyResult.Count}, new={newResult.Count})");
-                return false;
-            }
-
-            for (int i = 0; i < legacyResult.Count; i++)
-            {
-                var legacyKvp = legacyResult[i];
-                var newKvp = newResult[i];
-
-                if (!string.Equals(legacyKvp.Key, newKvp.Key, StringComparison.Ordinal))
-                {
-                    _trace.Info($"CompareJobServiceContainers mismatch - ServiceContainers[{i}].Key differs (legacy='{legacyKvp.Key}', new='{newKvp.Key}')");
-                    return false;
-                }
-
-                if (!CompareJobContainer(legacyKvp.Value, newKvp.Value))
-                {
-                    _trace.Info($"CompareJobServiceContainers mismatch - ServiceContainers['{legacyKvp.Key}']");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool CompareSnapshot(
-            GitHub.DistributedTask.Pipelines.Snapshot legacyResult,
-            GitHub.Actions.WorkflowParser.Snapshot newResult)
-        {
-            if (legacyResult == null && newResult == null)
-            {
-                return true;
-            }
-
-            if (legacyResult == null || newResult == null)
-            {
-                _trace.Info($"CompareSnapshot mismatch - one is null (legacy={legacyResult == null}, new={newResult == null})");
-                return false;
-            }
-
-            if (!string.Equals(legacyResult.ImageName, newResult.ImageName, StringComparison.Ordinal))
-            {
-                _trace.Info($"CompareSnapshot mismatch - Snapshot.ImageName differs (legacy='{legacyResult.ImageName}', new='{newResult.ImageName}')");
-                return false;
-            }
-
-            if (!string.Equals(legacyResult.Version, newResult.Version, StringComparison.Ordinal))
-            {
-                _trace.Info($"CompareSnapshot mismatch - Snapshot.Version differs (legacy='{legacyResult.Version}', new='{newResult.Version}')");
-                return false;
-            }
-
-            // Compare Condition (legacy) vs If (new)
-            // Legacy has Condition as string, new has If as BasicExpressionToken
-            // For comparison, we'll serialize the If token and compare with Condition
-            var newIfValue = newResult.If != null ? Newtonsoft.Json.JsonConvert.SerializeObject(newResult.If, Newtonsoft.Json.Formatting.None) : null;
-
-            // Legacy Condition is a string expression like "success()"
-            // New If is a BasicExpressionToken that needs to be serialized
-            // We'll do a basic comparison - if both are null/empty or both exist
-            var legacyHasCondition = !string.IsNullOrEmpty(legacyResult.Condition);
-            var newHasIf = newResult.If != null;
-
-            if (legacyHasCondition != newHasIf)
-            {
-                _trace.Info($"CompareSnapshot mismatch - condition/if presence differs (legacy has condition={legacyHasCondition}, new has if={newHasIf})");
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool CompareExceptions(Exception legacyException, Exception newException)
-        {
-            if (legacyException == null && newException == null)
-            {
-                return true;
-            }
-
-            if (legacyException == null || newException == null)
-            {
-                _trace.Info($"CompareExceptions mismatch - one exception is null (legacy={legacyException == null}, new={newException == null})");
-                return false;
-            }
-
-            // Compare exception messages recursively (including inner exceptions)
-            var legacyMessages = GetExceptionMessages(legacyException);
-            var newMessages = GetExceptionMessages(newException);
-
-            if (legacyMessages.Count != newMessages.Count)
-            {
-                _trace.Info($"CompareExceptions mismatch - different number of exception messages (legacy={legacyMessages.Count}, new={newMessages.Count})");
-                return false;
-            }
-
-            for (int i = 0; i < legacyMessages.Count; i++)
-            {
-                if (!string.Equals(legacyMessages[i], newMessages[i], StringComparison.Ordinal))
-                {
-                    _trace.Info($"CompareExceptions mismatch - exception messages differ at level {i} (legacy='{legacyMessages[i]}', new='{newMessages[i]}')");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private IList<string> GetExceptionMessages(Exception ex)
-        {
-            var messages = new List<string>();
-            var toProcess = new Queue<Exception>();
-            toProcess.Enqueue(ex);
-            int count = 0;
-
-            while (toProcess.Count > 0 && count < 50)
-            {
-                var current = toProcess.Dequeue();
-                if (current == null) continue;
-
-                messages.Add(current.Message);
-                count++;
-
-                // Special handling for AggregateException - enqueue all inner exceptions
-                if (current is AggregateException aggregateEx)
-                {
-                    foreach (var innerEx in aggregateEx.InnerExceptions)
-                    {
-                        if (innerEx != null && count < 50)
-                        {
-                            toProcess.Enqueue(innerEx);
-                        }
-                    }
-                }
-                else if (current.InnerException != null)
-                {
-                    toProcess.Enqueue(current.InnerException);
-                }
-
-                // Failsafe: if we have too many exceptions, stop and return what we have
-                if (count >= 50)
-                {
-                    _trace.Info("CompareExceptions failsafe triggered - too many exceptions (50+)");
-                    break;
-                }
-            }
-
-            return messages;
-        }
-    }
-}

src/Runner.Worker/Runner.Worker.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-    <SelfContained>true</SelfContained>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+    <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
     <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
@@ -19,9 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
-    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
+    <PackageReference Include="System.Threading.Channels" Version="4.4.0" />
     <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
   </ItemGroup>