Implement termination grace period support for the runner

2025-12-15 22:47:01 +00:00 · 2025-05-02 00:03:39 -04:00
42 changed files with 191 additions and 1278 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
  "features": {
    "ghcr.io/devcontainers/features/docker-in-docker:1": {},
    "ghcr.io/devcontainers/features/dotnet": {
-      "version": "8.0.410"
+      "version": "8.0.408"
    },
    "ghcr.io/devcontainers/features/node:1": {
      "version": "20"
--- a/.github/copilot-instructions.md
+++ b/.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).
--- a/.github/workflows/docker-buildx-upgrade.yml
+++ b/.github/workflows/docker-buildx-upgrade.yml
@@ -1,144 +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@v4
-
-      - 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@v4
-      
-      - 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
-          pr_body="Upgrades Docker version from ${{ needs.check-versions.outputs.DOCKER_CURRENT_VERSION }} to ${{ needs.check-versions.outputs.DOCKER_LATEST_VERSION }} and Docker Buildx version from ${{ needs.check-versions.outputs.BUILDX_CURRENT_VERSION }} to ${{ needs.check-versions.outputs.BUILDX_LATEST_VERSION }}.\n\n"
-          pr_body+="Release notes: https://docs.docker.com/engine/release-notes/\n\n"
-          pr_body+="---\n\nAutogenerated by [Docker/Buildx Version Upgrade Workflow](https://github.com/actions/runner/blob/main/.github/workflows/docker-buildx-upgrade.yml)"
-          
-          gh pr create -B main -H "$branch_name" \
-            --title "$pr_title" \
-            --body "$pr_body"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -214,7 +214,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 +224,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 +234,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 +244,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 +254,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 +264,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 +274,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:
--- a/docs/adrs/0276-problem-matchers.md
+++ b/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.
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -5,8 +5,8 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
-ARG DOCKER_VERSION=28.2.1
-ARG BUILDX_VERSION=0.24.0
+ARG DOCKER_VERSION=28.0.1
+ARG BUILDX_VERSION=0.21.2

 RUN apt update -y && apt install curl unzip -y

--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,13 +1,36 @@
 ## What's Changed
-* Create schedule workflow to upgrade docker and buildx version. by @TingluoHuang in https://github.com/actions/runner/pull/3859
-* Update dotnet sdk to latest version @8.0.409 by @github-actions in https://github.com/actions/runner/pull/3860
-* Allow runner to use authv2 during config. by @TingluoHuang in https://github.com/actions/runner/pull/3866
-* show helpful error message when resolving actions directly with launch by @aiqiaoy in https://github.com/actions/runner/pull/3874
-* Update dotnet sdk to latest version @8.0.410 by @github-actions in https://github.com/actions/runner/pull/3871
-* Update Docker to v28.2.1 and Buildx to v0.24.0 by @github-actions in https://github.com/actions/runner/pull/3881
-* Allow NO_SSL_VERIFY in RawHttpMessageHandler. by @TingluoHuang in https://github.com/actions/runner/pull/3883
+* Bump docker/login-action from 2 to 3 by @dependabot in https://github.com/actions/runner/pull/3673
+* Bump actions/stale from 8 to 9 by @dependabot in https://github.com/actions/runner/pull/3554
+* Bump docker/build-push-action from 3 to 6 by @dependabot in https://github.com/actions/runner/pull/3674
+* update node version from 20.18.0 -> 20.18.2 by @aiqiaoy in https://github.com/actions/runner/pull/3682
+* Pass BillingOwnerId through Acquire/Complete calls by @luketomlinson in https://github.com/actions/runner/pull/3689
+* Do not retry CompleteJobAsync for known non-retryable errors by @ericsciple in https://github.com/actions/runner/pull/3696
+* Update dotnet sdk to latest version @8.0.406 by @github-actions in https://github.com/actions/runner/pull/3712
+* Update Dockerfile with new docker and buildx versions by @thboop in https://github.com/actions/runner/pull/3680
+* chore: remove redundant words by @finaltrip in https://github.com/actions/runner/pull/3705
+* fix: actions feedback link is incorrect by @Yaminyam in https://github.com/actions/runner/pull/3165
+* Bump actions/github-script from 0.3.0 to 7.0.1 by @dependabot in https://github.com/actions/runner/pull/3557
+* Docker container provenance by @paveliak in https://github.com/actions/runner/pull/3736
+* Add request-id to http eventsource trace. by @TingluoHuang in https://github.com/actions/runner/pull/3740
+* Update Bocker and Buildx version to mitigate images scanners alerts by @Blizter in https://github.com/actions/runner/pull/3750
+* Fix typo, add invariant culture to timestamp for workflow log reporting by @GhadimiR in https://github.com/actions/runner/pull/3749
+* Create vssconnection to actions service when URL provided. by @TingluoHuang in https://github.com/actions/runner/pull/3751
+* Housekeeping: Update npm packages and node version by @thboop in https://github.com/actions/runner/pull/3752
+* Improve the out-of-date warning message. by @tecimovic in https://github.com/actions/runner/pull/3595
+* Update dotnet sdk to latest version @8.0.407 by @github-actions in https://github.com/actions/runner/pull/3753
+* Exit hosted runner cleanly during deprovisioning. by @TingluoHuang in https://github.com/actions/runner/pull/3755
+* Send annotation title to run-service. by @TingluoHuang in https://github.com/actions/runner/pull/3757
+* Allow server enforce runner settings. by @TingluoHuang in https://github.com/actions/runner/pull/3758
+* Support refresh runner configs with pipelines service. by @TingluoHuang in https://github.com/actions/runner/pull/3706

-**Full Changelog**: https://github.com/actions/runner/compare/v2.324.0...v2.325.0
+## New Contributors
+* @finaltrip made their first contribution in https://github.com/actions/runner/pull/3705
+* @Yaminyam made their first contribution in https://github.com/actions/runner/pull/3165
+* @Blizter made their first contribution in https://github.com/actions/runner/pull/3750
+* @GhadimiR made their first contribution in https://github.com/actions/runner/pull/3749
+* @tecimovic made their first contribution in https://github.com/actions/runner/pull/3595
+
+**Full Changelog**: https://github.com/actions/runner/compare/v2.322.0...v2.323.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.
--- a/2
+++ b/2
@@ -1 +1 @@
-2.325.0
+<Update to ./src/runnerversion when creating release>
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -6,7 +6,7 @@ NODE_URL=https://nodejs.org/dist
 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.1"
+NODE20_VERSION="20.19.0"

 get_abs_path() {
  # exploits the fact that pwd will print abs path when no args
--- a/src/Runner.Common/ConfigurationStore.cs
+++ b/src/Runner.Common/ConfigurationStore.cs
@@ -116,7 +116,6 @@ namespace GitHub.Runner.Common
        bool IsConfigured();
        bool IsServiceConfigured();
        bool HasCredentials();
-        bool IsMigratedConfigured();
        CredentialData GetCredentials();
        CredentialData GetMigratedCredentials();
        RunnerSettings GetSettings();
@@ -199,14 +198,6 @@ namespace GitHub.Runner.Common
            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)
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -155,10 +155,6 @@ 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
@@ -167,8 +163,6 @@ namespace GitHub.Runner.Common
                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 InternalTelemetryIssueDataKey = "_internal_telemetry";
@@ -263,6 +257,7 @@ namespace GitHub.Runner.Common
                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 ActionsTerminationGracePeriodSeconds = "ACTIONS_RUNNER_TERMINATION_GRACE_PERIOD_SECONDS";
            }

            public static class System
