Localize help message to the current platform

releaseNote.md

@@ -1,11 +1,21 @@
 ## Features
 
+- Support the `--ephemeral` flag (#660)
+  - This optional flag will configure the runner to only take one job, and let the service un-configure the runner after that job finishes.
+  - Expect to see more info in the Github API documentation soon. We'll link to those docs directly as they become generally available!
+
 ## Bugs
 
-- Fixed an issue where ephemeral runners did not restart after upgrading (#1396)
+- Fix a bug in `script/delete` wherein a repo with multiple runners would be unable to find the correct runner (#1268) (#1269)
+- Mitigate a race condition when requesting an OIDC `Id_token` (#1320)
+- Make client retries more resilient in JobServer (#1316)
 
 ## Misc
 
+- Increase readability of colored console output (#1295) (#1319)
+- Add more network troubleshooting to the docs (#1325)
+- Bump [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7 (#1256)
+
 ## Windows x64
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.
 

releaseVersion

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

src/Misc/layoutbin/update.sh.template

@@ -18,8 +18,6 @@ downloadrunnerversion=_DOWNLOAD_RUNNER_VERSION_
 logfile="_UPDATE_LOG_"
 restartinteractiverunner=_RESTART_INTERACTIVE_RUNNER_
 
-telemetryfile="$rootfolder/_diag/.telemetry"
-
 # log user who run the script
 date "+[%F %T-%4N] --------whoami--------" >> "$logfile" 2>&1
 whoami >> "$logfile" 2>&1
@@ -120,56 +118,12 @@ then
     exit 1
 fi
 
-# fix upgrade issue with macOS when running as a service
+# fix upgrade issue with macOS
-attemptedtargetedfix=0
 currentplatform=$(uname | awk '{print tolower($0)}')
-if [[ "$currentplatform" == 'darwin'  && restartinteractiverunner -eq 0 ]]; then
+if [[ "$currentplatform" == 'darwin' ]]; then
-    # We needed a fix for https://github.com/actions/runner/issues/743
+    # need a short-term fix for https://github.com/actions/runner/issues/743
-    # We will recreate the ./externals/node12/bin/node of the past runner version that launched the runnerlistener service
+    # we will recreate all the ./externals/node12/bin/node of the past 5 versions
-    # Otherwise mac gatekeeper kills the processes we spawn on creation as we are running a process with no backing file
+    # v2.280.3 v2.280.2 v2.280.1 v2.279.0 v2.278.0
-
-    # We need the pid for the nodejs loop, get that here, its the parent of the runner C# pid
-    # assumption here is only one process is invoking rootfolder/runsvc.sh
-    procgroup=$(ps x -o pgid,command | grep "$rootfolder/runsvc.sh" | grep -v grep | awk '{print $1}')
-    if [[ $? -eq 0 && -n "$procgroup" ]]
-    then
-        # inspect the open file handles to find the node process
-        # we can't actually inspect the process using ps because it uses relative paths and doesn't follow symlinks
-        path=$(lsof -a -g "$procgroup" -F n | grep node12/bin/node | grep externals | tail -1 | cut -c2-)
-        if [[ $? -eq 0 && -n "$path" ]]
-        then
-            # trim the last 5 characters of the path '/node'
-            trimmedpath=$(dirname "$path")
-            if [[ $? -eq 0 && -n "$trimmedpath" ]]
-            then
-                attemptedtargetedfix=1
-                # Create the path if it does not exist
-                if [[ ! -e "$path" ]]
-                then
-                    date "+[%F %T-%4N] Creating fallback node at path $path" >> "$logfile" 2>&1
-                    mkdir -p "$trimmedpath"
-                    cp "$rootfolder/externals/node12/bin/node" "$path"
-                else
-                    date "+[%F %T-%4N] Path for fallback node exists, skipping creating $path" >> "$logfile" 2>&1
-                fi
-            else
-                date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to trim runner path. TrimmedPath: $trimmedpath, path: $path, pgid: $procgroup, root: $rootfolder" >> "$logfile" 2>&1
-                date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to trim runner path. TrimmedPath: $trimmedpath, path: $path, pgid: $procgroup, root: $rootfolder" >> "$telemetryfile" 2>&1
-            fi
-        else
-            date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to find runner path. Path: $path, pgid: $procgroup, root: $rootfolder" >> "$logfile" 2>&1
-            date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to find runner path. Path: $path, pgid: $procgroup, root: $rootfolder" >> "$telemetryfile" 2>&1
-        fi
-    else
-            date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to find runner pgid. pgid: $procgroup, root: $rootfolder" >> "$logfile" 2>&1
-            date "+[%F %T-%4N] DarwinRunnerUpgrade: Failed to find runner pgid. pgid: $procgroup, root: $rootfolder" >> "$telemetryfile" 2>&1
-    fi
-
-    if [ $attemptedtargetedfix -eq 0 ]
-    then
-
-        date "+[%F %T-%4N] DarwinRunnerUpgrade: Defaulting to old macOS service fix" >> "$logfile" 2>&1
-        date "+[%F %T-%4N] DarwinRunnerUpgrade: Defaulting to old macOS service fix" >> "$telemetryfile" 2>&1
     if [[ ! -e "$rootfolder/externals.2.280.3/node12/bin/node" ]]
     then
         mkdir -p "$rootfolder/externals.2.280.3/node12/bin"
@@ -188,34 +142,17 @@ if [[ "$currentplatform" == 'darwin'  && restartinteractiverunner -eq 0 ]]; then
         cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.280.1/node12/bin/node"
     fi
 
-        # GHES 3.2
     if [[ ! -e "$rootfolder/externals.2.279.0/node12/bin/node" ]]
     then
         mkdir -p "$rootfolder/externals.2.279.0/node12/bin"
         cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.279.0/node12/bin/node"
     fi
 
-        # GHES 3.1.2 or later
     if [[ ! -e "$rootfolder/externals.2.278.0/node12/bin/node" ]]
     then
         mkdir -p "$rootfolder/externals.2.278.0/node12/bin"
         cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.278.0/node12/bin/node"
     fi
-
-        # GHES 3.1.0
-        if [[ ! -e "$rootfolder/externals.2.276.1/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.276.1/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.276.1/node12/bin/node"
-        fi
-
-        # GHES 3.0
-        if [[ ! -e "$rootfolder/externals.2.273.5/node12/bin/node" ]]
-        then
-            mkdir -p "$rootfolder/externals.2.273.5/node12/bin"
-            cp "$rootfolder/externals/node12/bin/node" "$rootfolder/externals.2.273.5/node12/bin/node"
-        fi
-    fi
 fi
 
 date "+[%F %T-%4N] Update succeed" >> "$logfile"

src/Misc/layoutroot/run.sh

@@ -43,21 +43,6 @@ else
         else
             sleep 5
         fi
-    elif [[ $returnCode == 4 ]]; then
-        if [ ! -x "$(command -v sleep)" ]; then
-            if [ ! -x "$(command -v ping)" ]; then
-                COUNT="0"
-                while [[ $COUNT != 5000 ]]; do
-                    echo "SLEEP" > /dev/null
-                    COUNT=$[$COUNT+1]
-                done
-            else
-                ping -c 5 127.0.0.1 > /dev/null
-            fi
-        else
-            sleep 5
-        fi
-        "$DIR"/bin/Runner.Listener run $*
     else
         exit $returnCode
     fi

src/Runner.Common/Constants.cs

@@ -26,7 +26,6 @@ namespace GitHub.Runner.Common
         Certificates,
         Options,
         SetupInfo,
-        Telemetry
     }
 
     public static class Constants
@@ -129,7 +128,7 @@ namespace GitHub.Runner.Common
                     public static readonly string Ephemeral = "ephemeral";
                     public static readonly string Help = "help";
                     public static readonly string Replace = "replace";
-                    public static readonly string Once = "once"; // Keep this around since customers still relies on it
+                    public static readonly string Once = "once"; // TODO: Remove in 10/2021
                     public static readonly string RunAsService = "runasservice";
                     public static readonly string Unattended = "unattended";
                     public static readonly string Version = "version";
@@ -155,7 +154,6 @@ namespace GitHub.Runner.Common
             public static readonly string LowDiskSpace = "LOW_DISK_SPACE";
             public static readonly string UnsupportedCommand = "UNSUPPORTED_COMMAND";
             public static readonly string UnsupportedCommandMessageDisabled = "The `{0}` command is disabled. Please upgrade to using Environment Files or opt into unsecure command execution by setting the `ACTIONS_ALLOW_UNSECURE_COMMANDS` environment variable to `true`. For more information see: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/";
-            public static readonly string UnsupportedStopCommandTokenDisabled = "You cannot use a endToken that is an empty string, the string 'pause-logging', or another workflow command. For more information see:  https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions#example-stopping-and-starting-workflow-commands or opt into insecure command execution by setting the `ACTIONS_ALLOW_UNSECURE_STOPCOMMAND_TOKENS` environment variable to `true`.";
         }
 
         public static class RunnerEvent
@@ -215,7 +213,6 @@ namespace GitHub.Runner.Common
                 // Keep alphabetical
                 //
                 public static readonly string AllowUnsupportedCommands = "ACTIONS_ALLOW_UNSECURE_COMMANDS";
-                public static readonly string AllowUnsupportedStopCommandTokens = "ACTIONS_ALLOW_UNSECURE_STOPCOMMAND_TOKENS";
                 public static readonly string RunnerDebug = "ACTIONS_RUNNER_DEBUG";
                 public static readonly string StepDebug = "ACTIONS_STEP_DEBUG";
             }

src/Runner.Common/HostContext.cs

@@ -343,12 +343,6 @@ namespace GitHub.Runner.Common
                         ".setup_info");
                     break;
 
-                case WellKnownConfigFile.Telemetry:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Diag),
-                        ".telemetry");
-                    break;
-
                 default:
                     throw new NotSupportedException($"Unexpected well known config file: '{configFile}'");
             }

src/Runner.Common/RunnerServer.cs

@@ -29,10 +29,8 @@ namespace GitHub.Runner.Common
         // Configuration
         Task<TaskAgent> AddAgentAsync(Int32 agentPoolId, TaskAgent agent);
         Task DeleteAgentAsync(int agentPoolId, int agentId);
-        Task DeleteAgentAsync(int agentId);
         Task<List<TaskAgentPool>> GetAgentPoolsAsync(string agentPoolName = null, TaskAgentPoolType poolType = TaskAgentPoolType.Automation);
         Task<List<TaskAgent>> GetAgentsAsync(int agentPoolId, string agentName = null);
-        Task<List<TaskAgent>> GetAgentsAsync(string agentName);
         Task<TaskAgent> ReplaceAgentAsync(int agentPoolId, TaskAgent agent);
 
         // messagequeue
@@ -254,11 +252,6 @@ namespace GitHub.Runner.Common
             return _genericTaskAgentClient.GetAgentsAsync(agentPoolId, agentName, false);
         }
 
-        public Task<List<TaskAgent>> GetAgentsAsync(string agentName)
-        {
-            return GetAgentsAsync(0, agentName); // search in all all agentPools
-        }
-
         public Task<TaskAgent> ReplaceAgentAsync(int agentPoolId, TaskAgent agent)
         {
             CheckConnection(RunnerConnectionType.Generic);
@@ -271,11 +264,6 @@ namespace GitHub.Runner.Common
             return _genericTaskAgentClient.DeleteAgentAsync(agentPoolId, agentId);
         }
 
-        public Task DeleteAgentAsync(int agentId)
-        {
-            return DeleteAgentAsync(0, agentId); // agentPool is ignored server side
-        }
-
         //-----------------------------------------------------------------
         // MessageQueue
         //-----------------------------------------------------------------

src/Runner.Listener/CommandSettings.cs

@@ -31,7 +31,6 @@ namespace GitHub.Runner.Listener
             Constants.Runner.CommandLine.Flags.Commit,
             Constants.Runner.CommandLine.Flags.Ephemeral,
             Constants.Runner.CommandLine.Flags.Help,
-            Constants.Runner.CommandLine.Flags.Once,
             Constants.Runner.CommandLine.Flags.Replace,
             Constants.Runner.CommandLine.Flags.RunAsService,
             Constants.Runner.CommandLine.Flags.Unattended,
@@ -69,7 +68,7 @@ namespace GitHub.Runner.Listener
         public bool Version => TestFlag(Constants.Runner.CommandLine.Flags.Version);
         public bool Ephemeral => TestFlag(Constants.Runner.CommandLine.Flags.Ephemeral);
 
-        // Keep this around since customers still relies on it
+        // TODO: Remove in 10/2021
         public bool RunOnce => TestFlag(Constants.Runner.CommandLine.Flags.Once);
 
         // Constructor.

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -22,7 +22,6 @@ namespace GitHub.Runner.Listener.Configuration
         bool IsConfigured();
         Task ConfigureAsync(CommandSettings command);
         Task UnconfigureAsync(CommandSettings command);
-        void DeleteLocalRunnerConfig();
         RunnerSettings LoadSettings();
     }
 
@@ -330,38 +329,6 @@ namespace GitHub.Runner.Listener.Configuration
 #endif
         }
 
-        // Delete .runner and .credentials files
-        public void DeleteLocalRunnerConfig()
-        {
-            bool isConfigured = _store.IsConfigured();
-            bool hasCredentials = _store.HasCredentials();
-            //delete credential config files
-            var currentAction = "Removing .credentials";
-            if (hasCredentials)
-            {
-                _store.DeleteCredential();
-                var keyManager = HostContext.GetService<IRSAKeyManager>();
-                keyManager.DeleteKey();
-                _term.WriteSuccessMessage("Removed .credentials");
-            }
-            else
-            {
-                _term.WriteLine("Does not exist. Skipping " + currentAction);
-            }
-
-            //delete settings config file
-            currentAction = "Removing .runner";
-            if (isConfigured)
-            {
-                _store.DeleteSettings();
-                _term.WriteSuccessMessage("Removed .runner");
-            }
-            else
-            {
-                _term.WriteLine("Does not exist. Skipping " + currentAction);
-            }
-        }
-
         public async Task UnconfigureAsync(CommandSettings command)
         {
             string currentAction = string.Empty;
@@ -415,7 +382,7 @@ namespace GitHub.Runner.Listener.Configuration
                     // Determine the service deployment type based on connection data. (Hosted/OnPremises)
                     await _runnerServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
 
-                    var agents = await _runnerServer.GetAgentsAsync(settings.AgentName);
+                    var agents = await _runnerServer.GetAgentsAsync(settings.PoolId, settings.AgentName);
                     Trace.Verbose("Returns {0} agents", agents.Count);
                     TaskAgent agent = agents.FirstOrDefault();
                     if (agent == null)
@@ -424,7 +391,7 @@ namespace GitHub.Runner.Listener.Configuration
                     }
                     else
                     {
-                        await _runnerServer.DeleteAgentAsync(settings.AgentId);
+                        await _runnerServer.DeleteAgentAsync(settings.PoolId, settings.AgentId);
 
                         _term.WriteLine();
                         _term.WriteSuccessMessage("Runner removed successfully");
@@ -435,7 +402,31 @@ namespace GitHub.Runner.Listener.Configuration
                     _term.WriteLine("Cannot connect to server, because config files are missing. Skipping removing runner from the server.");
                 }
 
-                DeleteLocalRunnerConfig();
+                //delete credential config files
+                currentAction = "Removing .credentials";
+                if (hasCredentials)
+                {
+                    _store.DeleteCredential();
+                    var keyManager = HostContext.GetService<IRSAKeyManager>();
+                    keyManager.DeleteKey();
+                    _term.WriteSuccessMessage("Removed .credentials");
+                }
+                else
+                {
+                    _term.WriteLine("Does not exist. Skipping " + currentAction);
+                }
+
+                //delete settings config file
+                currentAction = "Removing .runner";
+                if (isConfigured)
+                {
+                    _store.DeleteSettings();
+                    _term.WriteSuccessMessage("Removed .runner");
+                }
+                else
+                {
+                    _term.WriteLine("Does not exist. Skipping " + currentAction);
+                }
             }
             catch (Exception)
             {

src/Runner.Listener/JobDispatcher.cs

@@ -36,10 +36,7 @@ namespace GitHub.Runner.Listener
     {
         private readonly Lazy<Dictionary<long, TaskResult>> _localRunJobResult = new Lazy<Dictionary<long, TaskResult>>();
         private int _poolId;
-
+        RunnerSettings _runnerSetting;
-        IConfigurationStore _configurationStore;
-
-        RunnerSettings _runnerSettings;
         private static readonly string _workerProcessName = $"Runner.Worker{IOUtil.ExeExtension}";
 
         // this is not thread-safe
@@ -57,9 +54,9 @@ namespace GitHub.Runner.Listener
             base.Initialize(hostContext);
 
             // get pool id from config
-            _configurationStore = hostContext.GetService<IConfigurationStore>();
+            var configurationStore = hostContext.GetService<IConfigurationStore>();
-            _runnerSettings = _configurationStore.GetSettings();
+            _runnerSetting = configurationStore.GetSettings();
-            _poolId = _runnerSettings.PoolId;
+            _poolId = _runnerSetting.PoolId;
 
             int channelTimeoutSeconds;
             if (!int.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_CHANNEL_TIMEOUT") ?? string.Empty, out channelTimeoutSeconds))
@@ -664,15 +661,13 @@ namespace GitHub.Runner.Listener
                 try
                 {
                     request = await runnerServer.RenewAgentRequestAsync(poolId, requestId, lockToken, orchestrationId, token);
+
                     Trace.Info($"Successfully renew job request {requestId}, job is valid till {request.LockedUntil.Value}");
 
                     if (!firstJobRequestRenewed.Task.IsCompleted)
                     {
                         // fire first renew succeed event.
                         firstJobRequestRenewed.TrySetResult(0);
-
-                        // Update settings if the runner name has been changed server-side
-                        UpdateAgentNameIfNeeded(request.ReservedAgent?.Name);
                     }
 
                     if (encounteringError > 0)
@@ -772,27 +767,6 @@ namespace GitHub.Runner.Listener
             }
         }
 
-        private void UpdateAgentNameIfNeeded(string agentName)
-        {
-            var isNewAgentName = !string.Equals(_runnerSettings.AgentName, agentName, StringComparison.Ordinal);
-            if (!isNewAgentName || string.IsNullOrEmpty(agentName))
-            {
-                return;
-            }
-
-            _runnerSettings.AgentName = agentName;
-            try
-            {
-                _configurationStore.SaveSettings(_runnerSettings);
-            }
-            catch (Exception ex)
-            {
-                Trace.Error("Cannot update the settings file:");
-                Trace.Error(ex);
-            }
-
-        }
-
         // Best effort upload any logs for this job.
         private async Task TryUploadUnfinishedLogs(Pipelines.AgentJobRequestMessage message)
         {

src/Runner.Listener/Program.cs

@@ -95,7 +95,16 @@ namespace GitHub.Runner.Listener
                 var unknownCommandlines = command.Validate();
                 if (unknownCommandlines.Count > 0)
                 {
-                    terminal.WriteError($"Unrecognized command-line input arguments: '{string.Join(", ", unknownCommandlines)}'. For usage refer to: .\\config.cmd --help or ./config.sh --help");
+                    string separator;
+                    string ext;
+#if OS_WINDOWS
+                    separator = "\\";
+                    ext = "cmd";
+#else
+                    separator = "/";
+                    ext = "sh";
+#endif
+                    terminal.WriteError($"Unrecognized command-line input arguments: '{string.Join(", ", unknownCommandlines)}'. For usage refer to `.{separator}config.{ext} --help`");
                 }
 
                 // Defer to the Runner class to execute the command.

src/Runner.Listener/Runner.cs

@@ -233,14 +233,8 @@ namespace GitHub.Runner.Listener
                     Trace.Info($"Set runner startup type - {startType}");
                     HostContext.StartupType = startType;
 
-                    if (command.RunOnce)
-                    {
-                        _term.WriteLine("Warning: '--once' is going to be deprecated in the future, please consider using '--ephemeral' during runner registration.", ConsoleColor.Yellow);
-                        _term.WriteLine("https://docs.github.com/en/actions/hosting-your-own-runners/autoscaling-with-self-hosted-runners#using-ephemeral-runners-for-autoscaling", ConsoleColor.Yellow);
-                    }
-
                     // Run the runner interactively or as service
-                    return await RunAsync(settings, command.RunOnce || settings.Ephemeral);
+                    return await RunAsync(settings, command.RunOnce || settings.Ephemeral);  // TODO: Remove RunOnce later.
                 }
                 else
                 {
@@ -316,9 +310,6 @@ namespace GitHub.Runner.Listener
 
                 IJobDispatcher jobDispatcher = null;
                 CancellationTokenSource messageQueueLoopTokenSource = CancellationTokenSource.CreateLinkedTokenSource(HostContext.RunnerShutdownToken);
-                
-                // Should we try to cleanup ephemeral runners
-                bool runOnceJobCompleted = false;
                 try
                 {
                     var notification = HostContext.GetService<IJobNotification>();
@@ -380,7 +371,6 @@ namespace GitHub.Runner.Listener
                                 Task completeTask = await Task.WhenAny(getNextMessage, jobDispatcher.RunOnceJobCompleted.Task);
                                 if (completeTask == jobDispatcher.RunOnceJobCompleted.Task)
                                 {
-                                    runOnceJobCompleted = true;
                                     Trace.Info("Job has finished at backend, the runner will exit since it is running under onetime use mode.");
                                     Trace.Info("Stop message queue looping.");
                                     messageQueueLoopTokenSource.Cancel();
@@ -488,12 +478,6 @@ namespace GitHub.Runner.Listener
                     }
 
                     messageQueueLoopTokenSource.Dispose();
-
-                    if (settings.Ephemeral && runOnceJobCompleted)
-                    {
-                        var configManager = HostContext.GetService<IConfigurationManager>();
-                        configManager.DeleteLocalRunnerConfig();
-                    }
                 }
             }
             catch (TaskAgentAccessTokenExpiredException)

src/Runner.Worker/ActionCommandManager.cs

@@ -1,5 +1,7 @@
-using GitHub.DistributedTask.Pipelines.ContextData;
+using GitHub.DistributedTask.Pipelines;
+using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Worker.Container;
 using System;
 using System.Collections.Generic;
@@ -108,18 +110,11 @@ namespace GitHub.Runner.Worker
                     // Stop command
                     if (string.Equals(actionCommand.Command, _stopCommand, StringComparison.OrdinalIgnoreCase))
                     {
-                        ValidateStopToken(context, actionCommand.Data);
+                        context.Output(input);
-
+                        context.Debug("Paused processing commands until '##[{actionCommand.Data}]' is received");
                         _stopToken = actionCommand.Data;
                         _stopProcessCommand = true;
                         _registeredCommands.Add(_stopToken);
-                        if (_stopToken.Length > 6)
-                        {
-                            HostContext.SecretMasker.AddValue(_stopToken);
-                        }
-
-                        context.Output(input);
-                        context.Debug("Paused processing commands until the token you called ::stopCommands:: with is received");
                         return true;
                     }
                     // Found command
@@ -153,42 +148,7 @@ namespace GitHub.Runner.Worker
             return true;
         }
 
-        private void ValidateStopToken(IExecutionContext context, string stopToken)
+        internal static bool EnhancedAnnotationsEnabled(IExecutionContext context) {
-        {
-#if OS_WINDOWS
-            var envContext = context.ExpressionValues["env"] as DictionaryContextData;
-#else
-            var envContext = context.ExpressionValues["env"] as CaseSensitiveDictionaryContextData;
-#endif
-            var allowUnsecureStopCommandTokens = false;
-            allowUnsecureStopCommandTokens = StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable(Constants.Variables.Actions.AllowUnsupportedStopCommandTokens));
-            if (!allowUnsecureStopCommandTokens && envContext.ContainsKey(Constants.Variables.Actions.AllowUnsupportedStopCommandTokens))
-            {
-                allowUnsecureStopCommandTokens = StringUtil.ConvertToBoolean(envContext[Constants.Variables.Actions.AllowUnsupportedStopCommandTokens].ToString());
-            }
-
-            bool isTokenInvalid = _registeredCommands.Contains(stopToken)
-                || string.IsNullOrEmpty(stopToken)
-                || string.Equals(stopToken, "pause-logging", StringComparison.OrdinalIgnoreCase);
-
-            if (isTokenInvalid)
-            {
-                var telemetry = new JobTelemetry
-                {
-                    Message = $"Invoked ::stopCommand:: with token: [{stopToken}]",
-                    Type = JobTelemetryType.ActionCommand
-                };
-                context.JobTelemetry.Add(telemetry);
-            }
-
-            if (isTokenInvalid && !allowUnsecureStopCommandTokens)
-            {
-                throw new Exception(Constants.Runner.UnsupportedStopCommandTokenDisabled);
-            }
-        }
-
-        internal static bool EnhancedAnnotationsEnabled(IExecutionContext context)
-        {
             return context.Global.Variables.GetBoolean("DistributedTask.EnhancedAnnotations") ?? false;
         }
     }

