Merge branch 'master' into 150-runner-arch

Conflicts:
releaseNote.md
src/runnerversion

.github/workflows/build.yml

@@ -14,6 +14,7 @@ jobs:
     strategy:
       matrix:
         runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, osx-x64 ]
+        # runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, win-x86, osx-x64 ]
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -35,6 +36,10 @@ jobs:
           os: windows-latest
           devScript: ./dev
 
+        # - runtime: win-x86
+        #   os: windows-latest
+        #   devScript: ./dev
+
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1

azure-pipelines-release.yml

@@ -36,12 +36,53 @@ stages:
 
     # Upload agent package zip as build artifact
     - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (Windows x64)
+      displayName: Publish Artifact (Windows)
       inputs:
         pathToPublish: _package
         artifactName: runners
         artifactType: container
 
+  # ################################################################################
+  # - job: build_windows_agent_x86
+  # ################################################################################
+  #   displayName: Windows Agent (x86)
+  #   pool:
+  #     vmImage: vs2017-win2016
+  #   steps:
+
+  #   # Steps template for windows platform
+  #   - template: windows.template.yml
+  #     parameters:
+  #       targetRuntime: win-x86
+
+  #   # Package dotnet core windows dependency (VC++ Redistributable)
+  #   - powershell: |
+  #       Write-Host "Downloading 'VC++ Redistributable' package."
+  #       $outDir = Join-Path -Path $env:TMP -ChildPath ([Guid]::NewGuid())
+  #       New-Item -Path $outDir -ItemType directory
+  #       $outFile = Join-Path -Path $outDir -ChildPath "ucrt.zip"
+  #       Invoke-WebRequest -Uri https://vstsagenttools.blob.core.windows.net/tools/ucrt/ucrt_x86.zip -OutFile $outFile
+  #       Write-Host "Unzipping 'VC++ Redistributable' package to agent layout."
+  #       $unzipDir = Join-Path -Path $outDir -ChildPath "unzip"
+  #       Add-Type -AssemblyName System.IO.Compression.FileSystem
+  #       [System.IO.Compression.ZipFile]::ExtractToDirectory($outFile, $unzipDir)
+  #       $agentLayoutBin = Join-Path -Path $(Build.SourcesDirectory) -ChildPath "_layout\bin"
+  #       Copy-Item -Path $unzipDir -Destination $agentLayoutBin -Force
+  #     displayName: Package UCRT
+
+  #   # Create agent package zip
+  #   - script: dev.cmd package Release win-x86
+  #     workingDirectory: src
+  #     displayName: Package Release
+
+  #   # Upload agent package zip as build artifact
+  #   - task: PublishBuildArtifacts@1
+  #     displayName: Publish Artifact (Windows)
+  #     inputs:
+  #       pathToPublish: _package
+  #       artifactName: runners
+  #       artifactType: container
+
   ################################################################################
   - job: build_linux_agent_x64
   ################################################################################
@@ -62,7 +103,7 @@ stages:
 
     # Upload agent package zip as build artifact
     - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (Linux x64)
+      displayName: Publish Artifact (Linux)
       inputs:
         pathToPublish: _package
         artifactName: runners
@@ -88,7 +129,7 @@ stages:
 
     # Upload agent package zip as build artifact
     - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (Linux ARM64)
+      displayName: Publish Artifact (Linux)
       inputs:
         pathToPublish: _package
         artifactName: runners
@@ -114,7 +155,7 @@ stages:
 
     # Upload agent package zip as build artifact
     - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (Linux ARM)
+      displayName: Publish Artifact (Linux)
       inputs:
         pathToPublish: _package
         artifactName: runners
@@ -140,7 +181,7 @@ stages:
 
     # Upload agent package zip as build artifact
     - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (OSX x64)
+      displayName: Publish Artifact (OSX)
       inputs:
         pathToPublish: _package
         artifactName: runners

releaseNote.md

@@ -1,69 +1,55 @@
 ## Features