--- a/src/Runner.Common/HostContext.cs
+++ b/src/Runner.Common/HostContext.cs
@@ -34,7 +34,7 @@ namespace GitHub.Runner.Common
        T GetService<T>() where T : class, IRunnerService;
        void SetDefaultCulture(string name);
        event EventHandler Unloading;
-        void ShutdownRunner(ShutdownReason reason);
+        void ShutdownRunner(ShutdownReason reason, TimeSpan delay = default);
        void WritePerfCounter(string counter);
        void LoadDefaultUserAgents();

@@ -74,6 +74,8 @@ namespace GitHub.Runner.Common
        private string _perfFile;
        private RunnerWebProxy _webProxy = new();
        private string _hostType = string.Empty;
+        private ShutdownReason _shutdownReason = ShutdownReason.UserCancelled;
+        private int _shutdownReasonSet = 0;

        // disable auth migration by default
        private readonly ManualResetEventSlim _allowAuthMigration = new ManualResetEventSlim(false);
@@ -85,7 +87,7 @@ namespace GitHub.Runner.Common
        public event EventHandler Unloading;
        public event EventHandler<AuthMigrationEventArgs> AuthMigrationChanged;
        public CancellationToken RunnerShutdownToken => _runnerShutdownTokenSource.Token;
-        public ShutdownReason RunnerShutdownReason { get; private set; }
+        public ShutdownReason RunnerShutdownReason => _shutdownReason;
        public ISecretMasker SecretMasker => _secretMasker;
        public List<ProductInfoHeaderValue> UserAgents => _userAgents;
        public RunnerWebProxy WebProxy => _webProxy;
@@ -573,12 +575,28 @@ namespace GitHub.Runner.Common
        }


-        public void ShutdownRunner(ShutdownReason reason)
+        public void ShutdownRunner(ShutdownReason reason, TimeSpan delay = default)
        {
            ArgUtil.NotNull(reason, nameof(reason));
-            _trace.Info($"Runner will be shutdown for {reason.ToString()}");
-            RunnerShutdownReason = reason;
-            _runnerShutdownTokenSource.Cancel();
+            _trace.Info($"Runner will be shutdown for {reason.ToString()} after {delay.TotalSeconds} seconds.");
+            if (Interlocked.CompareExchange(ref _shutdownReasonSet, 1, 0) == 0)
+            {
+                // Set the shutdown reason only if it hasn't been set before.
+                _shutdownReason = reason;
+            }
+            else
+            {
+                _trace.Verbose($"Runner shutdown reason already set to {_shutdownReason.ToString()}.");
+            }
+
+            if (delay.TotalSeconds == 0)
+            {
+                _runnerShutdownTokenSource.Cancel();
+            }
+            else
+            {
+                _runnerShutdownTokenSource.CancelAfter(delay);
+            }
        }

        public override void Dispose()
--- a/src/Runner.Common/LaunchServer.cs
+++ b/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,16 +42,12 @@ 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);
+                return _launchClient.GetResolveActionsDownloadInfoAsync(planId, jobId, actionReferenceList,
+                    cancellationToken: cancellationToken);
            }

            throw new InvalidOperationException("Launch client is not initialized.");
--- a/src/Runner.Common/RunServer.cs
+++ b/src/Runner.Common/RunServer.cs
@@ -94,9 +94,7 @@ namespace GitHub.Runner.Common
        {
            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);
        }
    }
 }
--- a/src/Runner.Listener/BrokerMessageListener.cs
+++ b/src/Runner.Listener/BrokerMessageListener.cs
@@ -38,19 +38,6 @@ namespace GitHub.Runner.Listener
        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)
        {
@@ -66,22 +53,9 @@ namespace GitHub.Runner.Listener
        {
            Trace.Entering();

-            // Load settings if not provided through constructor
-            if (_settings == null)
-            {
-                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");
-                }
-            }
-
+            // Settings
+            var configManager = HostContext.GetService<IConfigurationManager>();
+            _settings = configManager.LoadSettings();
            var serverUrlV2 = _settings.ServerUrlV2;
            var serverUrl = _settings.ServerUrl;
            Trace.Info(_settings);
@@ -167,22 +141,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 && _credsV2.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))
@@ -203,8 +162,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)
@@ -325,11 +283,11 @@ namespace GitHub.Runner.Listener
                    Trace.Info("Hosted runner has been deprovisioned.");
                    throw;
                }
-                catch (AccessDeniedException e) when (e.ErrorCode == 1 && !HostContext.AllowAuthMigration)
+                catch (AccessDeniedException e) when (e.ErrorCode == 1)
                {
                    throw;
                }
-                catch (RunnerNotFoundException) when (!HostContext.AllowAuthMigration)
+                catch (RunnerNotFoundException)
                {
                    throw;
                }
@@ -338,8 +296,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);
                    }
--- a/src/Runner.Listener/Configuration/ConfigurationManager.cs
+++ b/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();
@@ -387,14 +370,6 @@ namespace GitHub.Runner.Listener.Configuration
                    },
                };

-                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);
            }
--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -315,11 +315,11 @@ namespace GitHub.Runner.Listener
                    Trace.Info("Hosted runner has been deprovisioned.");
                    throw;
                }
-                catch (AccessDeniedException e) when (e.ErrorCode == 1 && !HostContext.AllowAuthMigration)
+                catch (AccessDeniedException e) when (e.ErrorCode == 1)
                {
                    throw;
                }
-                catch (RunnerNotFoundException) when (!HostContext.AllowAuthMigration)
+                catch (RunnerNotFoundException)
                {
                    throw;
                }
