Update FileCommandManager.cs

.github/workflows/build.yml

@@ -75,7 +75,7 @@ jobs:
     # Upload runner package tar.gz/zip as artifact
     - name: Publish Artifact
       if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
         name: runner-package-${{ matrix.runtime }}
         path: |

.github/workflows/release.yml

@@ -117,11 +117,12 @@ jobs:
       working-directory: _package
 
     # Upload runner package tar.gz/zip as artifact.
+    # Since each package name is unique, so we don't need to put ${{matrix}} info into artifact name
     - name: Publish Artifact
       if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
-        name: runner-packages-${{ matrix.runtime }}
+        name: runner-packages
         path: |
           _package
 
@@ -133,40 +134,10 @@ jobs:
     - uses: actions/checkout@v3
 
     # Download runner package tar.gz/zip produced by 'build' job
-    - name: Download Artifact (win-x64)
-      uses: actions/download-artifact@v4
+    - name: Download Artifact
+      uses: actions/download-artifact@v1
       with:
-        name: runner-packages-win-x64
-        path: ./
-    - name: Download Artifact (win-arm64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-win-arm64
-        path: ./
-    - name: Download Artifact (osx-x64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-osx-x64
-        path: ./
-    - name: Download Artifact (osx-arm64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-osx-arm64
-        path: ./
-    - name: Download Artifact (linux-x64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-linux-x64
-        path: ./
-    - name: Download Artifact (linux-arm)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-linux-arm
-        path: ./
-    - name: Download Artifact (linux-arm64)
-      uses: actions/download-artifact@v4
-      with:
-        name: runner-packages-linux-arm64
+        name: runner-packages
         path: ./
 
     # Create ReleaseNote file
@@ -285,54 +256,54 @@ jobs:
         asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.tar.gz
         asset_content_type: application/octet-stream
 
-  # publish-image:
-  #   needs: release
-  #   runs-on: ubuntu-latest
-  #   permissions:
-  #     contents: read
-  #     packages: write
-  #   env:
-  #     REGISTRY: ghcr.io
-  #     IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
+  publish-image:
+    needs: release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository_owner }}/actions-runner
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-  #     - name: Compute image version
-  #       id: image
-  #       uses: actions/github-script@v6
-  #       with:
-  #         script: |
-  #           const fs = require('fs');
-  #           const runnerVersion = fs.readFileSync('${{ github.workspace }}/releaseVersion', 'utf8').replace(/\n$/g, '')
-  #           console.log(`Using runner version ${runnerVersion}`)
-  #           core.setOutput('version', runnerVersion);
+      - name: Compute image version
+        id: image
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fs = require('fs');
+            const runnerVersion = fs.readFileSync('${{ github.workspace }}/releaseVersion', 'utf8').replace(/\n$/g, '')
+            console.log(`Using runner version ${runnerVersion}`)
+            core.setOutput('version', runnerVersion);
 
-  #     - name: Setup Docker buildx
-  #       uses: docker/setup-buildx-action@v2
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
 
-  #     - name: Log into registry ${{ env.REGISTRY }}
-  #       uses: docker/login-action@v2
-  #       with:
-  #         registry: ${{ env.REGISTRY }}
-  #         username: ${{ github.actor }}
-  #         password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-  #     - name: Build and push Docker image
-  #       id: build-and-push
-  #       uses: docker/build-push-action@v3
-  #       with:
-  #         context: ./images
-  #         platforms: |
-  #           linux/amd64
-  #           linux/arm64
-  #         tags: |
-  #           ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.version }}
-  #           ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-  #         build-args: |
-  #           RUNNER_VERSION=${{ steps.image.outputs.version }}
-  #         push: true
-  #         labels: |
-  #           org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}
-  #           org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }}
-  #           org.opencontainers.image.licenses=MIT
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v3
+        with:
+          context: ./images
+          platforms: |
+            linux/amd64
+            linux/arm64
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.image.outputs.version }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          build-args: |
+            RUNNER_VERSION=${{ steps.image.outputs.version }}
+          push: true
+          labels: |
+            org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}
+            org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }}
+            org.opencontainers.image.licenses=MIT

releaseNote.md