-  - Added the "severity" keyword to allow action authors to set the default severity for problem matchers (#203)
+  - Add packages for Windows x86 (win-x6), Linux ARM32 (linux-arm), Linux ARM64 (linux-arm64)
 
 ## Bugs
-  - Fixed generated self-hosted runner names to never go over 80 characters (helps Windows customers) (#193)
-  - Fixed `PrepareActions_DownloadActionFromGraph` test by pointing to an active Actions repository (#205)
+  - N/A
 
 ## Misc
-  - Updated the publish and download artifact actions to use the v2 endpoint (#188)
-  - Updated the service name on self-hosted runner name to include repository or organization information (#193)
+  - N/A
+
+## Agent Downloads  
+
+|         | Package                                                                                                       |
+| ------- | ----------------------------------------------------------------------------------------------------------- |
+| Windows x64 | [actions-runner-win-x64-<RUNNER_VERSION>.zip](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip)      |
+| macOS   | [actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz)   |
+| Linux x64  | [actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz) |
+| Linux arm64  | [actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz) |
+| Linux arm  | [actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz) |
+
+After Download:  
 
 ## Windows x64
-We recommend configuring the runner under "<DRIVE>:\actions-runner". This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows
-``` 
-// Create a folder under the drive root
-mkdir \actions-runner ; cd \actions-runner
-// Download the latest runner package
-Invoke-WebRequest -Uri https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip -OutFile actions-runner-win-x64-<RUNNER_VERSION>.zip
-// Extract the installer
-Add-Type -AssemblyName System.IO.Compression.FileSystem ; 
-[System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
+
+``` bash
+C:\> mkdir myagent && cd myagent
+C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
 ```
 
 ## OSX
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
 ```
 
 ## Linux x64
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 ```
 
-## Linux arm64 (Pre-release)
+## Linux arm64
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
 ```
 
-## Linux arm (Pre-release)
+## Linux arm
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
-```
-
-## Using your self hosted runner
-For additional details about configuring, running, or shutting down the runner please check out our [product docs.](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/adding-self-hosted-runners)
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
+```

src/Directory.Build.props

@@ -16,6 +16,9 @@
   <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux'">
     <DefineConstants>$(DefineConstants);OS_LINUX</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'rhel.6-x64'">
+    <DefineConstants>$(DefineConstants);OS_RHEL6</DefineConstants>
+  </PropertyGroup>
 
   <!-- Set Platform/bitness vars -->
   <PropertyGroup Condition="'$(BUILD_OS)' == 'Windows' AND ('$(PackageRuntime)' == 'win-x64' OR '$(PackageRuntime)' == '')">

src/Misc/externals.sh

@@ -137,7 +137,7 @@ if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
 fi
 
 # Download the external tools for Linux PACKAGERUNTIMEs.
-if [[ "$PACKAGERUNTIME" == "linux-x64" ]]; then
+if [[ "$PACKAGERUNTIME" == "linux-x64" || "$PACKAGERUNTIME" == "rhel.6-x64" ]]; then
     acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-x64.tar.gz" node12 fix_nested_dir
     # TODO: Repath this blob to use a consistent version format (_ vs .)
     acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12_4_0/alpine/node-v${NODE12_VERSION}-alpine.tar.gz" node12_alpine

src/Runner.Common/ConfigurationStore.cs

@@ -1,8 +1,6 @@
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
-using System;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
@@ -53,34 +51,6 @@ namespace GitHub.Runner.Common
 
         [DataMember(EmitDefaultValue = false)]
         public string MonitorSocketAddress { get; set; }
-
-        /// <summary>
-        // Computed property for convenience. Can either return:
-        // 1. If runner was configured at the repo level, returns something like: "myorg/myrepo"
-        // 2. If runner was configured at the org level, returns something like: "myorg"
-        /// </summary>
-        public string RepoOrOrgName
-        {
-            get
-            {
-                Uri accountUri = new Uri(this.ServerUrl);
-                string repoOrOrgName = string.Empty;
-
-                if (accountUri.Host.EndsWith(".githubusercontent.com", StringComparison.OrdinalIgnoreCase))
-                {
-                    Uri gitHubUrl = new Uri(this.GitHubUrl);
-
-                    // Use the "NWO part" from the GitHub URL path
-                    repoOrOrgName = gitHubUrl.AbsolutePath.Trim('/');
-                }
-                else
-                {
-                    repoOrOrgName = accountUri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
-                }
-
-                return repoOrOrgName;
-            }
-        }
     }
 
     [DataContract]

src/Runner.Common/Runner.Common.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Listener/Configuration/OsxServiceControlManager.cs

@@ -12,8 +12,8 @@ namespace GitHub.Runner.Listener.Configuration
     public class OsxServiceControlManager : ServiceControlManager, ILinuxServiceControlManager
     {
         // This is the name you would see when you do `systemctl list-units | grep runner`
-        private const string _svcNamePattern = "actions.runner.{0}.{1}";
-        private const string _svcDisplayPattern = "GitHub Actions Runner ({0}.{1})";
+        private const string _svcNamePattern = "actions.runner.{0}.{1}.{2}";
+        private const string _svcDisplayPattern = "GitHub Actions Runner ({0}.{1}.{2})";
         private const string _shTemplate = "darwin.svc.sh.template";
         private const string _svcShName = "svc.sh";
 

src/Runner.Listener/Configuration/ServiceControlManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Text.RegularExpressions;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
@@ -38,38 +37,25 @@ namespace GitHub.Runner.Listener.Configuration
             serviceName = string.Empty;
             serviceDisplayName = string.Empty;
 
-            if (string.IsNullOrEmpty(settings.RepoOrOrgName))
+            Uri accountUri = new Uri(settings.ServerUrl);
+            string accountName = string.Empty;
+
+            if (accountUri.Host.EndsWith(".githubusercontent.com", StringComparison.OrdinalIgnoreCase))
             {
-                throw new InvalidOperationException($"Cannot find GitHub repository/organization name from server url: '{settings.ServerUrl}'");
+                accountName = accountUri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
+            }
+            else
+            {
+                accountName = accountUri.Host.Split('.').FirstOrDefault();
             }
 
-            // For the service name, replace any characters outside of the alpha-numeric set and ".", "_", "-" with "-"
-            Regex regex = new Regex(@"[^0-9a-zA-Z._\-]");
-            string repoOrOrgName = regex.Replace(settings.RepoOrOrgName, "-");
-
-            serviceName = StringUtil.Format(serviceNamePattern, repoOrOrgName, settings.AgentName);
-
-            if (serviceName.Length > 80)
+            if (string.IsNullOrEmpty(accountName))
             {
-                Trace.Verbose($"Calculated service name is too long (> 80 chars). Trying again by calculating a shorter name.");
-
-                int exceededCharLength = serviceName.Length - 80;
-                string repoOrOrgNameSubstring = StringUtil.SubstringPrefix(repoOrOrgName, 45);
-
-                exceededCharLength -= repoOrOrgName.Length - repoOrOrgNameSubstring.Length;
-
-                string runnerNameSubstring = settings.AgentName;
-
-                // Only trim runner name if it's really necessary
-                if (exceededCharLength > 0)
-                {
-                    runnerNameSubstring = StringUtil.SubstringPrefix(settings.AgentName, settings.AgentName.Length - exceededCharLength);
-                }
-
-                serviceName = StringUtil.Format(serviceNamePattern, repoOrOrgNameSubstring, runnerNameSubstring);
+                throw new InvalidOperationException($"Cannot find GitHub organization name from server url: '{settings.ServerUrl}'");
             }
 
-            serviceDisplayName = StringUtil.Format(serviceDisplayNamePattern, repoOrOrgName, settings.AgentName);
+            serviceName = StringUtil.Format(serviceNamePattern, accountName, settings.PoolName, settings.AgentName);
+            serviceDisplayName = StringUtil.Format(serviceDisplayNamePattern, accountName, settings.PoolName, settings.AgentName);
 
             Trace.Info($"Service name '{serviceName}' display name '{serviceDisplayName}' will be used for service configuration.");
         }

src/Runner.Listener/Configuration/SystemdControlManager.cs

@@ -13,8 +13,8 @@ namespace GitHub.Runner.Listener.Configuration
     public class SystemDControlManager : ServiceControlManager, ILinuxServiceControlManager
     {
         // This is the name you would see when you do `systemctl list-units | grep runner`
-        private const string _svcNamePattern = "actions.runner.{0}.{1}.service";
-        private const string _svcDisplayPattern = "GitHub Actions Runner ({0}.{1})";
+        private const string _svcNamePattern = "actions.runner.{0}.{1}.{2}.service";
+        private const string _svcDisplayPattern = "GitHub Actions Runner ({0}.{1}.{2})";
         private const string _shTemplate = "systemd.svc.sh.template";
         private const string _shName = "svc.sh";
 

src/Runner.Listener/Configuration/WindowsServiceControlManager.cs

@@ -15,8 +15,8 @@ namespace GitHub.Runner.Listener.Configuration
     {
         public const string WindowsServiceControllerName = "RunnerService.exe";
 
-        private const string ServiceNamePattern = "actions.runner.{0}.{1}";
-        private const string ServiceDisplayNamePattern = "GitHub Actions Runner ({0}.{1})";
+        private const string ServiceNamePattern = "actionsrunner.{0}.{1}.{2}";
+        private const string ServiceDisplayNamePattern = "GitHub Actions Runner ({0}.{1}.{2})";
 
         private INativeWindowsServiceHelper _windowsServiceHelper;
         private ITerminal _term;

src/Runner.Listener/Runner.Listener.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.PluginHost/Runner.PluginHost.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Plugins/Artifact/DownloadArtifact.cs

@@ -50,62 +50,29 @@ namespace GitHub.Runner.Plugins.Artifact
                 throw new ArgumentException($"Run Id is not an Int32: {buildIdStr}");
             }
 
-            // Determine whether to call Pipelines or Build endpoint to publish artifact based on variable setting
-            string usePipelinesArtifactEndpointVar = context.Variables.GetValueOrDefault("Runner.UseActionsArtifactsApis")?.Value;
-            bool.TryParse(usePipelinesArtifactEndpointVar, out bool usePipelinesArtifactEndpoint);
-            string containerPath;
-            long containerId;
+            context.Output($"Download artifact '{artifactName}' to: '{targetPath}'");
 
-            context.Output($"Downloading artifact '{artifactName}' to: '{targetPath}'");
+            BuildServer buildHelper = new BuildServer(context.VssConnection);
+            BuildArtifact buildArtifact = await buildHelper.GetArtifact(projectId, buildId, artifactName, token);
 
-            if (usePipelinesArtifactEndpoint)
+            if (string.Equals(buildArtifact.Resource.Type, "Container", StringComparison.OrdinalIgnoreCase))
             {
-                context.Debug("Downloading artifact using v2 endpoint");
-
-                // Definition ID is a dummy value only used by HTTP client routing purposes
-                int definitionId = 1;
-
-                var pipelinesHelper = new PipelinesServer(context.VssConnection);
-
-                var actionsStorageArtifact = await pipelinesHelper.GetActionsStorageArtifact(definitionId, buildId, artifactName, token);
-
-                if (actionsStorageArtifact == null)
+                string containerUrl = buildArtifact.Resource.Data;
+                string[] parts = containerUrl.Split(new[] { '/' }, 3);
+                if (parts.Length < 3 || !long.TryParse(parts[1], out long containerId))
                 {
-                    throw new Exception($"The actions storage artifact for '{artifactName}' could not be found, or is no longer available");
+                    throw new ArgumentOutOfRangeException($"Invalid container url '{containerUrl}' for artifact '{buildArtifact.Name}'");
                 }
 
-                containerPath = actionsStorageArtifact.Name; // In actions storage artifacts, name equals the path
-                containerId = actionsStorageArtifact.ContainerId;
+                string containerPath = parts[2];
+                FileContainerServer fileContainerServer = new FileContainerServer(context.VssConnection, projectId, containerId, containerPath);
+                await fileContainerServer.DownloadFromContainerAsync(context, targetPath, token);
             }
             else
             {
-                context.Debug("Downloading artifact using v1 endpoint");
-
-                BuildServer buildHelper = new BuildServer(context.VssConnection);
-                BuildArtifact buildArtifact = await buildHelper.GetArtifact(projectId, buildId, artifactName, token);
-
-                if (string.Equals(buildArtifact.Resource.Type, "Container", StringComparison.OrdinalIgnoreCase) ||
-                    // Artifact was published by Pipelines endpoint, check new type here to handle rollback scenario
-                    string.Equals(buildArtifact.Resource.Type, "Actions_Storage", StringComparison.OrdinalIgnoreCase))
-                {
-                    string containerUrl = buildArtifact.Resource.Data;
-                    string[] parts = containerUrl.Split(new[] { '/' }, 3);
-                    if (parts.Length < 3 || !long.TryParse(parts[1], out containerId))
-                    {
-                        throw new ArgumentOutOfRangeException($"Invalid container url '{containerUrl}' for artifact '{buildArtifact.Name}'");
-                    }
-
-                    containerPath = parts[2];
-                }
-                else
-                {
-                    throw new NotSupportedException($"Invalid artifact type: {buildArtifact.Resource.Type}");
-                }
+                throw new NotSupportedException($"Invalid artifact type: {buildArtifact.Resource.Type}");
             }
 
-            FileContainerServer fileContainerServer = new FileContainerServer(context.VssConnection, projectId, containerId, containerPath);
-            await fileContainerServer.DownloadFromContainerAsync(context, targetPath, token);
-
             context.Output("Artifact download finished.");
         }
     }

src/Runner.Plugins/Artifact/PipelinesServer.cs

@@ -1,60 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Actions.Pipelines.WebApi;
-using GitHub.Services.WebApi;
-using GitHub.Runner.Sdk;
-using Pipelines = GitHub.Actions.Pipelines.WebApi;
-
-namespace GitHub.Runner.Plugins.Artifact
-{
-    // A client wrapper interacting with Pipelines's Artifact API
-    public class PipelinesServer
-    {
-        private readonly PipelinesHttpClient _pipelinesHttpClient;
-
-        public PipelinesServer(VssConnection connection)
-        {
-            ArgUtil.NotNull(connection, nameof(connection));
-            _pipelinesHttpClient = connection.GetClient<PipelinesHttpClient>();
-        }
-
-        // Associate the specified Actions Storage artifact with a pipeline
-        public async Task<Pipelines.ActionsStorageArtifact> AssociateActionsStorageArtifactAsync(
-            int pipelineId,
-            int runId,
-            long containerId,
-            string name,
-            long size,
-            CancellationToken cancellationToken = default(CancellationToken))
-        {
-            CreateArtifactParameters parameters = new CreateActionsStorageArtifactParameters()
-            {
-                Name = name,
-                ContainerId = containerId,
-                Size = size
-            };
-
-            return await _pipelinesHttpClient.CreateArtifactAsync(
-                parameters,
-                pipelineId, 
-                runId,
-                cancellationToken: cancellationToken) as Pipelines.ActionsStorageArtifact;
-        }
-
-        // Get named Actions Storage artifact for a pipeline
-        public async Task<Pipelines.ActionsStorageArtifact> GetActionsStorageArtifact(
-            int pipelineId,
-            int runId,
-            string name,
-            CancellationToken cancellationToken)
-        {
-            return await _pipelinesHttpClient.GetArtifactAsync(
-                pipelineId,
-                runId,
-                name,
-                cancellationToken: cancellationToken) as Pipelines.ActionsStorageArtifact;
-        }
-    }
-}

src/Runner.Plugins/Artifact/PublishArtifact.cs

@@ -68,59 +68,27 @@ namespace GitHub.Runner.Plugins.Artifact
             string containerIdStr = context.Variables.GetValueOrDefault(BuildVariables.ContainerId)?.Value ?? string.Empty;
             if (!long.TryParse(containerIdStr, out long containerId))
             {
-                throw new ArgumentException($"Container Id is not an Int64: {containerIdStr}");
+                throw new ArgumentException($"Container Id is not a Int64: {containerIdStr}");
             }
 
             context.Output($"Uploading artifact '{artifactName}' from '{fullPath}' for run #{buildId}");
 
             FileContainerServer fileContainerHelper = new FileContainerServer(context.VssConnection, projectId, containerId, artifactName);
             var propertiesDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            long size = 0;
-
             try
             {
-                size = await fileContainerHelper.CopyToContainerAsync(context, fullPath, token);
-
+                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
             {
-                // Determine whether to call Pipelines or Build endpoint to publish artifact based on variable setting
-                string usePipelinesArtifactEndpointVar = context.Variables.GetValueOrDefault("Runner.UseActionsArtifactsApis")?.Value;
-                bool.TryParse(usePipelinesArtifactEndpointVar, out bool usePipelinesArtifactEndpoint);
-
-                if (usePipelinesArtifactEndpoint)
-                {
-                    // Definition ID is a dummy value only used by HTTP client routing purposes
-                    int definitionId = 1;
-
-                    PipelinesServer pipelinesHelper = new PipelinesServer(context.VssConnection);
-
-                    var artifact = await pipelinesHelper.AssociateActionsStorageArtifactAsync(
-                        definitionId,
-                        buildId,
-                        containerId,
-                        artifactName,
-                        size,
-                        token);
-
-                    context.Output($"Associated artifact {artifactName} ({artifact.ContainerId}) with run #{buildId}"); 
-                    context.Debug($"Associated artifact using v2 endpoint");
-                }
-                else
-                {
-                    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}");
-                    context.Debug($"Associated artifact using v1 endpoint");
-                }
+                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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Sdk/Runner.Sdk.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Runner.Sdk/Util/StringUtil.cs

@@ -122,10 +122,5 @@ namespace GitHub.Runner.Sdk
                 return format;
             }
         }
-
-        public static string SubstringPrefix(string value, int count)
-        {
-            return value?.Substring(0, Math.Min(value.Length, count));
-        }
     }
 }