@@ -333,14 +333,11 @@ namespace GitHub.Runner.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;
                    }
--- a/src/Runner.Listener/Runner.Listener.csproj
+++ b/src/Runner.Listener/Runner.Listener.csproj
@@ -23,7 +23,7 @@
    <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.ServiceProcess.ServiceController" Version="8.0.0" />
  </ItemGroup>

  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -6,7 +6,6 @@ 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 +15,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
@@ -38,11 +35,10 @@ namespace GitHub.Runner.Listener
        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();
+        private bool _runnerExiting = false;
+        private bool _hasTerminationGracePeriod = false;

        // <summary>
        // Helps avoid excessive calls to Run Service when encountering non-retriable errors from /acquirejob.
@@ -315,6 +311,12 @@ 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);
                    }

+                    if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable(Constants.Variables.Agent.ActionsTerminationGracePeriodSeconds)))
+                    {
+                        _hasTerminationGracePeriod = true;
+                        Trace.Verbose($"Runner has termination grace period set");
+                    }
+
                    var cred = store.GetCredentials();
                    if (cred != null &&
                        cred.Scheme == Constants.Configuration.OAuth &&
@@ -325,7 +327,7 @@ namespace GitHub.Runner.Listener
                    }

                    // 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,7 +337,6 @@ namespace GitHub.Runner.Listener
            }
            finally
            {
-                _authMigrationClaimsCheckTokenSource?.Cancel();
                _authMigrationTelemetryTokenSource?.Cancel();
                HostContext.AuthMigrationChanged -= HandleAuthMigrationChanged;
                _term.CancelKeyPress -= CtrlCHandler;
@@ -346,9 +347,10 @@ namespace GitHub.Runner.Listener

        private void Runner_Unloading(object sender, EventArgs e)
        {
+            _runnerExiting = true;
            if ((!_inConfigStage) && (!HostContext.RunnerShutdownToken.IsCancellationRequested))
            {
-                HostContext.ShutdownRunner(ShutdownReason.UserCancelled);
+                HostContext.ShutdownRunner(ShutdownReason.UserCancelled, GetShutdownDelay());
                _completedCommand.WaitOne(Constants.Runner.ExitOnUnloadTimeout);
            }
        }
@@ -356,6 +358,7 @@ namespace GitHub.Runner.Listener
        private void CtrlCHandler(object sender, EventArgs e)
        {
            _term.WriteLine("Exiting...");
+            _runnerExiting = true;
            if (_inConfigStage)
            {
                HostContext.Dispose();
@@ -378,21 +381,33 @@ namespace GitHub.Runner.Listener
                        reason = ShutdownReason.UserCancelled;
                    }

-                    HostContext.ShutdownRunner(reason);
+                    HostContext.ShutdownRunner(reason, GetShutdownDelay());
                }
                else
                {
-                    HostContext.ShutdownRunner(ShutdownReason.UserCancelled);
+                    HostContext.ShutdownRunner(ShutdownReason.UserCancelled, GetShutdownDelay());
                }
            }
        }

-        private IMessageListener GetMessageListener(RunnerSettings settings, bool isMigratedSettings = false)
+        private void HandleJobStatusEvent(object sender, JobStatusEventArgs e)
+        {
+            if (_hasTerminationGracePeriod &&
+                e != null &&
+                e.Status != TaskAgentStatus.Busy &&
+                _runnerExiting)
+            {
+                Trace.Info("Runner is no longer busy, shutting down.");
+                HostContext.ShutdownRunner(ShutdownReason.UserCancelled);
+            }
+        }
+
+        private IMessageListener GetMessageListener(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,65 +421,15 @@ 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 
+                _listener = GetMessageListener(settings);
+                CreateSessionResult createSessionResult = await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken);
+                if (createSessionResult == CreateSessionResult.SessionConflict)
                {
-                    migratedSettings = configManager.LoadMigratedSettings();
-                    Trace.Info("Loaded migrated settings from .runner_migrated file");
-                    Trace.Info(migratedSettings);
+                    return Constants.Runner.ReturnCode.SessionConflict;
                }
-                catch (Exception ex)
+                else if (createSessionResult == CreateSessionResult.Failure)
                {
-                    // 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);
-                    CreateSessionResult createSessionResult = await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken);
-                    if (createSessionResult == CreateSessionResult.SessionConflict)
-                    {
-                        return Constants.Runner.ReturnCode.SessionConflict;
-                    }
-                    else if (createSessionResult == CreateSessionResult.Failure)
-                    {
-                        return Constants.Runner.ReturnCode.TerminatedError;
-                    }
+                    return Constants.Runner.ReturnCode.TerminatedError;
                }

                HostContext.WritePerfCounter("SessionCreated");
@@ -478,8 +443,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>();
@@ -489,21 +452,16 @@ namespace GitHub.Runner.Listener
                    bool autoUpdateInProgress = false;
                    Task<bool> selfUpdateTask = null;
                    bool runOnceJobReceived = false;
-                    jobDispatcher = HostContext.CreateService<IJobDispatcher>();
+                    jobDispatcher = HostContext.GetService<IJobDispatcher>();

                    jobDispatcher.JobStatus += _listener.OnJobStatus;
+                    if (_hasTerminationGracePeriod)
+                    {
+                        jobDispatcher.JobStatus += HandleJobStatusEvent;
+                    }

                    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
@@ -740,17 +698,6 @@ namespace GitHub.Runner.Listener
                                    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}");
-                                }
                            }
                            else
                            {
@@ -782,6 +729,10 @@ namespace GitHub.Runner.Listener
                {
                    if (jobDispatcher != null)
                    {
+                        if (_hasTerminationGracePeriod)
+                        {
+                            jobDispatcher.JobStatus -= HandleJobStatusEvent;
+                        }
                        jobDispatcher.JobStatus -= _listener.OnJobStatus;
                        await jobDispatcher.ShutdownAsync();
                    }
@@ -805,16 +756,10 @@ 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)
            {
@@ -828,28 +773,6 @@ namespace GitHub.Runner.Listener
            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");
@@ -863,131 +786,6 @@ namespace GitHub.Runner.Listener
                    _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)
@@ -1042,6 +840,34 @@ namespace GitHub.Runner.Listener
            }
        }