@@ -1,8 +1,10 @@
 ## What's Changed
 
-- Backport: Expose ENV for cache service v2. https://github.com/actions/runner/pull/3548
+- .NET 8 OS compatibility test https://github.com/actions/runner/pull/3422
+- Ignore ssl cert on websocket client https://github.com/actions/runner/pull/3423
+- Revert "Bump runner to dotnet 8" https://github.com/actions/runner/pull/3412
 
-**Full Changelog**: https://github.com/actions/runner/compare/v2.320.0...v2.320.1
+**Full Changelog**: https://github.com/actions/runner/compare/v2.318.0...v2.319.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.

releaseVersion

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

src/Runner.Common/BrokerServer.cs

@@ -92,7 +92,7 @@ namespace GitHub.Runner.Common
 
         public bool ShouldRetryException(Exception ex)
         {
-            if (ex is AccessDeniedException ade)
+            if (ex is AccessDeniedException ade && ade.ErrorCode == 1)
             {
                 return false;
             }

src/Runner.Common/HostContext.cs

@@ -36,7 +36,6 @@ namespace GitHub.Runner.Common
         event EventHandler Unloading;
         void ShutdownRunner(ShutdownReason reason);
         void WritePerfCounter(string counter);
-        void LoadDefaultUserAgents();
     }
 
     public enum StartupType
@@ -68,7 +67,6 @@ namespace GitHub.Runner.Common
         private StartupType _startupType;
         private string _perfFile;
         private RunnerWebProxy _webProxy = new();
-        private string _hostType = string.Empty;
 
         public event EventHandler Unloading;
         public CancellationToken RunnerShutdownToken => _runnerShutdownTokenSource.Token;
@@ -80,7 +78,6 @@ namespace GitHub.Runner.Common
         {
             // Validate args.
             ArgUtil.NotNullOrEmpty(hostType, nameof(hostType));
-            _hostType = hostType;
 
             _loadContext = AssemblyLoadContext.GetLoadContext(typeof(HostContext).GetTypeInfo().Assembly);
             _loadContext.Unloading += LoadContext_Unloading;
@@ -199,16 +196,6 @@ namespace GitHub.Runner.Common
                 }
             }
 
