Update runnerversion

* Update GitHub API URL

* pr comments

* Updated GitHub API URL

.github/workflows/build.yml

@@ -43,14 +43,6 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    # Set Path workaround for https://github.com/actions/virtual-environments/issues/263
-    - run: |
-        echo "::add-path::C:\Program Files\Git\mingw64\bin"
-        echo "::add-path::C:\Program Files\Git\usr\bin"
-        echo "::add-path::C:\Program Files\Git\bin"
-      if: matrix.os == 'windows-latest'
-      name: "Temp step to Set Path for Windows"
-
     # Build runner layout
     - name: Build & Layout Release
       run: |

src/Runner.Common/HostContext.cs

@@ -83,7 +83,6 @@ namespace GitHub.Runner.Common
             _loadContext.Unloading += LoadContext_Unloading;
 
             this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscape);
-            this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeTrimmed);
             this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeShift1);
             this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeShift2);
             this.SecretMasker.AddValueEncoder(ValueEncoders.ExpressionStringEscape);

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -1,19 +1,18 @@
 using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
+using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.OAuth;
 using GitHub.Services.WebApi;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-using System.Runtime.InteropServices;
-using GitHub.Runner.Common;
-using GitHub.Runner.Sdk;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
 
 namespace GitHub.Runner.Listener.Configuration
 {
@@ -277,12 +276,15 @@ namespace GitHub.Runner.Listener.Configuration
                 throw new NotSupportedException("Message queue listen OAuth token.");
             }
 
-            // Testing agent connection, detect any protential connection issue, like local clock skew that cause OAuth token expired.
+            // Testing agent connection, detect any potential connection issue, like local clock skew that cause OAuth token expired.
             var credMgr = HostContext.GetService<ICredentialManager>();
             VssCredentials credential = credMgr.LoadCredentials();
             try
             {
                 await _runnerServer.ConnectAsync(new Uri(runnerSettings.ServerUrl), credential);
+                // ConnectAsync() hits _apis/connectionData which is an anonymous endpoint
+                // Need to hit an authenticate endpoint to trigger OAuth token exchange.
+                await _runnerServer.GetAgentPoolsAsync();
                 _term.WriteSuccessMessage("Runner connection is good");
             }
             catch (VssOAuthTokenRequestException ex) when (ex.Message.Contains("Current server time is"))