+        private TimeSpan GetShutdownDelay()
+        {
+            TimeSpan delay = TimeSpan.Zero;
+            if (_hasTerminationGracePeriod)
+            {
+                var jobDispatcher = HostContext.GetService<IJobDispatcher>();
+                if (jobDispatcher.Busy)
+                {
+                    Trace.Info("Runner is busy, checking for grace period.");
+                    var delayEnv = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ActionsTerminationGracePeriodSeconds);
+                    if (!string.IsNullOrEmpty(delayEnv) &&
+                        int.TryParse(delayEnv, out int delaySeconds) &&
+                        delaySeconds > 0 &&
+                        delaySeconds < 60 * 60) // 1 hour
+                    {
+                        Trace.Info($"Waiting for {delaySeconds} seconds before shutting down.");
+                        delay = TimeSpan.FromSeconds(delaySeconds);
+                    }
+                }
+                else
+                {
+                    Trace.Verbose("Runner is not busy, no grace period.");
+                }
+            }
+
+            return delay;
+        }
+
        private void PrintUsage(CommandSettings command)
        {
            string separator;
--- a/src/Runner.Sdk/Util/VssUtil.cs
+++ b/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>();
--- a/src/Runner.Worker/ActionManager.cs
+++ b/src/Runner.Worker/ActionManager.cs
@@ -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
                    {
--- a/src/Runner.Worker/ExecutionContext.cs
+++ b/src/Runner.Worker/ExecutionContext.cs
@@ -862,21 +862,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"));
--- a/src/Runner.Worker/IssueMatcher.cs
+++ b/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
--- a/src/Runner.Worker/JobContext.cs
+++ b/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;
-                }
-            }
-        }
    }
 }
--- a/src/Runner.Worker/Runner.Worker.csproj
+++ b/src/Runner.Worker/Runner.Worker.csproj
@@ -20,7 +20,7 @@

  <ItemGroup>
    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
    <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
  </ItemGroup>
--- a/src/Sdk/Common/Common/RawHttpMessageHandler.cs
+++ b/src/Sdk/Common/Common/RawHttpMessageHandler.cs
@@ -106,18 +106,6 @@ namespace GitHub.Services.Common
        {
            VssTraceActivity traceActivity = VssTraceActivity.Current;

-            if (!m_appliedServerCertificateValidationCallbackToTransportHandler &&
-                            request.RequestUri.Scheme == "https")
-            {
-                HttpClientHandler httpClientHandler = m_transportHandler as HttpClientHandler;
-                if (httpClientHandler != null &&
-                    this.Settings.ServerCertificateValidationCallback != null)
-                {
-                    httpClientHandler.ServerCertificateCustomValidationCallback = this.Settings.ServerCertificateValidationCallback;
-                }
-                m_appliedServerCertificateValidationCallbackToTransportHandler = true;
-            }
-
            lock (m_thisLock)
            {
                // Ensure that we attempt to use the most appropriate authentication mechanism by default.
@@ -303,7 +291,6 @@ namespace GitHub.Services.Common
            }
        }

-        private bool m_appliedServerCertificateValidationCallbackToTransportHandler;
        private readonly HttpMessageHandler m_transportHandler;
        private HttpMessageInvoker m_messageInvoker;
        private CredentialWrapper m_credentialWrapper;
--- a/src/Sdk/Sdk.csproj
+++ b/src/Sdk/Sdk.csproj
@@ -14,7 +14,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Azure.Storage.Blobs" Version="12.24.0" />
+        <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
--- a/src/Sdk/WebApi/WebApi/LaunchContracts.cs
+++ b/src/Sdk/WebApi/WebApi/LaunchContracts.cs
@@ -29,7 +29,7 @@ namespace GitHub.Services.Launch.Contracts
    {
        [DataMember(EmitDefaultValue = false, Name = "authentication")]
        public ActionDownloadAuthenticationResponse Authentication { get; set; }
-
+        
        [DataMember(EmitDefaultValue = false, Name = "package_details")]
        public ActionDownloadPackageDetailsResponse PackageDetails { get; set; }

@@ -64,7 +64,7 @@ namespace GitHub.Services.Launch.Contracts


    [DataContract]
-    public class ActionDownloadPackageDetailsResponse
+    public class ActionDownloadPackageDetailsResponse 
    {
        [DataMember(EmitDefaultValue = false, Name = "version")]
        public string Version { get; set; }
@@ -81,25 +81,4 @@ namespace GitHub.Services.Launch.Contracts
        [DataMember(EmitDefaultValue = false, Name = "actions")]
        public IDictionary<string, ActionDownloadInfoResponse> Actions { get; set; }
    }
-
-    [DataContract]
-    public class ActionDownloadResolutionError
-    {
-        /// <summary>
-        /// The error message associated with the action download error.
-        /// </summary>
-        [DataMember(EmitDefaultValue = false, Name = "message")]
-        public string Message { get; set; }
-    }
-
-    [DataContract]
-    public class ActionDownloadResolutionErrorCollection
-    {
-        /// <summary>
-        /// A mapping of action specifications to their download errors.
-        /// <remarks>The key is the full name of the action plus version, e.g. "actions/checkout@v2".</remarks>
-        /// </summary>
-        [DataMember(EmitDefaultValue = false, Name = "errors")]
-        public IDictionary<string, ActionDownloadResolutionError> Errors { get; set; }
-    }
 }
--- a/src/Sdk/WebApi/WebApi/LaunchHttpClient.cs
+++ b/src/Sdk/WebApi/WebApi/LaunchHttpClient.cs
@@ -2,7 +2,6 @@

 using System;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Formatting;
 using System.Net.Http.Headers;
@@ -33,52 +32,11 @@ namespace GitHub.Services.Launch.Client
        public async Task<ActionDownloadInfoCollection> GetResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList, CancellationToken cancellationToken)
        {
            var GetResolveActionsDownloadInfoURLEndpoint = new Uri(m_launchServiceUrl, $"/actions/build/{planId.ToString()}/jobs/{jobId.ToString()}/runnerresolve/actions");
-            var response = await GetLaunchSignedURLResponse<ActionReferenceRequestList>(GetResolveActionsDownloadInfoURLEndpoint, ToGitHubData(actionReferenceList), cancellationToken);
-            return ToServerData(await ReadJsonContentAsync<ActionDownloadInfoResponseCollection>(response, cancellationToken));
+            return ToServerData(await GetLaunchSignedURLResponse<ActionReferenceRequestList, ActionDownloadInfoResponseCollection>(GetResolveActionsDownloadInfoURLEndpoint, ToGitHubData(actionReferenceList), cancellationToken));
        }