src/Runner.Worker/ActionManager.cs

@@ -633,12 +633,7 @@ namespace GitHub.Runner.Worker
                 }
                 catch (Exception ex) when (!executionContext.CancellationToken.IsCancellationRequested) // Do not retry if the run is canceled.
                 {
-                    // UnresolvableActionDownloadInfoException is a 422 client error, don't retry
+                    if (attempt < 3)
-                    // Some possible cases are:
-                    // * Repo is rate limited
-                    // * Repo or tag doesn't exist, or isn't public
-                    // * Policy validation failed
-                    if (attempt < 3 && !(ex is WebApi.UnresolvableActionDownloadInfoException))
                     {
                         executionContext.Output($"Failed to resolve action download info. Error: {ex.Message}");
                         executionContext.Debug(ex.ToString());
@@ -654,7 +649,6 @@ namespace GitHub.Runner.Worker
                         // Some possible cases are:
                         // * Repo is rate limited
                         // * Repo or tag doesn't exist, or isn't public
-                        // * Policy validation failed
                         if (ex is WebApi.UnresolvableActionDownloadInfoException)
                         {
                             throw;

src/Runner.Worker/ExecutionContext.cs

@@ -52,7 +52,6 @@ namespace GitHub.Runner.Worker
         Dictionary<string, VariableValue> JobOutputs { get; }
         ActionsEnvironmentReference ActionsEnvironment { get; }
         List<ActionsStepTelemetry> ActionsStepsTelemetry { get; }
-        List<JobTelemetry> JobTelemetry { get; }
         DictionaryContextData ExpressionValues { get; }
         IList<IFunctionInfo> ExpressionFunctions { get; }
         JobContext JobContext { get; }
@@ -151,7 +150,6 @@ namespace GitHub.Runner.Worker
 
         public ActionsEnvironmentReference ActionsEnvironment { get; private set; }
         public List<ActionsStepTelemetry> ActionsStepsTelemetry { get; private set; }
-        public List<JobTelemetry> JobTelemetry { get; private set; }
         public DictionaryContextData ExpressionValues { get; } = new DictionaryContextData();
         public IList<IFunctionInfo> ExpressionFunctions { get; } = new List<IFunctionInfo>();
 
@@ -296,7 +294,6 @@ namespace GitHub.Runner.Worker
             child.ContextName = contextName;
             child.EmbeddedId = embeddedId;
             child.SiblingScopeName = siblingScopeName;
-            child.JobTelemetry = JobTelemetry;
             if (intraActionState == null)
             {
                 child.IntraActionState = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
@@ -653,8 +650,6 @@ namespace GitHub.Runner.Worker
             // ActionsStepTelemetry
             ActionsStepsTelemetry = new List<ActionsStepTelemetry>();
 
-            JobTelemetry = new List<JobTelemetry>();
-
             // Service container info
             Global.ServiceContainers = new List<ContainerInfo>();
 

src/Runner.Worker/JobRunner.cs

@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Net.Http;
@@ -107,9 +106,6 @@ namespace GitHub.Runner.Worker
 
                 jobContext.SetRunnerContext("os", VarUtil.OS);
 
-                var runnerSettings = HostContext.GetService<IConfigurationStore>().GetSettings();
-                jobContext.SetRunnerContext("name", runnerSettings.AgentName);
-
                 string toolsDirectory = HostContext.GetDirectory(WellKnownDirectory.Tools);
                 Directory.CreateDirectory(toolsDirectory);
                 jobContext.SetRunnerContext("tool_cache", toolsDirectory);
@@ -229,15 +225,8 @@ namespace GitHub.Runner.Worker
                 return result;
             }
 
-            // Load any upgrade telemetry
-            LoadFromTelemetryFile(jobContext.JobTelemetry);
-
-            // Make sure we don't submit secrets as telemetry
-            MaskTelemetrySecrets(jobContext.JobTelemetry);
-
             Trace.Info("Raising job completed event.");
-            var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, result, jobContext.JobOutputs, jobContext.ActionsEnvironment, jobContext.ActionsStepsTelemetry, jobContext.JobTelemetry);
+            var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, result, jobContext.JobOutputs, jobContext.ActionsEnvironment, jobContext.ActionsStepsTelemetry);
-
 
             var completeJobRetryLimit = 5;
             var exceptions = new List<Exception>();
@@ -281,38 +270,6 @@ namespace GitHub.Runner.Worker
             throw new AggregateException(exceptions);
         }
 