@@ -519,15 +521,20 @@ namespace GitHub.Runner.Listener.Configuration
 
         private async Task<GitHubAuthResult> GetTenantCredential(string githubUrl, string githubToken)
         {
-            var gitHubUrl = new UriBuilder(githubUrl);
-            var githubApiUrl = $"https://api.{gitHubUrl.Host}/repos/{gitHubUrl.Path.Trim('/')}/actions-runners/registration";
+            var gitHubUrlBuilder = new UriBuilder(githubUrl);
+            var githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/actions/runner-registration";
             using (var httpClientHandler = HostContext.CreateHttpClientHandler())
             using (var httpClient = new HttpClient(httpClientHandler))
             {
                 httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("RemoteAuth", githubToken);
                 httpClient.DefaultRequestHeaders.UserAgent.Add(HostContext.UserAgent);
-                httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github.shuri-preview+json"));
-                var response = await httpClient.PostAsync(githubApiUrl, new StringContent("", null, "application/json"));
+
+                var bodyObject = new Dictionary<string, string>()
+                {
+                    {"url", githubUrl}
+                };
+
+                var response = await httpClient.PostAsync(githubApiUrl, new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json"));
 
                 if (response.IsSuccessStatusCode)
                 {

src/Runner.Worker/ActionCommandManager.cs

@@ -1,6 +1,7 @@
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
+using GitHub.Runner.Worker.Container;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -15,14 +16,14 @@ namespace GitHub.Runner.Worker
     {
         void EnablePluginInternalCommand();
         void DisablePluginInternalCommand();
-        bool TryProcessCommand(IExecutionContext context, string input);
+        bool TryProcessCommand(IExecutionContext context, string input, ContainerInfo container);
     }
 
     public sealed class ActionCommandManager : RunnerService, IActionCommandManager
     {
         private const string _stopCommand = "stop-commands";
         private readonly Dictionary<string, IActionCommandExtension> _commandExtensions = new Dictionary<string, IActionCommandExtension>(StringComparer.OrdinalIgnoreCase);
-        private HashSet<string> _registeredCommands = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private readonly HashSet<string> _registeredCommands = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private readonly object _commandSerializeLock = new object();
         private bool _stopProcessCommand = false;
         private string _stopToken = null;
@@ -58,7 +59,7 @@ namespace GitHub.Runner.Worker
             _registeredCommands.Remove("internal-set-repo-path");
         }
 
-        public bool TryProcessCommand(IExecutionContext context, string input)
+        public bool TryProcessCommand(IExecutionContext context, string input, ContainerInfo container)
         {
             if (string.IsNullOrEmpty(input))
             {
@@ -114,7 +115,7 @@ namespace GitHub.Runner.Worker
 
                         try
                         {
-                            extension.ProcessCommand(context, input, actionCommand);
+                            extension.ProcessCommand(context, input, actionCommand, container);
                         }
                         catch (Exception ex)
                         {
@@ -140,7 +141,7 @@ namespace GitHub.Runner.Worker
         string Command { get; }
         bool OmitEcho { get; }
 
-        void ProcessCommand(IExecutionContext context, string line, ActionCommand command);
+        void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container);
     }
 
     public sealed class InternalPluginSetRepoPathCommandExtension : RunnerService, IActionCommandExtension
@@ -150,7 +151,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             if (!command.Properties.TryGetValue(SetRepoPathCommandProperties.repoFullName, out string repoFullName) || string.IsNullOrEmpty(repoFullName))
             {
@@ -180,7 +181,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             if (!command.Properties.TryGetValue(SetEnvCommandProperties.Name, out string envName) || string.IsNullOrEmpty(envName))
             {
@@ -205,7 +206,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             if (!command.Properties.TryGetValue(SetOutputCommandProperties.Name, out string outputName) || string.IsNullOrEmpty(outputName))
             {
@@ -229,7 +230,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             if (!command.Properties.TryGetValue(SaveStateCommandProperties.Name, out string stateName) || string.IsNullOrEmpty(stateName))
             {
@@ -253,7 +254,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             if (string.IsNullOrWhiteSpace(command.Data))
             {
@@ -279,7 +280,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             ArgUtil.NotNullOrEmpty(command.Data, "path");
             context.PrependPath.RemoveAll(x => string.Equals(x, command.Data, StringComparison.CurrentCulture));
@@ -294,7 +295,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             var file = command.Data;
 
@@ -306,9 +307,9 @@ namespace GitHub.Runner.Worker
             }
 
             // Translate file path back from container path
-            if (context.Container != null)
+            if (container != null)
             {
-                file = context.Container.TranslateToHostPath(file);
+                file = container.TranslateToHostPath(file);
             }
 
             // Root the path
@@ -341,7 +342,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             command.Properties.TryGetValue(RemoveMatcherCommandProperties.Owner, out string owner);
             var file = command.Data;
@@ -369,9 +370,9 @@ namespace GitHub.Runner.Worker
             else
             {
                 // Translate file path back from container path
-                if (context.Container != null)
+                if (container != null)
                 {
-                    file = context.Container.TranslateToHostPath(file);
+                    file = container.TranslateToHostPath(file);
                 }
 
                 // Root the path
@@ -409,7 +410,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command, ContainerInfo container)
         {
             context.Debug(command.Data);
         }
@@ -437,7 +438,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command, ContainerInfo container)
         {
             command.Properties.TryGetValue(IssueCommandProperties.File, out string file);
             command.Properties.TryGetValue(IssueCommandProperties.Line, out string line);
@@ -454,10 +455,10 @@ namespace GitHub.Runner.Worker
             {
                 issue.Category = "Code";
 
-                if (context.Container != null)
+                if (container != null)
                 {
                     // Translate file path back from container path
-                    file = context.Container.TranslateToHostPath(file);
+                    file = container.TranslateToHostPath(file);
                     command.Properties[IssueCommandProperties.File] = file;
                 }
 
@@ -517,7 +518,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             var data = this is GroupCommandExtension ? command.Data : string.Empty;
             context.Output($"##[{Command}]{data}");
@@ -531,7 +532,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
         {
             ArgUtil.NotNullOrEmpty(command.Data, "value");
 

src/Runner.Worker/Handlers/OutputManager.cs

@@ -84,7 +84,7 @@ namespace GitHub.Runner.Worker.Handlers
             {
                 // This does not need to be inside of a critical section.
                 // The logging queues and command handlers are thread-safe.
-                if (_commandManager.TryProcessCommand(_executionContext, line))
+                if (_commandManager.TryProcessCommand(_executionContext, line, _container))
                 {
                     return;
                 }

src/Sdk/DTLogging/Logging/ValueEncoders.cs

@@ -16,11 +16,6 @@ namespace GitHub.DistributedTask.Logging
         {
             return Convert.ToBase64String(Encoding.UTF8.GetBytes(value));
         }
-        
-        public static String Base64StringEscapeTrimmed(String value)
-        {
-            return TrimBase64End(Convert.ToBase64String(Encoding.UTF8.GetBytes(value)));
-        }
 
         // Base64 is 6 bits -> char
         // A byte is 8 bits
@@ -72,15 +67,15 @@ namespace GitHub.DistributedTask.Logging
             {
                 var shiftArray = new byte[bytes.Length - shift];
                 Array.Copy(bytes, shift, shiftArray, 0, bytes.Length - shift);
-                return TrimBase64End(Convert.ToBase64String(shiftArray));
+                return Convert.ToBase64String(shiftArray);
             }
             else
             {
-                return TrimBase64End(Convert.ToBase64String(bytes));
+                return Convert.ToBase64String(bytes);
             }
         }
 
-        public static String UriDataEscape(
+        private static String UriDataEscape(
             String value,
             Int32 maxSegmentSize)
         {
@@ -108,26 +103,5 @@ namespace GitHub.DistributedTask.Logging
 
             return result.ToString();
         }
-
-        private static String TrimBase64End(String value)
-        {
-            if (String.IsNullOrEmpty(value))
-            {
-                return String.Empty;
-            }
-            if (value.EndsWith('='))
-            {
-                var trimmed = value.TrimEnd('=');
-                if (trimmed.Length > 1)
-                {
-                    // If a base64 string ends in '=' it indicates that the base 64 character is only using 2 or 4 of the six bytes and will change if another character is added
-                    // For example 'ab' is 'YWI=' in base 64
-                    // 'abc' is 'YWJj'
-                    // We need to detect YW, not YWI so we trim the last character ('I')
-                    return trimmed.Substring(0, trimmed.Length - 1);
-                }
-            }
-            return value;
-        }
     }
 }

src/Test/L0/HostContextL0.cs

@@ -93,21 +93,12 @@ namespace GitHub.Runner.Common.Tests
                 Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Pass%20word%20123%21123"));
                 Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Pass<word>123!123"));
                 Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Pass''word''123!123"));
-                Assert.Equal("OlBh***Q==", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($":Password123!"))));
-                Assert.Equal("YTpQ***E=", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"a:Password123!"))));
+                Assert.Equal("OlBh***", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($":Password123!"))));
+                Assert.Equal("YTpQ***", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"a:Password123!"))));
                 Assert.Equal("YWI6***", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"ab:Password123!"))));