-        public async Task<ActionDownloadInfoCollection> GetResolveActionsDownloadInfoAsyncV2(Guid planId, Guid jobId, ActionReferenceList actionReferenceList, CancellationToken cancellationToken)
-        {
-            var GetResolveActionsDownloadInfoURLEndpoint = new Uri(m_launchServiceUrl, $"/actions/build/{planId.ToString()}/jobs/{jobId.ToString()}/runnerresolve/actions");
-            var response = await GetLaunchSignedURLResponse<ActionReferenceRequestList>(GetResolveActionsDownloadInfoURLEndpoint, ToGitHubData(actionReferenceList), cancellationToken);
-
-            if (response.IsSuccessStatusCode)
-            {
-                // Success response - deserialize the action download info
-                return ToServerData(await ReadJsonContentAsync<ActionDownloadInfoResponseCollection>(response, cancellationToken));
-            }
-
-            var responseError = response.ReasonPhrase ?? "";
-            if (response.StatusCode == HttpStatusCode.UnprocessableEntity)
-            {
-                // 422 response - unresolvable actions, error details are in the body
-                var errors = await ReadJsonContentAsync<ActionDownloadResolutionErrorCollection>(response, cancellationToken);
-                string combinedErrorMessage;
-                if (errors?.Errors != null && errors.Errors.Any())
-                {
-                    combinedErrorMessage = String.Join(". ", errors.Errors.Select(kvp => kvp.Value.Message));
-                }
-                else
-                {
-                    combinedErrorMessage = responseError;
-                }
-
-                throw new UnresolvableActionDownloadInfoException(combinedErrorMessage);
-            }
-            else if (response.StatusCode == HttpStatusCode.TooManyRequests)
-            {
-                // Here we want to add a message so customers don't think it's a rate limit scoped to them
-                // Ideally this would be 500 but the runner retries 500s, which we don't want to do when we're being rate limited
-                // See: https://github.com/github/ecosystem-api/issues/4084
-                throw new NonRetryableActionDownloadInfoException(responseError + " (GitHub has reached an internal rate limit, please try again later)");
-            }
-            else
-            {
-                throw new Exception(responseError);
-            }
-        }
-
-        private async Task<HttpResponseMessage> GetLaunchSignedURLResponse<R>(Uri uri, R request, CancellationToken cancellationToken)
+        // Resolve Actions
+        private async Task<T> GetLaunchSignedURLResponse<R, T>(Uri uri, R request, CancellationToken cancellationToken)
        {
            using (HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, uri))
            {
@@ -88,7 +46,10 @@ namespace GitHub.Services.Launch.Client
                using (HttpContent content = new ObjectContent<R>(request, m_formatter))
                {
                    requestMessage.Content = content;
-                    return await SendAsync(requestMessage, HttpCompletionOption.ResponseContentRead, cancellationToken: cancellationToken);
+                    using (var response = await SendAsync(requestMessage, HttpCompletionOption.ResponseContentRead, cancellationToken: cancellationToken))
+                    {
+                        return await ReadJsonContentAsync<T>(response, cancellationToken);
+                    }
                }
            }
        }
--- a/src/Test/L0/Listener/BrokerMessageListenerL0.cs
+++ b/src/Test/L0/Listener/BrokerMessageListenerL0.cs
@@ -363,49 +363,6 @@ namespace GitHub.Runner.Common.Tests.Listener
            }
        }

-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async Task CreatesSessionWithProvidedSettings()
-        {
-            using (TestHostContext tc = CreateTestContext())
-            using (var tokenSource = new CancellationTokenSource())
-            {
-                Tracing trace = tc.GetTrace();
-
-                // Arrange.
-                var expectedSession = new TaskAgentSession();
-                _brokerServer
-                    .Setup(x => x.CreateSessionAsync(
-                        It.Is<TaskAgentSession>(y => y != null),
-                        tokenSource.Token))
-                    .Returns(Task.FromResult(expectedSession));
-
-                _credMgr.Setup(x => x.LoadCredentials(true)).Returns(new VssCredentials());
-
-                // Make sure the config is never called when settings are provided
-                _config.Setup(x => x.LoadSettings()).Throws(new InvalidOperationException("Should not be called"));
-
-                // Act.
-                // Use the constructor that accepts settings
-                BrokerMessageListener listener = new(_settings);
-                listener.Initialize(tc);
-
-                CreateSessionResult result = await listener.CreateSessionAsync(tokenSource.Token);
-                trace.Info("result: {0}", result);
-
-                // Assert.
-                Assert.Equal(CreateSessionResult.Success, result);
-                _brokerServer
-                   .Verify(x => x.CreateSessionAsync(
-                       It.Is<TaskAgentSession>(y => y != null),
-                       tokenSource.Token), Times.Once());
-                
-                // Verify LoadSettings was never called
-                _config.Verify(x => x.LoadSettings(), Times.Never());
-            }
-        }
-
        private TestHostContext CreateTestContext([CallerMemberName] String testName = "")
        {
            TestHostContext tc = new(this, testName);
--- a/src/Test/L0/Listener/RunnerL0.cs
+++ b/src/Test/L0/Listener/RunnerL0.cs
@@ -126,7 +126,7 @@ namespace GitHub.Runner.Common.Tests.Listener

                    });

-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);

                _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                //Act
@@ -309,7 +309,7 @@ namespace GitHub.Runner.Common.Tests.Listener

                    });

-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);

                _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                //Act
@@ -413,7 +413,7 @@ namespace GitHub.Runner.Common.Tests.Listener

                    });

-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);

                _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                //Act
@@ -503,7 +503,7 @@ namespace GitHub.Runner.Common.Tests.Listener

                    });

-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);

                _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                //Act
@@ -578,7 +578,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                hc.SetSingleton<IConfigurationStore>(_configStore.Object);
                hc.SetSingleton<ICredentialManager>(_credentialManager.Object);
                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);

                runner.Initialize(hc);
                var settings = new RunnerSettings
@@ -679,7 +679,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                hc.SetSingleton<ICredentialManager>(_credentialManager.Object);
                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
                hc.EnqueueInstance<IActionsRunServer>(_actionsRunServer.Object);
-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);

                runner.Initialize(hc);
                var settings = new RunnerSettings
@@ -780,7 +780,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                hc.SetSingleton<ICredentialManager>(_credentialManager.Object);
                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
                hc.EnqueueInstance<IRunServer>(_runServer.Object);
-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);

                runner.Initialize(hc);
                var settings = new RunnerSettings
@@ -880,7 +880,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                hc.SetSingleton<ISelfUpdater>(_updater.Object);
                hc.SetSingleton<ICredentialManager>(_credentialManager.Object);
                hc.EnqueueInstance<IErrorThrottler>(_acquireJobThrottler.Object);
-                hc.EnqueueInstance<IJobDispatcher>(_jobDispatcher.Object);
+                hc.SetSingleton<IJobDispatcher>(_jobDispatcher.Object);
                hc.EnqueueInstance<IRunServer>(_runServer.Object);
                hc.EnqueueInstance<IRunServer>(_runServer.Object);