-            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY")))
-            {
-                _trace.Warning($"Runner is running under insecure mode: HTTPS server certificate validation has been turned off by GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY environment variable.");
-            }
-
-            LoadDefaultUserAgents();
-        }
-
-        public void LoadDefaultUserAgents()
-        {
             if (string.IsNullOrEmpty(WebProxy.HttpProxyAddress) && string.IsNullOrEmpty(WebProxy.HttpsProxyAddress))
             {
                 _trace.Info($"No proxy settings were found based on environmental variables (http_proxy/https_proxy/HTTP_PROXY/HTTPS_PROXY)");
@@ -218,6 +205,11 @@ namespace GitHub.Runner.Common
                 _userAgents.Add(new ProductInfoHeaderValue("HttpProxyConfigured", bool.TrueString));
             }
 
+            if (StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY")))
+            {
+                _trace.Warning($"Runner is running under insecure mode: HTTPS server certificate validation has been turned off by GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY environment variable.");
+            }
+
             var credFile = GetConfigFile(WellKnownConfigFile.Credentials);
             if (File.Exists(credFile))
             {
@@ -256,7 +248,6 @@ namespace GitHub.Runner.Common
             var currentProcess = Process.GetCurrentProcess();
             _userAgents.Add(new ProductInfoHeaderValue("Pid", currentProcess.Id.ToString()));
             _userAgents.Add(new ProductInfoHeaderValue("CreationTime", Uri.EscapeDataString(DateTime.UtcNow.ToString("O"))));
-            _userAgents.Add(new ProductInfoHeaderValue($"({_hostType})"));
         }
 
         public string GetDirectory(WellKnownDirectory directory)

src/Runner.Common/LaunchServer.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
 using GitHub.Services.Launch.Client;
+using GitHub.Services.WebApi;
 
 namespace GitHub.Runner.Common
 {
@@ -24,21 +23,8 @@ namespace GitHub.Runner.Common
 
         public void InitializeLaunchClient(Uri uri, string token)
         {
-            // Using default 100 timeout
-            RawClientHttpRequestSettings settings = VssUtil.GetHttpRequestSettings(null);
-
-            // Create retry handler
-            IEnumerable<DelegatingHandler> delegatingHandlers = new List<DelegatingHandler>();
-            if (settings.MaxRetryRequest > 0)
-            {
-                delegatingHandlers = new DelegatingHandler[] { new VssHttpRetryMessageHandler(settings.MaxRetryRequest) };
-            }
-
-            // Setup RawHttpMessageHandler without credentials
-            var httpMessageHandler = new RawHttpMessageHandler(new NoOpCredentials(null), settings);
-            var pipeline = HttpClientFactory.CreatePipeline(httpMessageHandler, delegatingHandlers);
-
-            this._launchClient = new LaunchHttpClient(uri, pipeline, token, disposeHandler: true);
+            var httpMessageHandler = HostContext.CreateHttpClientHandler();
+            this._launchClient = new LaunchHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
         }
 
         public Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList,

src/Runner.Listener/Runner.cs

@@ -237,10 +237,6 @@ namespace GitHub.Runner.Listener
                             File.SetAttributes(configFile, File.GetAttributes(configFile) | FileAttributes.Hidden);
                             Trace.Info($"Saved {configContent.Length} bytes to '{configFile}'.");
                         }
-
-                        // make sure we have the right user agent data added from the jitconfig
-                        HostContext.LoadDefaultUserAgents();
-                        VssUtil.InitializeVssClientSettings(HostContext.UserAgents, HostContext.WebProxy);
                     }
                     catch (Exception ex)
                     {

src/Runner.Worker/FileCommandManager.cs

@@ -179,7 +179,8 @@ namespace GitHub.Runner.Worker
 
         private string[] _setEnvBlockList =
         {
-            "NODE_OPTIONS"
+            "NODE_OPTIONS",
+            "BASH_ENV"
         };
     }
 

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -72,11 +72,6 @@ namespace GitHub.Runner.Worker.Handlers
                 Environment["ACTIONS_RESULTS_URL"] = resultsUrl;
             }
 
-            if (ExecutionContext.Global.Variables.GetBoolean("actions_uses_cache_service_v2") ?? false)
-            {
-                Environment["ACTIONS_CACHE_SERVICE_V2"] = bool.TrueString;
-            }
-
             // Resolve the target script.
             string target = null;
             if (stage == ActionRunStage.Main)
@@ -98,6 +93,7 @@ namespace GitHub.Runner.Worker.Handlers
                 ExecutionContext.StepTelemetry.HasPreStep = Data.HasPre;
                 ExecutionContext.StepTelemetry.HasPostStep = Data.HasPost;
             }
+            ExecutionContext.StepTelemetry.Type = Data.NodeVersion;
 
             ArgUtil.NotNullOrEmpty(target, nameof(target));
             target = Path.Combine(ActionDirectory, target);
@@ -128,7 +124,6 @@ namespace GitHub.Runner.Worker.Handlers
                 Data.NodeVersion = "node20";
             }
             var nodeRuntimeVersion = await StepHost.DetermineNodeRuntimeVersion(ExecutionContext, Data.NodeVersion);
-            ExecutionContext.StepTelemetry.Type = nodeRuntimeVersion;
             string file = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");
 
             // Format the arguments passed to node.

src/Runner.Worker/JobExtension.cs

@@ -403,7 +403,7 @@ namespace GitHub.Runner.Worker
                         var snapshotOperationProvider = HostContext.GetService<ISnapshotOperationProvider>();
                         jobContext.RegisterPostJobStep(new JobExtensionRunner(
                             runAsync: (executionContext, _) => snapshotOperationProvider.CreateSnapshotRequestAsync(executionContext, snapshotRequest),
-                            condition: snapshotRequest.Condition,
+                            condition: $"{PipelineTemplateConstants.Success}()",
                             displayName: $"Create custom image",
                             data: null));
                     }

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConstants.cs

@@ -30,7 +30,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
         public const String If = "if";
         public const String Image = "image";
         public const String ImageName = "image-name";