-        private void MaskTelemetrySecrets(List<JobTelemetry> jobTelemetry)
-        {
-            foreach (var telemetryItem in jobTelemetry)
-            {
-                telemetryItem.Message = HostContext.SecretMasker.MaskSecrets(telemetryItem.Message);
-            }
-        }
-
-        private void LoadFromTelemetryFile(List<JobTelemetry> jobTelemetry)
-        {
-            try
-            {
-                var telemetryFilePath = HostContext.GetConfigFile(WellKnownConfigFile.Telemetry);
-                if (File.Exists(telemetryFilePath))
-                {
-                    var telemetryData = File.ReadAllText(telemetryFilePath, Encoding.UTF8);
-                    var telemetry = new JobTelemetry
-                    {
-                        Message = $"Runner File Telemetry:\n{telemetryData}",
-                        Type = JobTelemetryType.General
-                    };
-                    jobTelemetry.Add(telemetry);
-                    IOUtil.DeleteFile(telemetryFilePath);
-                }
-            }
-            catch (Exception e)
-            {
-                Trace.Error("Error when trying to load telemetry from telemetry file");
-                Trace.Error(e);
-            }
-        }
-
         private async Task ShutdownQueue(bool throwOnFailure)
         {
             if (_jobServerQueue != null)

src/Sdk/DTWebApi/WebApi/JobEvent.cs

@@ -155,19 +155,6 @@ namespace GitHub.DistributedTask.WebApi
             this.ActionsStepsTelemetry = actionsStepsTelemetry;
         }
 