-                Assert.Equal("YWJjOlBh***Q==", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"abc:Password123!"))));
-                Assert.Equal("YWJjZDpQ***E=", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"abcd:Password123!"))));
+                Assert.Equal("YWJjOlBh***", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"abc:Password123!"))));
+                Assert.Equal("YWJjZDpQ***", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"abcd:Password123!"))));
                 Assert.Equal("YWJjZGU6***", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"abcde:Password123!"))));
-                Assert.Equal("***Og==", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"Password123!:"))));
-                Assert.Equal("***OmE=", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"Password123!:a"))));
-                Assert.Equal("***OmFi", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"Password123!:ab"))));
-                Assert.Equal("***OmFiYw==", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"Password123!:abc"))));
-                Assert.Equal("***OmFiY2Q=", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"Password123!:abcd"))));
-                Assert.Equal("***OmFiY2Rl", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"Password123!:abcde"))));
-                Assert.Equal("OlBh***To=", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($":Password123!:"))));
-                Assert.Equal("YTpQ***E6YQ==", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"a:Password123!:a"))));
-                Assert.Equal("YWJjOlBh***Tph", _hc.SecretMasker.MaskSecrets(Convert.ToBase64String(Encoding.UTF8.GetBytes($"abc:Password123!:a"))));
             }
             finally
             {

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

@@ -175,8 +175,8 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
                 Assert.True(s.PoolId.Equals(_expectedPoolId));
                 Assert.True(s.WorkFolder.Equals(_expectedWorkFolder));
 
-                // validate GetAgentPoolsAsync gets called once with automation pool type
-                _runnerServer.Verify(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.Is<TaskAgentPoolType>(p => p == TaskAgentPoolType.Automation)), Times.Once);
+                // 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));
 
                 _runnerServer.Verify(x => x.AddAgentAsync(It.IsAny<int>(), It.Is<TaskAgent>(a => a.Labels.Contains("self-hosted") && a.Labels.Contains(VarUtil.OS) && a.Labels.Contains(VarUtil.OSArchitecture))), Times.Once);
             }