--- a/src/Test/L0/Sdk/LaunchWebApi/LaunchHttpClientL0.cs
+++ b/src/Test/L0/Sdk/LaunchWebApi/LaunchHttpClientL0.cs
@@ -1,126 +0,0 @@
-using GitHub.Actions.RunService.WebApi;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Services.Launch.Client;
-using GitHub.Services.Launch.Contracts;
-using Moq;
-using Moq.Protected;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace GitHub.Actions.RunService.WebApi.Tests
-{
-    public sealed class LaunchHttpClientL0
-    {
-        [Fact]
-        public async Task GetResolveActionsDownloadInfoAsync_SuccessResponse()
-        {
-            var baseUrl = new Uri("https://api.github.com/");
-            var planId = Guid.NewGuid();
-            var jobId = Guid.NewGuid();
-            var token = "fake-token";
-
-            var actionReferenceList = new ActionReferenceList
-            {
-                Actions = new List<ActionReference>
-                {
-                    new ActionReference
-                    {
-                        NameWithOwner = "owner1/action1",
-                        Ref = "0123456789"
-                    }
-                }
-            };
-
-            var responseContent = @"{
-                ""actions"": {
-                    ""owner1/action1@0123456789"": {
-                        ""name"": ""owner1/action1"",
-                        ""resolved_name"": ""owner1/action1"",
-                        ""resolved_sha"": ""0123456789"",
-                        ""version"": ""0123456789"",
-                        ""zip_url"": ""https://github.com/owner1/action1/zip"",
-                        ""tar_url"": ""https://github.com/owner1/action1/tar""
-                    }
-                }
-            }";
-
-            var httpResponse = new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent(responseContent, Encoding.UTF8, "application/json"),
-                RequestMessage = new HttpRequestMessage()
-                {
-                    RequestUri = new Uri($"{baseUrl}actions/build/{planId}/jobs/{jobId}/runnerresolve/actions")
-                }
-            };
-
-            var mockHandler = new Mock<HttpMessageHandler>();
-            mockHandler.Protected().Setup<Task<HttpResponseMessage>>("SendAsync", ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>())
-                .ReturnsAsync(httpResponse);
-
-            var client = new LaunchHttpClient(baseUrl, mockHandler.Object, token, false);
-            var result = await client.GetResolveActionsDownloadInfoAsyncV2(planId, jobId, actionReferenceList, CancellationToken.None);
-
-            // Assert
-            Assert.NotNull(result);
-            Assert.NotEmpty(result.Actions);
-            Assert.Equal(actionReferenceList.Actions.Count, result.Actions.Count);
-            Assert.True(result.Actions.ContainsKey("owner1/action1@0123456789"));
-        }
-
-        [Fact]
-        public async Task GetResolveActionsDownloadInfoAsync_UnprocessableEntityResponse()
-        {
-            var baseUrl = new Uri("https://api.github.com/");
-            var planId = Guid.NewGuid();
-            var jobId = Guid.NewGuid();
-            var token = "fake-token";
-
-            var actionReferenceList = new ActionReferenceList
-            {
-                Actions = new List<ActionReference>
-                {
-                    new ActionReference
-                    {
-                        NameWithOwner = "owner1/action1",
-                        Ref = "0123456789"
-                    }
-                }
-            };
-
-            var responseContent = @"{
-                ""errors"": {
-                    ""owner1/invalid-action@0123456789"": {
-                        ""message"": ""Unable to resolve action 'owner1/invalid-action@0123456789', repository not found""
-                    }
-                }
-            }";
-
-            var httpResponse = new HttpResponseMessage(HttpStatusCode.UnprocessableEntity)
-            {
-                Content = new StringContent(responseContent, Encoding.UTF8, "application/json"),
-                RequestMessage = new HttpRequestMessage()
-                {
-                    RequestUri = new Uri($"{baseUrl}actions/build/{planId}/jobs/{jobId}/runnerresolve/actions")
-                }
-            };
-
-            var mockHandler = new Mock<HttpMessageHandler>();
-            mockHandler.Protected().Setup<Task<HttpResponseMessage>>("SendAsync", ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>())
-                .ReturnsAsync(httpResponse);
-
-            var client = new LaunchHttpClient(baseUrl, mockHandler.Object, token, false);
-
-            var exception = await Assert.ThrowsAsync<UnresolvableActionDownloadInfoException>(
-                () => client.GetResolveActionsDownloadInfoAsyncV2(planId, jobId, actionReferenceList, CancellationToken.None));
-            
-            Assert.Contains("repository not found", exception.Message);
-        }
-    }
-}
--- a/src/Test/L0/TestHostContext.cs
+++ b/src/Test/L0/TestHostContext.cs
@@ -339,7 +339,7 @@ namespace GitHub.Runner.Common.Tests
            return _traceManager[name];
        }

-        public void ShutdownRunner(ShutdownReason reason)
+        public void ShutdownRunner(ShutdownReason reason, TimeSpan delay = default)
        {
            ArgUtil.NotNull(reason, nameof(reason));
            RunnerShutdownReason = reason;
--- a/src/Test/L0/Worker/ActionManagerL0.cs
+++ b/src/Test/L0/Worker/ActionManagerL0.cs
@@ -2411,8 +2411,8 @@ runs:
                });

            _launchServer = new Mock<ILaunchServer>();
