Update releaseVersion

* Temporary fix for macOS runner upgrade crash loop. (#1304)

* Typo fixed (#1289)

* Update error to say 'uninstall' not 'unconfigure' (#1179)

* Update error to say 'uninstall' not 'unconfigure'

* Say uninstall service in *nix config error msgs

Co-authored-by: Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com>

* Allow setting default severity to "notice" (#1213)

* Show More Step Information in composite Actions (#1279)

* Prepare 2.281.1 runner release. (#1305)

Co-authored-by: Daniel Asztalos <asztalosdani@users.noreply.github.com>
Co-authored-by: Nick Fields <50085412+nick-invision@users.noreply.github.com>
Co-authored-by: Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com>
Co-authored-by: Vladimir Panteleev <CyberShadow@users.noreply.github.com>
Co-authored-by: Thomas Boop <52323235+thboop@users.noreply.github.com>

.editorconfig

@@ -1,8 +0,0 @@
-# https://editorconfig.org/
-
-[*]
-insert_final_newline = true # ensure all files end with a single newline
-trim_trailing_whitespace = true # attempt to remove trailing whitespace on save
-
-[*.md]
-trim_trailing_whitespace = false # in markdown, "two trailing spaces" is unfortunately meaningful; it means `<br>`

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
           devScript: ./dev.sh
 
         - runtime: win-x64
-          os: windows-2019
+          os: windows-latest
           devScript: ./dev
 
     runs-on: ${{ matrix.os }}

.github/workflows/release.yml

@@ -72,7 +72,7 @@ jobs:
           devScript: ./dev.sh
 
         - runtime: win-x64
-          os: windows-2019
+          os: windows-latest
           devScript: ./dev
 
     runs-on: ${{ matrix.os }}
@@ -164,7 +164,6 @@ jobs:
         release_name: "v${{ steps.releaseNote.outputs.version }}"
         body: |
           ${{ steps.releaseNote.outputs.note }}
-        prerelease: true
 
     # Upload release assets
     - name: Upload Release Asset (win-x64)

docs/checks/network.md

@@ -2,19 +2,17 @@
 
 ### Common things that can cause the runner to not working properly
 
-- A bug in the runner or the dotnet framework that causes the actions runner to be unable to make Http requests in a certain network environment.
+- Bug in the runner or the dotnet framework that causes actions runner can't make Http request in a certain network environment.
 
-- A Proxy or Firewall may block certain HTTP method, such as blocking all POST and PUT calls which the runner will use to upload logs.
+- Proxy/Firewall block certain HTTP method, like it block all POST and PUT calls which the runner will use to upload logs.
 
-- A Proxy or Firewall may only allows requests with certain user-agent to pass through and the actions runner user-agent is not in the allow list.
+- Proxy/Firewall only allows requests with certain user-agent to pass through and the actions runner user-agent is not in the allow list.
 
-- A Proxy try to decrypt and exam HTTPS traffic for security purpose but cause the actions-runner to fail to finish SSL handshake due to the lack of trusting proxy's CA.
+- Proxy try to decrypt and exam HTTPS traffic for security purpose but cause the actions-runner to fail to finish SSL handshake due to the lack of trusting proxy's CA.
 
-- The SSL handshake may fail if the client and server do not support the same TLS version, or the same cipher suites.
+- Proxy try to modify the HTTPS request (like add or change some http headers) and causes the request become incompatible with the Actions Service (ASP.NetCore), Ex: [Nginx](https://github.com/dotnet/aspnetcore/issues/17081)
 
-- A Proxy may try to modify the HTTPS request (like add or change some http headers) and causes the request become incompatible with the Actions Service (ASP.NetCore), Ex: [Nginx](https://github.com/dotnet/aspnetcore/issues/17081)
-
-- Firewall rules that block action runner from accessing certain hosts, ex: `*.github.com`, `*.actions.githubusercontent.com`, etc
+- Firewall rules that block action runner from accessing certain hosts, ex: `*.github.com`, `*.actions.githubusercontent.com`, etc.
 
 
 ### Identify and solve these problems
@@ -32,31 +30,3 @@ Use a 3rd party tool to make the same requests as the runner did would be a good
 If the 3rd party tool is also experiencing the same error as the runner does, then you might want to contact your network administrator for help.
 
 Otherwise, contact GitHub customer support or log an issue at https://github.com/actions/runner
-
-### Troubleshooting: Why can't I configure a runner?
-
-If you are having trouble connecting, try these steps:
-
-1. Validate you can reach our endpoints from your web browser. If not, double check your local network connection
-    - For hosted Github:
-      - https://api.github.com/
-      - https://vstoken.actions.githubusercontent.com/_apis/health
-      - https://pipelines.actions.githubusercontent.com/_apis/health
-    - For GHES/GHAE
-      - https://myGHES.com/_services/vstoken/_apis/health
-      - https://myGHES.com/_services/pipelines/_apis/health
-      - https://myGHES.com/api/v3
-2. Validate you can reach those endpoints in powershell core
-    - The runner runs on .net core, lets validate the local settings for that stack
-    - Open up `pwsh`
-    - Run the command using the urls above `Invoke-WebRequest {url}`
-3. If not, get a packet trace using a tool like wireshark and start looking at the TLS handshake.
-    - If you see a Client Hello followed by a Server RST:
-      - You may need to configure your TLS settings to use the correct version
-        - You should support TLS version 1.2 or later
-      - You may need to configure your TLS settings to have up to date cipher suites, this may be solved by system updates and patches.
-        - Most notably, on windows server 2012 make sure [the tls cipher suite update](https://support.microsoft.com/en-us/topic/update-adds-new-tls-cipher-suites-and-changes-cipher-suite-priorities-in-windows-8-1-and-windows-server-2012-r2-8e395e43-c8ef-27d8-b60c-0fc57d526d94) is installed
-      - Your firewall, proxy or network configuration may be blocking the connection
-      - You will want to reach out to whoever is in charge of your network with these pcap files to further troubleshoot
-    - If you see a failure later in the handshake:
-      - Try the fix in the [SSLCert Fix](./sslcert.md)

releaseNote.md

@@ -1,11 +1,18 @@
 ## Features
 
+- Allow setting default severity to "notice" (#1213)
+- Show More Step Information in composite Actions (#1279)
+
 ## Bugs
 
-- Fixed an issue where container environment variables names or values could escape the docker command (#2108)
+- Temporary fix for macOS runner upgrade crash loop. (#1304)
+- Fixed an issue where GHES runners fail to download public docker images (#1199)
 
 ## Misc
 
+- Update error to say 'uninstall' not 'unconfigure' (#1179)
+- Typo fixed (#1289)
+
 ## 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.4
+2.281.1

scripts/delete.sh

@@ -51,7 +51,7 @@ fi
 # Ensure offline
 #--------------------------------------
 runner_status=$(curl -s -X GET ${base_api_url}/${runner_scope}/actions/runners?per_page=100  -H "accept: application/vnd.github.everest-preview+json" -H "authorization: token ${RUNNER_CFG_PAT}" \
-        | jq -M -j ".runners | .[] | select(.name == \"${runner_name}\") | .status")
+        | jq -M -j ".runners | .[] | [select(.name == \"${runner_name}\")] | .[0].status")
 
 if [ -z "${runner_status}" ]; then 
     fatal "Could not find runner with name ${runner_name}"
@@ -67,7 +67,7 @@ fi
 # Get id of runner to remove
 #--------------------------------------
 runner_id=$(curl -s -X GET ${base_api_url}/${runner_scope}/actions/runners?per_page=100  -H "accept: application/vnd.github.everest-preview+json" -H "authorization: token ${RUNNER_CFG_PAT}" \
-        | jq -M -j ".runners | .[] | select(.name == \"${runner_name}\") | .id")
+        | jq -M -j ".runners | .[] | [select(.name == \"${runner_name}\")] | .[0].id")
 
 if [ -z "${runner_id}" ]; then 
     fatal "Could not find runner with name ${runner_name}"

src/Misc/expressionFunc/hashFiles/package-lock.json

@@ -1947,9 +1947,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
     "path-type": {

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
-attemptedtargetedfix=0
+# fix upgrade issue with macOS
 currentplatform=$(uname | awk '{print tolower($0)}')
-if [[ "$currentplatform" == 'darwin'  && restartinteractiverunner -eq 0 ]]; then
-    # We needed a 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
-    # Otherwise mac gatekeeper kills the processes we spawn on creation as we are running a process with no backing file
-
-    # 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 [[ "$currentplatform" == 'darwin' ]]; then
+    # need a short-term fix for https://github.com/actions/runner/issues/743
+    # we will recreate all the ./externals/node12/bin/node of the past 5 versions
+    # v2.280.3 v2.280.2 v2.280.1 v2.279.0 v2.278.0
     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/ConfigurationStore.cs

@@ -33,9 +33,6 @@ namespace GitHub.Runner.Common
         [DataMember(EmitDefaultValue = false)]
         public string PoolName { get; set; }
 
-        [DataMember(EmitDefaultValue = false)]
-        public bool Ephemeral { get; set; }
-
         [DataMember(EmitDefaultValue = false)]
         public string ServerUrl { get; set; }
 

src/Runner.Common/Constants.cs

@@ -26,7 +26,6 @@ namespace GitHub.Runner.Common
         Certificates,
         Options,
         SetupInfo,
-        Telemetry
     }
 
     public static class Constants
@@ -126,10 +125,9 @@ namespace GitHub.Runner.Common
                 {
                     public static readonly string Check = "check";
                     public static readonly string Commit = "commit";
-                    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";
                     public static readonly string RunAsService = "runasservice";
                     public static readonly string Unattended = "unattended";
                     public static readonly string Version = "version";
@@ -155,7 +153,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 +212,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/JobServerQueue.cs

@@ -15,7 +15,6 @@ namespace GitHub.Runner.Common
     [ServiceLocator(Default = typeof(JobServerQueue))]
     public interface IJobServerQueue : IRunnerService, IThrottlingReporter
     {
-        TaskCompletionSource<int> JobRecordUpdated { get; }
         event EventHandler<ThrottlingEventArgs> JobServerQueueThrottling;
         Task ShutdownAsync();
         void Start(Pipelines.AgentJobRequestMessage jobRequest);
@@ -63,11 +62,8 @@ namespace GitHub.Runner.Common
         private IJobServer _jobServer;
         private Task[] _allDequeueTasks;
         private readonly TaskCompletionSource<int> _jobCompletionSource = new TaskCompletionSource<int>();
-        private readonly TaskCompletionSource<int> _jobRecordUpdated = new TaskCompletionSource<int>();
         private bool _queueInProcess = false;
 
-        public TaskCompletionSource<int> JobRecordUpdated => _jobRecordUpdated;
-
         public event EventHandler<ThrottlingEventArgs> JobServerQueueThrottling;
 
         // Web console dequeue will start with process queue every 250ms for the first 60*4 times (~60 seconds).
@@ -459,14 +455,6 @@ namespace GitHub.Runner.Common
                             {
                                 Trace.Verbose("Cleanup buffered timeline record for timeline: {0}.", update.TimelineId);
                             }
-
-                            if (!_jobRecordUpdated.Task.IsCompleted &&
-                                update.PendingRecords.Any(x => x.Id == _jobTimelineRecordId && x.State != null))
-                            {
-                                // We have changed the state of the job
-                                Trace.Info("Job timeline record has been updated for the first time.");
-                                _jobRecordUpdated.TrySetResult(0);
-                            }
                         }
                         catch (Exception ex)
                         {

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.Common/Terminal.cs

@@ -164,8 +164,9 @@ namespace GitHub.Runner.Common
             if (!Silent)
             {
                 Console.WriteLine();
-                Console.ResetColor();
+                Console.ForegroundColor = ConsoleColor.White;
                 Console.WriteLine($"# {message}");
+                Console.ResetColor();
                 Console.WriteLine();
             }
         }
@@ -176,8 +177,9 @@ namespace GitHub.Runner.Common
             {
                 Console.ForegroundColor = ConsoleColor.Green;
                 Console.Write("√ ");
-                Console.ResetColor();
+                Console.ForegroundColor = ConsoleColor.White;
                 Console.WriteLine(message);
+                Console.ResetColor();
             }
         }
 

src/Runner.Listener/CommandSettings.cs

@@ -29,11 +29,10 @@ namespace GitHub.Runner.Listener
         {
             Constants.Runner.CommandLine.Flags.Check,
             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.Once,
             Constants.Runner.CommandLine.Flags.Unattended,
             Constants.Runner.CommandLine.Flags.Version
         };
@@ -67,9 +66,7 @@ namespace GitHub.Runner.Listener
         public bool Help => TestFlag(Constants.Runner.CommandLine.Flags.Help);
         public bool Unattended => TestFlag(Constants.Runner.CommandLine.Flags.Unattended);
         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
         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();
     }
 
@@ -66,18 +65,18 @@ namespace GitHub.Runner.Listener.Configuration
         public async Task ConfigureAsync(CommandSettings command)
         {
             _term.WriteLine();
-            _term.WriteLine("--------------------------------------------------------------------------------");
-            _term.WriteLine("|        ____ _ _   _   _       _          _        _   _                      |");
-            _term.WriteLine("|       / ___(_) |_| | | |_   _| |__      / \\   ___| |_(_) ___  _ __  ___      |");
-            _term.WriteLine("|      | |  _| | __| |_| | | | | '_ \\    / _ \\ / __| __| |/ _ \\| '_ \\/ __|     |");
-            _term.WriteLine("|      | |_| | | |_|  _  | |_| | |_) |  / ___ \\ (__| |_| | (_) | | | \\__ \\     |");
-            _term.WriteLine("|       \\____|_|\\__|_| |_|\\__,_|_.__/  /_/   \\_\\___|\\__|_|\\___/|_| |_|___/     |");
-            _term.WriteLine("|                                                                              |");
-            _term.Write("|                       ");
+            _term.WriteLine("--------------------------------------------------------------------------------", ConsoleColor.White);
+            _term.WriteLine("|        ____ _ _   _   _       _          _        _   _                      |", ConsoleColor.White);
+            _term.WriteLine("|       / ___(_) |_| | | |_   _| |__      / \\   ___| |_(_) ___  _ __  ___      |", ConsoleColor.White);
+            _term.WriteLine("|      | |  _| | __| |_| | | | | '_ \\    / _ \\ / __| __| |/ _ \\| '_ \\/ __|     |", ConsoleColor.White);
+            _term.WriteLine("|      | |_| | | |_|  _  | |_| | |_) |  / ___ \\ (__| |_| | (_) | | | \\__ \\     |", ConsoleColor.White);
+            _term.WriteLine("|       \\____|_|\\__|_| |_|\\__,_|_.__/  /_/   \\_\\___|\\__|_|\\___/|_| |_|___/     |", ConsoleColor.White);
+            _term.WriteLine("|                                                                              |", ConsoleColor.White);
+            _term.Write("|                       ", ConsoleColor.White);
             _term.Write("Self-hosted runner registration", ConsoleColor.Cyan);
-            _term.WriteLine("                        |");
-            _term.WriteLine("|                                                                              |");
-            _term.WriteLine("--------------------------------------------------------------------------------");
+            _term.WriteLine("                        |", ConsoleColor.White);
+            _term.WriteLine("|                                                                              |", ConsoleColor.White);
+            _term.WriteLine("--------------------------------------------------------------------------------", ConsoleColor.White);
 
             Trace.Info(nameof(ConfigureAsync));
             if (IsConfigured())
@@ -196,7 +195,6 @@ namespace GitHub.Runner.Listener.Configuration
             TaskAgent agent;
             while (true)
             {
-                runnerSettings.Ephemeral = command.Ephemeral;
                 runnerSettings.AgentName = command.GetRunnerName();
 
                 _term.WriteLine();
@@ -213,7 +211,7 @@ namespace GitHub.Runner.Listener.Configuration
                     if (command.GetReplace())
                     {
                         // Update existing agent with new PublicKey, agent version.
-                        agent = UpdateExistingAgent(agent, publicKey, userLabels, runnerSettings.Ephemeral);
+                        agent = UpdateExistingAgent(agent, publicKey, userLabels);
 
                         try
                         {
@@ -236,7 +234,7 @@ namespace GitHub.Runner.Listener.Configuration
                 else
                 {
                     // Create a new agent.
-                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels, runnerSettings.Ephemeral);
+                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels);
 
                     try
                     {
@@ -330,38 +328,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 +381,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 +390,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 +401,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)
             {
@@ -466,7 +456,7 @@ namespace GitHub.Runner.Listener.Configuration
         }
 
 
-        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral)
+        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels)
         {
             ArgUtil.NotNull(agent, nameof(agent));
             agent.Authorization = new TaskAgentAuthorization
@@ -477,8 +467,6 @@ namespace GitHub.Runner.Listener.Configuration
             // update should replace the existing labels
             agent.Version = BuildConstants.RunnerPackage.Version;
             agent.OSDescription = RuntimeInformation.OSDescription;
-            agent.Ephemeral = ephemeral;
-            agent.MaxParallelism = 1;
 
             agent.Labels.Clear();
 
@@ -494,7 +482,7 @@ namespace GitHub.Runner.Listener.Configuration
             return agent;
         }
 
-        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral)
+        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels)
         {
             TaskAgent agent = new TaskAgent(agentName)
             {
@@ -505,7 +493,6 @@ namespace GitHub.Runner.Listener.Configuration
                 MaxParallelism = 1,
                 Version = BuildConstants.RunnerPackage.Version,
                 OSDescription = RuntimeInformation.OSDescription,
-                Ephemeral = ephemeral,
             };
 
             agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));

src/Runner.Listener/Configuration/PromptManager.cs

@@ -85,7 +85,7 @@ namespace GitHub.Runner.Listener.Configuration
             while (true)
             {
                 // Write the message prompt.
-                _terminal.Write($"{description} ");
+                _terminal.Write($"{description} ", ConsoleColor.White);
 
                 if(!string.IsNullOrEmpty(defaultValue))
                 {

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;
-
-        IConfigurationStore _configurationStore;
-
-        RunnerSettings _runnerSettings;
+        RunnerSettings _runnerSetting;
         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>();
-            _runnerSettings = _configurationStore.GetSettings();
-            _poolId = _runnerSettings.PoolId;
+            var configurationStore = hostContext.GetService<IConfigurationStore>();
+            _runnerSetting = configurationStore.GetSettings();
+            _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/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);
                 }
                 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();
@@ -476,24 +466,10 @@ namespace GitHub.Runner.Listener
                         await jobDispatcher.ShutdownAsync();
                     }
 
-                    try
-                    {
+                    //TODO: make sure we don't mask more important exception
                     await _listener.DeleteSessionAsync();
-                    }
-                    catch (Exception ex) when (runOnce)
-                    {
-                        // ignore exception during delete session for ephemeral runner since the runner might already be deleted from the server side
-                        // and the delete session call will ends up with 401.
-                        Trace.Info($"Ignore any exception during DeleteSession for an ephemeral runner. {ex}");
-                    }
 
                     messageQueueLoopTokenSource.Dispose();
-
-                    if (settings.Ephemeral && runOnceJobCompleted)
-                    {
-                        var configManager = HostContext.GetService<IConfigurationManager>();
-                        configManager.DeleteLocalRunnerConfig();
-                    }
                 }
             }
             catch (TaskAgentAccessTokenExpiredException)
@@ -536,9 +512,7 @@ Config Options:
  --labels string        Extra labels in addition to the default: 'self-hosted,{Constants.Runner.Platform},{Constants.Runner.PlatformArchitecture}'
  --work string          Relative runner work directory (default {Constants.Path.WorkDirectory})
  --replace              Replace any existing runner with the same name (default false)
- --pat                  GitHub personal access token used for checking network connectivity when executing `.{separator}run.{ext} --check`
- --ephemeral            Configure the runner to only take one job and then let the service un-configure the runner after the job finishes (default false)");
-
+ --pat                  GitHub personal access token used for checking network connectivity when executing `.{separator}run.{ext} --check`");
 #if OS_WINDOWS
     _term.WriteLine($@" --runasservice   Run the runner as a service");
     _term.WriteLine($@" --windowslogonaccount string   Account to run the service as. Requires runasservice");

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)
-        {
-#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)
-        {
+        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
-                    // 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))
+                    if (attempt < 3)
                     {
                         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/Container/DockerCommandManager.cs

@@ -131,11 +131,11 @@ namespace GitHub.Runner.Worker.Container
             {
                 if (String.IsNullOrEmpty(env.Value))
                 {
-                    dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key));
+                    dockerOptions.Add($"-e \"{env.Key}\"");
                 }
                 else
                 {
-                    dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key, env.Value));
+                    dockerOptions.Add($"-e \"{env.Key}={env.Value.Replace("\"", "\\\"")}\"");
                 }
             }
 
@@ -202,7 +202,7 @@ namespace GitHub.Runner.Worker.Container
             {
                 // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing
                 // the value directly in the command
-                dockerOptions.Add(DockerUtil.CreateEscapedOption("-e", env.Key));
+                dockerOptions.Add($"-e {env.Key}");
             }
 
             // Watermark for GitHub Action environment

src/Runner.Worker/Container/DockerUtil.cs

@@ -6,9 +6,6 @@ namespace GitHub.Runner.Worker.Container
 {
     public class DockerUtil
     {
-        private static readonly Regex QuoteEscape = new Regex(@"(\\*)" + "\"", RegexOptions.Compiled);
-        private static readonly Regex EndOfStringEscape = new Regex(@"(\\+)$", RegexOptions.Compiled);
-
         public static List<PortMapping> ParseDockerPort(IList<string> portMappingLines)
         {
             const string targetPort = "targetPort";
@@ -20,7 +17,7 @@ namespace GitHub.Runner.Worker.Container
             string pattern = $"^(?<{targetPort}>\\d+)/(?<{proto}>\\w+) -> (?<{host}>.+):(?<{hostPort}>\\d+)$";
 
             List<PortMapping> portMappings = new List<PortMapping>();
-            foreach (var line in portMappingLines)
+            foreach(var line in portMappingLines)
             {
                 Match m = Regex.Match(line, pattern, RegexOptions.None, TimeSpan.FromSeconds(1));
                 if (m.Success)
@@ -64,44 +61,5 @@ namespace GitHub.Runner.Worker.Container
             }
             return "";
         }
-
-        public static string CreateEscapedOption(string flag, string key)
-        {
-            if (String.IsNullOrEmpty(key))
-            {
-                return "";
-            }
-            return $"{flag} {EscapeString(key)}";
-        }
-
-        public static string CreateEscapedOption(string flag, string key, string value)
-        {
-            if (String.IsNullOrEmpty(key))
-            {
-                return "";
-            }
-            var escapedString = EscapeString($"{key}={value}");
-            return $"{flag} {escapedString}";
-        }
-
-        private static string EscapeString(string value)
-        {
-            if (String.IsNullOrEmpty(value))
-            {
-                return "";
-            }
-            // Dotnet escaping rules are weird here, we can only escape \ if it precedes a "
-            // If a double quotation mark follows two or an even number of backslashes, each proceeding backslash pair is replaced with one backslash and the double quotation mark is removed.
-            // If a double quotation mark follows an odd number of backslashes, including just one, each preceding pair is replaced with one backslash and the remaining backslash is removed; however, in this case the double quotation mark is not removed.
-            // https://docs.microsoft.com/en-us/dotnet/api/system.environment.getcommandlineargs?redirectedfrom=MSDN&view=net-6.0#remarks
-
-            // First, find any \ followed by a " and double the number of \ + 1.
-             value = QuoteEscape.Replace(value, @"$1$1\" + "\"");
-            // Next, what if it ends in `\`, it would escape the end quote. So, we need to detect that at the end of the string and perform the same escape
-            // Luckily, we can just use the $ character with detects the end of string in regex
-            value = EndOfStringEscape.Replace(value, @"$1$1");
-            // Finally, wrap it in quotes
-            return $"\"{value}\"";
-        }
     }
 }

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/GitHubContext.cs

@@ -26,7 +26,6 @@ namespace GitHub.Runner.Worker
             "repository",
             "repository_owner",
             "retention_days",
-            "run_attempt",
             "run_id",
             "run_number",
             "server_url",

src/Runner.Worker/Handlers/StepHost.cs

@@ -188,7 +188,7 @@ namespace GitHub.Runner.Worker.Handlers
             {
                 // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing
                 // the value directly in the command
-                dockerCommandArgs.Add(DockerUtil.CreateEscapedOption("-e", env.Key));
+                dockerCommandArgs.Add($"-e {env.Key}");
             }
             if (!string.IsNullOrEmpty(PrependPath))
             {

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);
@@ -149,16 +145,6 @@ namespace GitHub.Runner.Worker
                 Trace.Verbose($"Job steps: '{string.Join(", ", jobSteps.Select(x => x.DisplayName))}'");
                 HostContext.WritePerfCounter($"WorkerJobInitialized_{message.RequestId.ToString()}");
 
-                if (systemConnection.Data.TryGetValue("GenerateIdTokenUrl", out var generateIdTokenUrl) &&
-                    !string.IsNullOrEmpty(generateIdTokenUrl))
-                {
-                    // Server won't issue ID_TOKEN for non-inprogress job.
-                    // If the job is trying to use OIDC feature, we want the job to be marked as in-progress before running any customer's steps as much as we can.
-                    // Timeline record update background process runs every 500ms, so delay 1000ms is enough for most of the cases
-                    Trace.Info($"Waiting for job to be marked as started.");
-                    await Task.WhenAny(_jobServerQueue.JobRecordUpdated.Task, Task.Delay(1000));
-                }
-
                 // Run all job steps
                 Trace.Info("Run all job steps.");
                 var stepsRunner = HostContext.GetService<IStepsRunner>();
@@ -229,15 +215,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 +260,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/Sdk/DTWebApi/WebApi/TaskAgentReference.cs

@@ -24,7 +24,6 @@ namespace GitHub.DistributedTask.WebApi
             this.OSDescription = referenceToBeCloned.OSDescription;
             this.ProvisioningState = referenceToBeCloned.ProvisioningState;
             this.AccessPoint = referenceToBeCloned.AccessPoint;
-            this.Ephemeral = referenceToBeCloned.Ephemeral;
 
             if (referenceToBeCloned.m_links != null)
             {
@@ -82,16 +81,6 @@ namespace GitHub.DistributedTask.WebApi
             set;
         }
 
-        /// <summary>
-        /// Signifies that this Agent can only run one job and will be removed by the server after that one job finish.
-        /// </summary>
-        [DataMember]
-        public bool? Ephemeral
-        {
-            get;
-            set;
-        }
-
         /// <summary>
         /// Whether or not the agent is online.
         /// </summary>

src/Test/L0/Container/DockerUtilL0.cs

@@ -144,54 +144,5 @@ namespace GitHub.Runner.Common.Tests.Worker.Container
             var actual = DockerUtil.ParseRegistryHostnameFromImageName(input);
             Assert.Equal(expected, actual);
         }
-
-        [Theory]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        [InlineData("", "")]
-        [InlineData("foo", "foo")]
-        [InlineData("foo \\ bar", "foo \\ bar")]
-        [InlineData("foo \\", "foo \\\\")]
-        [InlineData("foo \\\\", "foo \\\\\\\\")]
-        [InlineData("foo \\\" bar", "foo \\\\\\\" bar")]
-        [InlineData("foo \\\\\" bar", "foo \\\\\\\\\\\" bar")]
-        public void CreateEscapedOption_keyOnly(string input, string escaped)
-        {
-            var flag = "--example";
-            var actual = DockerUtil.CreateEscapedOption(flag, input);
-            string expected;
-            if (String.IsNullOrEmpty(input))
-            {
-                expected = "";
-            }
-            else
-            {
-                expected = $"{flag} \"{escaped}\"";
-            }
-            Assert.Equal(expected, actual);
-        }
-
-        [Theory]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        [InlineData("foo", "bar", "foo=bar")]
-        [InlineData("foo\\", "bar", "foo\\=bar")]
-        [InlineData("foo\\", "bar\\", "foo\\=bar\\\\")]
-        [InlineData("foo \\","bar \\", "foo \\=bar \\\\")]
-        public void CreateEscapedOption_keyValue(string keyInput, string valueInput, string escapedString)
-        {
-            var flag = "--example";
-            var actual = DockerUtil.CreateEscapedOption(flag, keyInput, valueInput);
-            string expected;
-            if (String.IsNullOrEmpty(keyInput))
-            {
-                expected = "";
-            }
-            else
-            {
-                expected = $"{flag} \"{escapedString}\"";
-            }
-            Assert.Equal(expected, actual);
-        }
     }
 }

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,
-                       "--ephemeral",
+                       "--labels", userLabels
                     });
                 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());
                 }
             }
         }