src/Test/L0/Worker/ActionCommandManagerL0.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Runtime.CompilerServices;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
+using GitHub.Runner.Worker.Container;
 using Moq;
 using Xunit;
 using Pipelines = GitHub.DistributedTask.Pipelines;
@@ -11,47 +13,35 @@ namespace GitHub.Runner.Common.Tests.Worker
 {
     public sealed class ActionCommandManagerL0
     {
+        private ActionCommandManager _commandManager;
+        private Mock<IExecutionContext> _ec;
+        private Mock<IExtensionManager> _extensionManager;
+        private Mock<IPipelineDirectoryManager> _pipelineDirectoryManager;
+
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void EnablePluginInternalCommand()
         {
-            using (TestHostContext _hc = new TestHostContext(this))
+            using (TestHostContext hc = CreateTestContext())
             {
-                var extensionManger = new Mock<IExtensionManager>();
-                var directoryManager = new Mock<IPipelineDirectoryManager>();
-
-                var pluginCommand = new InternalPluginSetRepoPathCommandExtension();
-                pluginCommand.Initialize(_hc);
-
-                var envCommand = new SetEnvCommandExtension();
-                envCommand.Initialize(_hc);
-
-                extensionManger.Setup(x => x.GetExtensions<IActionCommandExtension>())
-                               .Returns(new List<IActionCommandExtension>() { pluginCommand, envCommand });
-                _hc.SetSingleton<IExtensionManager>(extensionManger.Object);
-                _hc.SetSingleton<IPipelineDirectoryManager>(directoryManager.Object);
-
-                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                _hc.GetTrace().Info($"{tag} {line}");
+                                hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
                 _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
                    .Callback((Issue issue, string message) =>
                    {
-                       _hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
                    });
-                ActionCommandManager commandManager = new ActionCommandManager();
-                commandManager.Initialize(_hc);
 
-                commandManager.EnablePluginInternalCommand();
+                _commandManager.EnablePluginInternalCommand();
 
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath", null));
 
-                directoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
+                _pipelineDirectoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
             }
         }
 
@@ -60,47 +50,29 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void DisablePluginInternalCommand()
         {
-            using (TestHostContext _hc = new TestHostContext(this))
+            using (TestHostContext hc = CreateTestContext())
             {
-                var extensionManger = new Mock<IExtensionManager>();
-                var directoryManager = new Mock<IPipelineDirectoryManager>();
-
-                var pluginCommand = new InternalPluginSetRepoPathCommandExtension();
-                pluginCommand.Initialize(_hc);
-
-                var envCommand = new SetEnvCommandExtension();
-                envCommand.Initialize(_hc);
-
-                extensionManger.Setup(x => x.GetExtensions<IActionCommandExtension>())
-                               .Returns(new List<IActionCommandExtension>() { pluginCommand, envCommand });
-
-                _hc.SetSingleton<IExtensionManager>(extensionManger.Object);
-                _hc.SetSingleton<IPipelineDirectoryManager>(directoryManager.Object);
-
-                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                _hc.GetTrace().Info($"{tag} {line}");
+                                hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
                 _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
                    .Callback((Issue issue, string message) =>
                    {
-                       _hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
                    });
-                ActionCommandManager commandManager = new ActionCommandManager();
-                commandManager.Initialize(_hc);
 
-                commandManager.EnablePluginInternalCommand();
+                _commandManager.EnablePluginInternalCommand();
 
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath", null));
 
-                commandManager.DisablePluginInternalCommand();
+                _commandManager.DisablePluginInternalCommand();
 
-                Assert.False(commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath"));
+                Assert.False(_commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath", null));
 
-                directoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
+                _pipelineDirectoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
             }
         }
 
@@ -109,42 +81,27 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void StopProcessCommand()
         {
-            using (TestHostContext _hc = new TestHostContext(this))
+            using (TestHostContext hc = CreateTestContext())
             {
-                var extensionManger = new Mock<IExtensionManager>();
-                var pluginCommand = new InternalPluginSetRepoPathCommandExtension();
-                pluginCommand.Initialize(_hc);
-
-                var envCommand = new SetEnvCommandExtension();
-                envCommand.Initialize(_hc);
-
-                extensionManger.Setup(x => x.GetExtensions<IActionCommandExtension>())
-                               .Returns(new List<IActionCommandExtension>() { pluginCommand, envCommand });
-                _hc.SetSingleton<IExtensionManager>(extensionManger.Object);
-
-                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                _hc.GetTrace().Info($"{tag} {line}");
+                                hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
 
                 _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
                    .Callback((Issue issue, string message) =>
                    {
-                       _hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
                    });
 
                 _ec.Setup(x => x.EnvironmentVariables).Returns(new Dictionary<string, string>());
 
-                ActionCommandManager commandManager = new ActionCommandManager();
-                commandManager.Initialize(_hc);
-
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[stop-commands]stopToken"));
-                Assert.False(commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar"));
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[stopToken]"));
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[stop-commands]stopToken", null));
+                Assert.False(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[stopToken]", null));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
             }
         }
 
@@ -153,41 +110,29 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void EchoProcessCommand()
         {
-            using (TestHostContext _hc = new TestHostContext(this))
+            using (TestHostContext hc = CreateTestContext())
             {
-                var extensionManager = new Mock<IExtensionManager>();
-                var echoCommand = new EchoCommandExtension();
-                echoCommand.Initialize(_hc);
-
-                extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
-                               .Returns(new List<IActionCommandExtension>() { echoCommand });
-                _hc.SetSingleton<IExtensionManager>(extensionManager.Object);
-
-                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                _hc.GetTrace().Info($"{tag} {line}");
+                                hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
 
                 _ec.SetupAllProperties();
 
-                ActionCommandManager commandManager = new ActionCommandManager();
-                commandManager.Initialize(_hc);
-
                 Assert.False(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::on"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::on", null));
                 Assert.True(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::off"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::off", null));
                 Assert.False(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::ON"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::ON", null));
                 Assert.True(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::Off   "));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::Off   ", null));
                 Assert.False(_ec.Object.EchoOnActionCommand);
             }
         }
@@ -197,7 +142,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void EchoProcessCommandDebugOn()
         {
-            using (TestHostContext _hc = new TestHostContext(this))
+            using (TestHostContext hc = CreateTestContext())
             {
                 // Set up a few things
                 // 1. Job request message (with ACTIONS_STEP_DEBUG = true)
@@ -219,84 +164,135 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var jobServerQueue = new Mock<IJobServerQueue>();
                 jobServerQueue.Setup(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.IsAny<TimelineRecord>()));
 
-                _hc.SetSingleton(jobServerQueue.Object);
-
-                var extensionManager = new Mock<IExtensionManager>();
-                var echoCommand = new EchoCommandExtension();
-                echoCommand.Initialize(_hc);
-
-                extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
-                               .Returns(new List<IActionCommandExtension>() { echoCommand });
-                _hc.SetSingleton<IExtensionManager>(extensionManager.Object);
+                hc.SetSingleton(jobServerQueue.Object);
 
                 var configurationStore = new Mock<IConfigurationStore>();
                 configurationStore.Setup(x => x.GetSettings()).Returns(new RunnerSettings());
-                _hc.SetSingleton(configurationStore.Object);
+                hc.SetSingleton(configurationStore.Object);
 
                 var pagingLogger = new Mock<IPagingLogger>();
-                _hc.EnqueueInstance(pagingLogger.Object);
-
-                ActionCommandManager commandManager = new ActionCommandManager();
-                commandManager.Initialize(_hc);
-
-                var _ec = new Runner.Worker.ExecutionContext();
-                _ec.Initialize(_hc);
+                hc.EnqueueInstance(pagingLogger.Object);
 
                 // Initialize the job (to exercise logic that sets EchoOnActionCommand)
-                _ec.InitializeJob(jobRequest, System.Threading.CancellationToken.None);
+                var ec = new Runner.Worker.ExecutionContext();
+                ec.Initialize(hc);
+                ec.InitializeJob(jobRequest, System.Threading.CancellationToken.None);
 
-                _ec.Complete();
+                ec.Complete();
 
-                Assert.True(_ec.EchoOnActionCommand);
+                Assert.True(ec.EchoOnActionCommand);
 
-                Assert.True(commandManager.TryProcessCommand(_ec, "::echo::off"));
-                Assert.False(_ec.EchoOnActionCommand);
+                Assert.True(_commandManager.TryProcessCommand(ec, "::echo::off", null));
+                Assert.False(ec.EchoOnActionCommand);
 
-                Assert.True(commandManager.TryProcessCommand(_ec, "::echo::on"));
-                Assert.True(_ec.EchoOnActionCommand);
+                Assert.True(_commandManager.TryProcessCommand(ec, "::echo::on", null));
+                Assert.True(ec.EchoOnActionCommand);
             }
         }
 
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void EchoProcessCommandInvalid()
         {
-            using (TestHostContext _hc = new TestHostContext(this))
+            using (TestHostContext hc = CreateTestContext())
             {
-                var extensionManager = new Mock<IExtensionManager>();
-                var echoCommand = new EchoCommandExtension();
-                echoCommand.Initialize(_hc);
-
-                extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
-                               .Returns(new List<IActionCommandExtension>() { echoCommand });
-                _hc.SetSingleton<IExtensionManager>(extensionManager.Object);
-
-                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                _hc.GetTrace().Info($"{tag} {line}");
+                                hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
 
                 _ec.SetupAllProperties();
 
-                ActionCommandManager commandManager = new ActionCommandManager();
-                commandManager.Initialize(_hc);
-
                 // Echo commands below are considered "processed", but are invalid
                 // 1. Invalid echo value
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::invalid"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::invalid", null));
                 Assert.Equal(TaskResult.Failed, _ec.Object.CommandResult);
                 Assert.False(_ec.Object.EchoOnActionCommand);
 
                 // 2. No value
-                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::"));
+                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::", null));
                 Assert.Equal(TaskResult.Failed, _ec.Object.CommandResult);
                 Assert.False(_ec.Object.EchoOnActionCommand);
             }
         }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void AddMatcherTranslatesFilePath()