-            _launchServer.Setup(x => x.ResolveActionsDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>(), It.IsAny<bool>()))
-                .Returns((Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken, bool displayHelpfulActionsDownloadErrors) =>
+            _launchServer.Setup(x => x.ResolveActionsDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
+                .Returns((Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
                {
                    var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
                    foreach (var action in actions.Actions)
--- a/src/Test/L0/Worker/ExecutionContextL0.cs
+++ b/src/Test/L0/Worker/ExecutionContextL0.cs
@@ -1168,77 +1168,6 @@ namespace GitHub.Runner.Common.Tests.Worker
            }
        }

-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void InitializeJob_HydratesJobContextWithCheckRunId()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange: Create a job request message and make sure the feature flag is enabled
-                var variables = new Dictionary<string, VariableValue>()
-                {
-                    [Constants.Runner.Features.AddCheckRunIdToJobContext] = new VariableValue("true"),
-                };
-                var jobRequest = new Pipelines.AgentJobRequestMessage(new TaskOrchestrationPlanReference(), new TimelineReference(), Guid.NewGuid(), "some job name", "some job name", null, null, null, variables, new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null, null);
-                var pagingLogger = new Moq.Mock<IPagingLogger>();
-                var jobServerQueue = new Moq.Mock<IJobServerQueue>();
-                hc.EnqueueInstance(pagingLogger.Object);
-                hc.SetSingleton(jobServerQueue.Object);
-                var ec = new Runner.Worker.ExecutionContext();
-                ec.Initialize(hc);
-
-                // Arrange: Add check_run_id to the job context
-                var jobContext = new Pipelines.ContextData.DictionaryContextData();
-                jobContext["check_run_id"] = new NumberContextData(123456);
-                jobRequest.ContextData["job"] = jobContext;
-                jobRequest.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
-
-                // Act
-                ec.InitializeJob(jobRequest, CancellationToken.None);
-
-                // Assert
-                Assert.NotNull(ec.JobContext);
-                Assert.Equal(123456, ec.JobContext.CheckRunId);
-            }
-        }
-
-        // TODO: this test can be deleted when `AddCheckRunIdToJobContext` is fully rolled out
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void InitializeJob_HydratesJobContextWithCheckRunId_FeatureFlagDisabled()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange: Create a job request message and make sure the feature flag is disabled
-                var variables = new Dictionary<string, VariableValue>()
-                {
-                    [Constants.Runner.Features.AddCheckRunIdToJobContext] = new VariableValue("false"),
-                };
-                var jobRequest = new Pipelines.AgentJobRequestMessage(new TaskOrchestrationPlanReference(), new TimelineReference(), Guid.NewGuid(), "some job name", "some job name", null, null, null, variables, new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null, null);
-                var pagingLogger = new Moq.Mock<IPagingLogger>();
-                var jobServerQueue = new Moq.Mock<IJobServerQueue>();
-                hc.EnqueueInstance(pagingLogger.Object);
-                hc.SetSingleton(jobServerQueue.Object);
-                var ec = new Runner.Worker.ExecutionContext();
-                ec.Initialize(hc);
-
-                // Arrange: Add check_run_id to the job context
-                var jobContext = new Pipelines.ContextData.DictionaryContextData();
-                jobContext["check_run_id"] = new NumberContextData(123456);
-                jobRequest.ContextData["job"] = jobContext;
-                jobRequest.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
-
-                // Act
-                ec.InitializeJob(jobRequest, CancellationToken.None);
-
-                // Assert
-                Assert.NotNull(ec.JobContext);
-                Assert.Null(ec.JobContext.CheckRunId); // with the feature flag disabled we should not have added a CheckRunId to the JobContext
-            }
-        }
-
        private bool ExpressionValuesAssertEqual(DictionaryContextData expect, DictionaryContextData actual)
        {
            foreach (var key in expect.Keys.ToList())
--- a/src/Test/L0/Worker/IssueMatcherL0.cs
+++ b/src/Test/L0/Worker/IssueMatcherL0.cs
@@ -896,173 +896,5 @@ namespace GitHub.Runner.Common.Tests.Worker
            Assert.Equal("not-working", match.Message);
            Assert.Equal("my-project.proj", match.FromPath);
        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Matcher_SinglePattern_DefaultFromPath()
-        {
-            var config = JsonUtility.FromString<IssueMatchersConfig>(@"
-{
-  ""problemMatcher"": [
-    {
-      ""owner"": ""myMatcher"",
-      ""fromPath"": ""subdir/default-project.csproj"",
-      ""pattern"": [
-        {
-          ""regexp"": ""^file:(.+) line:(.+) column:(.+) severity:(.+) code:(.+) message:(.+)$"",
-          ""file"": 1,
-          ""line"": 2,
-          ""column"": 3,
-          ""severity"": 4,
-          ""code"": 5,
-          ""message"": 6
-        }
-      ]
-    }
-  ]
-}
-");
-            config.Validate();
-            var matcher = new IssueMatcher(config.Matchers[0], TimeSpan.FromSeconds(1));
-
-            var match = matcher.Match("file:my-file.cs line:123 column:45 severity:real-bad code:uh-oh message:not-working");
-            Assert.Equal("my-file.cs", match.File);
-            Assert.Equal("123", match.Line);
-            Assert.Equal("45", match.Column);
-            Assert.Equal("real-bad", match.Severity);
-            Assert.Equal("uh-oh", match.Code);
-            Assert.Equal("not-working", match.Message);
-            Assert.Equal("subdir/default-project.csproj", match.FromPath);
-
-            // Test that a pattern-specific fromPath overrides the default
-            config = JsonUtility.FromString<IssueMatchersConfig>(@"
-{
-  ""problemMatcher"": [
-    {
-      ""owner"": ""myMatcher"",
-      ""fromPath"": ""subdir/default-project.csproj"",
-      ""pattern"": [
-        {
-          ""regexp"": ""^file:(.+) line:(.+) column:(.+) severity:(.+) code:(.+) message:(.+) fromPath:(.+)$"",
-          ""file"": 1,
-          ""line"": 2,
-          ""column"": 3,
-          ""severity"": 4,
-          ""code"": 5,
-          ""message"": 6,
-          ""fromPath"": 7
-        }
-      ]
-    }
-  ]
-}
-");
-            config.Validate();
-            matcher = new IssueMatcher(config.Matchers[0], TimeSpan.FromSeconds(1));
-
-            match = matcher.Match("file:my-file.cs line:123 column:45 severity:real-bad code:uh-oh message:not-working fromPath:my-project.proj");
-            Assert.Equal("my-file.cs", match.File);
-            Assert.Equal("123", match.Line);
-            Assert.Equal("45", match.Column);
-            Assert.Equal("real-bad", match.Severity);
-            Assert.Equal("uh-oh", match.Code);
-            Assert.Equal("not-working", match.Message);
-            Assert.Equal("my-project.proj", match.FromPath);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Matcher_MultiplePatterns_DefaultFromPath()
-        {
-            var config = JsonUtility.FromString<IssueMatchersConfig>(@"
-{
-  ""problemMatcher"": [
-    {
-      ""owner"": ""myMatcher"",
-      ""fromPath"": ""subdir/default-project.csproj"",
-      ""pattern"": [
-        {
-          ""regexp"": ""^file:(.+)$"",
-          ""file"": 1,
-        },
-        {
-          ""regexp"": ""^severity:(.+)$"",
-          ""severity"": 1
-        },
-        {
-          ""regexp"": ""^line:(.+) column:(.+) code:(.+) message:(.+)$"",
-          ""line"": 1,
-          ""column"": 2,
-          ""code"": 3,
-          ""message"": 4
-        }
-      ]
-    }
-  ]
-}
-");
-            config.Validate();
-            var matcher = new IssueMatcher(config.Matchers[0], TimeSpan.FromSeconds(1));
-
-            var match = matcher.Match("file:my-file.cs");
-            Assert.Null(match);
-            match = matcher.Match("severity:real-bad");
-            Assert.Null(match);
-            match = matcher.Match("line:123 column:45 code:uh-oh message:not-working");
-            Assert.Equal("my-file.cs", match.File);
-            Assert.Equal("123", match.Line);
-            Assert.Equal("45", match.Column);
-            Assert.Equal("real-bad", match.Severity);
-            Assert.Equal("uh-oh", match.Code);
-            Assert.Equal("not-working", match.Message);
-            Assert.Equal("subdir/default-project.csproj", match.FromPath);
-
-            // Test that pattern-specific fromPath overrides the default
-            config = JsonUtility.FromString<IssueMatchersConfig>(@"
-{
-  ""problemMatcher"": [
-    {
-      ""owner"": ""myMatcher"",
-      ""fromPath"": ""subdir/default-project.csproj"",
-      ""pattern"": [
-        {
-          ""regexp"": ""^file:(.+) fromPath:(.+)$"",
-          ""file"": 1,
-          ""fromPath"": 2
-        },
-        {
-          ""regexp"": ""^severity:(.+)$"",
-          ""severity"": 1
-        },
-        {
-          ""regexp"": ""^line:(.+) column:(.+) code:(.+) message:(.+)$"",
-          ""line"": 1,
-          ""column"": 2,
-          ""code"": 3,
-          ""message"": 4
-        }
-      ]
-    }
-  ]
-}
-");
-            config.Validate();
-            matcher = new IssueMatcher(config.Matchers[0], TimeSpan.FromSeconds(1));
-
-            match = matcher.Match("file:my-file.cs fromPath:my-project.proj");
-            Assert.Null(match);
-            match = matcher.Match("severity:real-bad");
-            Assert.Null(match);
-            match = matcher.Match("line:123 column:45 code:uh-oh message:not-working");
-            Assert.Equal("my-file.cs", match.File);
-            Assert.Equal("123", match.Line);
-            Assert.Equal("45", match.Column);
-            Assert.Equal("real-bad", match.Severity);
-            Assert.Equal("uh-oh", match.Code);
-            Assert.Equal("not-working", match.Message);
-            Assert.Equal("my-project.proj", match.FromPath);
-        }
    }
 }
--- a/src/Test/L0/Worker/JobContextL0.cs
+++ b/src/Test/L0/Worker/JobContextL0.cs
@@ -1,38 +0,0 @@
-using System;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.Runner.Worker;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Worker
-{
-    public class JobContextL0
-    {
-        [Fact]
-        public void CheckRunId_SetAndGet_WorksCorrectly()
-        {
-            var ctx = new JobContext();
-            ctx.CheckRunId = 12345;
-            Assert.Equal(12345, ctx.CheckRunId);
-            Assert.True(ctx.TryGetValue("check_run_id", out var value));
-            Assert.IsType<NumberContextData>(value);
-            Assert.Equal(12345, ((NumberContextData)value).Value);
-        }
-
-        [Fact]
-        public void CheckRunId_NotSet_ReturnsNull()
-        {
-            var ctx = new JobContext();
-            Assert.Null(ctx.CheckRunId);
-            Assert.False(ctx.TryGetValue("check_run_id", out var value));
-        }
-
-        [Fact]
-        public void CheckRunId_SetNull_RemovesKey()
-        {
-            var ctx = new JobContext();
-            ctx.CheckRunId = 12345;
-            ctx.CheckRunId = null;
-            Assert.Null(ctx.CheckRunId);
-        }
-    }
-}
--- a/src/Test/L0/Worker/OutputManagerL0.cs
+++ b/src/Test/L0/Worker/OutputManagerL0.cs
@@ -937,62 +937,6 @@ namespace GitHub.Runner.Common.Tests.Worker
            }
        }

-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void MatcherDefaultFromPath()
-        {
-            var matchers = new IssueMatchersConfig
-            {
-                Matchers =
-                {
-                    new IssueMatcherConfig
-                    {
-                        Owner = "my-matcher-1",
-                        FromPath = "workflow-repo/some-project/some-project.proj",
-                        Patterns = new[]
-                        {
-                            new IssuePatternConfig
-                            {
-                                Pattern = @"(.+): (.+)",
-                                File = 1,
-                                Message = 2,
-                            },
-                        },
-                    },
-                },
-            };
-            using (var hostContext = Setup(matchers: matchers))
-            using (_outputManager)
-            {
-                // Setup github.workspace, github.repository
-                var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
-                ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
-                Directory.CreateDirectory(workDirectory);
-                var workspaceDirectory = Path.Combine(workDirectory, "workspace");
-                Directory.CreateDirectory(workspaceDirectory);
-                _executionContext.Setup(x => x.GetGitHubContext("workspace")).Returns(workspaceDirectory);
-                _executionContext.Setup(x => x.GetGitHubContext("repository")).Returns("my-org/workflow-repo");
-
-                // Setup a git repository
-                var repositoryPath = Path.Combine(workspaceDirectory, "workflow-repo");
-                await CreateRepository(hostContext, repositoryPath, "https://github.com/my-org/workflow-repo");
-
-                // Create a test file
-                var filePath = Path.Combine(repositoryPath, "some-project", "some-directory", "some-file.txt");
-                Directory.CreateDirectory(Path.GetDirectoryName(filePath));
-                File.WriteAllText(filePath, "");
-
-                // Process
-                Process("some-directory/some-file.txt: some error");
-                Assert.Equal(1, _issues.Count);
-                Assert.Equal("some error", _issues[0].Item1.Message);
-                Assert.Equal("some-project/some-directory/some-file.txt", _issues[0].Item1.Data["file"]);
-                Assert.Equal(0, _commands.Count);
-                Assert.Equal(0, _messages.Count);
-            }
-        }
-
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -15,9 +15,9 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
        <PackageReference Include="xunit" Version="2.7.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
        <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
        <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
        <PackageReference Include="Moq" Version="4.20.72" />
--- a/src/dev.sh
+++ b/src/dev.sh
@@ -17,7 +17,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
 DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
 PACKAGE_DIR="$SCRIPT_DIR/../_package"
 DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="8.0.410"
+DOTNETSDK_VERSION="8.0.408"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)

--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "8.0.410"
+    "version": "8.0.408"
  }
 }
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.325.0
+2.323.0
@@ -1 +1 @@
 .325.0
 .323.0