-        public JobCompletedEvent(
-            Int64 requestId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            ActionsEnvironmentReference actionsEnvironment,
-            List<ActionsStepTelemetry> actionsStepsTelemetry,
-            List<JobTelemetry> jobTelemetry)
-            : this(requestId, jobId, result, outputs, actionsEnvironment, actionsStepsTelemetry)
-        {
-            this.JobTelemetry = jobTelemetry;
-        }
-
         [DataMember(EmitDefaultValue = false)]
         public Int64 RequestId
         {
@@ -202,13 +189,6 @@ namespace GitHub.DistributedTask.WebApi
             get;
             set;
         }
-
-        [DataMember(EmitDefaultValue = false)]
-        public List<JobTelemetry> JobTelemetry
-        {
-            get;
-            set;
-        }
     }
 
     [DataContract]

src/Sdk/DTWebApi/WebApi/JobTelemetry.cs

@@ -1,17 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.DistributedTask.WebApi
-{
-    /// <summary>
-    /// Information about a job run on the runner
-    /// </summary>
-    [DataContract]
-    public class JobTelemetry
-    {
-        [DataMember(EmitDefaultValue = false)]
-        public string Message { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public JobTelemetryType Type { get; set; }
-    }
-}

src/Sdk/DTWebApi/WebApi/JobTelemetryType.cs

@@ -1,13 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.DistributedTask.WebApi
-{
-    public enum JobTelemetryType
-    {
-        [EnumMember]
-        General = 0,
-
-        [EnumMember]
-        ActionCommand = 1,
-    }
-}

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

@@ -161,8 +161,7 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
                        "--work", _expectedWorkFolder,
                        "--auth", _expectedAuthType,
                        "--token", _expectedToken,
-                       "--labels", userLabels,
+                       "--labels", userLabels
-                       "--ephemeral",
                     });
                 trace.Info("Constructed.");
                 _store.Setup(x => x.IsConfigured()).Returns(false);
