Merge branch 'master' into 150-runner-arch

Conflicts: releaseNote.md src/runnerversion
V 2.160.2 Release notes and version bump (#190 )
2025-12-10 12:36:23 +00:00 · 2019-11-12 11:36:25 -05:00 · 2019-11-11 15:45:37 -05:00 · 2019-11-11 15:45:13 -05:00 · 2019-11-11 15:40:18 -05:00 · 2019-11-11 15:35:15 -05:00
43 changed files with 781 additions and 565 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,34 +1,53 @@
 name: Runner CI

-on: 
+on:
  push:
-    branches: 
+    branches:
    - master
    - releases/*
  pull_request:
-    branches: 
+    branches:
    - '*'

 jobs:
  build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        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:
-        - os: ubuntu-latest
+        - runtime: linux-x64
+          os: ubuntu-latest
          devScript: ./dev.sh
-        - os: macOS-latest
+
+        - runtime: linux-arm64
+          os: ubuntu-latest
          devScript: ./dev.sh
-        - os: windows-latest
+
+        - runtime: linux-arm
+          os: ubuntu-latest
+          devScript: ./dev.sh
+
+        - runtime: osx-x64
+          os: macOS-latest
+          devScript: ./dev.sh
+
+        - runtime: win-x64
+          os: windows-latest
          devScript: ./dev
+
+        # - runtime: win-x86
+        #   os: windows-latest
+        #   devScript: ./dev
+
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v1
-    
+
    # Build runner layout
    - name: Build & Layout Release
      run: |
-        ${{ matrix.devScript }} layout Release
+        ${{ matrix.devScript }} layout Release ${{ matrix.runtime }}
      working-directory: src

    # Run tests
@@ -36,18 +55,19 @@ jobs:
      run: |
        ${{ matrix.devScript }} test
      working-directory: src
-  
+      if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm'
+
    # Create runner package tar.gz/zip
    - name: Package Release
      if: github.event_name != 'pull_request'
      run: |
        ${{ matrix.devScript }} package Release
      working-directory: src
-      
+
    # Upload runner package tar.gz/zip as artifact
    - name: Publish Artifact
      if: github.event_name != 'pull_request'
      uses: actions/upload-artifact@v1
      with:
-        name: runner-package-${{ matrix.os }} 
+        name: runner-package-${{ matrix.runtime }}
        path: _package
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 **/libs
 **/*.xproj
 **/*.xproj.user
-**/*.sln
 **/.vs
 **/.vscode
 **/*.error
--- a/ActionsRunner.sln
+++ b/ActionsRunner.sln
@@ -0,0 +1,73 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29411.138
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Runner.Common", "src\Runner.Common\Runner.Common.csproj", "{084289A3-CD7A-42E0-9219-4348B4B7E19B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Runner.Listener", "src\Runner.Listener\Runner.Listener.csproj", "{7D461AEE-BF2A-4855-BD96-56921160B36A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Runner.PluginHost", "src\Runner.PluginHost\Runner.PluginHost.csproj", "{D0320EB1-CB6D-4179-BFDC-2F2B664A370C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Runner.Plugins", "src\Runner.Plugins\Runner.Plugins.csproj", "{C23AFD6F-4DCD-4243-BC61-865BE31B9168}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Runner.Sdk", "src\Runner.Sdk\Runner.Sdk.csproj", "{D0484633-DA97-4C34-8E47-1DADE212A57A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RunnerService", "src\Runner.Service\Windows\RunnerService.csproj", "{D12EBD71-0464-46D0-8394-40BCFBA0A6F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Runner.Worker", "src\Runner.Worker\Runner.Worker.csproj", "{C2F5B9FA-2621-411F-8EB2-273ED276F503}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sdk", "src\Sdk\Sdk.csproj", "{D2EE812B-E4DF-49BB-AE87-12BC49949B5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "src\Test\Test.csproj", "{C932061F-F6A1-4F1E-B854-A6C6B30DC3EF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{084289A3-CD7A-42E0-9219-4348B4B7E19B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{084289A3-CD7A-42E0-9219-4348B4B7E19B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{084289A3-CD7A-42E0-9219-4348B4B7E19B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{084289A3-CD7A-42E0-9219-4348B4B7E19B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D461AEE-BF2A-4855-BD96-56921160B36A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D461AEE-BF2A-4855-BD96-56921160B36A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D461AEE-BF2A-4855-BD96-56921160B36A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D461AEE-BF2A-4855-BD96-56921160B36A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0320EB1-CB6D-4179-BFDC-2F2B664A370C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0320EB1-CB6D-4179-BFDC-2F2B664A370C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0320EB1-CB6D-4179-BFDC-2F2B664A370C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0320EB1-CB6D-4179-BFDC-2F2B664A370C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C23AFD6F-4DCD-4243-BC61-865BE31B9168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C23AFD6F-4DCD-4243-BC61-865BE31B9168}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C23AFD6F-4DCD-4243-BC61-865BE31B9168}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C23AFD6F-4DCD-4243-BC61-865BE31B9168}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0484633-DA97-4C34-8E47-1DADE212A57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0484633-DA97-4C34-8E47-1DADE212A57A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0484633-DA97-4C34-8E47-1DADE212A57A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0484633-DA97-4C34-8E47-1DADE212A57A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D12EBD71-0464-46D0-8394-40BCFBA0A6F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D12EBD71-0464-46D0-8394-40BCFBA0A6F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D12EBD71-0464-46D0-8394-40BCFBA0A6F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D12EBD71-0464-46D0-8394-40BCFBA0A6F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2F5B9FA-2621-411F-8EB2-273ED276F503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2F5B9FA-2621-411F-8EB2-273ED276F503}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2F5B9FA-2621-411F-8EB2-273ED276F503}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2F5B9FA-2621-411F-8EB2-273ED276F503}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2EE812B-E4DF-49BB-AE87-12BC49949B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2EE812B-E4DF-49BB-AE87-12BC49949B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2EE812B-E4DF-49BB-AE87-12BC49949B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2EE812B-E4DF-49BB-AE87-12BC49949B5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C932061F-F6A1-4F1E-B854-A6C6B30DC3EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C932061F-F6A1-4F1E-B854-A6C6B30DC3EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C932061F-F6A1-4F1E-B854-A6C6B30DC3EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C932061F-F6A1-4F1E-B854-A6C6B30DC3EF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4A831DDA-3860-45E5-930E-BB3A7833AE80}
+	EndGlobalSection
+EndGlobal
--- a/assets.json
+++ b/assets.json
@@ -16,5 +16,17 @@
        "platform": "linux-x64",
        "version": "<RUNNER_VERSION>",
        "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz"
+    },
+    {
+        "name": "actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz",
+        "platform": "linux-arm64",
+        "version": "<RUNNER_VERSION>",
+        "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz"
+    },
+    {
+        "name": "actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz",
+        "platform": "linux-arm",
+        "version": "<RUNNER_VERSION>",
+        "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz"
    }
 ]
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -1,5 +1,5 @@
 stages:
- stage: Build    
+- stage: Build
  jobs:
  ################################################################################
  - job: build_windows_agent_x64
@@ -11,12 +11,14 @@ stages:

    # Steps template for windows platform
    - template: windows.template.yml
-    
+      parameters:
+        targetRuntime: win-x64
+
    # 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 
+        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_x64.zip -OutFile $outFile
        Write-Host "Unzipping 'VC++ Redistributable' package to agent layout."
@@ -28,7 +30,7 @@ stages:
      displayName: Package UCRT

    # Create agent package zip
-    - script: dev.cmd package Release
+    - script: dev.cmd package Release win-x64
      workingDirectory: src
      displayName: Package Release

@@ -40,6 +42,47 @@ stages:
        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
  ################################################################################
@@ -50,22 +93,76 @@ stages:

    # Steps template for non-windows platform
    - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: linux-x64

    # Create agent package zip
-    - script: ./dev.sh package Release
+    - script: ./dev.sh package Release linux-x64
      workingDirectory: src
-      displayName: Package Release    
+      displayName: Package Release

    # Upload agent package zip as build artifact
    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (Linux)    
+      displayName: Publish Artifact (Linux)
      inputs:
        pathToPublish: _package
        artifactName: runners
        artifactType: container

  ################################################################################
-  - job: build_osx_agent
+  - job: build_linux_agent_arm64
+  ################################################################################
+    displayName: Linux Agent (arm64)
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+
+    # Steps template for non-windows platform
+    - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: linux-arm64
+
+    # Create agent package zip
+    - script: ./dev.sh package Release linux-arm64
+      workingDirectory: src
+      displayName: Package Release
+
+    # Upload agent package zip as build artifact
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (Linux)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+  ################################################################################
+  - job: build_linux_agent_arm
+  ################################################################################
+    displayName: Linux Agent (arm)
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+
+    # Steps template for non-windows platform
+    - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: linux-arm
+
+    # Create agent package zip
+    - script: ./dev.sh package Release linux-arm
+      workingDirectory: src
+      displayName: Package Release
+
+    # Upload agent package zip as build artifact
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (Linux)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+  ################################################################################
+  - job: build_osx_agent_x64
  ################################################################################
    displayName: macOS Agent (x64)
    pool:
@@ -74,15 +171,17 @@ stages:

    # Steps template for non-windows platform
    - template: nonwindows.template.yml
-    
+      parameters:
+        targetRuntime: osx-x64
+
    # Create agent package zip
-    - script: ./dev.sh package Release
+    - script: ./dev.sh package Release osx-x64
      workingDirectory: src
-      displayName: Package Release    
+      displayName: Package Release

    # Upload agent package zip as build artifact
    - task: PublishBuildArtifacts@1
-      displayName: Publish Artifact (OSX)    
+      displayName: Publish Artifact (OSX)
      inputs:
        pathToPublish: _package
        artifactName: runners
@@ -98,7 +197,7 @@ stages:
    pool:
      name: ProductionRMAgents
    steps:
-    
+
    # Download all agent packages from all previous phases
    - task: DownloadBuildArtifacts@0
      displayName: Download Agent Packages
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -1,12 +1,12 @@
-# Contribute (Dev)
+# Contribution guide for developers

-## Dev Dependencies
+## Required Dev Dependencies

 ![Win](res/win_sm.png) Git for Windows [Install Here](https://git-scm.com/downloads) (needed for dev sh script)

-## Build, Test, Layout 
+## To Build, Test, Layout 

-From src:
+Navigate to the `src` directory and run the following command:

 ![Win](res/win_sm.png) `dev {command}`  

@@ -14,13 +14,12 @@ From src:
  
 **Commands:**  

-`layout` (`l`):  Run first time to create a full agent layout in {root}/_layout  
+* `layout` (`l`):  Run first time to create a full agent layout in `{root}/_layout`
+* `build` (`b`):   Build everything and update agent layout folder
+* `test` (`t`):    Build agent binaries and run unit tests

-`build` (`b`):   build everything and update agent layout folder  
+Sample developer flow:

-`test` (`t`):    build agent binaries and run unit tests  
-
-Normal dev flow:
 ```bash
 git clone https://github.com/actions/runner
 cd ./src
@@ -37,5 +36,5 @@ cd ./src

 ## Styling

-We use the dotnet foundation and CoreCLR style guidelines [located here](
+We use the .NET Foundation and CoreCLR style guidelines [located here](
 https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md)
--- a/docs/start/envosx.md
+++ b/docs/start/envosx.md
@@ -4,7 +4,7 @@

 ## Supported Versions

-  - macOS Sierra (10.12) and later versions
+  - macOS High Sierra (10.13) and later versions


-## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore2x)
+## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore30)
--- a/docs/start/envwin.md
+++ b/docs/start/envwin.md
@@ -5,8 +5,8 @@
 - Windows 7 64-bit
 - Windows 8.1 64-bit
 - Windows 10 64-bit
- - Windows Server 2008 R2 SP1 64-bit
 - Windows Server 2012 R2 64-bit
 - Windows Server 2016 64-bit
+ - Windows Server 2019 64-bit

-## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x)
+## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore30)
--- a/nonwindows.template.yml
+++ b/nonwindows.template.yml
@@ -1,14 +1,18 @@
+parameters:
+  targetRuntime: ''
+
 steps:

 # Build agent layout
- script: ./dev.sh layout Release
+- script: ./dev.sh layout Release ${{ parameters.targetRuntime }}
  workingDirectory: src
-  displayName: Build & Layout Release
+  displayName: Build & Layout Release ${{ parameters.targetRuntime }}

 # Run test
 - script: ./dev.sh test
  workingDirectory: src
  displayName: Test
+  condition: and(ne('${{ parameters.targetRuntime }}', 'linux-arm64'), ne('${{ parameters.targetRuntime }}', 'linux-arm'))

 # # Publish test results
 # - task: PublishTestResults@2
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -1,12 +1,8 @@
 ## Features
-  - Added commands to enable or disable echoing of commands (#139)
+  - Add packages for Windows x86 (win-x6), Linux ARM32 (linux-arm), Linux ARM64 (linux-arm64)

 ## Bugs
-  - Do not retry uploads on 4xx Errors for Artifact Upload Service (#131)
-  - Actions cache no longer incorrectly caches the action if the tag was updated for self hosted runners (#148)
-  - Disabled echoing of commands on add-mask, debug, warning and error commands (#158)
-  - HashFile now is correctly configured to only support basic globbing and globstar (#149)
-  - HashFile now sets a default root and handles Windows paths correctly (#151)
+  - N/A

 ## Misc
  - N/A
@@ -18,6 +14,8 @@
 | 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:  

@@ -41,3 +39,17 @@ C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO
 ~/$ mkdir myagent && cd myagent
 ~/myagent$ tar xzf ~/Downloads/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 ```
+
+## Linux arm64
+
+``` bash
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
+```
+
+## Linux arm
+
+``` bash
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
+```
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -0,0 +1,52 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Detect OS for build -->
+  <PropertyGroup>
+    <BUILD_OS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">Windows</BUILD_OS>
+    <BUILD_OS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">OSX</BUILD_OS>
+    <BUILD_OS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">Linux</BUILD_OS>
+  </PropertyGroup>
+
+  <!-- Set OS vars -->
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'Windows'">
+    <DefineConstants>$(DefineConstants);OS_WINDOWS</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'OSX'">
+    <DefineConstants>$(DefineConstants);OS_OSX</DefineConstants>
+  </PropertyGroup>
+  <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)' == '')">
+    <DefineConstants>$(DefineConstants);X64</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'Windows' AND '$(PackageRuntime)' == 'win-x86'">
+    <DefineConstants>$(DefineConstants);X86</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'OSX'">
+    <DefineConstants>$(DefineConstants);X64</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND ('$(PackageRuntime)' == 'linux-x64' OR '$(PackageRuntime)' == '')">
+    <DefineConstants>$(DefineConstants);X64</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'linux-arm'">
+    <DefineConstants>$(DefineConstants);ARM</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'linux-arm64'">
+    <DefineConstants>$(DefineConstants);ARM64</DefineConstants>
+  </PropertyGroup>
+
+  <!-- Set TRACE/DEBUG vars -->
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+  </PropertyGroup>
+</Project>
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -123,9 +123,9 @@ function acquireExternalTool() {
 }

 # Download the external tools only for Windows.
-if [[ "$PACKAGERUNTIME" == "win-x64" ]]; then
-    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/win-x64/node.exe" node12/bin
-    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/win-x64/node.lib" node12/bin
+if [[ "$PACKAGERUNTIME" == "win-x64" || "$PACKAGERUNTIME" == "win-x86" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.exe" node12/bin
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/$PACKAGERUNTIME/node.lib" node12/bin
    if [[ "$PRECACHE" != "" ]]; then
        acquireExternalTool "https://github.com/microsoft/vswhere/releases/download/2.6.7/vswhere.exe" vswhere
    fi
@@ -136,13 +136,23 @@ if [[ "$PACKAGERUNTIME" == "osx-x64" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-darwin-x64.tar.gz" node12 fix_nested_dir
 fi

-# Download the external tools common across Linux PACKAGERUNTIMEs (excluding OSX).
+# Download the external tools for Linux PACKAGERUNTIMEs.
 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
+    # acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12.13.0/alpine/x64/node-v${NODE12_VERSION}-alpine-x64.tar.gz" node12_alpine
+fi
+
+if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then
+    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-arm64.tar.gz" node12 fix_nested_dir
+    # TODO: alpine node runtime for arm64(8)
+    # acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12.13.0/alpine/arm64/node-v${NODE12_VERSION}-alpine-arm64.tar.gz" node12_alpine
 fi

 if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
    acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-armv7l.tar.gz" node12 fix_nested_dir
+    # TODO: alpine node runtime for arm32(7)
+    # Need to set up custom gcc toolchain to cross compile on x64 ubuntu for armv7 (per https://github.com/nodejs/node/blob/master/BUILDING.md)
+    # acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/12.13.0/alpine/arm/node-v${NODE12_VERSION}-alpine-arm.tar.gz" node12_alpine
 fi
--- a/src/Runner.Common/Runner.Common.csproj
+++ b/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-arm;rhel.6-x64;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>
@@ -27,43 +27,5 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <DebugType>portable</DebugType>
  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-    <DefineConstants>OS_OSX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' AND '$(Configuration)' == 'Debug'">
-    <DefineConstants>OS_OSX;DEBUG;X64;TRACE</DefineConstants>
-  </PropertyGroup>

-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
 </Project>
--- a/src/Runner.Common/Util/VarUtil.cs
+++ b/src/Runner.Common/Util/VarUtil.cs
@@ -54,6 +54,8 @@ namespace GitHub.Runner.Common.Util
                        return "X64";
                    case Constants.Architecture.Arm:
                        return "ARM";
+                    case Constants.Architecture.Arm64:
+                        return "ARM64";
                    default:
                        throw new NotSupportedException(); // Should never reach here.
                }
--- a/src/Runner.Listener/Runner.Listener.csproj
+++ b/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-arm;rhel.6-x64;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>
@@ -30,43 +30,5 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <DebugType>portable</DebugType>
  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-    <DefineConstants>OS_OSX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' AND '$(Configuration)' == 'Debug'">
-    <DefineConstants>OS_OSX;DEBUG;X64;TRACE</DefineConstants>
-  </PropertyGroup>

-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
 </Project>
--- a/src/Runner.PluginHost/Runner.PluginHost.csproj
+++ b/src/Runner.PluginHost/Runner.PluginHost.csproj
@@ -3,13 +3,13 @@
  <PropertyGroup>
    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;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>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <PublishReadyToRun>true</PublishReadyToRun>    
+    <PublishReadyToRun>true</PublishReadyToRun>
  </PropertyGroup>

  <ItemGroup>
@@ -24,42 +24,4 @@
    <DebugType>portable</DebugType>
  </PropertyGroup>

-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-    <DefineConstants>OS_OSX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' AND '$(Configuration)' == 'Debug'">
-    <DefineConstants>OS_OSX;DEBUG;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
 </Project>
--- a/src/Runner.Plugins/Runner.Plugins.csproj
+++ b/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-arm;rhel.6-x64;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>
@@ -19,43 +19,5 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <DebugType>portable</DebugType>
  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-    <DefineConstants>OS_OSX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' AND '$(Configuration)' == 'Debug'">
-    <DefineConstants>OS_OSX;DEBUG;X64;TRACE</DefineConstants>
-  </PropertyGroup>

-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
 </Project>
--- a/src/Runner.Sdk/Runner.Sdk.csproj
+++ b/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-arm;rhel.6-x64;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>
@@ -24,43 +24,5 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <DebugType>portable</DebugType>
  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-    <DefineConstants>OS_OSX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' AND '$(Configuration)' == 'Debug'">
-    <DefineConstants>OS_OSX;DEBUG;X64;TRACE</DefineConstants>
-  </PropertyGroup>

-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
 </Project>
--- a/src/Runner.Service/Windows/FinalPublicKey.snk
+++ b/src/Runner.Service/Windows/FinalPublicKey.snk
--- a/src/Runner.Service/Windows/RunnerService.csproj
+++ b/src/Runner.Service/Windows/RunnerService.csproj
@@ -9,9 +9,8 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>RunnerService</RootNamespace>
    <AssemblyName>RunnerService</AssemblyName>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>FinalPublicKey.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>true</DelaySign>
+    <SignAssembly>false</SignAssembly>
+    <DelaySign>false</DelaySign>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -64,7 +63,6 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
-    <None Include="FinalPublicKey.snk" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Resource.resx">
--- a/src/Runner.Worker/ActionCommandManager.cs
+++ b/src/Runner.Worker/ActionCommandManager.cs
@@ -547,7 +547,6 @@ namespace GitHub.Runner.Worker
                    break;
                default:
                    throw new Exception($"Invalid echo command value. Possible values can be: 'on', 'off'. Current value is: '{command.Data}'.");
-                    break;
            }
        }
    }
--- a/src/Runner.Worker/Container/DockerCommandManager.cs
+++ b/src/Runner.Worker/Container/DockerCommandManager.cs
@@ -276,7 +276,9 @@ namespace GitHub.Runner.Worker.Container
            return await ExecuteDockerCommandAsync(context, "exec", $"{options} {containerId} {command}", context.CancellationToken);
        }

+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms)
        public async Task<int> DockerExec(IExecutionContext context, string containerId, string options, string command, List<string> output)
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
        {
            ArgUtil.NotNull(output, nameof(output));

@@ -337,7 +339,9 @@ namespace GitHub.Runner.Worker.Container
            return ExecuteDockerCommandAsync(context, command, options, null, cancellationToken);
        }

+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms)
        private async Task<int> ExecuteDockerCommandAsync(IExecutionContext context, string command, string options, IDictionary<string, string> environment, EventHandler<ProcessDataReceivedEventArgs> stdoutDataReceived, EventHandler<ProcessDataReceivedEventArgs> stderrDataReceived, CancellationToken cancellationToken = default(CancellationToken))
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
        {
            string arg = $"{command} {options}".Trim();
            context.Command($"{DockerPath} {arg}");
@@ -362,7 +366,9 @@ namespace GitHub.Runner.Worker.Container
 #endif
        }

+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms)
        private async Task<int> ExecuteDockerCommandAsync(IExecutionContext context, string command, string options, string workingDirectory, CancellationToken cancellationToken = default(CancellationToken))
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
        {
            string arg = $"{command} {options}".Trim();
            context.Command($"{DockerPath} {arg}");
--- a/src/Runner.Worker/DiagnosticLogManager.cs
+++ b/src/Runner.Worker/DiagnosticLogManager.cs
@@ -31,7 +31,9 @@ namespace GitHub.Runner.Worker
    public sealed class DiagnosticLogManager : RunnerService, IDiagnosticLogManager
    {
        private static string DateTimeFormat = "yyyyMMdd-HHmmss";
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms)
        public async Task UploadDiagnosticLogsAsync(IExecutionContext executionContext,
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
                                                IExecutionContext parentContext, 
                                                Pipelines.AgentJobRequestMessage message,
                                                DateTime jobStartTimeUtc)
--- a/src/Runner.Worker/Handlers/ContainerActionHandler.cs
+++ b/src/Runner.Worker/Handlers/ContainerActionHandler.cs
@@ -22,7 +22,9 @@ namespace GitHub.Runner.Worker.Handlers
    {
        public ContainerActionExecutionData Data { get; set; }

+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms)
        public async Task RunAsync(ActionRunStage stage)
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
        {
            // Validate args.
            Trace.Entering();
--- a/src/Runner.Worker/Handlers/OutputManager.cs
+++ b/src/Runner.Worker/Handlers/OutputManager.cs
@@ -263,15 +263,17 @@ namespace GitHub.Runner.Worker.Handlers
                    // Root using fromPath
                    if (!string.IsNullOrWhiteSpace(match.FromPath) && !Path.IsPathRooted(file))
                    {
-                        file = Path.Combine(match.FromPath, file);
+                        var fromDirectory = Path.GetDirectoryName(match.FromPath);
+                        if (!string.IsNullOrWhiteSpace(fromDirectory))
+                        {
+                            file = Path.Combine(fromDirectory, file);
+                        }
                    }

-                    // Root using system.defaultWorkingDirectory
+                    // Root using workspace
                    if (!Path.IsPathRooted(file))
                    {
-                        var githubContext = _executionContext.ExpressionValues["github"] as GitHubContext;
-                        ArgUtil.NotNull(githubContext, nameof(githubContext));
-                        var workspace = githubContext["workspace"].ToString();
+                        var workspace = _executionContext.GetGitHubContext("workspace");
                        ArgUtil.NotNullOrEmpty(workspace, "workspace");

                        file = Path.Combine(workspace, file);
@@ -297,7 +299,7 @@ namespace GitHub.Runner.Worker.Handlers
                        }
                        else
                        {
-                            // prefer `/` on all platforms
+                            // Prefer `/` on all platforms
                            issue.Data["file"] = file.Substring(repositoryPath.Length).TrimStart(Path.DirectorySeparatorChar).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
                        }
                    }
--- a/src/Runner.Worker/Runner.Worker.csproj
+++ b/src/Runner.Worker/Runner.Worker.csproj
@@ -3,13 +3,13 @@
  <PropertyGroup>
    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;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>
    <Version>$(Version)</Version>
    <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <PublishReadyToRun>true</PublishReadyToRun>    
+    <PublishReadyToRun>true</PublishReadyToRun>
  </PropertyGroup>

  <ItemGroup>
@@ -35,42 +35,4 @@
    <DebugType>portable</DebugType>
  </PropertyGroup>

-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x64'">
-    <DefineConstants>OS_WINDOWS;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x86'">
-    <DefineConstants>OS_WINDOWS;X86;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-    <DefineConstants>OS_OSX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' AND '$(Configuration)' == 'Debug'">
-    <DefineConstants>OS_OSX;DEBUG;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-x64'">
-    <DefineConstants>OS_LINUX;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-    <DefineConstants>OS_LINUX;OS_RHEL6;X64;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-arm'">
-    <DefineConstants>OS_LINUX;ARM;DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
 </Project>
--- a/src/Sdk/Sdk.csproj
+++ b/src/Sdk/Sdk.csproj
@@ -3,7 +3,7 @@
    <PropertyGroup>
        <TargetFramework>netcoreapp3.0</TargetFramework>
        <OutputType>Library</OutputType>
-        <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm;rhel.6-x64;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>
--- a/src/Test/L0/CommandLineParserL0.cs
+++ b/src/Test/L0/CommandLineParserL0.cs
@@ -47,8 +47,8 @@ namespace GitHub.Runner.Common.Tests
                });

                // Assert.
-                Assert.Equal(hc.SecretMasker.MaskSecrets("secret value 1"), "***");
-                Assert.Equal(hc.SecretMasker.MaskSecrets("secret value 2"), "***");
+                Assert.Equal("***", hc.SecretMasker.MaskSecrets("secret value 1"));
+                Assert.Equal("***", hc.SecretMasker.MaskSecrets("secret value 2"));
            }
        }

@@ -90,9 +90,9 @@ namespace GitHub.Runner.Common.Tests
                trace.Info("Args: {0}", clp.Args.Count);
                Assert.True(clp.Args.Count == 2);
                Assert.True(clp.Args.ContainsKey("arg1"));
-                Assert.Equal(clp.Args["arg1"], "arg1val");
+                Assert.Equal("arg1val", clp.Args["arg1"]);
                Assert.True(clp.Args.ContainsKey("arg2"));
-                Assert.Equal(clp.Args["arg2"], "arg2val");
+                Assert.Equal("arg2val", clp.Args["arg2"]);
            }
        }

@@ -113,8 +113,8 @@ namespace GitHub.Runner.Common.Tests

                trace.Info("Args: {0}", clp.Flags.Count);
                Assert.True(clp.Flags.Count == 2);
-                Assert.True(clp.Flags.Contains("flag1"));
-                Assert.True(clp.Flags.Contains("flag2"));
+                Assert.Contains("flag1", clp.Flags);
+                Assert.Contains("flag2", clp.Flags);
            }
        }

--- a/src/Test/L0/ConstantGenerationL0.cs
+++ b/src/Test/L0/ConstantGenerationL0.cs
@@ -18,6 +18,7 @@ namespace GitHub.Runner.Common.Tests
                "win-x86",
                "linux-x64",
                "linux-arm",
+                "linux-arm64",
                "rhel.6-x64",
                "osx-x64"
            };
--- a/src/Test/L0/Container/DockerUtilL0.cs
+++ b/src/Test/L0/Container/DockerUtilL0.cs
@@ -36,10 +36,10 @@ namespace GitHub.Runner.Common.Tests.Worker.Container

            // Assert
            Assert.NotNull(result0);
-            Assert.Equal(result0.Count, 0);
+            Assert.Equal(0, result0.Count);

            Assert.NotNull(result1);
-            Assert.Equal(result1.Count, 1);
+            Assert.Equal(1, result1.Count);
            var result1Port80Mapping = result1.Find(pm =>
                string.Equals(pm.ContainerPort, "80") &&
                string.Equals(pm.HostPort, "32881") &&
@@ -48,10 +48,10 @@ namespace GitHub.Runner.Common.Tests.Worker.Container
            Assert.NotNull(result1Port80Mapping);

            Assert.NotNull(result1Empty);
-            Assert.Equal(result1Empty.Count, 0);
+            Assert.Equal(0, result1Empty.Count);

            Assert.NotNull(result2);
-            Assert.Equal(result2.Count, 2);
+            Assert.Equal(2, result2.Count);
            var result2Port80Mapping = result2.Find(pm =>
                string.Equals(pm.ContainerPort, "80") &&
                string.Equals(pm.HostPort, "32881") &&
--- a/src/Test/L0/HostContextL0.cs
+++ b/src/Test/L0/HostContextL0.cs
@@ -107,7 +107,7 @@ namespace GitHub.Runner.Common.Tests
            }
        }

-        public void Setup([CallerMemberName] string testName = "")
+        private void Setup([CallerMemberName] string testName = "")
        {
            _tokenSource = new CancellationTokenSource();
            _hc = new HostContext(
@@ -115,7 +115,7 @@ namespace GitHub.Runner.Common.Tests
                logFile: Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"trace_{nameof(HostContextL0)}_{testName}.log"));
        }

-        public void Teardown()
+        private void Teardown()
        {
            _hc?.Dispose();
            _tokenSource?.Dispose();
--- a/src/Test/L0/Listener/CommandSettingsL0.cs
+++ b/src/Test/L0/Listener/CommandSettingsL0.cs
@@ -52,7 +52,7 @@ namespace GitHub.Runner.Common.Tests
                    // Assert.
                    Assert.Equal("some agent", actual);
                    Assert.Equal(string.Empty, Environment.GetEnvironmentVariable("ACTIONS_RUNNER_INPUT_AGENT") ?? string.Empty); // Should remove.
-                    Assert.Equal(hc.SecretMasker.MaskSecrets("some agent"), "some agent");
+                    Assert.Equal("some agent", hc.SecretMasker.MaskSecrets("some agent"));
                }
                finally
                {
@@ -80,7 +80,7 @@ namespace GitHub.Runner.Common.Tests
                    // Assert.
                    Assert.Equal("some secret token value", actual);
                    Assert.Equal(string.Empty, Environment.GetEnvironmentVariable("ACTIONS_RUNNER_INPUT_TOKEN") ?? string.Empty); // Should remove.
-                    Assert.Equal(hc.SecretMasker.MaskSecrets("some secret token value"), "***");
+                    Assert.Equal("***", hc.SecretMasker.MaskSecrets("some secret token value"));
                }
                finally
                {
@@ -250,7 +250,7 @@ namespace GitHub.Runner.Common.Tests
                    bool actual = command.Unattended;

                    // Assert.
-                    Assert.Equal(true, actual);
+                    Assert.True(actual);
                    Assert.Equal(string.Empty, Environment.GetEnvironmentVariable("ACTIONS_RUNNER_INPUT_UNATTENDED") ?? string.Empty); // Should remove.
                }
                finally
@@ -720,7 +720,7 @@ namespace GitHub.Runner.Common.Tests
                var command = new CommandSettings(hc, args: new string[] { "badcommand" });

                // Assert.
-                Assert.True(command.Validate().Contains("badcommand"));
+                Assert.Contains("badcommand", command.Validate());
            }
        }

@@ -735,7 +735,7 @@ namespace GitHub.Runner.Common.Tests
                var command = new CommandSettings(hc, args: new string[] { "--badflag" });

                // Assert.
-                Assert.True(command.Validate().Contains("badflag"));
+                Assert.Contains("badflag", command.Validate());
            }
        }

@@ -750,7 +750,7 @@ namespace GitHub.Runner.Common.Tests
                var command = new CommandSettings(hc, args: new string[] { "--badargname", "bad arg value" });

                // Assert.
-                Assert.True(command.Validate().Contains("badargname"));
+                Assert.Contains("badargname", command.Validate());
            }
        }

--- a/src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs
+++ b/src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs
@@ -43,10 +43,6 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
        private string _expectedServerUrl = "https://localhost";
        private string _expectedAgentName = "expectedAgentName";
        private string _expectedPoolName = "poolName";
-        private string _expectedCollectionName = "testCollectionName";
-        private string _expectedProjectName = "testProjectName";
-        private string _expectedProjectId = "edf3f94e-d251-49df-bfce-602d6c967409";
-        private string _expectedMachineGroupName = "testMachineGroupName";
        private string _expectedAuthType = "pat";
        private string _expectedWorkFolder = "_work";
        private int _expectedPoolId = 1;
--- a/src/Test/L0/PagingLoggerL0.cs
+++ b/src/Test/L0/PagingLoggerL0.cs
@@ -64,7 +64,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                                string line;
                                while ((line = freader.ReadLine()) != null)
                                {
-                                    Assert.True(line.EndsWith(LogData));
+                                    Assert.EndsWith(LogData, line);
                                    bytesWritten += logDataSize;
                                }
                            }
--- a/src/Test/L0/Util/VssUtilL0.cs
+++ b/src/Test/L0/Util/VssUtilL0.cs
@@ -31,8 +31,8 @@ namespace GitHub.Runner.Common.Tests.Util
                    var connect = VssUtil.CreateConnection(new Uri("https://github.com/actions/runner"), new VssCredentials());

                    // Assert.
-                    Assert.Equal(connect.Settings.MaxRetryRequest.ToString(), "10");
-                    Assert.Equal(connect.Settings.SendTimeout.TotalSeconds.ToString(), "360");
+                    Assert.Equal("10", connect.Settings.MaxRetryRequest.ToString());
+                    Assert.Equal("360", connect.Settings.SendTimeout.TotalSeconds.ToString());

                    trace.Info("Set httpretry to 100.");
                    Environment.SetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_HTTP_RETRY", "100");
@@ -42,8 +42,8 @@ namespace GitHub.Runner.Common.Tests.Util
                    connect = VssUtil.CreateConnection(new Uri("https://github.com/actions/runner"), new VssCredentials());

                    // Assert.
-                    Assert.Equal(connect.Settings.MaxRetryRequest.ToString(), "10");
-                    Assert.Equal(connect.Settings.SendTimeout.TotalSeconds.ToString(), "1200");
+                    Assert.Equal("10", connect.Settings.MaxRetryRequest.ToString());
+                    Assert.Equal("1200", connect.Settings.SendTimeout.TotalSeconds.ToString());
                }
                finally
                {
--- a/src/Test/L0/Worker/ActionManifestManagerL0.cs
+++ b/src/Test/L0/Worker/ActionManifestManagerL0.cs
@@ -37,25 +37,25 @@ namespace GitHub.Runner.Common.Tests.Worker

                //Assert

-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.Container);
+                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);

                var containerAction = result.Execution as ContainerActionExecutionData;

-                Assert.Equal(containerAction.Image, "Dockerfile");
-                Assert.Equal(containerAction.EntryPoint, "main.sh");
-                Assert.Equal(containerAction.Arguments[0].ToString(), "bzz");
-                Assert.Equal(containerAction.Environment[0].Key.ToString(), "Token");
-                Assert.Equal(containerAction.Environment[0].Value.ToString(), "foo");
-                Assert.Equal(containerAction.Environment[1].Key.ToString(), "Url");
-                Assert.Equal(containerAction.Environment[1].Value.ToString(), "bar");
+                Assert.Equal("Dockerfile", containerAction.Image);
+                Assert.Equal("main.sh", containerAction.EntryPoint);
+                Assert.Equal("bzz", containerAction.Arguments[0].ToString());
+                Assert.Equal("Token", containerAction.Environment[0].Key.ToString());
+                Assert.Equal("foo", containerAction.Environment[0].Value.ToString());
+                Assert.Equal("Url", containerAction.Environment[1].Key.ToString());
+                Assert.Equal("bar", containerAction.Environment[1].Value.ToString());
            }
            finally
            {
@@ -81,27 +81,27 @@ namespace GitHub.Runner.Common.Tests.Worker

                //Assert

-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.Container);
+                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);

                var containerAction = result.Execution as ContainerActionExecutionData;

-                Assert.Equal(containerAction.Image, "Dockerfile");
-                Assert.Equal(containerAction.EntryPoint, "main.sh");
-                Assert.Equal(containerAction.Cleanup, "cleanup.sh");
-                Assert.Equal(containerAction.CleanupCondition, "failure()");
-                Assert.Equal(containerAction.Arguments[0].ToString(), "bzz");
-                Assert.Equal(containerAction.Environment[0].Key.ToString(), "Token");
-                Assert.Equal(containerAction.Environment[0].Value.ToString(), "foo");
-                Assert.Equal(containerAction.Environment[1].Key.ToString(), "Url");
-                Assert.Equal(containerAction.Environment[1].Value.ToString(), "bar");
+                Assert.Equal("Dockerfile", containerAction.Image);
+                Assert.Equal("main.sh", containerAction.EntryPoint);
+                Assert.Equal("cleanup.sh", containerAction.Cleanup);
+                Assert.Equal("failure()", containerAction.CleanupCondition);
+                Assert.Equal("bzz", containerAction.Arguments[0].ToString());
+                Assert.Equal("Token", containerAction.Environment[0].Key.ToString());
+                Assert.Equal("foo", containerAction.Environment[0].Value.ToString());
+                Assert.Equal("Url", containerAction.Environment[1].Key.ToString());
+                Assert.Equal("bar", containerAction.Environment[1].Value.ToString());
            }
            finally
            {
@@ -126,19 +126,19 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "dockerfileaction_noargs_noenv_noentrypoint.yml"));

                //Assert
-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.Container);
+                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);

                var containerAction = result.Execution as ContainerActionExecutionData;

-                Assert.Equal(containerAction.Image, "Dockerfile");
+                Assert.Equal("Dockerfile", containerAction.Image);
            }
            finally
            {
@@ -164,25 +164,25 @@ namespace GitHub.Runner.Common.Tests.Worker

                //Assert

-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.Container);
+                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);

                var containerAction = result.Execution as ContainerActionExecutionData;

-                Assert.Equal(containerAction.Image, "Dockerfile");
-                Assert.Equal(containerAction.EntryPoint, "main.sh");
-                Assert.Equal(containerAction.Arguments[0].ToString(), "${{ inputs.greeting }}");
-                Assert.Equal(containerAction.Environment[0].Key.ToString(), "Token");
-                Assert.Equal(containerAction.Environment[0].Value.ToString(), "foo");
-                Assert.Equal(containerAction.Environment[1].Key.ToString(), "Url");
-                Assert.Equal(containerAction.Environment[1].Value.ToString(), "${{ inputs.entryPoint }}");
+                Assert.Equal("Dockerfile", containerAction.Image);
+                Assert.Equal("main.sh", containerAction.EntryPoint);
+                Assert.Equal("${{ inputs.greeting }}", containerAction.Arguments[0].ToString());
+                Assert.Equal("Token", containerAction.Environment[0].Key.ToString());
+                Assert.Equal("foo", containerAction.Environment[0].Value.ToString());
+                Assert.Equal("Url", containerAction.Environment[1].Key.ToString());
+                Assert.Equal("${{ inputs.entryPoint }}", containerAction.Environment[1].Value.ToString());
            }
            finally
            {
@@ -207,25 +207,25 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "dockerhubaction.yml"));

                //Assert
-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.Container);
+                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);

                var containerAction = result.Execution as ContainerActionExecutionData;

-                Assert.Equal(containerAction.Image, "docker://ubuntu:18.04");
-                Assert.Equal(containerAction.EntryPoint, "main.sh");
-                Assert.Equal(containerAction.Arguments[0].ToString(), "bzz");
-                Assert.Equal(containerAction.Environment[0].Key.ToString(), "Token");
-                Assert.Equal(containerAction.Environment[0].Value.ToString(), "foo");
-                Assert.Equal(containerAction.Environment[1].Key.ToString(), "Url");
-                Assert.Equal(containerAction.Environment[1].Value.ToString(), "bar");
+                Assert.Equal("docker://ubuntu:18.04", containerAction.Image);
+                Assert.Equal("main.sh", containerAction.EntryPoint);
+                Assert.Equal("bzz", containerAction.Arguments[0].ToString());
+                Assert.Equal("Token", containerAction.Environment[0].Key.ToString());
+                Assert.Equal("foo", containerAction.Environment[0].Value.ToString());
+                Assert.Equal("Url", containerAction.Environment[1].Key.ToString());
+                Assert.Equal("bar", containerAction.Environment[1].Value.ToString());
            }
            finally
            {
@@ -250,24 +250,24 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "nodeaction.yml"));

                //Assert
-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
-                Assert.Equal(result.Deprecated.Count, 1);
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
+                Assert.Equal(1, result.Deprecated.Count);

                Assert.True(result.Deprecated.ContainsKey("greeting"));
                result.Deprecated.TryGetValue("greeting", out string value);
-                Assert.Equal(value, "This property has been deprecated");
+                Assert.Equal("This property has been deprecated", value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.NodeJS);
+                Assert.Equal(ActionExecutionType.NodeJS, result.Execution.ExecutionType);

                var nodeAction = result.Execution as NodeJSActionExecutionData;

-                Assert.Equal(nodeAction.Script, "main.js");
+                Assert.Equal("main.js", nodeAction.Script);
            }
            finally
            {
@@ -292,26 +292,26 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "nodeaction_cleanup.yml"));

                //Assert
-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
-                Assert.Equal(result.Deprecated.Count, 1);
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
+                Assert.Equal(1, result.Deprecated.Count);

                Assert.True(result.Deprecated.ContainsKey("greeting"));
                result.Deprecated.TryGetValue("greeting", out string value);
-                Assert.Equal(value, "This property has been deprecated");
+                Assert.Equal("This property has been deprecated", value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.NodeJS);
+                Assert.Equal(ActionExecutionType.NodeJS, result.Execution.ExecutionType);

                var nodeAction = result.Execution as NodeJSActionExecutionData;

-                Assert.Equal(nodeAction.Script, "main.js");
-                Assert.Equal(nodeAction.Cleanup, "cleanup.js");
-                Assert.Equal(nodeAction.CleanupCondition, "cancelled()");
+                Assert.Equal("main.js", nodeAction.Script);
+                Assert.Equal("cleanup.js", nodeAction.Cleanup);
+                Assert.Equal("cancelled()", nodeAction.CleanupCondition);
            }
            finally
            {
@@ -336,19 +336,19 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "pluginaction.yml"));

                //Assert
-                Assert.Equal(result.Name, "Hello World");
-                Assert.Equal(result.Description, "Greet the world and record the time");
-                Assert.Equal(result.Inputs.Count, 2);
-                Assert.Equal(result.Inputs[0].Key.AssertString("key").Value, "greeting");
-                Assert.Equal(result.Inputs[0].Value.AssertString("value").Value, "Hello");
-                Assert.Equal(result.Inputs[1].Key.AssertString("key").Value, "entryPoint");
-                Assert.Equal(result.Inputs[1].Value.AssertString("value").Value, "");
+                Assert.Equal("Hello World", result.Name);
+                Assert.Equal("Greet the world and record the time", result.Description);
+                Assert.Equal(2, result.Inputs.Count);
+                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
+                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
+                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
+                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);

-                Assert.Equal(result.Execution.ExecutionType, ActionExecutionType.Plugin);
+                Assert.Equal(ActionExecutionType.Plugin, result.Execution.ExecutionType);

                var pluginAction = result.Execution as PluginActionExecutionData;

-                Assert.Equal(pluginAction.Plugin, "someplugin");
+                Assert.Equal("someplugin", pluginAction.Plugin);
            }
            finally
            {
@@ -383,9 +383,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.EvaluateContainerArguments(_ec.Object, arguments, evaluateContext);

                //Assert
-                Assert.Equal(result[0], "hello");
-                Assert.Equal(result[1], "test");
-                Assert.Equal(result.Count, 2);
+                Assert.Equal("hello", result[0]);
+                Assert.Equal("test", result[1]);
+                Assert.Equal(2, result.Count);
            }
            finally
            {
@@ -420,9 +420,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.EvaluateContainerEnvironment(_ec.Object, environment, evaluateContext);

                //Assert
-                Assert.Equal(result["hello"], "hello");
-                Assert.Equal(result["test"], "test");
-                Assert.Equal(result.Count, 2);
+                Assert.Equal("hello", result["hello"]);
+                Assert.Equal("test", result["test"]);
+                Assert.Equal(2, result.Count);
            }
            finally
            {
@@ -459,13 +459,13 @@ namespace GitHub.Runner.Common.Tests.Worker
                var result = actionManifest.EvaluateDefaultInput(_ec.Object, "testInput", new StringToken(null, null, null, "defaultValue"), evaluateContext);

                //Assert
-                Assert.Equal(result, "defaultValue");
+                Assert.Equal("defaultValue", result);

                //Act
                result = actionManifest.EvaluateDefaultInput(_ec.Object, "testInput", new BasicExpressionToken(null, null, null, "github.ref"), evaluateContext);

                //Assert
-                Assert.Equal(result, "refs/heads/master");
+                Assert.Equal("refs/heads/master", result);
            }
            finally
            {
--- a/src/Test/L0/Worker/ActionRunnerL0.cs
+++ b/src/Test/L0/Worker/ActionRunnerL0.cs
@@ -31,7 +31,6 @@ namespace GitHub.Runner.Common.Tests.Worker
        private TestHostContext _hc;
        private ActionRunner _actionRunner;
        private IActionManifestManager _actionManifestManager;
-        private string _workFolder;
        private DictionaryContextData _context = new DictionaryContextData();

        [Fact]
@@ -75,9 +74,9 @@ namespace GitHub.Runner.Common.Tests.Worker
            }

            //Assert
-            Assert.Equal(finialInputs["input1"], "test1");
-            Assert.Equal(finialInputs["input2"], "test2");
-            Assert.Equal(finialInputs["input3"], "github");
+            Assert.Equal("test1", finialInputs["input1"]);
+            Assert.Equal("test2", finialInputs["input2"]);
+            Assert.Equal("github", finialInputs["input3"]);
        }

        [Fact]
@@ -278,24 +277,6 @@ namespace GitHub.Runner.Common.Tests.Worker
            Assert.Equal("${{ matrix.node }}", _actionRunner.DisplayName);
        }

-        private void CreateAction(string yamlContent, out Pipelines.ActionStep instance, out string directory)
-        {
-            directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "master");
-            string file = Path.Combine(directory, Constants.Path.ActionManifestFile);
-            Directory.CreateDirectory(Path.GetDirectoryName(file));
-            File.WriteAllText(file, yamlContent);
-            instance = new Pipelines.ActionStep()
-            {
-                Id = Guid.NewGuid(),
-                Reference = new Pipelines.RepositoryPathReference()
-                {
-                    Name = "GitHub/actions",
-                    Ref = "master",
-                    RepositoryType = Pipelines.RepositoryTypes.GitHub
-                }
-            };
-        }
-
        private void Setup([CallerMemberName] string name = "")
        {
            _ecTokenSource?.Dispose();
--- a/src/Test/L0/Worker/OutputManagerL0.cs
+++ b/src/Test/L0/Worker/OutputManagerL0.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using GitHub.Runner.Sdk;
@@ -158,7 +159,7 @@ namespace GitHub.Runner.Common.Tests.Worker
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
-        public void Code()
+        public void MatcherCode()
        {
            var matchers = new IssueMatchersConfig
            {
@@ -300,7 +301,7 @@ namespace GitHub.Runner.Common.Tests.Worker
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
-        public void LineColumn()
+        public void MatcherLineColumn()
        {
            var matchers = new IssueMatchersConfig
            {
@@ -348,7 +349,7 @@ namespace GitHub.Runner.Common.Tests.Worker
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
-        public void ProcessCommand()
+        public void MatcherDoesNotReceiveCommand()
        {
            using (Setup())
            using (_outputManager)
@@ -382,7 +383,7 @@ namespace GitHub.Runner.Common.Tests.Worker
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
-        public void RemoveColorCodes()
+        public void MatcherRemoveColorCodes()
        {
            using (Setup())
            using (_outputManager)
@@ -528,7 +529,7 @@ namespace GitHub.Runner.Common.Tests.Worker
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
-        public void Severity()
+        public void MatcherSeverity()
        {
            var matchers = new IssueMatchersConfig
            {
@@ -589,7 +590,7 @@ namespace GitHub.Runner.Common.Tests.Worker
        [Fact]
        [Trait("Level", "L0")]
        [Trait("Category", "Worker")]
-        public void Timeout()
+        public void MatcherTimeout()
        {
            Environment.SetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_ISSUE_MATCHER_TIMEOUT", "0:0:0.01");
            var matchers = new IssueMatchersConfig
@@ -640,10 +641,216 @@ namespace GitHub.Runner.Common.Tests.Worker
            }
        }

-        // todo: roots file against fromPath
-        // todo: roots file against system.defaultWorkingDirectory
-        // todo: matches repository
-        // todo: checks file exists
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void MatcherFile()
+        {
+            var matchers = new IssueMatchersConfig
+            {
+                Matchers =
+                {
+                    new IssueMatcherConfig
+                    {
+                        Owner = "my-matcher-1",
+                        Patterns = new[]
+                        {
+                            new IssuePatternConfig
+                            {
+                                Pattern = @"(.+): (.+)",
+                                File = 1,
+                                Message = 2,
+                            },
+                        },
+                    },
+                },
+            };
+            using (var hostContext = Setup(matchers: matchers))
+            using (_outputManager)
+            {
+                // Setup github.workspace
+                var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
+                ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
+                Directory.CreateDirectory(workDirectory);
+                var workspaceDirectory = Path.Combine(workDirectory, "workspace");
+                Directory.CreateDirectory(workspaceDirectory);
+                _executionContext.Setup(x => x.GetGitHubContext("workspace")).Returns(workspaceDirectory);
+
+                // Create a test file
+                Directory.CreateDirectory(Path.Combine(workspaceDirectory, "some-directory"));
+                var filePath = Path.Combine(workspaceDirectory, "some-directory", "some-file.txt");
+                File.WriteAllText(filePath, "");
+
+                // Process
+                Process("some-directory/some-file.txt: some error");
+                Assert.Equal(1, _issues.Count);
+                Assert.Equal("some error", _issues[0].Item1.Message);
+                Assert.Equal("some-directory/some-file.txt", _issues[0].Item1.Data["file"]);
+                Assert.Equal(0, _commands.Count);
+                Assert.Equal(0, _messages.Count);
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void MatcherFileExists()
+        {
+            var matchers = new IssueMatchersConfig
+            {
+                Matchers =
+                {
+                    new IssueMatcherConfig
+                    {
+                        Owner = "my-matcher-1",
+                        Patterns = new[]
+                        {
+                            new IssuePatternConfig
+                            {
+                                Pattern = @"(.+): (.+)",
+                                File = 1,
+                                Message = 2,
+                            },
+                        },
+                    },
+                },
+            };
+            using (var hostContext = Setup(matchers: matchers))
+            using (_outputManager)
+            {
+                // Setup github.workspace
+                var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
+                ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
+                Directory.CreateDirectory(workDirectory);
+                var workspaceDirectory = Path.Combine(workDirectory, "workspace");
+                Directory.CreateDirectory(workspaceDirectory);
+                _executionContext.Setup(x => x.GetGitHubContext("workspace")).Returns(workspaceDirectory);
+
+                // Create a test file
+                File.WriteAllText(Path.Combine(workspaceDirectory, "some-file-1.txt"), "");
+
+                // Process
+                Process("some-file-1.txt: some error 1"); // file exists
+                Process("some-file-2.txt: some error 2"); // file does not exist
+
+                Assert.Equal(2, _issues.Count);
+                Assert.Equal("some error 1", _issues[0].Item1.Message);
+                Assert.Equal("some-file-1.txt", _issues[0].Item1.Data["file"]);
+                Assert.Equal("some error 2", _issues[1].Item1.Message);
+                Assert.False(_issues[1].Item1.Data.ContainsKey("file")); // does not contain file key
+                Assert.Equal(0, _commands.Count);
+                Assert.Equal(0, _messages.Where(x => !x.StartsWith("##[debug]")).Count());
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void MatcherFileOutsideRepository()
+        {
+            var matchers = new IssueMatchersConfig
+            {
+                Matchers =
+                {
+                    new IssueMatcherConfig
+                    {
+                        Owner = "my-matcher-1",
+                        Patterns = new[]
+                        {
+                            new IssuePatternConfig
+                            {
+                                Pattern = @"(.+): (.+)",
+                                File = 1,
+                                Message = 2,
+                            },
+                        },
+                    },
+                },
+            };
+            using (var hostContext = Setup(matchers: matchers))
+            using (_outputManager)
+            {
+                // Setup github.workspace
+                var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
+                ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
+                Directory.CreateDirectory(workDirectory);
+                var workspaceDirectory = Path.Combine(workDirectory, "workspace");
+                Directory.CreateDirectory(workspaceDirectory);
+                _executionContext.Setup(x => x.GetGitHubContext("workspace")).Returns(workspaceDirectory);
+
+                // Create test files
+                var filePath1 = Path.Combine(workspaceDirectory, "some-file-1.txt");
+                File.WriteAllText(filePath1, "");
+                var workspaceSiblingDirectory = Path.Combine(Path.GetDirectoryName(workspaceDirectory), "workspace-sibling");
+                Directory.CreateDirectory(workspaceSiblingDirectory);
+                var filePath2 = Path.Combine(workspaceSiblingDirectory, "some-file-2.txt");
+                File.WriteAllText(filePath2, "");
+
+                // Process
+                Process($"{filePath1}: some error 1"); // file exists inside workspace
+                Process($"{filePath2}: some error 2"); // file exists outside workspace
+
+                Assert.Equal(2, _issues.Count);
+                Assert.Equal("some error 1", _issues[0].Item1.Message);
+                Assert.Equal("some-file-1.txt", _issues[0].Item1.Data["file"]);
+                Assert.Equal("some error 2", _issues[1].Item1.Message);
+                Assert.False(_issues[1].Item1.Data.ContainsKey("file")); // does not contain file key
+                Assert.Equal(0, _commands.Count);
+                Assert.Equal(0, _messages.Where(x => !x.StartsWith("##[debug]")).Count());
+            }
+        }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Worker")]
+        public void MatcherFromPath()
+        {
+            var matchers = new IssueMatchersConfig
+            {
+                Matchers =
+                {
+                    new IssueMatcherConfig
+                    {
+                        Owner = "my-matcher-1",
+                        Patterns = new[]
+                        {
+                            new IssuePatternConfig
+                            {
+                                Pattern = @"(.+): (.+) \[(.+)\]",
+                                File = 1,
+                                Message = 2,
+                                FromPath = 3,
+                            },
+                        },
+                    },
+                },
+            };
+            using (var hostContext = Setup(matchers: matchers))
+            using (_outputManager)
+            {
+                // Setup github.workspace
+                var workDirectory = hostContext.GetDirectory(WellKnownDirectory.Work);
+                ArgUtil.NotNullOrEmpty(workDirectory, nameof(workDirectory));
+                Directory.CreateDirectory(workDirectory);
+                var workspaceDirectory = Path.Combine(workDirectory, "workspace");
+                Directory.CreateDirectory(workspaceDirectory);
+                _executionContext.Setup(x => x.GetGitHubContext("workspace")).Returns(workspaceDirectory);
+
+                // Create a test file
+                Directory.CreateDirectory(Path.Combine(workspaceDirectory, "some-directory"));
+                Directory.CreateDirectory(Path.Combine(workspaceDirectory, "some-project", "some-directory"));
+                var filePath = Path.Combine(workspaceDirectory, "some-project", "some-directory", "some-file.txt");
+                File.WriteAllText(filePath, "");
+
+                // Process
+                Process("some-directory/some-file.txt: some error [some-project/some-project.proj]");
+                Assert.Equal(1, _issues.Count);
+                Assert.Equal("some error", _issues[0].Item1.Message);
+                Assert.Equal("some-project/some-directory/some-file.txt", _issues[0].Item1.Data["file"]);
+                Assert.Equal(0, _commands.Count);
+                Assert.Equal(0, _messages.Count);
+            }
+        }

        private TestHostContext Setup(
            [CallerMemberName] string name = "",
--- a/src/Test/L0/Worker/VariablesL0.cs
+++ b/src/Test/L0/Worker/VariablesL0.cs
@@ -150,7 +150,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                string actual = variables.Get("no such");

                // Assert.
-                Assert.Equal(null, actual);
+                Assert.Null(actual);
            }
        }

--- a/src/Test/Test.csproj
+++ b/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-arm;rhel.6-x64;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>
@@ -29,42 +29,4 @@
        <DebugType>portable</DebugType>
    </PropertyGroup>

-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x64'">
-        <DefineConstants>OS_WINDOWS;X64;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(PackageRuntime)' == 'win-x86'">
-        <DefineConstants>OS_WINDOWS;X86;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x64'">
-        <DefineConstants>OS_WINDOWS;X64;DEBUG;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'win-x86'">
-        <DefineConstants>OS_WINDOWS;X86;DEBUG;TRACE</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-        <DefineConstants>OS_OSX;X64;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' AND '$(Configuration)' == 'Debug'">
-        <DefineConstants>OS_OSX;DEBUG;X64;TRACE</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-x64'">
-        <DefineConstants>OS_LINUX;X64;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-        <DefineConstants>OS_LINUX;OS_RHEL6;X64;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(PackageRuntime)' == 'linux-arm'">
-        <DefineConstants>OS_LINUX;ARM;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-x64'">
-        <DefineConstants>OS_LINUX;X64;DEBUG;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'rhel.6-x64'">
-        <DefineConstants>OS_LINUX;OS_RHEL6;X64;DEBUG;TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(Configuration)' == 'Debug' AND '$(PackageRuntime)' == 'linux-arm'">
-        <DefineConstants>OS_LINUX;ARM;DEBUG;TRACE</DefineConstants>
-    </PropertyGroup>
 </Project>
--- a/src/dev.sh
+++ b/src/dev.sh
@@ -10,6 +10,7 @@ set -e

 DEV_CMD=$1
 DEV_CONFIG=$2
+DEV_TARGET_RUNTIME=$3

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LAYOUT_DIR="$SCRIPT_DIR/../_layout"
@@ -33,29 +34,32 @@ if [[ ($(uname) == "Linux") || ($(uname) == "Darwin") ]]; then
 fi

 if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then
-   RUNTIME_ID='win-x64'
-   if [[ "$PROCESSOR_ARCHITECTURE" == 'x86' ]]; then
-      RUNTIME_ID='win-x86'
-   fi
+    RUNTIME_ID='win-x64'
+    if [[ "$PROCESSOR_ARCHITECTURE" == 'x86' ]]; then
+        RUNTIME_ID='win-x86'
+    fi
 elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
-   RUNTIME_ID="linux-x64"
-   if command -v uname > /dev/null; then
-      CPU_NAME=$(uname -m)
-      case $CPU_NAME in
-         armv7l) RUNTIME_ID="linux-arm";;
-         aarch64) RUNTIME_ID="linux-arm";;
-      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
-   
+    RUNTIME_ID="linux-x64"
+    if command -v uname > /dev/null; then
+        CPU_NAME=$(uname -m)
+        case $CPU_NAME in
+            armv7l) RUNTIME_ID="linux-arm";;
+            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'
+    RUNTIME_ID='osx-x64'
+fi
+
+if [[ -n "$DEV_TARGET_RUNTIME" ]]; then
+    RUNTIME_ID="$DEV_TARGET_RUNTIME"
 fi

 # Make sure current platform support publish the dotnet runtime
@@ -63,34 +67,34 @@ fi
 # 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
-      echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
-      exit 1
-   fi
+    if [[ ("$RUNTIME_ID" != 'win-x86') && ("$RUNTIME_ID" != 'win-x64') ]]; then
+        echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
+        exit 1
+    fi
 elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
-   if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-arm') && ("$RUNTIME_ID" != 'rhel.6-x64') ]]; then
-      echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
-      exit 1
-   fi
+    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
 elif [[ "$CURRENT_PLATFORM" == 'darwin' ]]; then
-   if [[ ("$RUNTIME_ID" != 'osx-x64') ]]; then
-      echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
-      exit 1
-   fi
+    if [[ ("$RUNTIME_ID" != 'osx-x64') ]]; then
+       echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
+       exit 1
+    fi
 fi

 function failed()
 {
-   local error=${1:-Undefined error}
-   echo "Failed: $error" >&2
-   popd
-   exit 1
+    local error=${1:-Undefined error}
+    echo "Failed: $error" >&2
+    popd
+    exit 1
 }

 function warn()
 {
-   local error=${1:-Undefined error}
-   echo "WARNING - FAILED: $error" >&2
+    local error=${1:-Undefined error}
+    echo "WARNING - FAILED: $error" >&2
 }

 function checkRC() {
@@ -151,7 +155,8 @@ function package ()
        echo "You must build first.  Expecting to find ${LAYOUT_DIR}/bin"
    fi

-    runner_ver=$("${LAYOUT_DIR}/bin/Runner.Listener" --version) || failed "version"
+    # TODO: We are cross-compiling arm on x64 so we cant exec Runner.Listener. Remove after building on native arm host
+    runner_ver=$("${LAYOUT_DIR}/bin/Runner.Listener" --version) || runner_ver=$(cat runnerversion) || failed "version"
    runner_pkg_name="actions-runner-${RUNTIME_ID}-${runner_ver}"

    heading "Packaging ${runner_pkg_name}"
@@ -208,8 +213,6 @@ fi
 echo "Prepend ${DOTNETSDK_INSTALLDIR} to %PATH%"
 export PATH=${DOTNETSDK_INSTALLDIR}:$PATH

-heading "Github Dreamlifter Runner"
-
 heading "Dotnet SDK Version"
 dotnet --version

@@ -233,15 +236,15 @@ if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then
 fi

 case $DEV_CMD in
-   "build") build;;
-   "b") build;;
-   "test") runtest;;
-   "t") runtest;;
-   "layout") layout;;
-   "l") layout;;
-   "package") package;;
-   "p") package;;
-   *) echo "Invalid cmd.  Use build(b), test(t), layout(l) or package(p)";;
+    "build") build;;
+    "b") build;;
+    "test") runtest;;
+    "t") runtest;;
+    "layout") layout;;
+    "l") layout;;
+    "package") package;;
+    "p") package;;
+    *) echo "Invalid cmd.  Use build(b), test(t), layout(l) or package(p)";;
 esac

 popd
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.160.1
+2.161.0
--- a/windows.template.yml
+++ b/windows.template.yml
@@ -1,9 +1,12 @@
+parameters:
+  targetRuntime: ''
+
 steps:

 # Build agent layout
- script: dev.cmd layout Release
+- script: dev.cmd layout Release ${{ parameters.targetRuntime }}
  workingDirectory: src
-  displayName: Build & Layout Release
+  displayName: Build & Layout Release ${{ parameters.targetRuntime }}

 # Run test
 - script: dev.cmd test
Author	SHA1	Message	Date
David Kale	3ade8424a5	Merge branch 'master' into 150-runner-arch Conflicts: releaseNote.md src/runnerversion	2019-11-12 11:36:25 -05:00
Thomas Boop	9ba971592b	V 2.160.2 Release notes and version bump (#190 )	2019-11-11 15:45:37 -05:00
Thomas Boop	b27cfb18e6	2.160.1 Runner Release Notes (#171 ) * 2.160.1 Runner Release Notes * Minor verbiage updates to be consistent	2019-11-11 15:45:13 -05:00
Thomas Boop	ced4c2ca50	add-mask is leaking a secret in master if debug or ::echo::on is set (#158 ) * Output after processing command to avoid leaking mask * Remove extra noise output from echo changes * Omit Echoing of add-mask command * avoid echoing on debug/warning/error	2019-11-11 15:40:18 -05:00
David Kale	c0e866faf0	Get version from file to avoid exec error during package on x64 host for arm package	2019-11-11 15:35:15 -05:00
David Kale	d6956ba213	Fix version	2019-11-11 15:07:33 -05:00
David Kale	215f78888a	New arch is a feature Dont release x86 until we have an e2e test machine	2019-11-11 15:02:21 -05:00
Thomas Boop	54f21c641f	Update dependency docs for OSX and Windows (#162 ) * Update Dependency docs for .net 3.0 depedencies * Update Supported Windows Versions * Update Supported Mac OS link * Update docs/start/envosx.md Fix typo in OSX Version Co-Authored-By: Lucas Costi <lucascosti@users.noreply.github.com>	2019-11-11 13:43:02 -05:00
David Kale	d46e92e9bb	Cant cross test arm on x64 hosts	2019-11-11 13:25:31 -05:00
David Kale	9573fa77ae	RID typo	2019-11-11 13:22:39 -05:00
David Kale	e962329269	Update release, add packages	2019-11-11 13:07:29 -05:00
David Kale	dd804e13a8	Remove unused rhel from matrix includes	2019-11-11 11:06:02 -05:00
David Kale	7d30e27ca3	Package based on new runtime names	2019-11-08 17:13:02 -05:00
David Kale	dbf36630ae	Remove RHEL6	2019-11-08 15:16:44 -05:00
David Kale	84b352c693	Add stub for downloading new node externals when they are ready	2019-11-08 13:30:38 -05:00
Thomas Boop	c5cbac9796	Runner fails to run as a service on windows: Disable Delay Signing on the Runner Service (#185 ) * test release * Reverse test release changes * Remove Unused Public Keys from Runner Service	2019-11-08 09:49:20 -05:00
David Kale	f4adf7585b	Add RHEL6, skip L0 on arm for now	2019-11-07 15:39:14 -05:00
David Kale	e0f8313645	Temporarily bench rhel	2019-11-07 14:52:40 -05:00
David Kale	9889c42041	win-x86 externals	2019-11-07 14:47:27 -05:00
David Kale	55948e4ee6	TEMP: Only test when platform === target runtime Fix arm64 node externals url	2019-11-07 14:41:35 -05:00
David Kale	5b011dc4ce	x32 -> x86	2019-11-07 14:36:55 -05:00
David Kale	4899d8513d	Use 4 space indent consistently	2019-11-07 14:30:18 -05:00
David Kale	f1b36bb957	Fix formatting. Remove piplines	2019-11-07 14:28:02 -05:00
David Kale	724f8fcb60	build.yaml	2019-11-07 14:20:50 -05:00
David Kale	39b4472a5f	Preserve CURRENT_PLATFORM in dev.sh	2019-11-07 13:27:08 -05:00
David Kale	2f3f51b303	Remove win-x86	2019-11-07 13:22:08 -05:00
David Kale	f6a4f588fc	Build with actions instead	2019-11-07 13:15:26 -05:00
David Kale	bdafe16af4	Cross compile for win-x86, linux-arm, linux-arm64	2019-11-07 13:04:16 -05:00
eric sciple	8911283cdb	fix problem matcher to treat fromPath as a file path (#183 )	2019-11-07 11:26:29 -05:00
Eilon Lipton	76078b5c44	Add SLN file and make projects build in VS (#173 ) * Add SLN file and make projects build in VS - Added new ActionsRunner.sln file with all the CSPROJ's in it - Added Directory.Build.props that gets auto-included in all CSPROJ files under it - Made default runtime platforms for Windows and Linux (to be 64bit) so that you don't have to specify it in order to build * Remove extra invalid parens	2019-11-06 16:57:46 -05:00
Eilon Lipton	ec9cb6c68d	Fix build warnings in Test project (#178 ) The build warnings were of these type (mostly reported by xUnit's Code Analyzers): - Fixed wrong parameter order in xUnit assertions (can lead to poor error reporting in test failures) - Unused code was removed - Correct assertions were used (e.g. Assert.True/.Contains/.EndsWith) - Public non-test methods on test classes were made private	2019-11-06 08:52:51 -05:00
Eilon Lipton	bcac4557a0	Fix Runner.Worker build warnings (#174 ) Most of these warnings show up on only certain build OSes because of #ifdefs in the code. The fix is to suppress these warnings.	2019-11-06 08:47:56 -05:00
Eilon Lipton	19580bdaf8	Update contribute.md (#175 ) Small cleanup of contribution guide	2019-11-05 17:21:50 -05:00
Eilon Lipton	96d3288553	Remove unused dreamlifter section (#177 )	2019-11-05 17:21:00 -05:00
Tingluo Huang	5b6f9d3b93	Stop job container after all post actions. (#165 ) * stop job container after all post actions. * c * c	2019-11-04 13:19:21 -05:00
eric sciple	51581ac865	root search pattern for hashfiles and allow forward slash on windows (#151 )	2019-10-29 13:23:30 -04:00
eric sciple	e7dd2c6cc2	Update dotnet install script (#155 )	2019-10-29 13:13:58 -04:00
@@ -1 +1 @@
 .160.1
 .161.0