@@ -246,8 +243,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
                 {
-                    PoolId = 43242,
-                    Ephemeral = true
+                    PoolId = 43242
                 };
 
                 var message = new TaskAgentMessage()
@@ -298,7 +294,7 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                 //Act
-                var command = new CommandSettings(hc, new string[] { "run" });
+                var command = new CommandSettings(hc, new string[] { "run", "--once" });
                 Task<int> runnerTask = runner.ExecuteCommand(command);
 
                 //Assert
@@ -315,9 +311,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());
             }
         }
 
@@ -339,8 +332,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
                 {
-                    PoolId = 43242,
-                    Ephemeral = true
+                    PoolId = 43242
                 };
 
                 var message1 = new TaskAgentMessage()
@@ -398,7 +390,7 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                 //Act
-                var command = new CommandSettings(hc, new string[] { "run" });
+                var command = new CommandSettings(hc, new string[] { "run", "--once" });
                 Task<int> runnerTask = runner.ExecuteCommand(command);
 
                 //Assert
@@ -439,8 +431,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 var settings = new RunnerSettings
                 {
                     PoolId = 43242,
-                    AgentId = 5678,
-                    Ephemeral = true
+                    AgentId = 5678
                 };
 
                 var message1 = new TaskAgentMessage()
@@ -484,7 +475,7 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                 //Act
-                var command = new CommandSettings(hc, new string[] { "run" });
+                var command = new CommandSettings(hc, new string[] { "run", "--once" });
                 Task<int> runnerTask = runner.ExecuteCommand(command);
 
                 //Assert

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")]
@@ -286,7 +202,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                                 return 1;
                             });
 
-                var registeredCommands = new HashSet<string>(new string[1] { "warning" });
+                var registeredCommands = new HashSet<string>(new string[1]{ "warning" });
                 ActionCommand command;
                 
                 // Columns when lines are different
@@ -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.4
+2.281.1