@@ -180,7 +179,6 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
                 Assert.True(s.AgentName.Equals(_expectedAgentName));
                 Assert.True(s.PoolId.Equals(_secondRunnerGroupId));
                 Assert.True(s.WorkFolder.Equals(_expectedWorkFolder));
-                Assert.True(s.Ephemeral.Equals(true));
 
                 // validate GetAgentPoolsAsync gets called twice with automation pool type
                 _runnerServer.Verify(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.Is<TaskAgentPoolType>(p => p == TaskAgentPoolType.Automation)), Times.Exactly(2));

src/Test/L0/Listener/JobDispatcherL0.cs

@@ -264,170 +264,6 @@ namespace GitHub.Runner.Common.Tests.Listener
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async void RenewJobRequestNewAgentNameUpdatesSettings()
-        {
-            //Arrange
-            using (var hc = new TestHostContext(this))
-            {
-                var count = 0;
-                var oldName = "OldName";
-                var newName = "NewName";
-                var oldSettings = new RunnerSettings { AgentName = oldName };
-                var reservedAgent = new TaskAgentReference { Name = newName };
-
-                var trace = hc.GetTrace(nameof(DispatcherRenewJobRequestStopOnJobTokenExpiredExceptions));
-                TaskCompletionSource<int> firstJobRequestRenewed = new TaskCompletionSource<int>();
-                CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-
-                var request = new Mock<TaskAgentJobRequest>();
-                request.Object.ReservedAgent = reservedAgent;
-                PropertyInfo lockUntilProperty = request.Object.GetType().GetProperty("LockedUntil", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-                Assert.NotNull(lockUntilProperty);
-                lockUntilProperty.SetValue(request.Object, DateTime.UtcNow.AddMinutes(5));
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                _configurationStore.Setup(x => x.GetSettings()).Returns(oldSettings);
-                _runnerServer.Setup(x => x.RenewAgentRequestAsync(It.IsAny<int>(), It.IsAny<long>(), It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
-                            .Returns(() =>
-                            {
-                                count++;
-                                if (count < 5)
-                                {
-                                    return Task.FromResult<TaskAgentJobRequest>(request.Object);
-                                }
-                                else if (count == 5 || count == 6 || count == 7)
-                                {
-                                    throw new TimeoutException("");
-                                }
-                                else
-                                {
-                                    cancellationTokenSource.Cancel();
-                                    return Task.FromResult<TaskAgentJobRequest>(request.Object);
-                                }
-                            });
-
-                var jobDispatcher = new JobDispatcher();
-                jobDispatcher.Initialize(hc);
-
-                // Act
-                await jobDispatcher.RenewJobRequestAsync(0, 0, Guid.Empty, Guid.NewGuid().ToString(), firstJobRequestRenewed, cancellationTokenSource.Token);
-
-                // Assert
-                _configurationStore.Verify(x => x.SaveSettings(It.Is<RunnerSettings>(settings => settings.AgentName == newName)), Times.Once);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async void RenewJobRequestSameAgentNameIgnored()
-        {
-            //Arrange
-            using (var hc = new TestHostContext(this))
-            {
-                var count = 0;
-                var oldName = "OldName";
-                var newName = "OldName";
-                var oldSettings = new RunnerSettings { AgentName = oldName };
-                var reservedAgent = new TaskAgentReference { Name = newName };
-
-                var trace = hc.GetTrace(nameof(DispatcherRenewJobRequestStopOnJobTokenExpiredExceptions));
-                TaskCompletionSource<int> firstJobRequestRenewed = new TaskCompletionSource<int>();
-                CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-
-                var request = new Mock<TaskAgentJobRequest>();
-                request.Object.ReservedAgent = reservedAgent;
-                PropertyInfo lockUntilProperty = request.Object.GetType().GetProperty("LockedUntil", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-                Assert.NotNull(lockUntilProperty);
-                lockUntilProperty.SetValue(request.Object, DateTime.UtcNow.AddMinutes(5));
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                _configurationStore.Setup(x => x.GetSettings()).Returns(oldSettings);
-                _runnerServer.Setup(x => x.RenewAgentRequestAsync(It.IsAny<int>(), It.IsAny<long>(), It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
-                            .Returns(() =>
-                            {
-                                count++;
-                                if (count < 5)
-                                {
-                                    return Task.FromResult<TaskAgentJobRequest>(request.Object);
-                                }
-                                else if (count == 5 || count == 6 || count == 7)
-                                {
-                                    throw new TimeoutException("");
-                                }
-                                else
-                                {
-                                    cancellationTokenSource.Cancel();
-                                    return Task.FromResult<TaskAgentJobRequest>(request.Object);
-                                }
-                            });
-                var jobDispatcher = new JobDispatcher();
-                jobDispatcher.Initialize(hc);
-
-                // Act
-                await jobDispatcher.RenewJobRequestAsync(0, 0, Guid.Empty, Guid.NewGuid().ToString(), firstJobRequestRenewed, cancellationTokenSource.Token);
-
-                // Assert
-                _configurationStore.Verify(x => x.SaveSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Runner")]
-        public async void RenewJobRequestNullAgentNameIgnored()
-        {
-            //Arrange
-            using (var hc = new TestHostContext(this))
-            {
-                var count = 0;
-                var oldName = "OldName";
-                var oldSettings = new RunnerSettings { AgentName = oldName };
-
-                var trace = hc.GetTrace(nameof(DispatcherRenewJobRequestStopOnJobTokenExpiredExceptions));
-                TaskCompletionSource<int> firstJobRequestRenewed = new TaskCompletionSource<int>();
-                CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-
-                var request = new Mock<TaskAgentJobRequest>();
-                PropertyInfo lockUntilProperty = request.Object.GetType().GetProperty("LockedUntil", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-                Assert.NotNull(lockUntilProperty);
-                lockUntilProperty.SetValue(request.Object, DateTime.UtcNow.AddMinutes(5));
-                hc.SetSingleton<IRunnerServer>(_runnerServer.Object);
-                hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
-                _configurationStore.Setup(x => x.GetSettings()).Returns(oldSettings);
-                _runnerServer.Setup(x => x.RenewAgentRequestAsync(It.IsAny<int>(), It.IsAny<long>(), It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
-                            .Returns(() =>
-                            {
-                                count++;
-                                if (count < 5)
-                                {
-                                    return Task.FromResult<TaskAgentJobRequest>(request.Object);
-                                }
-                                else if (count == 5 || count == 6 || count == 7)
-                                {
-                                    throw new TimeoutException("");
-                                }
-                                else
-                                {
-                                    cancellationTokenSource.Cancel();
-                                    return Task.FromResult<TaskAgentJobRequest>(request.Object);
-                                }
-                            });
-
-                var jobDispatcher = new JobDispatcher();
-                jobDispatcher.Initialize(hc);
-
-                // Act
-                await jobDispatcher.RenewJobRequestAsync(0, 0, Guid.Empty, Guid.NewGuid().ToString(), firstJobRequestRenewed, cancellationTokenSource.Token);
-
-                // Assert
-                _configurationStore.Verify(x => x.SaveSettings(It.IsAny<RunnerSettings>()), Times.Never);
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]

src/Test/L0/Listener/RunnerL0.cs

@@ -149,9 +149,6 @@ namespace GitHub.Runner.Common.Tests.Listener
                     _messageListener.Verify(x => x.CreateSessionAsync(It.IsAny<CancellationToken>()), Times.Once());
                     _messageListener.Verify(x => x.DeleteSessionAsync(), Times.Once());
                     _messageListener.Verify(x => x.DeleteMessageAsync(It.IsAny<TaskAgentMessage>()), Times.AtLeastOnce());
-
-                    // verify that we didn't try to delete local settings file (since we're not ephemeral)
-                    _configurationManager.Verify(x => x.DeleteLocalRunnerConfig(), Times.Never());
                 }
             }
         }
@@ -315,9 +312,6 @@ namespace GitHub.Runner.Common.Tests.Listener
                 _messageListener.Verify(x => x.CreateSessionAsync(It.IsAny<CancellationToken>()), Times.Once());
                 _messageListener.Verify(x => x.DeleteSessionAsync(), Times.Once());
                 _messageListener.Verify(x => x.DeleteMessageAsync(It.IsAny<TaskAgentMessage>()), Times.AtLeastOnce());
-
-                // verify that we did try to delete local settings file (since we're ephemeral)
-                _configurationManager.Verify(x => x.DeleteLocalRunnerConfig(), Times.Once());
             }
         }
 

src/Test/L0/Worker/ActionCommandManagerL0.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
-using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
 using GitHub.Runner.Worker.Container;
@@ -84,7 +83,6 @@ namespace GitHub.Runner.Common.Tests.Worker
         {
             using (TestHostContext hc = CreateTestContext())
             {
-                _ec.Setup(x => x.ExpressionValues).Returns(GetExpressionValues());
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
@@ -107,88 +105,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Theory]
-        [InlineData("stop-commands", "1")]
-        [InlineData("", "1")]
-        [InlineData("set-env", "1")]
-        [InlineData("stop-commands", "true")]
-        [InlineData("", "true")]
-        [InlineData("set-env", "true")]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void StopProcessCommand__AllowsInvalidStopTokens__IfEnvVarIsSet(string invalidToken, string allowUnsupportedStopCommandTokens)
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                _ec.Object.Global.EnvironmentVariables = new Dictionary<string, string>();
-                var expressionValues = new DictionaryContextData
-            {
-                ["env"] =
-#if OS_WINDOWS
-                        new DictionaryContextData{ { Constants.Variables.Actions.AllowUnsupportedStopCommandTokens, new StringContextData(allowUnsupportedStopCommandTokens) }}
-#else
-                        new CaseSensitiveDictionaryContextData{ { Constants.Variables.Actions.AllowUnsupportedStopCommandTokens, new StringContextData(allowUnsupportedStopCommandTokens) }}
-#endif
-            };
-                _ec.Setup(x => x.ExpressionValues).Returns(expressionValues);
-                _ec.Setup(x => x.JobTelemetry).Returns(new List<JobTelemetry>());
-
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, $"::stop-commands::{invalidToken}", null));
-            }
-        }
-
-        [Theory]
-        [InlineData("stop-commands")]
-        [InlineData("")]
-        [InlineData("set-env")]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void StopProcessCommand__FailOnInvalidStopTokens(string invalidToken)
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                _ec.Object.Global.EnvironmentVariables = new Dictionary<string, string>();
-                _ec.Setup(x => x.ExpressionValues).Returns(GetExpressionValues());
-                _ec.Setup(x => x.JobTelemetry).Returns(new List<JobTelemetry>());
-                Assert.Throws<Exception>(() => _commandManager.TryProcessCommand(_ec.Object, $"::stop-commands::{invalidToken}", null));
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void StopProcessCommandAcceptsValidToken()
-        {
-            var validToken = "randomToken";
-            using (TestHostContext hc = CreateTestContext())
-            {
-                _ec.Setup(x => x.ExpressionValues).Returns(GetExpressionValues());
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, $"::stop-commands::{validToken}", null));
-                Assert.False(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, $"::{validToken}::", null));
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void StopProcessCommandMasksValidTokenForEntireRun()
-        {
-            var validToken = "randomToken";
-            using (TestHostContext hc = CreateTestContext())
-            {
-                _ec.Setup(x => x.ExpressionValues).Returns(GetExpressionValues());
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, $"::stop-commands::{validToken}", null));
-                Assert.False(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
-                Assert.Equal("***", hc.SecretMasker.MaskSecrets(validToken));
-
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, $"::{validToken}::", null));
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
-                Assert.Equal("***", hc.SecretMasker.MaskSecrets(validToken));
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -459,19 +375,5 @@ namespace GitHub.Runner.Common.Tests.Worker
 
             return hostContext;
         }
-
-        private DictionaryContextData GetExpressionValues()
-        {
-            return new DictionaryContextData
-            {
-                ["env"] =
-#if OS_WINDOWS
-                        new DictionaryContextData()
-#else
-                        new CaseSensitiveDictionaryContextData()
-#endif
-            };
-        }
-
     }
 }

src/runnerversion

@@ -1 +1 @@
-2.283.3
+2.282.0