-        public const String CustomImageVersion = "version";
         public const String Include = "include";
         public const String Inputs = "inputs";
         public const String Job = "job";

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Globalization;
 using System.Linq;
 using GitHub.DistributedTask.Expressions2;
 using GitHub.DistributedTask.Expressions2.Sdk;
@@ -350,10 +349,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
         internal static Snapshot ConvertToJobSnapshotRequest(TemplateContext context, TemplateToken token)
         {
             string imageName = null;
-            string version = "1.*";
-            string versionString = string.Empty;
-            var condition = $"{PipelineTemplateConstants.Success}()";
-
             if (token is StringToken snapshotStringLiteral)
             {
                 imageName = snapshotStringLiteral.Value;
@@ -364,19 +359,11 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
                 foreach (var snapshotPropertyPair in snapshotMapping)
                 {
                     var propertyName = snapshotPropertyPair.Key.AssertString($"{PipelineTemplateConstants.Snapshot} key");
-                    var propertyValue = snapshotPropertyPair.Value;
                     switch (propertyName.Value)
                     {
                         case PipelineTemplateConstants.ImageName:
                             imageName = snapshotPropertyPair.Value.AssertString($"{PipelineTemplateConstants.Snapshot} {propertyName}").Value;
                             break;
-                        case PipelineTemplateConstants.If:
-                            condition = ConvertToIfCondition(context, propertyValue, false);
-                            break;
-                        case PipelineTemplateConstants.CustomImageVersion:
-                            versionString = propertyValue.AssertString($"job {PipelineTemplateConstants.Snapshot} {PipelineTemplateConstants.CustomImageVersion}").Value;
-                            version = IsSnapshotImageVersionValid(versionString) ? versionString : null;
-                            break;
                         default:
                             propertyName.AssertUnexpectedValue($"{PipelineTemplateConstants.Snapshot} key");
                             break;
@@ -389,26 +376,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
                 return null;
             }
 
-            return new Snapshot(imageName)
-            {
-                Condition = condition,
-                Version = version
-            };
-        }
-
-        private static bool IsSnapshotImageVersionValid(string versionString)
-        {
-            var versionSegments = versionString.Split(".");
-
-            if (versionSegments.Length != 2 ||
-                !versionSegments[1].Equals("*") ||
-                !Int32.TryParse(versionSegments[0], NumberStyles.None, CultureInfo.InvariantCulture, result: out int parsedMajor) ||
-                parsedMajor < 0)
-            {
-                return false;
-            }
-
-            return true;
+            return new Snapshot(imageName);
         }
 
         private static ActionStep ConvertToStep(

src/Sdk/DTPipelines/Pipelines/Snapshot.cs

@@ -1,27 +1,17 @@
 using System;
 using System.Runtime.Serialization;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.Pipelines.ObjectTemplating;
 
 namespace GitHub.DistributedTask.Pipelines
 {
     [DataContract]
     public class Snapshot
     {
-        public Snapshot(string imageName, string condition = null, string version = null)
+        public Snapshot(string imageName)
         {
             ImageName = imageName;
-            Condition = condition ?? $"{PipelineTemplateConstants.Success}()";
-            Version = version ?? "1.*";
         }
 
         [DataMember(EmitDefaultValue = false)]
         public String ImageName { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public String Condition { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public String Version { get; set; }
     }
 }

src/Sdk/DTPipelines/workflow-v1.0.json

@@ -169,28 +169,11 @@
           "image-name": {
             "type": "non-empty-string",
             "required": true
-          },
-          "if": "snapshot-if",
-          "version": {
-            "type": "non-empty-string",
-            "required": false
           }
         }
       }
     },
 
-    "snapshot-if": {
-      "context": [
-        "github",
-        "inputs",
-        "vars",
-        "needs",
-        "strategy",
-        "matrix"
-      ],
-      "string": {}
-    },
-
     "runs-on": {
       "context": [
         "github",

src/Sdk/RSWebApi/Contracts/BrokerError.cs

@@ -1,20 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class BrokerError
-    {
-        [DataMember(Name = "source", EmitDefaultValue = false)]
-        public string Source { get; set; }
-
-        [DataMember(Name = "errorKind", EmitDefaultValue = false)]
-        public string ErrorKind { get; set; }
-
-        [DataMember(Name = "statusCode", EmitDefaultValue = false)]
-        public int StatusCode { get; set; }
-
-        [DataMember(Name = "errorMessage", EmitDefaultValue = false)]
-        public string Message { get; set; }
-    }
-}

src/Sdk/RSWebApi/Contracts/BrokerErrorKind.cs

@@ -1,10 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.Actions.RunService.WebApi
-{
-    [DataContract]
-    public class BrokerErrorKind
-    {
-        public const string RunnerVersionTooOld = "RunnerVersionTooOld";
-    }
-}

src/Sdk/RSWebApi/RunServiceHttpClient.cs

@@ -107,6 +107,15 @@ namespace GitHub.Actions.RunService.WebApi
                 }
             }
 
+            // Temporary back compat
+            switch (result.StatusCode)
+            {
+                case HttpStatusCode.NotFound:
+                    throw new TaskOrchestrationJobNotFoundException($"Job message not found: {messageId}");
+                case HttpStatusCode.Conflict:
+                    throw new TaskOrchestrationJobAlreadyAcquiredException($"Job message already acquired: {messageId}");
+            }
+
             if (!string.IsNullOrEmpty(result.ErrorBody))
             {
                 throw new Exception($"Failed to get job message: {result.Error}. {Truncate(result.ErrorBody)}");
@@ -162,6 +171,13 @@ namespace GitHub.Actions.RunService.WebApi
                 }
             }
 