src/Runner.Worker/ContainerOperationProvider.cs

@@ -57,6 +57,9 @@ namespace GitHub.Runner.Worker
             {
                 throw new NotSupportedException("Container feature is not supported when runner is already running inside container.");
             }
+#elif OS_RHEL6
+            // Red Hat and CentOS 6 do not support the container feature
+            throw new NotSupportedException("Runner does not support the container feature on Red Hat Enterprise Linux 6 or CentOS 6.");
 #else
             var initProcessCgroup = File.ReadLines("/proc/1/cgroup");
             if (initProcessCgroup.Any(x => x.IndexOf(":/docker/", StringComparison.OrdinalIgnoreCase) >= 0))

src/Runner.Worker/IssueMatcher.cs

@@ -20,7 +20,6 @@ namespace GitHub.Runner.Worker
 
     public sealed class IssueMatcher
     {
-        private string _defaultSeverity;
         private string _owner;
         private IssuePattern[] _patterns;
         private IssueMatch[] _state;
@@ -28,7 +27,6 @@ namespace GitHub.Runner.Worker
         public IssueMatcher(IssueMatcherConfig config, TimeSpan timeout)
         {
             _owner = config.Owner;
-            _defaultSeverity = config.Severity;
             _patterns = config.Patterns.Select(x => new IssuePattern(x , timeout)).ToArray();
             Reset();
         }
@@ -39,26 +37,13 @@ namespace GitHub.Runner.Worker
             {
                 if (_owner == null)
                 {
-                    _owner = string.Empty;
+                    _owner = String.Empty;
                 }
 
                 return _owner;
             }
         }
 
-        public string DefaultSeverity
-        {
-            get
-            {
-                if (_defaultSeverity == null)
-                {
-                    _defaultSeverity = string.Empty;
-                }
-
-                return _defaultSeverity;
-            }
-        }
-
         public IssueMatch Match(string line)
         {
             // Single pattern
@@ -69,7 +54,7 @@ namespace GitHub.Runner.Worker
 
                 if (regexMatch.Success)
                 {
-                    return new IssueMatch(null, pattern, regexMatch.Groups, DefaultSeverity);
+                    return new IssueMatch(null, pattern, regexMatch.Groups);
                 }
 
                 return null;
@@ -110,7 +95,7 @@ namespace GitHub.Runner.Worker
                                 }
 
                                 // Return
-                                return new IssueMatch(runningMatch, pattern, regexMatch.Groups, DefaultSeverity);
+                                return new IssueMatch(runningMatch, pattern, regexMatch.Groups);
                             }
                             // Not the last pattern
                             else