+        {
+            using (TestHostContext hc = CreateTestContext())
+            {
+                // Create a problem matcher config file
+                var hostDirectory = hc.GetDirectory(WellKnownDirectory.Temp);
+                var hostFile = Path.Combine(hostDirectory, "my-matcher.json");
+                Directory.CreateDirectory(hostDirectory);
+                var content = @"
+{
+    ""problemMatcher"": [
+        {
+            ""owner"": ""my-matcher"",
+            ""pattern"": [
+                {
+                    ""regexp"": ""^ERROR: (.+)$"",
+                    ""message"": 1
+                }
+            ]
+        }
+    ]
+}";
+                File.WriteAllText(hostFile, content);
+
+                // Setup translation info
+                var container = new ContainerInfo();
+                var containerDirectory = "/some-container-directory";
+                var containerFile = Path.Combine(containerDirectory, "my-matcher.json");
+                container.AddPathTranslateMapping(hostDirectory, containerDirectory);
+
+                // Act
+                _commandManager.TryProcessCommand(_ec.Object, $"::add-matcher::{containerFile}", container);
+
+                // Assert
+                _ec.Verify(x => x.AddMatchers(It.IsAny<IssueMatchersConfig>()), Times.Once);
+            }
+        }
+
+        private TestHostContext CreateTestContext([CallerMemberName] string testName = "")
+        {
+            var hostContext = new TestHostContext(this, testName);
+
+            // Mock extension manager
+            _extensionManager = new Mock<IExtensionManager>();
+            var commands = new IActionCommandExtension[]
+            {
+                new AddMatcherCommandExtension(),
+                new EchoCommandExtension(),
+                new InternalPluginSetRepoPathCommandExtension(),
+                new SetEnvCommandExtension(),
+            };
+            foreach (var command in commands)
+            {
+                command.Initialize(hostContext);
+            }
+            _extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
+                .Returns(new List<IActionCommandExtension>(commands));
+            hostContext.SetSingleton<IExtensionManager>(_extensionManager.Object);
+
+            // Mock pipeline directory manager
+            _pipelineDirectoryManager = new Mock<IPipelineDirectoryManager>();
+            hostContext.SetSingleton<IPipelineDirectoryManager>(_pipelineDirectoryManager.Object);
+
+            // Execution context
+            _ec = new Mock<IExecutionContext>();
+
+            // Command manager
+            _commandManager = new ActionCommandManager();
+            _commandManager.Initialize(hostContext);
+
+            return hostContext;
+        }
     }
 }