+            // Temporary back compat
+            switch (result.StatusCode)
+            {
+                case HttpStatusCode.NotFound:
+                    throw new TaskOrchestrationJobNotFoundException($"Job not found: {jobId}");
+            }
+
             if (!string.IsNullOrEmpty(result.ErrorBody))
             {
                 throw new Exception($"Failed to complete job: {result.Error}. {Truncate(result.ErrorBody)}");
@@ -209,6 +225,13 @@ namespace GitHub.Actions.RunService.WebApi
                 }
             }
 
+            // Temporary back compat
+            switch (result.StatusCode)
+            {
+                case HttpStatusCode.NotFound:
+                    throw new TaskOrchestrationJobNotFoundException($"Job not found: {jobId}");
+            }
+
             if (!string.IsNullOrEmpty(result.ErrorBody))
             {
                 throw new Exception($"Failed to renew job: {result.Error}. {Truncate(result.ErrorBody)}");

src/Sdk/WebApi/WebApi/BrokerHttpClient.cs

@@ -103,7 +103,6 @@ namespace GitHub.Actions.RunService.WebApi
                 new HttpMethod("GET"),
                 requestUri: requestUri,
                 queryParameters: queryParams,
-                readErrorBody: true,
                 cancellationToken: cancellationToken);
 
             if (result.IsSuccess)
@@ -111,21 +110,8 @@ namespace GitHub.Actions.RunService.WebApi
                 return result.Value;
             }
 
-            if (TryParseErrorBody(result.ErrorBody, out BrokerError brokerError))
-            {
-                switch (brokerError.ErrorKind)
-                {
-                    case BrokerErrorKind.RunnerVersionTooOld:
-                        throw new AccessDeniedException(brokerError.Message)
-                        {
-                            ErrorCode = 1
-                        };
-                    default:
-                        break;
-                }
-            }
-
-            // temporary back compat
+            // the only time we throw a `Forbidden` exception from Listener /messages is when the runner is
+            // disable_update and is too old to poll
             if (result.StatusCode == HttpStatusCode.Forbidden)
             {
                 throw new AccessDeniedException($"{result.Error} Runner version v{runnerVersion} is deprecated and cannot receive messages.")
@@ -134,7 +120,7 @@ namespace GitHub.Actions.RunService.WebApi
                 };
             }
 
-            throw new Exception($"Failed to get job message. Request to {requestUri} failed with status: {result.StatusCode}. Error message {result.Error}");
+            throw new Exception($"Failed to get job message: {result.Error}");
         }
 
         public async Task<TaskAgentSession> CreateSessionAsync(
@@ -186,26 +172,5 @@ namespace GitHub.Actions.RunService.WebApi
 
             throw new Exception($"Failed to delete broker session: {result.Error}");
         }