@@ -184,7 +169,7 @@ namespace GitHub.Runner.Worker
 
     public sealed class IssueMatch
     {
-        public IssueMatch(IssueMatch runningMatch, IssuePattern pattern, GroupCollection groups, string defaultSeverity = null)
+        public IssueMatch(IssueMatch runningMatch, IssuePattern pattern, GroupCollection groups)
         {
             File = runningMatch?.File ?? GetValue(groups, pattern.File);
             Line = runningMatch?.Line ?? GetValue(groups, pattern.Line);
@@ -193,11 +178,6 @@ namespace GitHub.Runner.Worker
             Code = runningMatch?.Code ?? GetValue(groups, pattern.Code);
             Message = runningMatch?.Message ?? GetValue(groups, pattern.Message);
             FromPath = runningMatch?.FromPath ?? GetValue(groups, pattern.FromPath);
-
-            if (string.IsNullOrEmpty(Severity) && !string.IsNullOrEmpty(defaultSeverity))
-            {
-                Severity = defaultSeverity;
-            }
         }
 
         public string File { get; }
@@ -276,9 +256,6 @@ namespace GitHub.Runner.Worker
         [DataMember(Name = "owner")]
         private string _owner;
 
-        [DataMember(Name = "severity")]
-        private string _severity;
-
         [DataMember(Name = "pattern")]
         private IssuePatternConfig[] _patterns;
 
@@ -288,7 +265,7 @@ namespace GitHub.Runner.Worker
             {
                 if (_owner == null)
                 {
-                    _owner = string.Empty;
+                    _owner = String.Empty;
                 }
 
                 return _owner;
@@ -300,24 +277,6 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        public string Severity
-        {
-            get
-            {
-                if (_severity == null)
-                {
-                    _severity = string.Empty;
-                }
-
-                return _severity;
-            }
-
-            set
-            {
-                _severity = value;
-            }
-        }
-
         public IssuePatternConfig[] Patterns
         {
             get
@@ -344,17 +303,6 @@ namespace GitHub.Runner.Worker
                 throw new ArgumentException("Owner must not be empty");
             }
 
-            // Validate severity
-            switch ((_severity ?? string.Empty).ToUpperInvariant())
-            {
-                case "":
-                case "ERROR":
-                case "WARNING":
-                    break;
-                default:
-                    throw new ArgumentException($"Matcher '{_owner}' contains unexpected default severity '{_severity}'");
-            }
-
             // Validate at least one pattern
             if (_patterns == null || _patterns.Length == 0)
             {

src/Runner.Worker/Runner.Worker.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
     <NoWarn>NU1701;NU1603</NoWarn>

src/Sdk/PipelinesWebApi/Contracts/ActionsStorageArtifact.cs

@@ -1,44 +0,0 @@
-using System.Runtime.Serialization;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    [DataContract]
-    public class ActionsStorageArtifact : Artifact
-    {
-        public ActionsStorageArtifact()
-            : base(ArtifactType.Actions_Storage)
-        {
-        }
-
-        /// <summary>
-        /// File Container ID
-        /// </summary>
-        [DataMember]
-        public long ContainerId 
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Size of the file in bytes
-        /// </summary>
-        [DataMember]
-        public long Size
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Signed content url for downloading the artifact 
-        /// </summary>
-        [DataMember]
-        public SignedUrl SignedContent
-        {
-            get;
-            set;
-        }
-    }
-}

src/Sdk/PipelinesWebApi/Contracts/Artifact.cs

@@ -1,46 +0,0 @@
-using System.Runtime.Serialization;
-using GitHub.Actions.Pipelines.WebApi.Contracts;
-using Newtonsoft.Json;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    [DataContract]
-    [KnownType(typeof(ActionsStorageArtifact))]
-    [JsonConverter(typeof(ArtifactJsonConverter))]
-    public class Artifact
-    {
-        public Artifact(ArtifactType type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// The type of the artifact.
-        /// </summary>
-        [DataMember]
-        public ArtifactType Type
-        {
-            get;
-        }
-
-        /// <summary>
-        /// The name of the artifact.
-        /// </summary>
-        [DataMember]
-        public string Name
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Self-referential url
-        /// </summary>
-        [DataMember]
-        public string Url
-        {
-            get;
-            set;
-        }
-     }
-}

src/Sdk/PipelinesWebApi/Contracts/ArtifactBaseJsonConverter.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Reflection;
-using GitHub.Services.WebApi;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Serialization;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public abstract class ArtifactBaseJsonConverter<T> : VssSecureJsonConverter where T : class
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return typeof(T).GetTypeInfo().IsAssignableFrom(objectType.GetTypeInfo());
-        }
-
-        // by returning false, the converter doesn't take part in writes
-        // which means we use the default serialization logic
-        public override bool CanWrite
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        protected abstract T Create(Type objectType);
-
-        protected abstract T Create(ArtifactType type);
-
-        public override object ReadJson(
-            JsonReader reader,
-            Type objectType,
-            object existingValue,
-            JsonSerializer serializer)
-        {
-            if (reader.TokenType != JsonToken.StartObject)
-            {
-                return null;
-            }
-
-            var contract = serializer.ContractResolver.ResolveContract(objectType) as JsonObjectContract;
-            if (contract == null)
-            {
-                return existingValue;
-            }
-
-            // if objectType is one of our known types, we can ignore the type property
-            T targetObject = Create(objectType);
-
-            // read the data into a JObject so we can look at it
-            var value = JObject.Load(reader);
-
-            if (targetObject == null)
-            {
-                // use the Type property
-                var typeProperty = contract.Properties.GetClosestMatchProperty("Type");
-                if (typeProperty == null)
-                {
-                    // we don't know the type. just bail
-                    return existingValue;
-                }
-
-                if (!value.TryGetValue(typeProperty.PropertyName, StringComparison.OrdinalIgnoreCase, out var typeValue))
-                {
-                    // a type property exists on the contract, but the JObject has no value for it
-                    return existingValue;
-                }
-
-                var type = UnknownEnum.Parse<ArtifactType>(typeValue.ToString());
-                targetObject = Create(type);
-            }
-
-            if (targetObject != null)
-            {
-                using (var objectReader = value.CreateReader())
-                {
-                    serializer.Populate(objectReader, targetObject);
-                }
-            }
-
-            return targetObject;
-        }
-    }
-}

src/Sdk/PipelinesWebApi/Contracts/ArtifactJsonConverter.cs

@@ -1,29 +0,0 @@
-using System;
-
-namespace GitHub.Actions.Pipelines.WebApi.Contracts
-{
-    public class ArtifactJsonConverter : ArtifactBaseJsonConverter<Artifact>
-    {
-        protected override Artifact Create(Type objectType)
-        {
-            if (objectType == typeof(ActionsStorageArtifact))
-            {
-                return new ActionsStorageArtifact();
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        protected override Artifact Create(ArtifactType type)
-        {
-            if (type == ArtifactType.Actions_Storage)
-            {
-                return new ActionsStorageArtifact();
-            }
-
-            return null;
-        }
-    }
-}

src/Sdk/PipelinesWebApi/Contracts/ArtifactType.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    [DataContract]
-    [JsonConverter(typeof(ArtifactTypeEnumJsonConverter))]
-    public enum ArtifactType
-    {
-        Unknown = 0,
-        Actions_Storage = 1
-    }
-} 

src/Sdk/PipelinesWebApi/Contracts/ArtifactTypeEnumJsonConverter.cs

@@ -1,25 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Net.Http.Formatting;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public class ArtifactTypeEnumJsonConverter : UnknownEnumJsonConverter
-    {
-        //json.net v12 exposes a "NamingStrategy" member that can do all this. We are at json.net v10 which only supports camel case.
-        //This is a poor man's way to fake it 
-        public override void WriteJson(JsonWriter writer, object enumValue, JsonSerializer serializer)
-        {
-            var value = (ArtifactType)enumValue;
-            if (value == ArtifactType.Actions_Storage)
-            {
-                writer.WriteValue("actions_storage");
-            }
-            else
-            { 
-                base.WriteJson(writer, enumValue, serializer);
-            }
-        }
-    }
-}

src/Sdk/PipelinesWebApi/Contracts/CreateActionsStorageArtifactParameters.cs

@@ -1,33 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    [DataContract]
-    public class CreateActionsStorageArtifactParameters : CreateArtifactParameters
-    {
-        public CreateActionsStorageArtifactParameters()
-            : base(ArtifactType.Actions_Storage)
-        {
-        }
-
-        /// <summary>
-        /// the id of the file container 
-        /// </summary>
-        [DataMember]
-        public long ContainerId
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Size of the file in bytes
-        /// </summary>
-        [DataMember]
-        public long Size
-        {
-            get;
-            set;
-        }
-    }
-}

src/Sdk/PipelinesWebApi/Contracts/CreateArtifactParameters.cs

@@ -1,35 +0,0 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    [DataContract]
-    [KnownType(typeof(CreateActionsStorageArtifactParameters))]
-    [JsonConverter(typeof(CreateArtifactParametersJsonConverter))]
-    public class CreateArtifactParameters
-    {
-        protected CreateArtifactParameters(ArtifactType type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// The type of the artifact.
-        /// </summary>
-        [DataMember]
-        public ArtifactType Type
-        {
-            get;
-        }
-
-        /// <summary>
-        /// The name of the artifact.
-        /// </summary>
-        [DataMember]
-        public string Name
-        {
-            get;
-            set;
-        }
-    }
-}