src/Test/L0/Worker/OutputManagerL0.cs

@@ -973,8 +973,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 });
 
             _commandManager = new Mock<IActionCommandManager>();
-            _commandManager.Setup(x => x.TryProcessCommand(It.IsAny<IExecutionContext>(), It.IsAny<string>()))
-                .Returns((IExecutionContext executionContext, string line) =>
+            _commandManager.Setup(x => x.TryProcessCommand(It.IsAny<IExecutionContext>(), It.IsAny<string>(), It.IsAny<ContainerInfo>()))
+                .Returns((IExecutionContext executionContext, string line, ContainerInfo container) =>
                 {
                     if (line.IndexOf("##[some-command]") >= 0)
                     {

src/dev.cmd

@@ -1,5 +1,16 @@
 @setlocal
 @echo off
+ rem add expected utils to path
+IF EXIST C:\Program Files\Git\usr\bin (
+  SET PATH=C:\Program Files\Git\usr\bin;%PATH%
+)
+IF EXIST C:\Program Files\Git\mingw64\bin (
+  SET PATH=C:\Program Files\Git\mingw64\bin;%PATH%
+)
+IF EXIST C:\Program Files\Git\bin (
+  SET PATH=C:\Program Files\Git\bin;%PATH%
+)
+
  rem Check if SH_PATH is defined.
 if defined SH_PATH (
   goto run

src/runnerversion

@@ -1 +1 @@
-2.165.0
+2.165.2