-
-        private static bool TryParseErrorBody(string errorBody, out BrokerError error)
-        {
-            if (!string.IsNullOrEmpty(errorBody))
-            {
-                try
-                {
-                    error = JsonUtility.FromString<BrokerError>(errorBody);
-                    if (error?.Source == "actions-broker-listener")
-                    {
-                        return true;
-                    }
-                }
-                catch (Exception)
-                {
-                }
-            }
-
-            error = null;
-            return false;
-        }
     }
 }

src/Test/L0/TestHostContext.cs

@@ -370,11 +370,6 @@ namespace GitHub.Runner.Common.Tests
                 Unloading(this, null);
             }
         }
-
-        public void LoadDefaultUserAgents()
-        {
-            return;
-        }
     }
 
     public class DelayEventArgs : EventArgs

src/Test/L0/Worker/JobExtensionL0.cs

@@ -506,27 +506,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             return EnsureSnapshotPostJobStepForToken(mappingToken, snapshot);
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public Task EnsureSnapshotPostJobStepForMappingToken_WithIf_Is_False()
-        {
-            var snapshot = new Pipelines.Snapshot("TestImageNameFromMappingToken", condition: $"{PipelineTemplateConstants.Success}() && 1==0", version: "2.*");
-            var imageNameValueStringToken = new StringToken(null, null, null, snapshot.ImageName);
-            var condition = new StringToken(null, null, null, snapshot.Condition);
-            var version = new StringToken(null, null, null, snapshot.Version);
-
-            var mappingToken = new MappingToken(null, null, null)
-            {
-                { new StringToken(null,null,null, PipelineTemplateConstants.ImageName), imageNameValueStringToken },
-                { new StringToken(null,null,null, PipelineTemplateConstants.If), condition },
-                { new StringToken(null,null,null, PipelineTemplateConstants.CustomImageVersion), version }
-            };
-
-            return EnsureSnapshotPostJobStepForToken(mappingToken, snapshot, skipSnapshotStep: true);
-        }
-
-        private async Task EnsureSnapshotPostJobStepForToken(TemplateToken snapshotToken, Pipelines.Snapshot expectedSnapshot, bool skipSnapshotStep = false)
+        private async Task EnsureSnapshotPostJobStepForToken(TemplateToken snapshotToken, Pipelines.Snapshot expectedSnapshot)
         {
             using (TestHostContext hc = CreateTestContext())
             {
@@ -544,28 +524,14 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 Assert.Equal(1, postJobSteps.Count);
                 var snapshotStep = postJobSteps.First();
-                _jobEc.JobSteps.Enqueue(snapshotStep);
-
-                var _stepsRunner = new StepsRunner();
-                _stepsRunner.Initialize(hc);
-                await _stepsRunner.RunAsync(_jobEc);
-
                 Assert.Equal("Create custom image", snapshotStep.DisplayName);
-                Assert.Equal(expectedSnapshot.Condition ?? $"{PipelineTemplateConstants.Success}()", snapshotStep.Condition);
+                Assert.Equal($"{PipelineTemplateConstants.Success}()", snapshotStep.Condition);
 
                 // Run the mock snapshot step, so we can verify it was executed with the expected snapshot object.
-                // await snapshotStep.RunAsync();
-                if (skipSnapshotStep)
-                {
-                    Assert.Null(_requestedSnapshot);
-                }
-                else
-                {
-                    Assert.NotNull(_requestedSnapshot);
-                    Assert.Equal(expectedSnapshot.ImageName, _requestedSnapshot.ImageName);
-                    Assert.Equal(expectedSnapshot.Condition ?? $"{PipelineTemplateConstants.Success}()", _requestedSnapshot.Condition);
-                    Assert.Equal(expectedSnapshot.Version ?? "1.*", _requestedSnapshot.Version);
-                }
+                await snapshotStep.RunAsync();
+
+                Assert.NotNull(_requestedSnapshot);
+                Assert.Equal(expectedSnapshot.ImageName, _requestedSnapshot.ImageName);
             }
         }
     }

src/runnerversion

@@ -1 +1 @@
-2.320.1
+2.319.1