src/Sdk/PipelinesWebApi/Contracts/CreateArtifactParametersJsonConverter.cs

@@ -1,29 +0,0 @@
-using System;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public class CreateArtifactParametersJsonConverter : ArtifactBaseJsonConverter<CreateArtifactParameters>
-    {
-        protected override CreateArtifactParameters Create(Type objectType)
-        {
-            if (objectType == typeof(CreateActionsStorageArtifactParameters))
-            {
-                return new CreateActionsStorageArtifactParameters();
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        protected override CreateArtifactParameters Create(ArtifactType type)
-        {
-            if (type == ArtifactType.Actions_Storage)
-            {
-                return new CreateActionsStorageArtifactParameters();
-            }
-
-            return null;
-        }
-    }
-}

src/Sdk/PipelinesWebApi/Contracts/GetArtifactExpandOptions.cs

@@ -1,16 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    /// <summary>
-    /// $expand options for GetArtifact and ListArtifacts.
-    /// </summary>
-    [TypeConverter(typeof(KnownFlagsEnumTypeConverter))]
-    [Flags]
-    public enum GetArtifactExpandOptions
-    {
-        None = 0,
-        SignedContent = 1,
-    }
-}

src/Sdk/PipelinesWebApi/FlagsEnum.cs

@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.Serialization;
-using GitHub.Services.Common;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public static class FlagsEnum
-    {
-        public static TEnum ParseKnownFlags<TEnum>(string stringValue) where TEnum : System.Enum
-        {
-            return (TEnum)ParseKnownFlags(typeof(TEnum), stringValue);
-        }
-
-        /// <summary>
-        /// Parse known enum flags in a comma-separated string. Unknown flags are ignored. Allows for degraded compatibility without serializing enums to integers.
-        /// </summary>
-        /// <remarks>
-        /// Case insensitive. Both standard and EnumMemberAttribute names are parsed.
-        /// </remarks>
-        /// <exception cref="NullReferenceException">Thrown if stringValue is null.</exception>
-        /// <exception cref="ArgumentException">Thrown if a flag name is empty.</exception>
-        public static object ParseKnownFlags(Type enumType, string stringValue)
-        {
-            ArgumentUtility.CheckForNull(enumType, nameof(enumType));
-            if (!enumType.IsEnum)
-            {
-                throw new ArgumentException(PipelinesWebApiResources.FlagEnumTypeRequired());
-            }
-
-            // Check for the flags attribute in debug. Skip this reflection in release.
-            Debug.Assert(enumType.GetCustomAttributes(typeof(FlagsAttribute), inherit: false).Any(), "FlagsEnum only intended for enums with the Flags attribute.");
-
-            // The exception types below are based on Enum.TryParseEnum (http://index/?query=TryParseEnum&rightProject=mscorlib&file=system%5Cenum.cs&rightSymbol=bhaeh2vnegwo)
-            if (stringValue == null)
-            {
-                throw new ArgumentNullException(stringValue);
-            }
-
-            if (String.IsNullOrWhiteSpace(stringValue))
-            {
-                throw new ArgumentException(PipelinesWebApiResources.NonEmptyEnumElementsRequired(stringValue));
-            }
-
-            if (UInt64.TryParse(stringValue, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out ulong ulongValue))
-            {
-                return Enum.Parse(enumType, stringValue);
-            }
-
-            var enumNames = Enum.GetNames(enumType).ToHashSet(name => name, StringComparer.OrdinalIgnoreCase);
-            var enumMemberMappings = new Lazy<IDictionary<string, string>>(() =>
-            {
-                IDictionary<string, string> mappings = null;
-                foreach (var field in enumType.GetFields())
-                {
-                    if (field.GetCustomAttributes(typeof(EnumMemberAttribute), false).FirstOrDefault() is EnumMemberAttribute enumMemberAttribute)
-                    {
-                        if (mappings == null)
-                        {
-                            mappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                        }
-                        mappings.Add(enumMemberAttribute.Value, field.GetValue(null).ToString());
-                    }
-                }
-
-                return mappings;
-            });
-
-            var values = stringValue.Split(s_enumSeparatorCharArray);
-
-            var matches = new List<string>();
-            for (int i = 0; i < values.Length; i++)
-            {
-                string value = values[i].Trim();
-
-                if (String.IsNullOrEmpty(value))
-                {
-                    throw new ArgumentException(PipelinesWebApiResources.NonEmptyEnumElementsRequired(stringValue));
-                }
-
-                if (enumNames.Contains(value))
-                {
-                    matches.Add(value);
-                }
-                else if (enumMemberMappings.Value != null && enumMemberMappings.Value.TryGetValue(value, out string matchingValue))
-                {
-                    matches.Add(matchingValue);
-                }
-            }
-
-            if (!matches.Any())
-            {
-                return Enum.Parse(enumType, "0");
-            }
-
-            string matchesString = String.Join(", ", matches);
-            return Enum.Parse(enumType, matchesString, ignoreCase: true);
-        }
-
-        private static readonly char[] s_enumSeparatorCharArray = new char[] { ',' };
-    }
-}

src/Sdk/PipelinesWebApi/Generated/PipelinesHttpClientBase.cs

