Implement new echo behavior and command (#139)

* Remove controlling echoing by command

* Add 'echo on' and 'echo off' action commands

* PR feedback and add L0 tests

* Register new command

* Eric's PR feedback

* Tweak logging a bit

* Rename EchoOnActionCommandSuccess -> EchoOnActionCommand

* More PR reaction

* Make warning messages in Action Commands not rely on context from echo commands

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: 
     - master
+    - releases/*
   pull_request:
     branches: 
     - '*'
@@ -19,7 +20,7 @@ jobs:
         - os: macOS-latest
           devScript: ./dev.sh
         - os: windows-latest
-          devScript: dev.cmd
+          devScript: ./dev
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1

docs/start/envlinux.md

@@ -5,36 +5,55 @@
 ## Supported Distributions and Versions
 
 x64
-  - Red Hat Enterprise Linux 6 (see note 1), 7
-  - CentOS 6 (see note 1), 7
+  - Red Hat Enterprise Linux 7
+  - CentOS 7
   - Oracle Linux 7
-  - Fedora 28, 27
-  - Debian 9, 8.7 or later versions
-  - Ubuntu 18.04, Ubuntu 16.04, Ubuntu 14.04
-  - Linux Mint 18, 17
-  - openSUSE 42.3 or later versions
-  - SUSE Enterprise Linux (SLES) 12 SP2 or later versions
+  - Fedora 29+
+  - Debian 9+
+  - Ubuntu 16.04+
+  - Linux Mint 18+
+  - openSUSE 15+
+  - SUSE Enterprise Linux (SLES) 12 SP2+
 
-ARM32 (see note 2)
-  - Debian 9 or later versions
-  - Ubuntu 18.04 or later versions
+## Install .Net Core 3.x Linux Dependencies
 
-> Note 1: Red Hat Enterprise Linux 6 and CentOS 6 require installing the specialized "rhel.6-x64" agent package
-> Note 2: ARM instruction set [ARMv7](https://en.wikipedia.org/wiki/List_of_ARM_microarchitectures) or above is required, you can get your device's information by executing `uname -a`
-
-## Install .Net Core 2.x Linux Dependencies
-
-The `./config.sh` will check .Net Core 2.x dependencies during agent configuration.  
+The `./config.sh` will check .Net Core 3.x dependencies during runner configuration.  
 You might see something like this which indicate a dependency's missing.
 ```bash
 ./config.sh
     libunwind.so.8 => not found
     libunwind-x86_64.so.8 => not found
-Dependencies is missing for Dotnet Core 2.1
-Execute ./bin/installdependencies.sh to install any missing Dotnet Core 2.1 dependencies.
+Dependencies is missing for Dotnet Core 3.0
+Execute ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 dependencies.
 ```
 You can easily correct the problem by executing `./bin/installdependencies.sh`.  
 The `installdependencies.sh` script should install all required dependencies on all supported Linux versions   
 > Note: The `installdependencies.sh` script will try to use the default package management mechanism on your Linux flavor (ex. `yum`/`apt-get`/`apt`). You might need to deal with error coming from the package management mechanism related to your setup, like [#1353](https://github.com/Microsoft/vsts-agent/issues/1353)
 
+### Full dependencies list
+
+Debian based OS (Debian, Ubuntu, Linux Mint)
+
+- liblttng-ust0
+- libkrb5-3 
+- zlib1g
+- libssl1.1, libssl1.0.2 or libssl1.0.0
+- libicu63, libicu60, libicu57 or libicu55
+
+Fedora based OS (Fedora, Redhat, Centos, Oracle Linux 7)
+
+- lttng-ust 
+- openssl-libs 
+- krb5-libs
+- zlib
+- libicu
+
+SUSE based OS (OpenSUSE, SUSE Enterprise)
+
+- lttng-ust
+- libopenssl1_1
+- krb5
+- zlib
+- libicu60_2
+
 ## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x)

releaseNote.md

@@ -1,16 +1,12 @@
 ## Features
-  - Runner config auth via GitHub.com. (#107) (#117) 
-  - Adding wrapper action to support post job cleanup, adding checkout v1.1 (#91)
-  - Improving terminal experience (#110)
-  - Add runner support for cache action. (#120)
+  - Set Default shell to powershell for windows runners (#135)
+  - Use Powershell as fallback if Powershell Core is not available for default shell on windows (#142)
 
 ## Bugs
-  - Set GITHUB_ACTIONS in containers. (#119)
-  - Fix issue data column/col mismatch. (#122)
+  - Removed unintended additional fields on error and warning commands (#137)
 
 ## Misc
-  - Use GitHub actions for CI/PR (#112) 
-  - Code Cleanup (#123) (#124) (#125)
+  - N/A
 
 ## Agent Downloads  
 

src/Misc/layoutbin/installdependencies.sh

@@ -60,10 +60,9 @@ then
                 print_errormessage
                 exit 1
             fi
-            
-            # ubuntu 18 uses libcurl4
-            # ubuntu 14, 16 and other linux use libcurl3
-            apt install -y libcurl3 || apt install -y libcurl4
+
+            # libissl version prefer: libssl1.1 -> libssl1.0.2 -> libssl1.0.0
+            apt install -y libssl1.1$ || apt install -y libssl1.0.2$ || apt install -y libssl1.0.0$
             if [ $? -ne 0 ]
             then
                 echo "'apt' failed with exit code '$?'"
@@ -71,18 +70,8 @@ then
                 exit 1
             fi
 
-            # debian 9 use libssl1.0.2
-            # other debian linux use libssl1.0.0
-            apt install -y libssl1.0.0 || apt install -y libssl1.0.2
-            if [ $? -ne 0 ]
-            then
-                echo "'apt' failed with exit code '$?'"
-                print_errormessage
-                exit 1
-            fi
-
-            # libicu version prefer: libicu52 -> libicu55 -> libicu57 -> libicu60
-            apt install -y libicu52 || apt install -y libicu55 || apt install -y libicu57 || apt install -y libicu60
+            # libicu version prefer: libicu63 -> libicu60 -> libicu57 -> libicu55 -> libicu52
+            apt install -y libicu63 || apt install -y libicu60 || apt install -y libicu57 || apt install -y libicu55 || apt install -y libicu52
             if [ $? -ne 0 ]
             then
                 echo "'apt' failed with exit code '$?'"
@@ -101,9 +90,8 @@ then
                     exit 1
                 fi
                 
-                # ubuntu 18 uses libcurl4
-                # ubuntu 14, 16 and other linux use libcurl3
-                apt-get install -y libcurl3 || apt-get install -y libcurl4
+                # libissl version prefer: libssl1.1 -> libssl1.0.2 -> libssl1.0.0
+                apt-get install -y libssl1.1$ || apt-get install -y libssl1.0.2$ || apt install -y libssl1.0.0$
                 if [ $? -ne 0 ]
                 then
                     echo "'apt-get' failed with exit code '$?'"
@@ -111,18 +99,8 @@ then
                     exit 1
                 fi
 
-                # debian 9 use libssl1.0.2
-                # other debian linux use libssl1.0.0
-                apt-get install -y libssl1.0.0 || apt install -y libssl1.0.2
-                if [ $? -ne 0 ]
-                then
-                    echo "'apt-get' failed with exit code '$?'"
-                    print_errormessage
-                    exit 1
-                fi
-
-                # libicu version prefer: libicu52 -> libicu55 -> libicu57 -> libicu60
-                apt-get install -y libicu52 || apt install -y libicu55 || apt install -y libicu57 || apt install -y libicu60
+                # libicu version prefer: libicu63 -> libicu60 -> libicu57 -> libicu55 -> libicu52
+                apt-get install -y libicu63 || apt-get install -y libicu60 || apt install -y libicu57 || apt install -y libicu55 || apt install -y libicu52
                 if [ $? -ne 0 ]
                 then
                     echo "'apt-get' failed with exit code '$?'"
@@ -149,46 +127,7 @@ then
             command -v dnf
             if [ $? -eq 0 ]
             then
-                useCompatSsl=0
-                grep -i 'fedora release 28' /etc/fedora-release
-                if [ $? -eq 0 ]
-                then
-                   useCompatSsl=1
-                else 
-                    grep -i 'fedora release 27' /etc/fedora-release
-                    if [ $? -eq 0 ]
-                    then
-                        useCompatSsl=1
-                    else
-                        grep -i 'fedora release 26' /etc/fedora-release
-                        if [ $? -eq 0 ]
-                        then
-                            useCompatSsl=1
-                        fi
-                    fi
-                fi
-
-                if [ $useCompatSsl -eq 1 ]
-                then
-                    echo "Use compat-openssl10-devel instead of openssl-devel for Fedora 27/28 (dotnet core requires openssl 1.0.x)"                    
-                    dnf install -y compat-openssl10
-                    if [ $? -ne 0 ]
-                    then
-                        echo "'dnf' failed with exit code '$?'"
-                        print_errormessage
-                        exit 1
-                    fi
-                else
-                    dnf install -y openssl-libs
-                    if [ $? -ne 0 ]
-                    then
-                        echo "'dnf' failed with exit code '$?'"
-                        print_errormessage
-                        exit 1
-                    fi
-                fi       
-
-                dnf install -y lttng-ust libcurl krb5-libs zlib libicu
+                dnf install -y lttng-ust openssl-libs krb5-libs zlib libicu
                 if [ $? -ne 0 ]
                 then
                     echo "'dnf' failed with exit code '$?'"
@@ -204,22 +143,13 @@ then
             command -v yum
             if [ $? -eq 0 ]
             then
-                yum install -y openssl-libs libcurl krb5-libs zlib libicu
+                yum install -y lttng-ust openssl-libs krb5-libs zlib libicu
                 if [ $? -ne 0 ]
                 then                    
                     echo "'yum' failed with exit code '$?'"
                     print_errormessage
                     exit 1
                 fi
-
-                # install lttng-ust separately since it's not part of offical package repository
-                yum install -y wget && wget -P /etc/yum.repos.d/ https://packages.efficios.com/repo.files/EfficiOS-RHEL7-x86-64.repo && rpmkeys --import https://packages.efficios.com/rhel/repo.key && yum updateinfo && yum install -y lttng-ust
-                if [ $? -ne 0 ]
-                then                    
-                    echo "'lttng-ust' installation failed with exit code '$?'"
-                    print_errormessage
-                    exit 1
-                fi
             else
                 echo "Can not find 'yum'"
                 print_errormessage
@@ -230,13 +160,14 @@ then
         # we might on OpenSUSE
         OSTYPE=$(grep ID_LIKE /etc/os-release | cut -f2 -d=)
         echo $OSTYPE
-        if [ $OSTYPE == '"suse"' ]
+        echo $OSTYPE | grep "suse"
+        if [ $? -eq 0 ]
         then
             echo "The current OS is SUSE based"
             command -v zypper
             if [ $? -eq 0 ]
             then
-                zypper -n install lttng-ust libopenssl1_0_0 libcurl4 krb5 zlib libicu52_1
+                zypper -n install lttng-ust libopenssl1_1 krb5 zlib libicu60_2
                 if [ $? -ne 0 ]
                 then
                     echo "'zypper' failed with exit code '$?'"

src/Misc/layoutroot/config.sh

@@ -8,7 +8,7 @@ if [ $user_id -eq 0 -a -z "$AGENT_ALLOW_RUNASROOT" ]; then
     exit 1
 fi
 
-# Check dotnet core 2.1 dependencies for Linux
+# Check dotnet core 3.0 dependencies for Linux
 if [[ (`uname` == "Linux") ]]
 then
     command -v ldd > /dev/null
@@ -20,29 +20,22 @@ then
 
     ldd ./bin/libcoreclr.so | grep 'not found'
     if [ $? -eq 0 ]; then
-        echo "Dependencies is missing for Dotnet Core 2.1"
-        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 2.1 dependencies."
+        echo "Dependencies is missing for Dotnet Core 3.0"
+        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 dependencies."
         exit 1
     fi
 
     ldd ./bin/System.Security.Cryptography.Native.OpenSsl.so | grep 'not found'
     if [ $? -eq 0 ]; then
-        echo "Dependencies is missing for Dotnet Core 2.1"
-        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 2.1 dependencies."
+        echo "Dependencies is missing for Dotnet Core 3.0"
+        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 dependencies."
         exit 1
     fi
 
     ldd ./bin/System.IO.Compression.Native.so | grep 'not found'
     if [ $? -eq 0 ]; then
-        echo "Dependencies is missing for Dotnet Core 2.1"
-        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 2.1 dependencies."
-        exit 1
-    fi
-
-    ldd ./bin/System.Net.Http.Native.so | grep 'not found'
-    if [ $? -eq 0 ]; then
-        echo "Dependencies is missing for Dotnet Core 2.1"
-        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 2.1 dependencies."
+        echo "Dependencies is missing for Dotnet Core 3.0"
+        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 dependencies."
         exit 1
     fi
 
@@ -59,8 +52,8 @@ then
     libpath=${LD_LIBRARY_PATH:-}
     $LDCONFIG_COMMAND -NXv ${libpath//:/} 2>&1 | grep libicu >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        echo "Libicu's dependencies is missing for Dotnet Core 2.1"
-        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 2.1 dependencies."
+        echo "Libicu's dependencies is missing for Dotnet Core 3.0"
+        echo "Execute ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 dependencies."
         exit 1
     fi
 fi

src/Runner.Common/Capabilities/CapabilitiesManager.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
-
-namespace GitHub.Runner.Common.Capabilities
-{
-    [ServiceLocator(Default = typeof(CapabilitiesManager))]
-    public interface ICapabilitiesManager : IRunnerService
-    {
-        Task<Dictionary<string, string>> GetCapabilitiesAsync(RunnerSettings settings, CancellationToken token);
-    }
-
-    public sealed class CapabilitiesManager : RunnerService, ICapabilitiesManager
-    {
-        public async Task<Dictionary<string, string>> GetCapabilitiesAsync(RunnerSettings settings, CancellationToken cancellationToken)
-        {
-            Trace.Entering();
-            ArgUtil.NotNull(settings, nameof(settings));
-
-            // Initialize a dictionary of capabilities.
-            var capabilities = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            if (settings.SkipCapabilitiesScan)
-            {
-                Trace.Info("Skip capabilities scan.");
-                return capabilities;
-            }
-
-            // Get the providers.
-            var extensionManager = HostContext.GetService<IExtensionManager>();
-            IEnumerable<ICapabilitiesProvider> providers =
-                extensionManager
-                .GetExtensions<ICapabilitiesProvider>()
-                ?.OrderBy(x => x.Order);
-
-            // Add each capability returned from each provider.
-            foreach (ICapabilitiesProvider provider in providers ?? new ICapabilitiesProvider[0])
-            {
-                foreach (Capability capability in await provider.GetCapabilitiesAsync(settings, cancellationToken) ?? new List<Capability>())
-                {
-                    // Make sure we mask secrets in capabilities values.
-                    capabilities[capability.Name] = HostContext.SecretMasker.MaskSecrets(capability.Value);
-                }
-            }
-
-            return capabilities;
-        }
-    }
-
-    public interface ICapabilitiesProvider : IExtension
-    {
-        int Order { get; }
-
-        Task<List<Capability>> GetCapabilitiesAsync(RunnerSettings settings, CancellationToken cancellationToken);
-    }
-
-    public sealed class Capability
-    {
-        public string Name { get; }
-        public string Value { get; }
-
-        public Capability(string name, string value)
-        {
-            ArgUtil.NotNullOrEmpty(name, nameof(name));
-            Name = name;
-            Value = value ?? string.Empty;
-        }
-    }
-}

src/Runner.Common/Capabilities/RunnerCapabilitiesProvider.cs

@@ -1,86 +0,0 @@
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace GitHub.Runner.Common.Capabilities
-{
-    public sealed class RunnerCapabilitiesProvider : RunnerService, ICapabilitiesProvider
-    {
-        public Type ExtensionType => typeof(ICapabilitiesProvider);
-
-        public int Order => 99; // Process last to override prior.
-
-        public Task<List<Capability>> GetCapabilitiesAsync(RunnerSettings settings, CancellationToken cancellationToken)
-        {
-            ArgUtil.NotNull(settings, nameof(settings));
-            var capabilities = new List<Capability>();
-            Add(capabilities, "Runner.Name", settings.AgentName ?? string.Empty);
-            Add(capabilities, "Runner.OS", VarUtil.OS);
-            Add(capabilities, "Runner.OSArchitecture", VarUtil.OSArchitecture);
-#if OS_WINDOWS
-            Add(capabilities, "Runner.OSVersion", GetOSVersionString());
-#endif
-            Add(capabilities, "InteractiveSession", (HostContext.StartupType != StartupType.Service).ToString());
-            Add(capabilities, "Runner.Version", BuildConstants.RunnerPackage.Version);
-            Add(capabilities, "Runner.ComputerName", Environment.MachineName ?? string.Empty);
-            Add(capabilities, "Runner.HomeDirectory", HostContext.GetDirectory(WellKnownDirectory.Root));
-            return Task.FromResult(capabilities);
-        }
-
-        private void Add(List<Capability> capabilities, string name, string value)
-        {
-            Trace.Info($"Adding '{name}': '{value}'");
-            capabilities.Add(new Capability(name, value));
-        }
-
-        private object GetHklmValue(string keyName, string valueName)
-        {
-            keyName = $@"HKEY_LOCAL_MACHINE\{keyName}";
-            object value = Registry.GetValue(keyName, valueName, defaultValue: null);
-            if (object.ReferenceEquals(value, null))
-            {
-                Trace.Info($"Key name '{keyName}', value name '{valueName}' is null.");
-                return null;
-            }
-
-            Trace.Info($"Key name '{keyName}', value name '{valueName}': '{value}'");
-            return value;
-        }
-
-        private string GetOSVersionString()
-        {
-            // Do not use System.Environment.OSVersion.Version to resolve the OS version number.
-            // It leverages the GetVersionEx function which may report an incorrect version
-            // depending on the app's manifest. For details, see:
-            //     https://msdn.microsoft.com/library/windows/desktop/ms724451(v=vs.85).aspx
-
-            // Attempt to retrieve the major/minor version from the new registry values added in
-            // in Windows 10.
-            //
-            // The registry value "CurrentVersion" is unreliable in Windows 10. It contains the
-            // value "6.3" instead of "10.0".
-            object major = GetHklmValue(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentMajorVersionNumber");
-            object minor = GetHklmValue(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentMinorVersionNumber");
-            string majorMinorString;
-            if (major != null && minor != null)
-            {
-                majorMinorString = StringUtil.Format("{0}.{1}", major, minor);
-            }
-            else
-            {
-                // Fallback to the registry value "CurrentVersion".
-                majorMinorString = GetHklmValue(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentVersion") as string;
-            }
-
-            // Opted to use the registry value "CurrentBuildNumber" over "CurrentBuild". Based on brief
-            // internet investigation, the only difference appears to be that on Windows XP "CurrentBuild"
-            // was unreliable and "CurrentBuildNumber" was the correct choice.
-            string build = GetHklmValue(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentBuildNumber") as string;
-            return StringUtil.Format("{0}.{1}", majorMinorString, build);
-        }
-    }
-}

src/Runner.Common/ExtensionManager.cs

@@ -39,10 +39,6 @@ namespace GitHub.Runner.Common
             var extensions = new List<IExtension>();
             switch (typeof(T).FullName)
             {
-                // Listener capabilities providers.
-                case "GitHub.Runner.Common.Capabilities.ICapabilitiesProvider":
-                    Add<T>(extensions, "GitHub.Runner.Common.Capabilities.RunnerCapabilitiesProvider, Runner.Common");
-                    break;
                 // Action command extensions.
                 case "GitHub.Runner.Worker.IActionCommandExtension":
                     Add<T>(extensions, "GitHub.Runner.Worker.InternalPluginSetRepoPathCommandExtension, Runner.Worker");
@@ -58,6 +54,7 @@ namespace GitHub.Runner.Common
                     Add<T>(extensions, "GitHub.Runner.Worker.DebugCommandExtension, Runner.Worker");
                     Add<T>(extensions, "GitHub.Runner.Worker.GroupCommandExtension, Runner.Worker");
                     Add<T>(extensions, "GitHub.Runner.Worker.EndGroupCommandExtension, Runner.Worker");
+                    Add<T>(extensions, "GitHub.Runner.Worker.EchoCommandExtension, Runner.Worker");
                     break;
                 default:
                     // This should never happen.

src/Runner.Common/HostContext.cs

@@ -84,9 +84,6 @@ namespace GitHub.Runner.Common
             this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscape);
             this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeShift1);
             this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeShift2);
-            this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeShift3);
-            this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeShift4);
-            this.SecretMasker.AddValueEncoder(ValueEncoders.Base64StringEscapeShift5);
             this.SecretMasker.AddValueEncoder(ValueEncoders.ExpressionStringEscape);
             this.SecretMasker.AddValueEncoder(ValueEncoders.JsonStringEscape);
             this.SecretMasker.AddValueEncoder(ValueEncoders.UriDataEscape);

src/Runner.Common/Runner.Common.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
+    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
   </PropertyGroup>
 
   <ItemGroup>

src/Runner.Common/RunnerServer.cs

@@ -31,7 +31,7 @@ namespace GitHub.Runner.Common
         Task DeleteAgentAsync(int agentPoolId, int agentId);
         Task<List<TaskAgentPool>> GetAgentPoolsAsync(string agentPoolName = null, TaskAgentPoolType poolType = TaskAgentPoolType.Automation);
         Task<List<TaskAgent>> GetAgentsAsync(int agentPoolId, string agentName = null);
-        Task<TaskAgent> UpdateAgentAsync(int agentPoolId, TaskAgent agent);
+        Task<TaskAgent> ReplaceAgentAsync(int agentPoolId, TaskAgent agent);
 
         // messagequeue
         Task<TaskAgentSession> CreateAgentSessionAsync(Int32 poolId, TaskAgentSession session, CancellationToken cancellationToken);
@@ -257,7 +257,7 @@ namespace GitHub.Runner.Common
             return _genericTaskAgentClient.GetAgentsAsync(agentPoolId, agentName, false);
         }
 
-        public Task<TaskAgent> UpdateAgentAsync(int agentPoolId, TaskAgent agent)
+        public Task<TaskAgent> ReplaceAgentAsync(int agentPoolId, TaskAgent agent)
         {
             CheckConnection(RunnerConnectionType.Generic);
             return _genericTaskAgentClient.ReplaceAgentAsync(agentPoolId, agent);

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -1,24 +1,19 @@
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Capabilities;
 using GitHub.Runner.Common.Util;
 using GitHub.Services.Common;
 using GitHub.Services.OAuth;
 using GitHub.Services.WebApi;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
-using System.Security.Principal;
-using System.Threading;
 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.Text;
 
 namespace GitHub.Runner.Listener.Configuration
 {
@@ -168,7 +163,8 @@ namespace GitHub.Runner.Listener.Configuration
             {
                 // Get the URL
                 var inputUrl = command.GetUrl();
-                if (!inputUrl.Contains("github.com", StringComparison.OrdinalIgnoreCase))
+                if (!inputUrl.Contains("github.com", StringComparison.OrdinalIgnoreCase) &&
+                    !inputUrl.Contains("github.localhost", StringComparison.OrdinalIgnoreCase))
                 {
                     runnerSettings.ServerUrl = inputUrl;
                     // Get the credentials
@@ -238,11 +234,8 @@ namespace GitHub.Runner.Listener.Configuration
             {
                 runnerSettings.AgentName = command.GetAgentName();
 
-                // Get the system capabilities.
-                Dictionary<string, string> systemCapabilities = await HostContext.GetService<ICapabilitiesManager>().GetCapabilitiesAsync(runnerSettings, CancellationToken.None);
-
                 _term.WriteLine();
-                
+
                 var agents = await _runnerServer.GetAgentsAsync(runnerSettings.PoolId, runnerSettings.AgentName);
                 Trace.Verbose("Returns {0} agents", agents.Count);
                 agent = agents.FirstOrDefault();
@@ -251,12 +244,12 @@ namespace GitHub.Runner.Listener.Configuration
                     _term.WriteLine("A runner exists with the same name", ConsoleColor.Yellow);
                     if (command.GetReplace())
                     {
-                        // Update existing agent with new PublicKey, agent version and SystemCapabilities.
-                        agent = UpdateExistingAgent(agent, publicKey, systemCapabilities);
+                        // Update existing agent with new PublicKey, agent version.
+                        agent = UpdateExistingAgent(agent, publicKey);
 
                         try
                         {
-                            agent = await _runnerServer.UpdateAgentAsync(runnerSettings.PoolId, agent);
+                            agent = await _runnerServer.ReplaceAgentAsync(runnerSettings.PoolId, agent);
                             _term.WriteSuccessMessage("Successfully replaced the runner");
                             break;
                         }
@@ -275,7 +268,7 @@ namespace GitHub.Runner.Listener.Configuration
                 else
                 {
                     // Create a new agent. 
-                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, systemCapabilities);
+                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey);
 
                     try
                     {
@@ -435,7 +428,7 @@ namespace GitHub.Runner.Listener.Configuration
         {
             ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             string currentAction = string.Empty;
-            
+
             _term.WriteSection("Runner removal");
 
             try
@@ -499,7 +492,7 @@ namespace GitHub.Runner.Listener.Configuration
                     else
                     {
                         await _runnerServer.DeleteAgentAsync(settings.PoolId, settings.AgentId);
-                        
+
                         _term.WriteLine();
                         _term.WriteSuccessMessage("Runner removed successfully");
                     }
@@ -573,7 +566,7 @@ namespace GitHub.Runner.Listener.Configuration
         }
 
 
-        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, Dictionary<string, string> systemCapabilities)
+        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey)
         {
             ArgUtil.NotNull(agent, nameof(agent));
             agent.Authorization = new TaskAgentAuthorization
@@ -585,15 +578,14 @@ namespace GitHub.Runner.Listener.Configuration
             agent.Version = BuildConstants.RunnerPackage.Version;
             agent.OSDescription = RuntimeInformation.OSDescription;
 
-            foreach (KeyValuePair<string, string> capability in systemCapabilities)
-            {
-                agent.SystemCapabilities[capability.Key] = capability.Value ?? string.Empty;
-            }
+            agent.Labels.Add("self-hosted");
+            agent.Labels.Add(VarUtil.OS);
+            agent.Labels.Add(VarUtil.OSArchitecture);
 
             return agent;
         }
 
-        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, Dictionary<string, string> systemCapabilities)
+        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey)
         {
             TaskAgent agent = new TaskAgent(agentName)
             {
@@ -606,10 +598,9 @@ namespace GitHub.Runner.Listener.Configuration
                 OSDescription = RuntimeInformation.OSDescription,
             };
 
-            foreach (KeyValuePair<string, string> capability in systemCapabilities)
-            {
-                agent.SystemCapabilities[capability.Key] = capability.Value ?? string.Empty;
-            }
+            agent.Labels.Add("self-hosted");
+            agent.Labels.Add(VarUtil.OS);
+            agent.Labels.Add(VarUtil.OSArchitecture);
 
             return agent;
         }
@@ -638,7 +629,7 @@ namespace GitHub.Runner.Listener.Configuration
         private async Task<GitHubAuthResult> GetTenantCredential(string githubUrl, string githubToken)
         {
             var gitHubUrl = new UriBuilder(githubUrl);
-            var githubApiUrl = $"https://api.github.com/repos/{gitHubUrl.Path.Trim('/')}/actions-runners/registration";
+            var githubApiUrl = $"https://api.{gitHubUrl.Host}/repos/{gitHubUrl.Path.Trim('/')}/actions-runners/registration";
             using (var httpClientHandler = HostContext.CreateHttpClientHandler())
             using (var httpClient = new HttpClient(httpClientHandler))
             {

src/Runner.Listener/MessageListener.cs

@@ -1,7 +1,5 @@
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Capabilities;
 using GitHub.Runner.Listener.Configuration;
-using GitHub.Runner.Common.Util;
 using GitHub.Services.Common;
 using System;
 using System.Collections.Generic;
@@ -10,7 +8,6 @@ using System.Threading.Tasks;
 using System.Security.Cryptography;
 using System.IO;
 using System.Text;
-using GitHub.Services.WebApi;
 using GitHub.Services.OAuth;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -59,9 +56,6 @@ namespace GitHub.Runner.Listener
             var serverUrl = _settings.ServerUrl;
             Trace.Info(_settings);
 
-            // Capabilities.
-            Dictionary<string, string> systemCapabilities = await HostContext.GetService<ICapabilitiesManager>().GetCapabilitiesAsync(_settings, token);
-
             // Create connection.
             Trace.Info("Loading Credentials");
             var credMgr = HostContext.GetService<ICredentialManager>();
@@ -75,7 +69,7 @@ namespace GitHub.Runner.Listener
                 OSDescription = RuntimeInformation.OSDescription,
             };
             string sessionName = $"{Environment.MachineName ?? "RUNNER"}";
-            var taskAgentSession = new TaskAgentSession(sessionName, agent, systemCapabilities);
+            var taskAgentSession = new TaskAgentSession(sessionName, agent);
 
             string errorMessage = string.Empty;
             bool encounteringError = false;

src/Runner.Listener/Runner.Listener.csproj

@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
+    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
+    <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
 
   <ItemGroup>

src/Runner.PluginHost/Runner.PluginHost.csproj

@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
+    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
+    <PublishReadyToRun>true</PublishReadyToRun>    
   </PropertyGroup>
 
   <ItemGroup>

src/Runner.Plugins/Artifact/FileContainerServer.cs

@@ -236,15 +236,15 @@ namespace GitHub.Runner.Plugins.Artifact
                     // try upload all files for the first time.
                     UploadResult uploadResult = await ParallelUploadAsync(context, files, maxConcurrentUploads, _uploadCancellationTokenSource.Token);
 
-                    if (uploadResult.FailedFiles.Count == 0)
+                    if (uploadResult.RetryFiles.Count == 0)
                     {
                         // all files have been upload succeed.
-                        context.Output("File upload succeed.");
+                        context.Output("File upload complete.");
                         return uploadResult.TotalFileSizeUploaded;
                     }
                     else
                     {
-                        context.Output($"{uploadResult.FailedFiles.Count} files failed to upload, retry these files after a minute.");
+                        context.Output($"{uploadResult.RetryFiles.Count} files failed to upload, retry these files after a minute.");
                     }
 
                     // Delay 1 min then retry failed files.
@@ -255,13 +255,13 @@ namespace GitHub.Runner.Plugins.Artifact
                     }
 
                     // Retry upload all failed files.
-                    context.Output($"Start retry {uploadResult.FailedFiles.Count} failed files upload.");
-                    UploadResult retryUploadResult = await ParallelUploadAsync(context, uploadResult.FailedFiles, maxConcurrentUploads, _uploadCancellationTokenSource.Token);
+                    context.Output($"Start retry {uploadResult.RetryFiles.Count} failed files upload.");
+                    UploadResult retryUploadResult = await ParallelUploadAsync(context, uploadResult.RetryFiles, maxConcurrentUploads, _uploadCancellationTokenSource.Token);
 
-                    if (retryUploadResult.FailedFiles.Count == 0)
+                    if (retryUploadResult.RetryFiles.Count == 0)
                     {
                         // all files have been upload succeed after retry.
-                        context.Output("File upload succeed after retry.");
+                        context.Output("File upload complete after retry.");
                         return uploadResult.TotalFileSizeUploaded + retryUploadResult.TotalFileSizeUploaded;
                     }
                     else
@@ -465,75 +465,61 @@ namespace GitHub.Runner.Plugins.Artifact
                     using (FileStream fs = File.Open(fileToUpload, FileMode.Open, FileAccess.Read, FileShare.Read))
                     {
                         string itemPath = (_containerPath.TrimEnd('/') + "/" + fileToUpload.Remove(0, _sourceParentDirectory.Length + 1)).Replace('\\', '/');
-                        uploadTimer.Restart();
-                        bool catchExceptionDuringUpload = false;
-                        HttpResponseMessage response = null;
+                        bool failAndExit = false;
                         try
                         {
-                            response = await _fileContainerHttpClient.UploadFileAsync(_containerId, itemPath, fs, _projectId, cancellationToken: token, chunkSize: 4 * 1024 * 1024);
+                            uploadTimer.Restart();
+                            using (HttpResponseMessage response = await _fileContainerHttpClient.UploadFileAsync(_containerId, itemPath, fs, _projectId, cancellationToken: token, chunkSize: 4 * 1024 * 1024))
+                            {
+                                if (response == null || response.StatusCode != HttpStatusCode.Created)
+                                {
+                                    context.Output($"Unable to copy file to server StatusCode={response?.StatusCode}: {response?.ReasonPhrase}. Source file path: {fileToUpload}. Target server path: {itemPath}");
+
+                                    if (response?.StatusCode == HttpStatusCode.Conflict)
+                                    {
+                                        // fail upload task but continue with any other files
+                                        context.Error($"Error '{fileToUpload}' has already been uploaded.");
+                                    }
+                                    else if (_fileContainerHttpClient.IsFastFailResponse(response))
+                                    {
+                                        // Fast fail: we received an http status code where we should abandon our efforts
+                                        context.Output($"Cannot continue uploading files, so draining upload queue of {_fileUploadQueue.Count} items.");
+                                        DrainUploadQueue(context);
+                                        failedFiles.Clear();
+                                        failAndExit = true;
+                                        throw new UploadFailedException($"Critical failure uploading '{fileToUpload}'");
+                                    }
+                                    else
+                                    {
+                                        context.Debug($"Adding '{fileToUpload}' to retry list.");
+                                        failedFiles.Add(fileToUpload);
+                                    }
+                                    throw new UploadFailedException($"Http failure response '{response?.StatusCode}': '{response?.ReasonPhrase}' while uploading '{fileToUpload}'");
+                                }
+
+                                uploadTimer.Stop();
+                                context.Debug($"File: '{fileToUpload}' took {uploadTimer.ElapsedMilliseconds} milliseconds to finish upload");
+                                uploadedSize += fs.Length;
+                                OutputLogForFile(context, fileToUpload, $"Detail upload trace for file: {itemPath}", context.Debug);
+                            }
                         }
                         catch (OperationCanceledException) when (token.IsCancellationRequested)
                         {
                             context.Output($"File upload has been cancelled during upload file: '{fileToUpload}'.");
-                            if (response != null)
-                            {
-                                response.Dispose();
-                                response = null;
-                            }
-
                             throw;
                         }
                         catch (Exception ex)
                         {
-                            catchExceptionDuringUpload = true;
                             context.Output($"Fail to upload '{fileToUpload}' due to '{ex.Message}'.");
                             context.Output(ex.ToString());
-                        }
 
-                        uploadTimer.Stop();
-                        if (catchExceptionDuringUpload || (response != null && response.StatusCode != HttpStatusCode.Created))
-                        {
-                            if (response != null)
+                            OutputLogForFile(context, fileToUpload, $"Detail upload trace for file that fail to upload: {itemPath}", context.Output);
+
+                            if (failAndExit)
                             {
-                                context.Output($"Unable to copy file to server StatusCode={response.StatusCode}: {response.ReasonPhrase}. Source file path: {fileToUpload}. Target server path: {itemPath}");
+                                context.Debug("Exiting upload.");
+                                throw;
                             }
-
-                            // output detail upload trace for the file.
-                            ConcurrentQueue<string> logQueue;
-                            if (_fileUploadTraceLog.TryGetValue(itemPath, out logQueue))
-                            {
-                                context.Output($"Detail upload trace for file that fail to upload: {itemPath}");
-                                string message;
-                                while (logQueue.TryDequeue(out message))
-                                {
-                                    context.Output(message);
-                                }
-                            }
-
-                            // tracking file that failed to upload.
-                            failedFiles.Add(fileToUpload);
-                        }
-                        else
-                        {
-                            context.Debug($"File: '{fileToUpload}' took {uploadTimer.ElapsedMilliseconds} milliseconds to finish upload");
-                            uploadedSize += fs.Length;
-                            // debug detail upload trace for the file.
-                            ConcurrentQueue<string> logQueue;
-                            if (_fileUploadTraceLog.TryGetValue(itemPath, out logQueue))
-                            {
-                                context.Debug($"Detail upload trace for file: {itemPath}");
-                                string message;
-                                while (logQueue.TryDequeue(out message))
-                                {
-                                    context.Debug(message);
-                                }
-                            }
-                        }
-
-                        if (response != null)
-                        {
-                            response.Dispose();
-                            response = null;
                         }
                     }
 
@@ -590,6 +576,30 @@ namespace GitHub.Runner.Plugins.Artifact
             }
         }
 
+        private void DrainUploadQueue(RunnerActionPluginExecutionContext context)
+        {
+            while (_fileUploadQueue.TryDequeue(out string fileToUpload))
+            {
+                context.Debug($"Clearing upload queue: '{fileToUpload}'");
+                Interlocked.Increment(ref _uploadFilesProcessed);
+            }
+        }
+
+        private void OutputLogForFile(RunnerActionPluginExecutionContext context, string itemPath, string logDescription, Action<string> log)
+        {
+            // output detail upload trace for the file.
+            ConcurrentQueue<string> logQueue;
+            if (_fileUploadTraceLog.TryGetValue(itemPath, out logQueue))
+            {
+                log(logDescription);
+                string message;
+                while (logQueue.TryDequeue(out message))
+                {
+                    log(message);
+                }
+            }
+        }
+
         private void UploadFileTraceReportReceived(object sender, ReportTraceEventArgs e)
         {
             ConcurrentQueue<string> logQueue = _fileUploadTraceLog.GetOrAdd(e.File, new ConcurrentQueue<string>());
@@ -607,22 +617,22 @@ namespace GitHub.Runner.Plugins.Artifact
     {
         public UploadResult()
         {
-            FailedFiles = new List<string>();
+            RetryFiles = new List<string>();
             TotalFileSizeUploaded = 0;
         }
 
-        public UploadResult(List<string> failedFiles, long totalFileSizeUploaded)
+        public UploadResult(List<string> retryFiles, long totalFileSizeUploaded)
         {
-            FailedFiles = failedFiles;
+            RetryFiles = retryFiles ?? new List<string>();
             TotalFileSizeUploaded = totalFileSizeUploaded;
         }
-        public List<string> FailedFiles { get; set; }
+        public List<string> RetryFiles { get; set; }
 
         public long TotalFileSizeUploaded { get; set; }
 
         public void AddUploadResult(UploadResult resultToAdd)
         {
-            this.FailedFiles.AddRange(resultToAdd.FailedFiles);
+            this.RetryFiles.AddRange(resultToAdd.RetryFiles);
             this.TotalFileSizeUploaded += resultToAdd.TotalFileSizeUploaded;
         }
     }
@@ -657,4 +667,19 @@ namespace GitHub.Runner.Plugins.Artifact
             this.FailedFiles.AddRange(resultToAdd.FailedFiles);
         }
     }
+
+    public class UploadFailedException : Exception
+    {
+        public UploadFailedException()
+            : base()
+        { }
+
+        public UploadFailedException(string message)
+            : base(message)
+        { }
+
+        public UploadFailedException(string message, Exception inner)
+            : base(message, inner)
+        { }
+    }
 }

src/Runner.Plugins/Artifact/PublishArtifact.cs

@@ -74,17 +74,22 @@ namespace GitHub.Runner.Plugins.Artifact
             context.Output($"Uploading artifact '{artifactName}' from '{fullPath}' for run #{buildId}");
 
             FileContainerServer fileContainerHelper = new FileContainerServer(context.VssConnection, projectId, containerId, artifactName);
-            long size = await fileContainerHelper.CopyToContainerAsync(context, fullPath, token);
             var propertiesDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            propertiesDictionary.Add("artifactsize", size.ToString());
-
-            string fileContainerFullPath = StringUtil.Format($"#/{containerId}/{artifactName}");
-            context.Output($"Uploaded '{fullPath}' to server");
-
-            BuildServer buildHelper = new BuildServer(context.VssConnection);
-            string jobId = context.Variables.GetValueOrDefault(WellKnownDistributedTaskVariables.JobId).Value ?? string.Empty;
-            var artifact = await buildHelper.AssociateArtifact(projectId, buildId, jobId, artifactName, ArtifactResourceTypes.Container, fileContainerFullPath, propertiesDictionary, token);
-            context.Output($"Associated artifact {artifactName} ({artifact.Id}) with run #{buildId}");
+            try
+            {
+                long size = await fileContainerHelper.CopyToContainerAsync(context, fullPath, token);
+                propertiesDictionary.Add("artifactsize", size.ToString());
+                context.Output($"Uploaded '{size}' bytes from '{fullPath}' to server");
+            }
+            // if any of the results were successful, make sure to attach them to the build
+            finally
+            {
+                string fileContainerFullPath = StringUtil.Format($"#/{containerId}/{artifactName}");
+                BuildServer buildHelper = new BuildServer(context.VssConnection);
+                string jobId = context.Variables.GetValueOrDefault(WellKnownDistributedTaskVariables.JobId).Value ?? string.Empty;
+                var artifact = await buildHelper.AssociateArtifact(projectId, buildId, jobId, artifactName, ArtifactResourceTypes.Container, fileContainerFullPath, propertiesDictionary, token);
+                context.Output($"Associated artifact {artifactName} ({artifact.Id}) with run #{buildId}");
+            }
         }
     }
 }

src/Runner.Plugins/Runner.Plugins.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
+    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
   </PropertyGroup>
 
   <ItemGroup>

src/Runner.Sdk/ActionPlugin.cs

@@ -70,13 +70,6 @@ namespace GitHub.Runner.Sdk
 
             VssClientHttpRequestSettings.Default.UserAgent = headerValues;
 
-#if OS_LINUX || OS_OSX
-            // The .NET Core 2.1 runtime switched its HTTP default from HTTP 1.1 to HTTP 2.
-            // This causes problems with some versions of the Curl handler.
-            // See GitHub issue https://github.com/dotnet/corefx/issues/32376
-            VssClientHttpRequestSettings.Default.UseHttp11 = true;
-#endif
-
             var certSetting = GetCertConfiguration();
             if (certSetting != null)
             {

src/Runner.Sdk/Runner.Sdk.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
+    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
   </PropertyGroup>
   
   <ItemGroup>

src/Runner.Sdk/Util/VssUtil.cs

@@ -27,13 +27,6 @@ namespace GitHub.Runner.Sdk
 
             VssClientHttpRequestSettings.Default.UserAgent = headerValues;
             VssClientHttpRequestSettings.Default.ClientCertificateManager = clientCert;
-#if OS_LINUX || OS_OSX
-            // The .NET Core 2.1 runtime switched its HTTP default from HTTP 1.1 to HTTP 2.
-            // This causes problems with some versions of the Curl handler.
-            // See GitHub issue https://github.com/dotnet/corefx/issues/32376
-            VssClientHttpRequestSettings.Default.UseHttp11 = true;
-#endif
-
             VssHttpMessageHandler.DefaultWebProxy = proxy;
         }
 

src/Runner.Worker/ActionCommandManager.cs

@@ -107,26 +107,35 @@ namespace GitHub.Runner.Worker
                     }
                     else if (_commandExtensions.TryGetValue(actionCommand.Command, out IActionCommandExtension extension))
                     {
-                        bool omitEcho;
+                        bool commandHasBeenOutput = false;
+
                         try
                         {
-                            extension.ProcessCommand(context, input, actionCommand, out omitEcho);
+                            if (context.EchoOnActionCommand)
+                            {
+                                context.Output(input);
+                                context.Debug($"Processing command '{actionCommand.Command}'");
+                                commandHasBeenOutput = true;
+                            }
+
+                            extension.ProcessCommand(context, input, actionCommand);
+
+                            if (context.EchoOnActionCommand)
+                            {
+                                context.Debug($"Processed command '{actionCommand.Command}' successfully");
+                            }
                         }
                         catch (Exception ex)
                         {
-                            omitEcho = true;
-                            context.Output(input);
+                            if (!commandHasBeenOutput)
+                            {
+                                context.Output(input);
+                            }
+
                             context.Error($"Unable to process command '{input}' successfully.");
                             context.Error(ex);
                             context.CommandResult = TaskResult.Failed;
                         }
-
-                        if (!omitEcho)
-                        {
-                            context.Output(input);
-                            context.Debug($"Processed command");
-                        }
-
                     }
                     else
                     {
@@ -143,7 +152,7 @@ namespace GitHub.Runner.Worker
     {
         string Command { get; }
 
-        void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho);
+        void ProcessCommand(IExecutionContext context, string line, ActionCommand command);
     }
 
     public sealed class InternalPluginSetRepoPathCommandExtension : RunnerService, IActionCommandExtension
@@ -152,7 +161,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SetRepoPathCommandProperties.repoFullName, out string repoFullName) || string.IsNullOrEmpty(repoFullName))
             {
@@ -166,8 +175,6 @@ namespace GitHub.Runner.Worker
 
             var directoryManager = HostContext.GetService<IPipelineDirectoryManager>();
             var trackingConfig = directoryManager.UpdateRepositoryDirectory(context, repoFullName, command.Data, StringUtil.ConvertToBoolean(workspaceRepo));
-
-            omitEcho = true;
         }
 
         private static class SetRepoPathCommandProperties
@@ -183,7 +190,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SetEnvCommandProperties.Name, out string envName) || string.IsNullOrEmpty(envName))
             {
@@ -192,9 +199,7 @@ namespace GitHub.Runner.Worker
 
             context.EnvironmentVariables[envName] = command.Data;
             context.SetEnvContext(envName, command.Data);
-            context.Output(line);
             context.Debug($"{envName}='{command.Data}'");
-            omitEcho = true;
         }
 
         private static class SetEnvCommandProperties
@@ -209,7 +214,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SetOutputCommandProperties.Name, out string outputName) || string.IsNullOrEmpty(outputName))
             {
@@ -217,9 +222,7 @@ namespace GitHub.Runner.Worker
             }
 
             context.SetOutput(outputName, command.Data, out var reference);
-            context.Output(line);
             context.Debug($"{reference}='{command.Data}'");
-            omitEcho = true;
         }
 
         private static class SetOutputCommandProperties
@@ -234,7 +237,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SaveStateCommandProperties.Name, out string stateName) || string.IsNullOrEmpty(stateName))
             {
@@ -243,7 +246,6 @@ namespace GitHub.Runner.Worker
 
             context.IntraActionState[stateName] = command.Data;
             context.Debug($"Save intra-action state {stateName} = {command.Data}");
-            omitEcho = true;
         }
 
         private static class SaveStateCommandProperties
@@ -258,19 +260,17 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (string.IsNullOrWhiteSpace(command.Data))
             {
-                context.Warning("Can't add secret mask for empty string.");
+                context.Warning("Can't add secret mask for empty string in ##[add-mask] command.");
             }
             else
             {
                 HostContext.SecretMasker.AddValue(command.Data);
                 Trace.Info($"Add new secret mask with length of {command.Data.Length}");
             }
-
-            omitEcho = true;
         }
     }
 
@@ -280,12 +280,11 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             ArgUtil.NotNullOrEmpty(command.Data, "path");
             context.PrependPath.RemoveAll(x => string.Equals(x, command.Data, StringComparison.CurrentCulture));
             context.PrependPath.Add(command.Data);
-            omitEcho = false;
         }
     }
 
@@ -295,9 +294,8 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
-            omitEcho = false;
             var file = command.Data;
 
             // File is required
@@ -342,23 +340,22 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
-            omitEcho = false;
             command.Properties.TryGetValue(RemoveMatcherCommandProperties.Owner, out string owner);
             var file = command.Data;
 
             // Owner and file are mutually exclusive
             if (!string.IsNullOrEmpty(owner) && !string.IsNullOrEmpty(file))
             {
-                context.Warning("Either specify a matcher owner name or a file path. Both values cannot be set.");
+                context.Warning("Either specify an owner name or a file path in ##[remove-matcher] command. Both values cannot be set.");
                 return;
             }
 
             // Owner or file is required
             if (string.IsNullOrEmpty(owner) && string.IsNullOrEmpty(file))
             {
-                context.Warning("Either a matcher owner name or a file path must be specified.");
+                context.Warning("Either an owner name or a file path must be specified in ##[remove-matcher] command.");
                 return;
             }
 
@@ -410,9 +407,8 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command)
         {
-            omitEcho = true;
             context.Debug(command.Data);
         }
     }
@@ -438,13 +434,8 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command)
         {
-            omitEcho = true;
-            command.Properties.TryGetValue(IssueCommandProperties.File, out string file);
-            command.Properties.TryGetValue(IssueCommandProperties.Line, out string line);
-            command.Properties.TryGetValue(IssueCommandProperties.Column, out string column);
-
             Issue issue = new Issue()
             {
                 Category = "General",
@@ -452,54 +443,8 @@ namespace GitHub.Runner.Worker
                 Message = command.Data
             };
 
-            if (!string.IsNullOrEmpty(file))
-            {
-                issue.Category = "Code";
-
-                if (context.Container != null)
-                {
-                    // Translate file path back from container path
-                    file = context.Container.TranslateToHostPath(file);
-                    command.Properties[IssueCommandProperties.File] = file;
-                }
-
-                // Get the values that represent the server path given a local path
-                string repoName = context.GetGitHubContext("repository");
-                var repoPath = context.GetGitHubContext("workspace");
-
-                string relativeSourcePath = IOUtil.MakeRelative(file, repoPath);
-                if (!string.Equals(relativeSourcePath, file, IOUtil.FilePathStringComparison))
-                {
-                    // add repo info
-                    if (!string.IsNullOrEmpty(repoName))
-                    {
-                        command.Properties["repo"] = repoName;
-                    }
-
-                    if (!string.IsNullOrEmpty(relativeSourcePath))
-                    {
-                        // replace sourcePath with the new relative path
-                        // prefer `/` on all platforms
-                        command.Properties[IssueCommandProperties.File] = relativeSourcePath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-                    }
-                }
-            }
-
-            foreach (var property in command.Properties)
-            {
-                issue.Data[property.Key] = property.Value;
-            }
-
             context.AddIssue(issue);
         }
-
-        private static class IssueCommandProperties
-        {
-            public const String File = "file";
-            public const String Line = "line";
-            public const String Column = "col";
-        }
-
     }
 
     public sealed class GroupCommandExtension : GroupingCommandExtension
@@ -517,11 +462,37 @@ namespace GitHub.Runner.Worker
         public abstract string Command { get; }
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, out bool omitEcho)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             var data = this is GroupCommandExtension ? command.Data : string.Empty;
             context.Output($"##[{Command}]{data}");
-            omitEcho = true;
+        }
+    }
+
+    public sealed class EchoCommandExtension : RunnerService, IActionCommandExtension
+    {
+        public string Command => "echo";
+
+        public Type ExtensionType => typeof(IActionCommandExtension);
+
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
+        {
+            ArgUtil.NotNullOrEmpty(command.Data, "value");
+
+            switch (command.Data.Trim().ToUpperInvariant())
+            {
+                case "ON":
+                    context.EchoOnActionCommand = true;
+                    context.Debug("Setting echo command value to 'on'");
+                    break;
+                case "OFF":
+                    context.EchoOnActionCommand = false;
+                    context.Debug("Setting echo command value to 'off'");
+                    break;
+                default:
+                    throw new Exception($"Invalid echo command value. Possible values can be: 'on', 'off'. Current value is: '{command.Data}'.");
+                    break;
+            }
         }
     }
 }

src/Runner.Worker/DiagnosticLogManager.cs

@@ -2,19 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
-using System.Text;
-using System.Runtime.InteropServices;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Worker;
-using GitHub.Runner.Common.Capabilities;
-using GitHub.Services.WebApi;
-using Microsoft.Win32;
-using System.Diagnostics;
 using System.Linq;
-using System.Collections.ObjectModel;
 using System.Globalization;
-using System.Threading;
 using System.Threading.Tasks;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 using GitHub.Runner.Common;

src/Runner.Worker/ExecutionContext.cs

@@ -12,14 +12,14 @@ using GitHub.Services.WebApi;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
-using Pipelines = GitHub.DistributedTask.Pipelines;
-using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using Newtonsoft.Json;
 using System.Text;
 using System.Collections;
+using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Worker
 {
@@ -62,6 +62,8 @@ namespace GitHub.Runner.Worker
         // Only job level ExecutionContext has PostJobSteps
         Stack<IStep> PostJobSteps { get; }
 
+        bool EchoOnActionCommand { get; set; }
+
         // Initialize
         void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token);
         void CancelToken();
@@ -153,6 +155,8 @@ namespace GitHub.Runner.Worker
         // Only job level ExecutionContext has PostJobSteps
         public Stack<IStep> PostJobSteps { get; private set; }
 
+        public bool EchoOnActionCommand { get; set; }
+
 
         public TaskResult? Result
         {
@@ -292,6 +296,7 @@ namespace GitHub.Runner.Worker
             child.PrependPath = PrependPath;
             child.Container = Container;
             child.ServiceContainers = ServiceContainers;
+            child.EchoOnActionCommand = EchoOnActionCommand;
 
             if (recordOrder != null)
             {
@@ -704,6 +709,9 @@ namespace GitHub.Runner.Worker
             _logger = HostContext.CreateService<IPagingLogger>();
             _logger.Setup(_mainTimelineId, _record.Id);
 
+            // Initialize 'echo on action command success' property, default to false, unless Step_Debug is set
+            EchoOnActionCommand = Variables.Step_Debug ?? false;
+
             // Verbosity (from GitHub.Step_Debug).
             WriteDebug = Variables.Step_Debug ?? false;
 

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -60,10 +60,16 @@ namespace GitHub.Runner.Worker.Handlers
             if (string.IsNullOrEmpty(shell))
             {
 #if OS_WINDOWS
-                shellCommand = "cmd";
+                shellCommand = "pwsh";
                 if(validateShellOnHost)
                 {
-                    shellCommandPath = System.Environment.GetEnvironmentVariable("ComSpec");
+                    shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace);
+                    if (string.IsNullOrEmpty(shellCommandPath))
+                    {
+                        shellCommand = "powershell";
+                        Trace.Info($"Defaulting to {shellCommand}");
+                        shellCommandPath = WhichUtil.Which(shellCommand, require: true, Trace);
+                    }
                 }
 #else
                 shellCommand = "sh";
@@ -143,9 +149,15 @@ namespace GitHub.Runner.Worker.Handlers
             if (string.IsNullOrEmpty(shell))
             {
 #if OS_WINDOWS
-                shellCommand = "cmd";
-                commandPath = System.Environment.GetEnvironmentVariable("ComSpec");
-                ArgUtil.NotNullOrEmpty(commandPath, "%ComSpec%");
+                shellCommand = "pwsh";
+                commandPath = WhichUtil.Which(shellCommand, require: false, Trace);
+                if (string.IsNullOrEmpty(commandPath))
+                {
+                    shellCommand = "powershell";
+                    Trace.Info($"Defaulting to {shellCommand}");
+                    commandPath = WhichUtil.Which(shellCommand, require: true, Trace);
+                }
+                ArgUtil.NotNullOrEmpty(commandPath, "Default Shell");
 #else
                 shellCommand = "sh";
                 commandPath = WhichUtil.Which("bash", false, Trace) ?? WhichUtil.Which("sh", true, Trace);

src/Runner.Worker/Runner.Worker.csproj

@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>
     <Version>$(Version)</Version>
+    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
+    <PublishReadyToRun>true</PublishReadyToRun>    
   </PropertyGroup>
 
   <ItemGroup>

src/Sdk/DTExpressions2/Expressions2/IExpressionNodeExtensions.cs

@@ -56,7 +56,7 @@ namespace GitHub.DistributedTask.Expressions2
 
                 // Attempt to match a named-value or index operator.
                 // Note, do not push children of the index operator.
-                if (node is NamedValue || node is Index)
+                if (node is NamedValue || node is Sdk.Operators.Index)
                 {
                     // Lazy initialize the pattern segments
                     if (segmentedPatterns is null)
@@ -201,7 +201,7 @@ namespace GitHub.DistributedTask.Expressions2
                 result.Push(node);
             }
             // Node is an index
-            else if (node is Index index)
+            else if (node is Sdk.Operators.Index index)
             {
                 while (true)
                 {
@@ -218,7 +218,7 @@ namespace GitHub.DistributedTask.Expressions2
                         break;
                     }
                     // Parameter 0 is an index
-                    else if (parameter0 is Index index2)
+                    else if (parameter0 is Sdk.Operators.Index index2)
                     {
                         index = index2;
                     }

src/Sdk/DTExpressions2/Expressions2/Tokens/Token.cs

@@ -154,7 +154,7 @@ namespace GitHub.DistributedTask.Expressions2.Tokens
             {
                 case TokenKind.StartIndex:          // "["
                 case TokenKind.Dereference:         // "."
-                    return new Index();
+                    return new Sdk.Operators.Index();
 
                 case TokenKind.LogicalOperator:
                     switch (RawValue)

src/Sdk/DTLogging/Logging/ValueEncoders.cs

@@ -17,10 +17,16 @@ namespace GitHub.DistributedTask.Logging
             return Convert.ToBase64String(Encoding.UTF8.GetBytes(value));
         }
 
-        // Base64 is 6 bytes -> char
+        // Base64 is 6 bits -> char
+        // A byte is 8 bits
         // When end user doing somthing like base64(user:password)
         // The length of the leading content will cause different base64 encoding result on the password
-        // So we add base64(value - 1/2/3/4/5 bytes) as secret as well.
+        // So we add base64(value shifted 1 and two bytes) as secret as well. 
+        //    B1         B2      B3                    B4      B5     B6     B7
+        // 000000|00 0000|0000 00|000000|            000000|00 0000|0000 00|000000| 
+        //  Char1  Char2    Char3   Char4  
+        // See the above, the first byte has a character beginning at index 0, the second byte has a character beginning at index 4, the third byte has a character beginning at index 2 and then the pattern repeats
+        // We register byte offsets for all these possible values
         public static String Base64StringEscapeShift1(String value)
         {
             return Base64StringEscapeShift(value, 1);
@@ -31,21 +37,6 @@ namespace GitHub.DistributedTask.Logging
             return Base64StringEscapeShift(value, 2);
         }
 
-        public static String Base64StringEscapeShift3(String value)
-        {
-            return Base64StringEscapeShift(value, 3);
-        }
-
-        public static String Base64StringEscapeShift4(String value)
-        {
-            return Base64StringEscapeShift(value, 4);
-        }
-
-        public static String Base64StringEscapeShift5(String value)
-        {
-            return Base64StringEscapeShift(value, 5);
-        }
-
         public static String ExpressionStringEscape(String value)
         {
             return Expressions.ExpressionUtil.StringEscape(value);

src/Sdk/DTWebApi/WebApi/TaskAgent.cs

@@ -55,14 +55,9 @@ namespace GitHub.DistributedTask.WebApi
                 m_properties = new PropertiesCollection(agentToBeCloned.m_properties);
             }
 
-            if (agentToBeCloned.m_systemCapabilities != null && agentToBeCloned.m_systemCapabilities.Count > 0)
+            if (agentToBeCloned.m_labels != null && agentToBeCloned.m_labels.Count > 0)
             {
-                m_systemCapabilities = new Dictionary<String, String>(agentToBeCloned.m_systemCapabilities, StringComparer.OrdinalIgnoreCase);
-            }
-
-            if (agentToBeCloned.m_userCapabilities != null && agentToBeCloned.m_userCapabilities.Count > 0)
-            {
-                m_userCapabilities = new Dictionary<String, String>(agentToBeCloned.m_userCapabilities, StringComparer.OrdinalIgnoreCase);
+                m_labels = new HashSet<string>(agentToBeCloned.m_labels, StringComparer.OrdinalIgnoreCase);
             }
 
             if (agentToBeCloned.PendingUpdate != null)
@@ -152,32 +147,17 @@ namespace GitHub.DistributedTask.WebApi
         }
 
         /// <summary>
-        /// System-defined capabilities supported by this agent's host.
+        /// The labels of the runner
         /// </summary>
-        public IDictionary<String, String> SystemCapabilities
+        public ISet<string> Labels
         {
             get
             {
-                if (m_systemCapabilities == null)
+                if (m_labels == null)
                 {
-                    m_systemCapabilities = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
+                    m_labels = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
                 }
-                return m_systemCapabilities;
-            }
-        }
-
-        /// <summary>
-        /// User-defined capabilities supported by this agent's host.
-        /// </summary>
-        public IDictionary<String, String> UserCapabilities
-        {
-            get
-            {
-                if (m_userCapabilities == null)
-                {
-                    m_userCapabilities = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
-                }
-                return m_userCapabilities;
+                return m_labels;
             }
         }
 
@@ -214,10 +194,7 @@ namespace GitHub.DistributedTask.WebApi
         [DataMember(IsRequired = false, EmitDefaultValue = false, Name = "Properties")]
         private PropertiesCollection m_properties;
 
-        [DataMember(IsRequired = false, EmitDefaultValue = false, Name = "SystemCapabilities")]
-        private Dictionary<String, String> m_systemCapabilities;
-
-        [DataMember(IsRequired = false, EmitDefaultValue = false, Name = "UserCapabilities")]
-        private Dictionary<String, String> m_userCapabilities;
+        [DataMember(IsRequired = false, EmitDefaultValue = false, Name = "Labels")]
+        private HashSet<string> m_labels;
     }
 }

src/Sdk/DTWebApi/WebApi/TaskAgentHttpClient.cs

@@ -246,8 +246,7 @@ namespace GitHub.DistributedTask.WebApi
                 PlanType = hubName,
                 ScopeId = scopeIdentifier,
                 PlanId = planId,
-                JobId = jobId,
-                Demands = demands,
+                JobId = jobId
             };
 
             return QueueAgentRequestByPoolAsync(poolId, request, userState, cancellationToken);

src/Sdk/DTWebApi/WebApi/TaskAgentJobRequest.cs

@@ -35,7 +35,6 @@ namespace GitHub.DistributedTask.WebApi
             this.PoolId = requestToBeCloned.PoolId;
             this.JobId = requestToBeCloned.JobId;
             this.JobName = requestToBeCloned.JobName;
-            this.Demands = new List<Demand>(requestToBeCloned.Demands ?? new Demand[0]);
             this.LockToken = requestToBeCloned.LockToken;
             this.ExpectedDuration = requestToBeCloned.ExpectedDuration;
             this.OrchestrationId = requestToBeCloned.OrchestrationId;
@@ -68,6 +67,11 @@ namespace GitHub.DistributedTask.WebApi
             {
                 this.AgentSpecification = new JObject(requestToBeCloned.AgentSpecification);
             }
+
+            if (requestToBeCloned.Labels != null)
+            {
+                this.Labels = new HashSet<string>(requestToBeCloned.Labels, StringComparer.OrdinalIgnoreCase);
+            }
         }
 
         /// <summary>
@@ -229,6 +233,7 @@ namespace GitHub.DistributedTask.WebApi
         /// </summary>
         /// <value></value>
         [DataMember(Order = 16, EmitDefaultValue = false)]
+        [Obsolete("No more demands, use labels", true)]
         public IList<Demand> Demands
         {
             get;
@@ -386,6 +391,13 @@ namespace GitHub.DistributedTask.WebApi
             set;
         }
 
+        [DataMember(Order = 33, EmitDefaultValue = false)]
+        public ISet<string> Labels
+        {
+            get;
+            set;
+        }
+
         [IgnoreDataMember]
         internal Guid? LockToken
         {

src/Sdk/DTWebApi/WebApi/TaskAgentSession.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace GitHub.DistributedTask.WebApi
@@ -27,29 +26,6 @@ namespace GitHub.DistributedTask.WebApi
             this.OwnerName = ownerName;
         }
 
-        /// <summary>
-        /// Initializes a new <c>TaskAgentSession</c> isntance with the specified owner name, agent, and capabilities.
-        /// </summary>
-        /// <param name="ownerName">The name of the owner for this session. This should typically be the agent machine</param>
-        /// <param name="agent">The target agent for the session</param>
-        /// <param name="systemCapabilities">A collection of capabilities to publish on session creation</param>
-        public TaskAgentSession(
-            String ownerName,
-            TaskAgentReference agent,
-            IDictionary<String, String> systemCapabilities)
-        {
-            this.Agent = agent;
-            this.OwnerName = ownerName;
-
-            foreach (var capability in systemCapabilities)
-            {
-                if (capability.Value != null)
-                {
-                    this.SystemCapabilities.Add(capability.Key, capability.Value);
-                }
-            }
-        }
-
         /// <summary>
         /// Gets the unique identifier for this session.
         /// </summary>
@@ -89,33 +65,5 @@ namespace GitHub.DistributedTask.WebApi
             get;
             set;
         }
-
-        /// <summary>
-        /// Gets the collection of system capabilities used for this session.
-        /// </summary>
-        public IDictionary<String, String> SystemCapabilities
-        {
-            get
-            {
-                if (m_systemCapabilities == null)
-                {
-                    m_systemCapabilities = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
-                }
-                return m_systemCapabilities;
-            }
-        }
-
-        [OnSerializing]
-        private void OnSerializing(StreamingContext context)
-        {
-            if (m_systemCapabilities?.Count == 0)
-            {
-                m_systemCapabilities = null;
-            }
-        }
-
-
-        [DataMember(IsRequired = false, EmitDefaultValue = false, Name = "SystemCapabilities")]
-        private IDictionary<String, String> m_systemCapabilities;
     }
 }

src/Sdk/Sdk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <OutputType>Library</OutputType>
         <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
@@ -11,6 +11,7 @@
         <DefineConstants>NETSTANDARD;NET_STANDARD;TRACE</DefineConstants>
         <LangVersion>7.3</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
     </PropertyGroup>
 
     <ItemGroup>
@@ -21,11 +22,7 @@
         <PackageReference Include="System.Security.Cryptography.Cng" Version="4.4.0" />
         <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
         <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
         <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.4" />
-        <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
-        <PackageReference Include="WindowsAzure.Storage" Version="8.7.0" />
         <PackageReference Include="Minimatch" Version="2.0.0" />
         <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
     </ItemGroup>

src/Sdk/WebApi/WebApi/HttpClients/FileContainerHttpClient.cs

@@ -397,6 +397,11 @@ namespace GitHub.Services.FileContainer.Client
                     {
                         break;
                     }
+                    else if (IsFastFailResponse(response))
+                    {
+                        FileUploadTrace(itemPath, $"Chunk '{currentChunk}' attempt '{attempt}' of file '{itemPath}' received non-success status code {response.StatusCode} for sending request and cannot continue.");
+                        break;
+                    }
                     else
                     {
                         FileUploadTrace(itemPath, $"Chunk '{currentChunk}' attempt '{attempt}' of file '{itemPath}' received non-success status code {response.StatusCode} for sending request.");
@@ -538,6 +543,17 @@ namespace GitHub.Services.FileContainer.Client
                 cancellationToken);
         }
 
+        public bool IsFastFailResponse(HttpResponseMessage response)
+        {
+            int statusCode = (int)response?.StatusCode;
+            return statusCode >= 400 && statusCode <= 499;
+        }
+        
+        protected override bool ShouldThrowError(HttpResponseMessage response)
+        {
+            return !response.IsSuccessStatusCode && !IsFastFailResponse(response);
+        }
+
         private async Task<HttpResponseMessage> ContainerGetRequestAsync(
             Int64 containerId,
             String itemPath,

src/Test/L0/ExtensionManagerL0.cs

@@ -1,5 +1,4 @@
-using GitHub.Runner.Common.Capabilities;
-using GitHub.Runner.Worker;
+using GitHub.Runner.Worker;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,12 +20,12 @@ namespace GitHub.Runner.Common.Tests
                 manager.Initialize(tc);
 
                 // Act.
-                List<ICapabilitiesProvider> extensions = manager.GetExtensions<ICapabilitiesProvider>();
+                List<IActionCommandExtension> extensions = manager.GetExtensions<IActionCommandExtension>();
 
                 // Assert.
                 Assert.True(
-                    extensions.Any(x => x is RunnerCapabilitiesProvider),
-                    $"Expected {nameof(RunnerCapabilitiesProvider)} extension to be returned as a job extension.");
+                    extensions.Any(x => x is SetEnvCommandExtension),
+                    $"Expected {nameof(SetEnvCommandExtension)} extension to be returned as a job extension.");
             }
         }
 
@@ -42,9 +41,9 @@ namespace GitHub.Runner.Common.Tests
                 manager.Initialize(tc);
 
                 // Act/Assert.
-                AssertContains<GitHub.Runner.Common.Capabilities.ICapabilitiesProvider>(
+                AssertContains<GitHub.Runner.Worker.IActionCommandExtension>(
                     manager,
-                    concreteType: typeof(GitHub.Runner.Common.Capabilities.RunnerCapabilitiesProvider));
+                    concreteType: typeof(GitHub.Runner.Worker.SetEnvCommandExtension));
             }
         }
 

src/Test/L0/HostContextL0.cs

@@ -1,7 +1,9 @@
 using GitHub.Runner.Common.Util;
+using System;
 using System.IO;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Text;
 using System.Threading;
 using Xunit;
 
@@ -67,6 +69,44 @@ namespace GitHub.Runner.Common.Tests
             }
         }
 
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public void DefaultSecretMaskers()
+        {
+            try
+            {
+                // Arrange.
+                Setup();
+
+                // Act.
+                _hc.SecretMasker.AddValue("Password123!");
+                _hc.SecretMasker.AddValue("Pass\"word\"123!");
+                _hc.SecretMasker.AddValue("Pass word 123!");
+                _hc.SecretMasker.AddValue("Pass<word>123!");
+                _hc.SecretMasker.AddValue("Pass'word'123!");
+
+                // Assert.
+                Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Password123!123"));
+                Assert.Equal("password123", _hc.SecretMasker.MaskSecrets("password123"));
+                Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Pass\\\"word\\\"123!123"));
+                Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Pass%20word%20123%21123"));
+                Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Pass&lt;word&gt;123!123"));
+                Assert.Equal("123***123", _hc.SecretMasker.MaskSecrets("123Pass''word''123!123"));
+                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***", _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!"))));
+            }
+            finally
+            {
+                // Cleanup.
+                Teardown();
+            }
+        }
+
         public void Setup([CallerMemberName] string testName = "")
         {
             _tokenSource = new CancellationTokenSource();

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

@@ -1,79 +0,0 @@
-using GitHub.Runner.Common.Capabilities;
-using GitHub.Runner.Listener.Configuration;
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Listener
-{
-    public sealed class AgentCapabilitiesProviderTestL0
-    {
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Agent")]
-        public async void TestGetCapabilities()
-        {
-            using (var hc = new TestHostContext(this))
-            using (var tokenSource = new CancellationTokenSource())
-            {
-                Mock<IConfigurationManager> configurationManager = new Mock<IConfigurationManager>();
-                hc.SetSingleton<IConfigurationManager>(configurationManager.Object);
-                
-                // Arrange
-                var provider = new RunnerCapabilitiesProvider();
-                provider.Initialize(hc);
-                var settings = new RunnerSettings() { AgentName = "IAmAgent007" };
-
-                // Act
-                List<Capability> capabilities = await provider.GetCapabilitiesAsync(settings, tokenSource.Token);
-
-                // Assert
-                Assert.NotNull(capabilities);
-                Capability runnerNameCapability = capabilities.SingleOrDefault(x => string.Equals(x.Name, "Runner.Name", StringComparison.Ordinal));
-                Assert.NotNull(runnerNameCapability);
-                Assert.Equal("IAmAgent007", runnerNameCapability.Value);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Agent")]
-        public async void TestInteractiveSessionCapability()
-        {
-            using (var hc = new TestHostContext(this))
-            using (var tokenSource = new CancellationTokenSource())
-            {
-                hc.StartupType = StartupType.AutoStartup;
-                await VerifyInteractiveSessionCapability(hc, tokenSource.Token, true);
-
-                hc.StartupType = StartupType.Service;
-                await VerifyInteractiveSessionCapability(hc, tokenSource.Token, false);
-
-                hc.StartupType = StartupType.Manual;
-                await VerifyInteractiveSessionCapability(hc, tokenSource.Token, true);
-            }
-        }
-
-        private async Task VerifyInteractiveSessionCapability(IHostContext hc, CancellationToken token, bool expectedValue)
-        {
-            // Arrange
-            var provider = new RunnerCapabilitiesProvider();
-            provider.Initialize(hc);
-            var settings = new RunnerSettings() { AgentName = "IAmAgent007" };
-
-            // Act
-            List<Capability> capabilities = await provider.GetCapabilitiesAsync(settings, token);
-
-            // Assert
-            Assert.NotNull(capabilities);
-            Capability iSessionCapability = capabilities.SingleOrDefault(x => string.Equals(x.Name, "InteractiveSession", StringComparison.Ordinal));
-            Assert.NotNull(iSessionCapability);
-            bool.TryParse(iSessionCapability.Value, out bool isInteractive);
-            Assert.Equal(expectedValue, isInteractive);
-        }
-    }
-}

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

@@ -1,6 +1,5 @@
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Listener;
-using GitHub.Runner.Common.Capabilities;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Common.Util;
 using GitHub.Services.WebApi;
@@ -40,8 +39,6 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
 #endif
 
         private Mock<IRSAKeyManager> _rsaKeyManager;
-        private ICapabilitiesManager _capabilitiesManager;
-        // private DeploymentGroupAgentConfigProvider _deploymentGroupAgentConfigProvider;
         private string _expectedToken = "expectedToken";
         private string _expectedServerUrl = "https://localhost";
         private string _expectedAgentName = "expectedAgentName";
@@ -78,8 +75,6 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
             _serviceControlManager = new Mock<ILinuxServiceControlManager>();
 #endif
 
-            _capabilitiesManager = new CapabilitiesManager();
-
             var expectedAgent = new TaskAgent(_expectedAgentName) { Id = 1 };
             var expectedDeploymentMachine = new DeploymentMachine() { Agent = expectedAgent, Id = _expectedDeploymentMachineId };
             expectedAgent.Authorization = new TaskAgentAuthorization
@@ -127,7 +122,7 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
             _agentServer.Setup(x => x.GetAgentsAsync(It.IsAny<int>(), It.IsAny<string>())).Returns(Task.FromResult(expectedAgents));
 
             _agentServer.Setup(x => x.AddAgentAsync(It.IsAny<int>(), It.IsAny<TaskAgent>())).Returns(Task.FromResult(expectedAgent));
-            _agentServer.Setup(x => x.UpdateAgentAsync(It.IsAny<int>(), It.IsAny<TaskAgent>())).Returns(Task.FromResult(expectedAgent));
+            _agentServer.Setup(x => x.ReplaceAgentAsync(It.IsAny<int>(), It.IsAny<TaskAgent>())).Returns(Task.FromResult(expectedAgent));
 
             rsa = new RSACryptoServiceProvider(2048);
 
@@ -143,8 +138,6 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
             tc.SetSingleton<IExtensionManager>(_extnMgr.Object);
             tc.SetSingleton<IRunnerServer>(_agentServer.Object);
             tc.SetSingleton<ILocationServer>(_locationServer.Object);
-            // tc.SetSingleton<IDeploymentGroupServer>(_machineGroupServer.Object);
-            tc.SetSingleton<ICapabilitiesManager>(_capabilitiesManager);
             tc.SetSingleton<IRunnerWebProxy>(_runnerWebProxy.Object);
             tc.SetSingleton<IRunnerCertificateManager>(_cert.Object);
 
@@ -208,12 +201,7 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
                 // validate GetAgentPoolsAsync gets called once with automation pool type
                 _agentServer.Verify(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.Is<TaskAgentPoolType>(p => p == TaskAgentPoolType.Automation)), Times.Once);
 
-                // validate GetAgentPoolsAsync not called with deployment pool type
-                _agentServer.Verify(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.Is<TaskAgentPoolType>(p => p == TaskAgentPoolType.Deployment)), Times.Never);
-
-                // For build and release agent / deployment pool, tags logic should not get trigger;
-                // _machineGroupServer.Verify(x =>
-                //      x.UpdateDeploymentTargetsAsync(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<List<DeploymentMachine>>()), Times.Never);
+                _agentServer.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/Listener/MessageListenerL0.cs

@@ -2,7 +2,6 @@
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using GitHub.Runner.Listener;
-using GitHub.Runner.Common.Capabilities;
 using GitHub.Runner.Listener.Configuration;
 using Moq;
 using System;
@@ -21,7 +20,6 @@ namespace GitHub.Runner.Common.Tests.Listener
         private Mock<IConfigurationManager> _config;
         private Mock<IRunnerServer> _agentServer;
         private Mock<ICredentialManager> _credMgr;
-        private Mock<ICapabilitiesManager> _capabilitiesManager;
 
         public MessageListenerL0()
         {
@@ -30,7 +28,6 @@ namespace GitHub.Runner.Common.Tests.Listener
             _config.Setup(x => x.LoadSettings()).Returns(_settings);
             _agentServer = new Mock<IRunnerServer>();
             _credMgr = new Mock<ICredentialManager>();
-            _capabilitiesManager = new Mock<ICapabilitiesManager>();
         }
 
         private TestHostContext CreateTestContext([CallerMemberName] String testName = "")
@@ -39,7 +36,6 @@ namespace GitHub.Runner.Common.Tests.Listener
             tc.SetSingleton<IConfigurationManager>(_config.Object);
             tc.SetSingleton<IRunnerServer>(_agentServer.Object);
             tc.SetSingleton<ICredentialManager>(_credMgr.Object);
-            tc.SetSingleton<ICapabilitiesManager>(_capabilitiesManager.Object);
             return tc;
         }
 
@@ -62,8 +58,6 @@ namespace GitHub.Runner.Common.Tests.Listener
                         tokenSource.Token))
                     .Returns(Task.FromResult(expectedSession));
 
-                _capabilitiesManager.Setup(x => x.GetCapabilitiesAsync(_settings, It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Dictionary<string, string>()));
-
                 _credMgr.Setup(x => x.LoadCredentials()).Returns(new VssCredentials());
 
                 // Act.
@@ -106,8 +100,6 @@ namespace GitHub.Runner.Common.Tests.Listener
                         tokenSource.Token))
                     .Returns(Task.FromResult(expectedSession));
 
-                _capabilitiesManager.Setup(x => x.GetCapabilitiesAsync(_settings, It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Dictionary<string, string>()));
-
                 _credMgr.Setup(x => x.LoadCredentials()).Returns(new VssCredentials());
 
                 // Act.
@@ -153,8 +145,6 @@ namespace GitHub.Runner.Common.Tests.Listener
                         tokenSource.Token))
                     .Returns(Task.FromResult(expectedSession));
 
-                _capabilitiesManager.Setup(x => x.GetCapabilitiesAsync(_settings, It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Dictionary<string, string>()));
-
                 _credMgr.Setup(x => x.LoadCredentials()).Returns(new VssCredentials());
 
                 // Act.

src/Test/L0/ServiceInterfacesL0.cs

@@ -1,5 +1,4 @@
 using GitHub.Runner.Listener;
-using GitHub.Runner.Common.Capabilities;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Worker;
 using GitHub.Runner.Worker.Handlers;
@@ -44,7 +43,6 @@ namespace GitHub.Runner.Common.Tests
                 typeof(IHostContext),
                 typeof(ITraceManager),
                 typeof(IThrottlingReporter),
-                typeof(ICapabilitiesProvider)
             };
             Validate(
                 assembly: typeof(IHostContext).GetTypeInfo().Assembly,

src/Test/L0/Worker/ActionCommandManagerL0.cs

@@ -5,6 +5,7 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
 using Moq;
 using Xunit;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Common.Tests.Worker
 {
@@ -146,5 +147,159 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar"));
             }
         }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void EchoProcessCommand()
+        {
+            using (TestHostContext _hc = new TestHostContext(this))
+            {
+                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}");
+                                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(_ec.Object.EchoOnActionCommand);
+
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::off"));
+                Assert.False(_ec.Object.EchoOnActionCommand);
+
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::ON"));
+                Assert.True(_ec.Object.EchoOnActionCommand);
+
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::Off   "));
+                Assert.False(_ec.Object.EchoOnActionCommand);
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void EchoProcessCommandDebugOn()
+        {
+            using (TestHostContext _hc = new TestHostContext(this))
+            {
+                // Set up a few things
+                // 1. Job request message (with ACTIONS_STEP_DEBUG = true)
+                TaskOrchestrationPlanReference plan = new TaskOrchestrationPlanReference();
+                TimelineReference timeline = new TimelineReference();
+                JobEnvironment environment = new JobEnvironment();
+                environment.SystemConnection = new ServiceEndpoint();
+                List<TaskInstance> tasks = new List<TaskInstance>();
+                Guid JobId = Guid.NewGuid();
+                string jobName = "some job name";
+                var jobRequest = Pipelines.AgentJobRequestMessageUtil.Convert(new AgentJobRequestMessage(plan, timeline, JobId, jobName, jobName, environment, tasks));
+                jobRequest.Resources.Repositories.Add(new Pipelines.RepositoryResource()
+                {
+                    Alias = Pipelines.PipelineConstants.SelfAlias,
+                    Id = "github",
+                    Version = "sha1"
+                });
+                jobRequest.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
+                jobRequest.Variables["ACTIONS_STEP_DEBUG"] = "true";
+
+                // Some service dependencies
+                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);
+
+                var configurationStore = new Mock<IConfigurationStore>();
+                configurationStore.Setup(x => x.GetSettings()).Returns(new RunnerSettings());
+                _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);
+
+                // Initialize the job (to exercise logic that sets EchoOnActionCommand)
+                _ec.InitializeJob(jobRequest, System.Threading.CancellationToken.None);
+
+                _ec.Complete();
+
+                Assert.True(_ec.EchoOnActionCommand);
+
+                Assert.True(commandManager.TryProcessCommand(_ec, "::echo::off"));
+                Assert.False(_ec.EchoOnActionCommand);
+
+                Assert.True(commandManager.TryProcessCommand(_ec, "::echo::on"));
+                Assert.True(_ec.EchoOnActionCommand);
+            }
+        }
+
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void EchoProcessCommandInvalid()
+        {
+            using (TestHostContext _hc = new TestHostContext(this))
+            {
+                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}");
+                                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.Equal(TaskResult.Failed, _ec.Object.CommandResult);
+                Assert.False(_ec.Object.EchoOnActionCommand);
+
+                // 2. No value
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::"));
+                Assert.Equal(TaskResult.Failed, _ec.Object.CommandResult);
+                Assert.False(_ec.Object.EchoOnActionCommand);
+            }
+        }
     }
 }

src/Test/Test.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
         <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>

src/dev.sh

@@ -16,7 +16,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
 DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
 PACKAGE_DIR="$SCRIPT_DIR/../_package"
 DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="2.2.300"
+DOTNETSDK_VERSION="3.0.100"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)
 

src/global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.2.300"
+    "version": "3.0.100"
   }
 }

src/runnerversion

@@ -1 +1 @@
-2.159.0
+2.159.2