@@ -1,273 +0,0 @@
-/*
- * ---------------------------------------------------------
- * Copyright(C) Microsoft Corporation. All rights reserved.
- * ---------------------------------------------------------
- *
- * ---------------------------------------------------------
- * Generated file, DO NOT EDIT
- * ---------------------------------------------------------
- *
- * See following wiki page for instructions on how to regenerate:
- *   https://aka.ms/azure-devops-client-generation
- *
- * Configuration file:
- *   actions\client\webapi\clientgeneratorconfigs\pipelines.genclient.json
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Formatting;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    [ResourceArea(PipelinesArea.IdString)]
-    public abstract class PipelinesHttpClientBase : VssHttpClientBase
-    {
-        public PipelinesHttpClientBase(Uri baseUrl, VssCredentials credentials)
-            : base(baseUrl, credentials)
-        {
-        }
-
-        public PipelinesHttpClientBase(Uri baseUrl, VssCredentials credentials, VssHttpRequestSettings settings)
-            : base(baseUrl, credentials, settings)
-        {
-        }
-
-        public PipelinesHttpClientBase(Uri baseUrl, VssCredentials credentials, params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, handlers)
-        {
-        }
-
-        public PipelinesHttpClientBase(Uri baseUrl, VssCredentials credentials, VssHttpRequestSettings settings, params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, settings, handlers)
-        {
-        }
-
-        public PipelinesHttpClientBase(Uri baseUrl, HttpMessageHandler pipeline, bool disposeHandler)
-            : base(baseUrl, pipeline, disposeHandler)
-        {
-        }
-
-        /// <summary>
-        /// [Preview API] Associates an artifact with a run.
-        /// </summary>
-        /// <param name="createArtifactParameters"></param>
-        /// <param name="pipelineId">The ID of the pipeline.</param>
-        /// <param name="runId">The ID of the run.</param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<Artifact> CreateArtifactAsync(
-            CreateArtifactParameters createArtifactParameters,
-            int pipelineId,
-            int runId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            Guid locationId = new Guid("85023071-bd5e-4438-89b0-2a5bf362a19d");
-            object routeValues = new { pipelineId = pipelineId, runId = runId };
-            HttpContent content = new ObjectContent<CreateArtifactParameters>(createArtifactParameters, new VssJsonMediaTypeFormatter(true));
-
-            return SendAsync<Artifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken,
-                content: content);
-        }
-
-        /// <summary>
-        /// [Preview API] Associates an artifact with a run.
-        /// </summary>
-        /// <param name="createArtifactParameters"></param>
-        /// <param name="project">Project ID or project name</param>
-        /// <param name="pipelineId">The ID of the pipeline.</param>
-        /// <param name="runId">The ID of the run.</param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<Artifact> CreateArtifactAsync(
-            CreateArtifactParameters createArtifactParameters,
-            string project,
-            int pipelineId,
-            int runId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            Guid locationId = new Guid("85023071-bd5e-4438-89b0-2a5bf362a19d");
-            object routeValues = new { project = project, pipelineId = pipelineId, runId = runId };
-            HttpContent content = new ObjectContent<CreateArtifactParameters>(createArtifactParameters, new VssJsonMediaTypeFormatter(true));
-
-            return SendAsync<Artifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken,
-                content: content);
-        }
-
-        /// <summary>
-        /// [Preview API] Associates an artifact with a run.
-        /// </summary>
-        /// <param name="createArtifactParameters"></param>
-        /// <param name="project">Project ID</param>
-        /// <param name="pipelineId">The ID of the pipeline.</param>
-        /// <param name="runId">The ID of the run.</param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<Artifact> CreateArtifactAsync(
-            CreateArtifactParameters createArtifactParameters,
-            Guid project,
-            int pipelineId,
-            int runId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            Guid locationId = new Guid("85023071-bd5e-4438-89b0-2a5bf362a19d");
-            object routeValues = new { project = project, pipelineId = pipelineId, runId = runId };
-            HttpContent content = new ObjectContent<CreateArtifactParameters>(createArtifactParameters, new VssJsonMediaTypeFormatter(true));
-
-            return SendAsync<Artifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken,
-                content: content);
-        }
-
-        /// <summary>
-        /// [Preview API] Get a specific artifact
-        /// </summary>
-        /// <param name="project">Project ID or project name</param>
-        /// <param name="pipelineId"></param>
-        /// <param name="runId"></param>
-        /// <param name="artifactName"></param>
-        /// <param name="expand"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<Artifact> GetArtifactAsync(
-            string project,
-            int pipelineId,
-            int runId,
-            string artifactName,
-            GetArtifactExpandOptions? expand = null,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("85023071-bd5e-4438-89b0-2a5bf362a19d");
-            object routeValues = new { project = project, pipelineId = pipelineId, runId = runId };
-
-            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
-            queryParams.Add("artifactName", artifactName);
-            if (expand != null)
-            {
-                queryParams.Add("$expand", expand.Value.ToString());
-            }
-
-            return SendAsync<Artifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                queryParameters: queryParams,
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
-
-        /// <summary>
-        /// [Preview API] Get a specific artifact
-        /// </summary>
-        /// <param name="project">Project ID</param>
-        /// <param name="pipelineId"></param>
-        /// <param name="runId"></param>
-        /// <param name="artifactName"></param>
-        /// <param name="expand"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<Artifact> GetArtifactAsync(
-            Guid project,
-            int pipelineId,
-            int runId,
-            string artifactName,
-            GetArtifactExpandOptions? expand = null,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("85023071-bd5e-4438-89b0-2a5bf362a19d");
-            object routeValues = new { project = project, pipelineId = pipelineId, runId = runId };
-
-            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
-            queryParams.Add("artifactName", artifactName);
-            if (expand != null)
-            {
-                queryParams.Add("$expand", expand.Value.ToString());
-            }
-
-            return SendAsync<Artifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                queryParameters: queryParams,
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
-
-        /// <summary>
-        /// [Preview API] Get a specific artifact
-        /// </summary>
-        /// <param name="pipelineId"></param>
-        /// <param name="runId"></param>
-        /// <param name="artifactName"></param>
-        /// <param name="expand"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<Artifact> GetArtifactAsync(
-            int pipelineId,
-            int runId,
-            string artifactName,
-            GetArtifactExpandOptions? expand = null,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("85023071-bd5e-4438-89b0-2a5bf362a19d");
-            object routeValues = new { pipelineId = pipelineId, runId = runId };
-
-            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
-            queryParams.Add("artifactName", artifactName);
-            if (expand != null)
-            {
-                queryParams.Add("$expand", expand.Value.ToString());
-            }
-
-            return SendAsync<Artifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                queryParameters: queryParams,
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
-    }
-}

src/Sdk/PipelinesWebApi/KnownFlagsEnumTypeConverter.cs

@@ -1,44 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    /// <summary>
-    /// Parses known enum flags in a comma-separated string. Unknown flags are ignored. Allows for degraded compatibility without serializing enums to integer values.
-    /// </summary>
-    /// <remarks>
-    /// Case insensitive. Both standard and EnumMemberAttribute names are parsed.
-    /// json deserialization doesn't happen for query parameters :)
-    /// </remarks>
-    public class KnownFlagsEnumTypeConverter : EnumConverter
-    {
-        public KnownFlagsEnumTypeConverter(Type type)
-            : base(type)
-        {
-        }
-
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
-        }
-
-        /// <exception cref="FormatException">Thrown if a flag name is empty.</exception>
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
-        {
-            if (value is string stringValue)
-            {
-                try
-                {
-                    return FlagsEnum.ParseKnownFlags(EnumType, stringValue);
-                }
-                catch (Exception ex)
-                {
-                    // Matches the exception type thrown by EnumTypeConverter.
-                    throw new FormatException(PipelinesWebApiResources.InvalidFlagsEnumValue(stringValue, EnumType), ex);
-                }
-            }
-            return base.ConvertFrom(context, culture, value);
-        }
-    }
-}

src/Sdk/PipelinesWebApi/PipelinesHttpClient.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Net.Http;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    [ResourceArea(PipelinesArea.IdString)]
-    public class PipelinesHttpClient : PipelinesHttpClientBase
-    {
-        public PipelinesHttpClient(Uri baseUrl, VssCredentials credentials)
-            : base(baseUrl, credentials)
-        {
-        }
-
-        public PipelinesHttpClient(Uri baseUrl, VssCredentials credentials, VssHttpRequestSettings settings)
-            : base(baseUrl, credentials, settings)
-        {
-        }
-
-        public PipelinesHttpClient(Uri baseUrl, VssCredentials credentials, params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, handlers)
-        {
-        }
-
-        public PipelinesHttpClient(Uri baseUrl, VssCredentials credentials, VssHttpRequestSettings settings, params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, settings, handlers)
-        {
-        }
-
-        public PipelinesHttpClient(Uri baseUrl, HttpMessageHandler pipeline, bool disposeHandler)
-            : base(baseUrl, pipeline, disposeHandler)
-        {
-        }
-    }
-}

src/Sdk/PipelinesWebApi/PipelinesResourceIds.cs

@@ -1,74 +0,0 @@
-using System;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public static class PipelinesArea
-    {
-        public const string Name = "pipelines";
-        public const string IdString = "2e0bf237-8973-4ec9-a581-9c3d679d1776";
-        public static readonly Guid Id = new Guid(PipelinesArea.IdString);
-    }
-
-    public static class PipelinesResources
-    {
-        public static class Artifacts
-        {
-            public const string Name = "artifacts";
-            public static readonly Guid Id = new Guid("85023071-BD5E-4438-89B0-2A5BF362A19D");
-        }
-
-        public static class PipelineOrgs
-        {
-            public const string Name = "orgs";
-            public static readonly Guid Id = new Guid("CD70BA1A-D59A-4E0B-9934-97998159CCC8");
-        }
-
-        public static class Logs
-        {
-            public const string Name = "logs";
-            public static readonly Guid Id = new Guid("fb1b6d27-3957-43d5-a14b-a2d70403e545");
-        }
-
-        public static class Pipelines
-        {
-            public const string Name = "pipelines";
-            public static readonly Guid Id = new Guid("28e1305e-2afe-47bf-abaf-cbb0e6a91988");
-        }
-
-        public static class Reputations
-        {
-            public const string Name = "reputations";
-            public static readonly Guid Id = new Guid("ABA353B0-46FB-4885-88C5-391C6B6382B3");
-        }
-
-        public static class Runs
-        {
-            public const string Name = "runs";
-            public static readonly Guid Id = new Guid("7859261e-d2e9-4a68-b820-a5d84cc5bb3d");
-        }
-
-        public static class SignalR
-        {
-            public const string Name = "signalr";
-            public static readonly Guid Id = new Guid("1FFE4916-AC72-4566-ADD0-9BAB31E44FCF");
-        }
-
-        public static class SignedArtifactsContent
-        {
-            public const string Name = "signedartifactscontent";
-            public static readonly Guid Id = new Guid("6B2AC16F-CD00-4DF9-A13B-3A1CC8AFB188");
-        }
-
-        public static class SignedLogContent
-        {
-            public const string Name = "signedlogcontent";
-            public static readonly Guid Id = new Guid("74f99e32-e2c4-44f4-93dc-dec0bca530a5");
-        }
-
-        public static class SignalRLive
-        {
-            public const string Name = "live";
-            public static readonly Guid Id = new Guid("C41B3775-6D50-48BD-B261-42DA7F0F1BA0");
-        }
-    }
-}

src/Sdk/PipelinesWebApi/UnknownEnum.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.Serialization;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public static class UnknownEnum
-    {
-        public static T Parse<T>(string stringValue)
-        {
-            return (T)Parse(typeof(T), stringValue);
-        }
-
-        public static object Parse(Type enumType, string stringValue)
-        {
-            var underlyingType = Nullable.GetUnderlyingType(enumType);
-            enumType = underlyingType != null ? underlyingType : enumType;
-
-            var names = Enum.GetNames(enumType);
-            if (!string.IsNullOrEmpty(stringValue))
-            {
-                var match = names.FirstOrDefault(name => string.Equals(name, stringValue, StringComparison.OrdinalIgnoreCase));
-                if (match != null)
-                {
-                    return Enum.Parse(enumType, match);
-                }
-
-                // maybe we have an enum member with an EnumMember attribute specifying a custom name
-                foreach (var field in enumType.GetFields())
-                {
-                    var enumMemberAttribute = field.GetCustomAttributes(typeof(EnumMemberAttribute), false).FirstOrDefault() as EnumMemberAttribute;
-                    if (enumMemberAttribute != null && string.Equals(enumMemberAttribute.Value, stringValue, StringComparison.OrdinalIgnoreCase))
-                    {
-                        // we already have the field, no need to do enum.parse on it
-                        return field.GetValue(null);
-                    }
-                }
-            }
-
-            return Enum.Parse(enumType, UnknownName);
-        }
-
-        private const string UnknownName = "Unknown";
-    }
-}

src/Sdk/PipelinesWebApi/UnknownEnumJsonConverter.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public class UnknownEnumJsonConverter : StringEnumConverter
-    {
-        public UnknownEnumJsonConverter()
-        {
-            this.CamelCaseText = true;
-        }
-
-        public override bool CanConvert(Type objectType)
-        {
-            // we require one member to be named "Unknown"
-            return objectType.IsEnum && Enum.GetNames(objectType).Any(name => string.Equals(name, UnknownName, StringComparison.OrdinalIgnoreCase));
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            // Newtonsoft doesn't call CanConvert if you specify the converter using a JsonConverter attribute
-            // they just assume you know what you're doing :)
-            if (!CanConvert(objectType))
-            {
-                // if there's no Unknown value, fall back to the StringEnumConverter behavior
-                return base.ReadJson(reader, objectType, existingValue, serializer);
-            }
-
-            if (reader.TokenType == JsonToken.Integer)
-            {
-                var intValue = Convert.ToInt32(reader.Value);
-                var values = (int[])Enum.GetValues(objectType);
-                if (values.Contains(intValue))
-                {
-                    return Enum.Parse(objectType, intValue.ToString());
-                }
-            }
-
-            if (reader.TokenType == JsonToken.String)
-            {
-                var stringValue = reader.Value.ToString();
-                return UnknownEnum.Parse(objectType, stringValue);
-            }
-
-            // we know there's an Unknown value because CanConvert returned true
-            return Enum.Parse(objectType, UnknownName);
-        }
-
-        private const string UnknownName = "Unknown";
-    }
-}

src/Sdk/Resources/PipelinesWebApiResources.g.cs

@@ -1,26 +0,0 @@
-using System.Globalization;
-
-namespace GitHub.Actions.Pipelines.WebApi
-{
-    public static class PipelinesWebApiResources
-    {
-
-        public static string FlagEnumTypeRequired()
-        {
-            const string Format = @"Invalid type. An enum type with the Flags attribute must be supplied.";
-            return Format;
-        }
-
-        public static string InvalidFlagsEnumValue(object arg0, object arg1)
-        {
-            const string Format = @"'{0}' is not a valid value for {1}";
-            return string.Format(CultureInfo.CurrentCulture, Format, arg0, arg1);
-        }
-
-        public static string NonEmptyEnumElementsRequired(object arg0)
-        {
-            const string Format = @"Each comma separated enum value must be non-empty: {0}";
-            return string.Format(CultureInfo.CurrentCulture, Format, arg0);
-        }
-    }
-}

src/Sdk/Sdk.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp3.0</TargetFramework>
         <OutputType>Library</OutputType>
-        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;rhel.6-x64;osx-x64</RuntimeIdentifiers>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
         <AssetTargetFallback>portable-net45+win8</AssetTargetFallback>
         <NoWarn>NU1701;NU1603</NoWarn>

src/Sdk/WebApi/WebApi/Contracts/SignedUrl/SignedUrl.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace GitHub.Services.WebApi
-{
-    /// <summary>
-    /// A signed url allowing limited-time anonymous access to private resources.
-    /// </summary>
-    [DataContract]
-    public class SignedUrl
-    {
-        [DataMember]
-        public string Url { get; set; }
-
-        [DataMember]
-        public DateTime SignatureExpires { get; set; }
-    }
-}

src/Test/L0/ConstantGenerationL0.cs

@@ -19,6 +19,7 @@ namespace GitHub.Runner.Common.Tests
                 "linux-x64",
                 "linux-arm",
                 "linux-arm64",
+                "rhel.6-x64",
                 "osx-x64"
             };
 

src/Test/L0/ServiceControlManagerL0.cs

@@ -1,175 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using GitHub.Runner.Common;
-using GitHub.Runner.Listener.Configuration;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests
-{
-    public sealed class ServiceControlManagerL0
-    {
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Service")]
-        public void CalculateServiceName()
-        {
-            RunnerSettings settings = new RunnerSettings();
-
-            settings.AgentName = "thisiskindofalongrunnername1";
-            settings.ServerUrl = "https://example.githubusercontent.com/12345678901234567890123456789012345678901234567890";
-            settings.GitHubUrl = "https://github.com/myorganizationexample/myrepoexample";
-
-            string serviceNamePattern = "actions.runner.{0}.{1}";
-            string serviceDisplayNamePattern = "GitHub Actions Runner ({0}.{1})";
-
-            using (TestHostContext hc = CreateTestContext())
-            {
-                ServiceControlManager scm = new ServiceControlManager();
-
-                scm.Initialize(hc);
-                scm.CalculateServiceName(
-                    settings,
-                    serviceNamePattern,
-                    serviceDisplayNamePattern,
-                    out string serviceName,
-                    out string serviceDisplayName);
-
-                var serviceNameParts = serviceName.Split('.');
-
-                // Verify name is 79 characters
-                Assert.Equal(79, serviceName.Length);
-
-                // Verify nothing has been shortened out
-                Assert.Equal("actions", serviceNameParts[0]);
-                Assert.Equal("runner", serviceNameParts[1]);
-                Assert.Equal("myorganizationexample-myrepoexample", serviceNameParts[2]); // '/' has been replaced with '-'
-                Assert.Equal("thisiskindofalongrunnername1", serviceNameParts[3]);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Service")]
-        public void CalculateServiceName80Chars()
-        {
-            RunnerSettings settings = new RunnerSettings();
-
-            settings.AgentName = "thisiskindofalongrunnername12";
-            settings.ServerUrl = "https://example.githubusercontent.com/12345678901234567890123456789012345678901234567890";
-            settings.GitHubUrl = "https://github.com/myorganizationexample/myrepoexample";
-
-            string serviceNamePattern = "actions.runner.{0}.{1}";
-            string serviceDisplayNamePattern = "GitHub Actions Runner ({0}.{1})";
-
-            using (TestHostContext hc = CreateTestContext())
-            {
-                ServiceControlManager scm = new ServiceControlManager();
-
-                scm.Initialize(hc);
-                scm.CalculateServiceName(
-                    settings,
-                    serviceNamePattern,
-                    serviceDisplayNamePattern,
-                    out string serviceName,
-                    out string serviceDisplayName);
-
-                // Verify name is still equal to 80 characters
-                Assert.Equal(80, serviceName.Length);
-
-                var serviceNameParts = serviceName.Split('.');
-
-                // Verify nothing has been shortened out
-                Assert.Equal("actions", serviceNameParts[0]);
-                Assert.Equal("runner", serviceNameParts[1]);
-                Assert.Equal("myorganizationexample-myrepoexample", serviceNameParts[2]); // '/' has been replaced with '-'
-                Assert.Equal("thisiskindofalongrunnername12", serviceNameParts[3]);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Service")]
-        public void CalculateServiceNameLimitsServiceNameTo80Chars()
-        {
-            RunnerSettings settings = new RunnerSettings();
-
-            settings.AgentName = "thisisareallyreallylongbutstillvalidagentname";
-            settings.ServerUrl = "https://example.githubusercontent.com/12345678901234567890123456789012345678901234567890";
-            settings.GitHubUrl = "https://github.com/myreallylongorganizationexample/myreallylongrepoexample";
-
-            string serviceNamePattern = "actions.runner.{0}.{1}";
-            string serviceDisplayNamePattern = "GitHub Actions Runner ({0}.{1})";
-
-            using (TestHostContext hc = CreateTestContext())
-            {
-                ServiceControlManager scm = new ServiceControlManager();
-
-                scm.Initialize(hc);
-                scm.CalculateServiceName(
-                    settings,
-                    serviceNamePattern,
-                    serviceDisplayNamePattern,
-                    out string serviceName,
-                    out string serviceDisplayName);
-
-                // Verify name has been shortened to 80 characters
-                Assert.Equal(80, serviceName.Length);
-
-                var serviceNameParts = serviceName.Split('.');
-
-                // Verify that each component has been shortened to a sensible length
-                Assert.Equal("actions", serviceNameParts[0]); // Never shortened
-                Assert.Equal("runner", serviceNameParts[1]); // Never shortened
-                Assert.Equal("myreallylongorganizationexample-myreallylongr", serviceNameParts[2]); // First 45 chars, '/' has been replaced with '-'
-                Assert.Equal("thisisareallyreally", serviceNameParts[3]); // Remainder of unused chars
-            }
-        }
-
-        // Special 'defensive' test that verifies we can gracefully handle creating service names
-        // in case GitHub.com changes its org/repo naming convention in the future,
-        // and some of these characters may be invalid for service names
-        // Not meant to test character set exhaustively -- it's just here to exercise the sanitizing logic
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Service")]
-        public void CalculateServiceNameSanitizeOutOfRangeChars()
-        {
-            RunnerSettings settings = new RunnerSettings();
-
-            settings.AgentName = "name";
-            settings.ServerUrl = "https://example.githubusercontent.com/12345678901234567890123456789012345678901234567890";
-            settings.GitHubUrl = "https://github.com/org!@$*+[]()/repo!@$*+[]()";
-
-            string serviceNamePattern = "actions.runner.{0}.{1}";
-            string serviceDisplayNamePattern = "GitHub Actions Runner ({0}.{1})";
-
-            using (TestHostContext hc = CreateTestContext())
-            {
-                ServiceControlManager scm = new ServiceControlManager();
-
-                scm.Initialize(hc);
-                scm.CalculateServiceName(
-                    settings,
-                    serviceNamePattern,
-                    serviceDisplayNamePattern,
-                    out string serviceName,
-                    out string serviceDisplayName);
-
-                var serviceNameParts = serviceName.Split('.');
-
-                // Verify service name parts are sanitized correctly
-                Assert.Equal("actions", serviceNameParts[0]);
-                Assert.Equal("runner", serviceNameParts[1]);
-                Assert.Equal("org----------repo---------", serviceNameParts[2]); // Chars replaced with '-'
-                Assert.Equal("name", serviceNameParts[3]);
-            }
-        }
-
-        private TestHostContext CreateTestContext([CallerMemberName] string testName = "")
-        {
-            TestHostContext hc = new TestHostContext(this, testName);
-
-            return hc;
-        }
-    }
-}

src/Test/L0/Worker/ActionManagerL0.cs

@@ -209,7 +209,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                         Id = actionId,
                         Reference = new Pipelines.RepositoryPathReference()
                         {
-                            Name = "actions/download-artifact",
+                            Name = "actions/npm",
                             Ref = "master",
                             RepositoryType = "GitHub"
                         }
@@ -220,12 +220,12 @@ namespace GitHub.Runner.Common.Tests.Worker
                 await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 //Assert
-                var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "actions/download-artifact", "master.completed");
+                var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "actions/npm", "master.completed");
                 Assert.True(File.Exists(watermarkFile));
 
-                var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "actions/download-artifact", "master", "action.yml");
-                Assert.True(File.Exists(actionYamlFile));
-                _hc.GetTrace().Info(File.ReadAllText(actionYamlFile));
+                var actionDockerfile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "actions/npm", "master", "Dockerfile");
+                Assert.True(File.Exists(actionDockerfile));
+                _hc.GetTrace().Info(File.ReadAllText(actionDockerfile));
             }
             finally
             {

src/Test/L0/Worker/IssueMatcherL0.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using GitHub.Runner.Worker;
 using GitHub.Services.WebApi;
 using Xunit;
@@ -350,48 +353,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             config.Validate();
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Matcher_MultiplePatterns_DefaultSeverity()
-        {
-            var config = JsonUtility.FromString<IssueMatchersConfig>(@"
-{
-  ""problemMatcher"": [
-    {
-      ""owner"": ""myMatcher"",
-      ""severity"": ""warning"",
-      ""pattern"": [
-        {
-          ""regexp"": ""^(ERROR)?(?: )?(.+):$"",
-          ""severity"": 1,
-          ""code"": 2
-        },
-        {
-          ""regexp"": ""^(.+)$"",
-          ""message"": 1
-        }
-      ]
-    }
-  ]
-}
-");
-            config.Validate();
-            var matcher = new IssueMatcher(config.Matchers[0], TimeSpan.FromSeconds(1));
-
-            var match = matcher.Match("ABC:");
-            match = matcher.Match("not-working");
-            Assert.Equal("warning", match.Severity);
-            Assert.Equal("ABC", match.Code);
-            Assert.Equal("not-working", match.Message);
-
-            match = matcher.Match("ERROR ABC:");
-            match = matcher.Match("not-working");
-            Assert.Equal("ERROR", match.Severity);
-            Assert.Equal("ABC", match.Code);
-            Assert.Equal("not-working", match.Message);
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -793,43 +754,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             Assert.Equal("myMatcher", matcher.Owner);
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Matcher_SinglePattern_DefaultSeverity()
-        {
-            var config = JsonUtility.FromString<IssueMatchersConfig>(@"
-{
-  ""problemMatcher"": [
-    {
-      ""owner"": ""myMatcher"",
-      ""severity"": ""warning"",
-      ""pattern"": [
-        {
-          ""regexp"": ""^(ERROR)?(?: )?(.+): (.+)$"",
-          ""severity"": 1,
-          ""code"": 2,
-          ""message"": 3
-        }
-      ]
-    }
-  ]
-}
-");
-            config.Validate();
-            var matcher = new IssueMatcher(config.Matchers[0], TimeSpan.FromSeconds(1));
-
-            var match = matcher.Match("ABC: not-working");
-            Assert.Equal("warning", match.Severity);
-            Assert.Equal("ABC", match.Code);
-            Assert.Equal("not-working", match.Message);
-
-            match = matcher.Match("ERROR ABC: not-working");
-            Assert.Equal("ERROR", match.Severity);
-            Assert.Equal("ABC", match.Code);
-            Assert.Equal("not-working", match.Message);
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]

src/Test/Test.csproj

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

src/dev.sh

@@ -47,6 +47,13 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
             aarch64) RUNTIME_ID="linux-arm64";;
         esac
     fi
+
+    if [ -e /etc/redhat-release ]; then
+        redhatRelease=$(</etc/redhat-release)
+        if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
+            RUNTIME_ID='rhel.6-x64'
+        fi
+    fi
 elif [[ "$CURRENT_PLATFORM" == 'darwin' ]]; then
     RUNTIME_ID='osx-x64'
 fi
@@ -57,7 +64,7 @@ fi
 
 # Make sure current platform support publish the dotnet runtime
 # Windows can publish win-x86/x64
-# Linux can publish linux-x64/arm/arm64
+# Linux can publish linux-x64/arm/rhel.6-x64
 # OSX can publish osx-x64
 if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then
     if [[ ("$RUNTIME_ID" != 'win-x86') && ("$RUNTIME_ID" != 'win-x64') ]]; then
@@ -65,7 +72,7 @@ if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then
         exit 1
     fi
 elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
-    if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-x86') && ("$RUNTIME_ID" != 'linux-arm64') && ("$RUNTIME_ID" != 'linux-arm') ]]; then
+    if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-x86') && ("$RUNTIME_ID" != 'linux-arm64') && ("$RUNTIME_ID" != 'linux-arm') && ("$RUNTIME_ID" != 'rhel.6-x64') ]]; then
        echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
        exit 1
     fi

src/runnerversion

@@ -1 +1 @@
-2.162.0
+2.161.0