WIP: Figure out notarizing

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+## Runner Version and Platform
+Version of your runner?
+
+OS of the machine running the runner? OSX/Windows/Linux/...
+
+## What's not working?
+Please include error messages and screenshots.
+
+## Runner and Worker's Diagnostic Logs
+Logs are located in the runner's `_diag` folder. The runner logs are prefixed with `Runner_` and the worker logs are prefixed with `Worker_`. All sensitive information should already be masked out, but please double-check before pasting here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,34 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Run '....'
-3. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-## Runner Version and Platform
-Version of your runner?
-
-OS of the machine running the runner? OSX/Windows/Linux/...
-
-## What's not working?
-Please include error messages and screenshots.
-
-## Job Log Output
-If applicable, include the relevant part of the job / step log output here.  All sensitive information should already be masked out, but please double-check before pasting here.
-
-## Runner and Worker's Diagnostic Logs
-If applicable, add relevant diagnostic log information.  Logs are located in the runner's `_diag` folder. The runner logs are prefixed with `Runner_` and the worker logs are prefixed with `Worker_`. Each job run correlates to a worker log.  All sensitive information should already be masked out, but please double-check before pasting here.

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -1,27 +0,0 @@
----
-name: Feature Request
-about: Create a request to help us improve
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-Thank you 🙇‍♀ for wanting to create a feature in this repository. Before you do, please ensure you are filing the issue in the right place. Issues should only be opened on if the issue **relates to code in this repository**.  
-
-* If you have found a security issue [please submit it here](https://hackerone.com/github)
-* If you have questions or issues with the service, writing workflows or actions, then please [visit the GitHub Community Forum's Actions Board](https://github.community/t5/GitHub-Actions/bd-p/actions)
-* If you are having an issue or question about GitHub Actions then please [contact customer support](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-github-actions#contacting-support)
-
-If you have a feature request that is relevant to this repository, the runner, then please include the information below:
-
-**Describe the enhancement**
-A clear and concise description of what the features or enhancement you need.
-
-**Code Snippet**
-If applicable, add a code snippet.
-
-**Additional information**
-Add any other context about the feature here.
-
-NOTE: if the feature request has been agreed upon then the assignee will create an ADR.   See docs/adrs/README.md

.github/workflows/build.yml

@@ -5,13 +5,9 @@ on:
     branches:
     - master
     - releases/*
-    paths-ignore:
-    - '**.md'    
   pull_request:
     branches:
     - '*'
-    paths-ignore:
-    - '**.md'    
 
 jobs:
   build:

.github/workflows/release.yml

@@ -1,195 +0,0 @@
-name: Runner CD
-
-on:
-  push:
-    paths:
-    - releaseVersion
-  
-jobs:
-  check:
-    if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-
-    # Make sure ./releaseVersion match ./src/runnerversion 
-    # Query GitHub release ensure version is not used 
-    - name: Check version
-      uses: actions/github-script@0.3.0
-      with:
-        github-token: ${{secrets.GITHUB_TOKEN}}
-        script: |
-          const core = require('@actions/core')
-          const fs = require('fs');
-          const runnerVersion = fs.readFileSync('${{ github.workspace }}/src/runnerversion', 'utf8').replace(/\n$/g, '')
-          const releaseVersion = fs.readFileSync('${{ github.workspace }}/releaseVersion', 'utf8').replace(/\n$/g, '')
-          if (runnerVersion != releaseVersion) {
-            console.log('Request Release Version: ' + releaseVersion + '\nCurrent Runner Version: ' + runnerVersion)
-            core.setFailed('Version mismatch! Make sure ./releaseVersion match ./src/runnerVersion')
-            return
-          }
-          try {
-            const release = await github.repos.getReleaseByTag({
-              owner: '${{ github.event.repository.owner.name }}',
-              repo: '${{ github.event.repository.name }}',
-              tag: 'v' + runnerVersion
-            })
-            core.setFailed('Release with same tag already created: ' + release.data.html_url)
-          } catch (e) {
-            // We are good to create the release if release with same tag doesn't exists
-            if (e.status != 404) {
-              throw e
-            }
-          }
-  
-  build:
-    needs: check
-    strategy:
-      matrix:
-        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, osx-x64 ]
-        include:
-        - runtime: linux-x64
-          os: ubuntu-latest
-          devScript: ./dev.sh
-
-        - runtime: linux-arm64
-          os: ubuntu-latest
-          devScript: ./dev.sh
-
-        - 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
-
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v1
-
-    # Build runner layout
-    - name: Build & Layout Release
-      run: |
-        ${{ matrix.devScript }} layout Release ${{ matrix.runtime }}
-      working-directory: src
-
-    # Run tests
-    - name: L0
-      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 ${{ matrix.runtime }}
-      working-directory: src
-
-    # Upload runner package tar.gz/zip as artifact.
-    # Since each package name is unique, so we don't need to put ${{matrix}} info into artifact name
-    - name: Publish Artifact
-      if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v1
-      with:
-        name: runner-packages
-        path: _package
-
-  release:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-
-    - uses: actions/checkout@v2
-
-    # Download runner package tar.gz/zip produced by 'build' job
-    - name: Download Artifact
-      uses: actions/download-artifact@v1
-      with:
-        name: runner-packages
-        path: ./
-
-    # Create ReleaseNote file
-    - name: Create ReleaseNote
-      id: releaseNote
-      uses: actions/github-script@0.3.0
-      with:
-        github-token: ${{secrets.GITHUB_TOKEN}}
-        script: |
-          const core = require('@actions/core')
-          const fs = require('fs');
-          const runnerVersion = fs.readFileSync('${{ github.workspace }}/src/runnerversion', 'utf8').replace(/\n$/g, '')
-          const releaseNote = fs.readFileSync('${{ github.workspace }}/releaseNote.md', 'utf8').replace(/<RUNNER_VERSION>/g, runnerVersion)
-          console.log(releaseNote)
-          core.setOutput('version', runnerVersion);
-          core.setOutput('note', releaseNote);
-        
-    # Create GitHub release
-    - uses: actions/create-release@master
-      id: createRelease
-      name: Create ${{ steps.releaseNote.outputs.version }} Runner Release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: "v${{ steps.releaseNote.outputs.version }}"
-        release_name: "v${{ steps.releaseNote.outputs.version }}"
-        body: |
-          ${{ steps.releaseNote.outputs.note }}
-        prerelease: true
-
-    # Upload release assets
-    - name: Upload Release Asset (win-x64)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip
-        asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip
-        asset_content_type: application/octet-stream
-
-    - name: Upload Release Asset (linux-x64)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/actions-runner-linux-x64-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_name: actions-runner-linux-x64-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_content_type: application/octet-stream
-
-    - name: Upload Release Asset (osx-x64)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/actions-runner-osx-x64-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_name: actions-runner-osx-x64-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_content_type: application/octet-stream
-
-    - name: Upload Release Asset (linux-arm)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/actions-runner-linux-arm-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_name: actions-runner-linux-arm-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_content_type: application/octet-stream
-
-    - name: Upload Release Asset (linux-arm64)
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.createRelease.outputs.upload_url }}
-        asset_path: ${{ github.workspace }}/actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.tar.gz
-        asset_content_type: application/octet-stream

.gitignore

@@ -1,18 +1,12 @@
-# build output
 **/bin
 **/obj
 **/libs
-
-# editors
 **/*.xproj
 **/*.xproj.user
 **/.vs
 **/.vscode
 **/*.error
 **/*.json.pretty
-.idea/
-
-# output
 node_modules
 _downloads
 _layout
@@ -25,3 +19,4 @@ TestLogs
 
 #generated
 src/Runner.Sdk/BuildConstants.cs
+

ActionsRunner.sln

@@ -3,23 +3,23 @@ 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", "Runner.Common\Runner.Common.csproj", "{084289A3-CD7A-42E0-9219-4348B4B7E19B}"
+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", "Runner.Listener\Runner.Listener.csproj", "{7D461AEE-BF2A-4855-BD96-56921160B36A}"
+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", "Runner.PluginHost\Runner.PluginHost.csproj", "{D0320EB1-CB6D-4179-BFDC-2F2B664A370C}"
+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", "Runner.Plugins\Runner.Plugins.csproj", "{C23AFD6F-4DCD-4243-BC61-865BE31B9168}"
+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", "Runner.Sdk\Runner.Sdk.csproj", "{D0484633-DA97-4C34-8E47-1DADE212A57A}"
+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", "Runner.Service\Windows\RunnerService.csproj", "{D12EBD71-0464-46D0-8394-40BCFBA0A6F2}"
+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", "Runner.Worker\Runner.Worker.csproj", "{C2F5B9FA-2621-411F-8EB2-273ED276F503}"
+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", "Sdk\Sdk.csproj", "{D2EE812B-E4DF-49BB-AE87-12BC49949B5F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sdk", "src\Sdk\Sdk.csproj", "{D2EE812B-E4DF-49BB-AE87-12BC49949B5F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj", "{C932061F-F6A1-4F1E-B854-A6C6B30DC3EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "src\Test\Test.csproj", "{C932061F-F6A1-4F1E-B854-A6C6B30DC3EF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2019 GitHub
+Copyright (c) Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,4 +17,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,25 +1,31 @@
+# GitHub Actions Runner
+
 <p align="center">
   <img src="docs/res/github-graph.png">
 </p>
 
-# GitHub Actions Runner
-
 [![Actions Status](https://github.com/actions/runner/workflows/Runner%20CI/badge.svg)](https://github.com/actions/runner/actions)
 
-The runner is the application that runs a job from a GitHub Actions workflow.  The runner can run on the [hosted machine pools](https://github.com/actions/virtual-environments) or run on [self-hosted environments](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-self-hosted-runners).
-
 ## Get Started
 
-For more information about installing and using self-hosted runners, see [Adding self-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/adding-self-hosted-runners) and [Using self-hosted runners in a workflow](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-self-hosted-runners-in-a-workflow)
+![win](docs/res/win_sm.png) [Pre-reqs](docs/start/envwin.md) | [Download](https://github.com/actions/runner/releases/latest)  
 
-Runner releases:
+![macOS](docs/res/apple_sm.png)  [Pre-reqs](docs/start/envosx.md) | [Download](https://github.com/actions/runner/releases/latest)  
 
-![win](docs/res/win_sm.png) [Pre-reqs](docs/start/envwin.md) | [Download](https://github.com/actions/runner/releases)  
+![linux](docs/res/linux_sm.png)  [Pre-reqs](docs/start/envlinux.md) | [Download](https://github.com/actions/runner/releases/latest)
 
-![macOS](docs/res/apple_sm.png)  [Pre-reqs](docs/start/envosx.md) | [Download](https://github.com/actions/runner/releases)  
+**Configure:**
 
-![linux](docs/res/linux_sm.png)  [Pre-reqs](docs/start/envlinux.md) | [Download](https://github.com/actions/runner/releases)
+*MacOS and Linux*
+```bash
+./config.sh
+```
+
+*Windows*
+```bash
+config.cmd
+```
 
 ## Contribute
 
-We accept contributions in the form of issues and pull requests.  [Read more here](docs/contribute.md) before contributing.
+For developers that want to contribute, [read here](docs/contribute.md) on how to build and test.

assets.json

@@ -0,0 +1,32 @@
+[
+    {
+        "name": "actions-runner-win-x64-<RUNNER_VERSION>.zip",
+        "platform": "win-x64",
+        "version": "<RUNNER_VERSION>",
+        "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip"
+    },
+    {
+        "name": "actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz",
+        "platform": "osx-x64",
+        "version": "<RUNNER_VERSION>",
+        "downloadUrl": "https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz"
+    },
+    {
+        "name": "actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz",
+        "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"
+    }
+]

azure-pipelines-release.yml

@@ -0,0 +1,235 @@
+stages:
+- stage: Build
+  jobs:
+  ################################################################################
+  - job: build_windows_agent_x64
+  ################################################################################
+    displayName: Windows Agent (x64)
+    pool:
+      vmImage: vs2017-win2016
+    steps:
+
+    # 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
+        $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."
+        $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-x64
+      workingDirectory: src
+      displayName: Package Release
+
+    # Upload agent package zip as build artifact
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (Windows x64)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+  ################################################################################
+  - job: build_linux_agent_x64
+  ################################################################################
+    displayName: Linux Agent (x64)
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+
+    # Steps template for non-windows platform
+    - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: linux-x64
+
+    # Create agent package zip
+    - script: ./dev.sh package Release linux-x64
+      workingDirectory: src
+      displayName: Package Release
+
+    # Upload agent package zip as build artifact
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (Linux x64)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+  ################################################################################
+  - 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 ARM64)
+      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 ARM)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+  ################################################################################
+  - job: build_osx_agent_x64
+  ################################################################################
+    displayName: macOS Agent (x64)
+    pool:
+      vmImage: macOS-10.13
+    steps:
+
+    # Steps template for non-windows platform
+    - template: nonwindows.template.yml
+      parameters:
+        targetRuntime: osx-x64
+
+    # Create agent package zip
+    - script: ./dev.sh package Release osx-x64
+      workingDirectory: src
+      displayName: Package Release
+
+    # Upload agent package zip as build artifact
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (OSX x64)
+      inputs:
+        pathToPublish: _package
+        artifactName: runners
+        artifactType: container
+
+- stage: Release
+  dependsOn: Build
+  jobs:
+  ################################################################################
+  - job: publish_agent_packages
+  ################################################################################
+    displayName: Publish Agents (Windows/Linux/OSX)
+    pool:
+      name: ProductionRMAgents
+    steps:
+
+    # Download all agent packages from all previous phases
+    - task: DownloadBuildArtifacts@0
+      displayName: Download Agent Packages
+      inputs:
+        artifactName: runners
+
+    # Upload agent packages to Azure blob storage and refresh Azure CDN
+    - powershell: |
+        Write-Host "Preloading Azure modules." # This is for better performance, to avoid module-autoloading.
+        Import-Module AzureRM, AzureRM.profile, AzureRM.Storage, Azure.Storage, AzureRM.Cdn -ErrorAction Ignore -PassThru
+        Enable-AzureRmAlias -Scope CurrentUser
+        $uploadFiles = New-Object System.Collections.ArrayList
+        $certificateThumbprint = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalCertThumbprint
+        $clientId = (Get-ItemProperty -Path "$(ServicePrincipalReg)").ServicePrincipalClientId
+        Write-Host "##vso[task.setsecret]$certificateThumbprint"
+        Write-Host "##vso[task.setsecret]$clientId"
+        Login-AzureRmAccount -ServicePrincipal -CertificateThumbprint $certificateThumbprint -ApplicationId $clientId -TenantId $(GitHubTenantId)
+        Select-AzureRmSubscription -SubscriptionId $(GitHubSubscriptionId)
+        $storage = Get-AzureRmStorageAccount -ResourceGroupName githubassets -AccountName githubassets
+        Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/runners" | ForEach-Object {
+          $versionDir = $_.Name.Trim('.zip').Trim('.tar.gz')
+          $versionDir = $versionDir.SubString($versionDir.LastIndexOf('-') + 1)
+          Write-Host "##vso[task.setvariable variable=ReleaseAgentVersion;]$versionDir"
+          Write-Host "Uploading $_ to BlobStorage githubassets/runners/$versionDir"
+          Set-AzureStorageBlobContent -Context $storage.Context -Container runners -File "$(System.ArtifactsDirectory)/runners/$_" -Blob "$versionDir/$_" -Force
+          $uploadFiles.Add("/runners/$versionDir/$_")
+        }
+        Write-Host "Get CDN info"
+        Get-AzureRmCdnEndpoint -ProfileName githubassets -ResourceGroupName githubassets
+        Write-Host "Purge Azure CDN Cache"
+        Unpublish-AzureRmCdnEndpointContent -EndpointName githubassets -ProfileName githubassets -ResourceGroupName githubassets -PurgeContent $uploadFiles
+        Write-Host "Pull assets through Azure CDN"
+        $uploadFiles | ForEach-Object {
+          $downloadUrl = "https://githubassets.azureedge.net" + $_
+          Write-Host $downloadUrl
+          Invoke-WebRequest -Uri $downloadUrl -OutFile $_.SubString($_.LastIndexOf('/') + 1)
+        }
+      displayName: Upload to Azure Blob
+
+    # Create agent release on Github
+    - powershell: |
+        Write-Host "Creating github release."
+        $releaseNotes = [System.IO.File]::ReadAllText("$(Build.SourcesDirectory)\releaseNote.md").Replace("<RUNNER_VERSION>","$(ReleaseAgentVersion)")
+        $releaseData = @{
+          tag_name = "v$(ReleaseAgentVersion)";
+          target_commitish = "$(Build.SourceVersion)";
+          name = "v$(ReleaseAgentVersion)";
+          body = $releaseNotes;
+          draft = $false;
+          prerelease = $true;
+        }
+        $releaseParams = @{
+          Uri = "https://api.github.com/repos/actions/runner/releases";
+          Method = 'POST';
+          Headers = @{
+            Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("github:$(GithubToken)"));
+          }
+          ContentType = 'application/json';
+          Body = (ConvertTo-Json $releaseData -Compress)
+        }
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+        $releaseCreated = Invoke-RestMethod @releaseParams
+        Write-Host $releaseCreated
+        $releaseId = $releaseCreated.id
+        $assets = [System.IO.File]::ReadAllText("$(Build.SourcesDirectory)\assets.json").Replace("<RUNNER_VERSION>","$(ReleaseAgentVersion)")
+        $assetsParams = @{
+          Uri = "https://uploads.github.com/repos/actions/runner/releases/$releaseId/assets?name=assets.json"
+          Method = 'POST';
+          Headers = @{
+            Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("github:$(GithubToken)"));
+          }
+          ContentType = 'application/octet-stream';
+          Body = [system.Text.Encoding]::UTF8.GetBytes($assets)
+        }
+        Invoke-RestMethod @assetsParams
+      displayName: Create agent release on Github

azure-pipelines.yml

@@ -0,0 +1,95 @@
+jobs:
+
+################################################################################
+- job: build_windows_x64_agent
+################################################################################
+  displayName: Windows Agent (x64)
+  pool:
+    vmImage: vs2017-win2016
+  steps:
+
+  # Steps template for windows platform
+  - template: windows.template.yml
+
+  # 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_x64.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
+    condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
+
+  # Create agent package zip
+  - script: dev.cmd package Release
+    workingDirectory: src
+    displayName: Package Release
+    condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
+
+  # Upload agent package zip as build artifact
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact (Windows x64)
+    condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
+    inputs:
+      pathToPublish: _package
+      artifactName: agent
+      artifactType: container
+
+################################################################################
+- job: build_linux_x64_agent
+################################################################################
+  displayName: Linux Agent (x64)
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+
+  # Steps template for non-windows platform
+  - template: nonwindows.template.yml
+
+  # Create agent package zip
+  - script: ./dev.sh package Release
+    workingDirectory: src
+    displayName: Package Release
+    condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
+
+  # Upload agent package zip as build artifact
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact (Linux x64)
+    condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
+    inputs:
+      pathToPublish: _package
+      artifactName: agent
+      artifactType: container
+
+################################################################################
+- job: build_osx_agent
+################################################################################
+  displayName: macOS Agent (x64)
+  pool:
+    vmImage: macOS-10.14
+  steps:
+
+  # Steps template for non-windows platform
+  - template: nonwindows.template.yml
+  
+  # Create agent package zip
+  - script: ./dev.sh package Release
+    workingDirectory: src
+    displayName: Package Release
+    condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
+
+  # Upload agent package zip as build artifact
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact (OSX)
+    condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
+    inputs:
+      pathToPublish: _package
+      artifactName: agent
+      artifactType: container

docs/adrs/README.md

@@ -1,19 +0,0 @@
-# ADRs
-
-ADR, short for "Architecture Decision Record" is a way of capturing important architectural decisions, along with their context and consequences.
-
-This folder includes ADRs for the actions runner. ADRs are proposed in the form of a pull request, and they commonly follow this format:
-
-* **Title**: short present tense imperative phrase, less than 50 characters, like a git commit message.
-
-* **Status**: proposed, accepted, rejected, deprecated, superseded, etc.
-
-* **Context**: what is the issue that we're seeing that is motivating this decision or change.
-
-* **Decision**: what is the change that we're actually proposing or doing.
-
-* **Consequences**: what becomes easier or more difficult to do because of this change.
-
----
-
-- More information about ADRs can be found [here](https://github.com/joelparkerhenderson/architecture_decision_record).

docs/contribute.md

@@ -1,31 +1,10 @@
-# Contributions
+# Contribution guide for developers
 
-We welcome contributions in the form of issues and pull requests.  We view the contributions and the process as the same for github and external contributors.
-
-> IMPORTANT: Building your own runner is critical for the dev inner loop process when contributing changes.  However, only runners built and distributed by GitHub (releases) are supported in production.  Be aware that workflows and orchestrations run service side with the runner being a remote process to run steps.  For that reason, the service can pull the runner forward so customizations can be lost.
-
-## Issues
-
-Log issues for both bugs and enhancement requests.  Logging issues are important for the open community.
-
-Issues in this repository should be for the runner application.  Note that the VM and virtual machine images (including the developer toolsets) installed on the actions hosted machine pools are located [in this repository](https://github.com/actions/virtual-environments)
-
-## Enhancements and Feature Requests
-
-We ask that before significant effort is put into code changes, that we have agreement on taking the change before time is invested in code changes. 
-
-1. Create a feature request.  Once agreed we will take the enhancment
-2. Create an ADR to agree on the details of the change.
-
-An ADR is an Architectural Decision Record.  This allows consensus on the direction forward and also serves as a record of the change and motivation.  [Read more here](adrs/README.md)
-
-## Development Life Cycle
-
-### Required 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)
 
-### To Build, Test, Layout 
+## To Build, Test, Layout 
 
 Navigate to the `src` directory and run the following command:
 
@@ -35,27 +14,27 @@ Navigate to the `src` directory and run the following command:
   
 **Commands:**  
 
-* `layout` (`l`):  Run first time to create a full runner layout in `{root}/_layout`
-* `build` (`b`):   Build everything and update runner layout folder
-* `test` (`t`):    Build runner binaries and run unit tests
+* `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
 
 Sample developer flow:
 
 ```bash
 git clone https://github.com/actions/runner
 cd ./src
-./dev.(sh/cmd) layout # the runner that build from source is in {root}/_layout
+./dev.(sh/cmd) layout # the agent that build from source is in {root}/_layout
 <make code changes>
 ./dev.(sh/cmd) build # {root}/_layout will get updated
 ./dev.(sh/cmd) test # run all unit tests before git commit/push
 ```
 
-### Editors
+## Editors
 
-[Using Visual Studio Code](https://code.visualstudio.com/)
 [Using Visual Studio 2019](https://www.visualstudio.com/vs/)  
+[Using Visual Studio Code](https://code.visualstudio.com/)
 
-### Styling
+## Styling
 
 We use the .NET Foundation and CoreCLR style guidelines [located here](
 https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md)

docs/start/envlinux.md

@@ -28,7 +28,7 @@ Execute ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 depe
 ```
 You can easily correct the problem by executing `./bin/installdependencies.sh`.  
 The `installdependencies.sh` script should install all required dependencies on all supported Linux versions   
-> Note: The `installdependencies.sh` script will try to use the default package management mechanism on your Linux flavor (ex. `yum`/`apt-get`/`apt`).
+> Note: The `installdependencies.sh` script will try to use the default package management mechanism on your Linux flavor (ex. `yum`/`apt-get`/`apt`). You might need to deal with error coming from the package management mechanism related to your setup, like [#1353](https://github.com/Microsoft/vsts-agent/issues/1353)
 
 ### Full dependencies list
 

docs/start/envwin.md

@@ -9,4 +9,4 @@
  - 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=netcore30)
+## [More .Net Core Prerequisites Information](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore30)

images/arm/Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:2.1
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+    && rm -rf /var/lib/apt/lists/*

images/centos6/Dockerfile

@@ -0,0 +1,150 @@
+FROM centos:6
+
+# Install dependencies
+
+RUN yum install -y \
+        centos-release-SCL \
+        epel-release \
+        wget \
+        unzip \
+    && \
+    rpm --import http://linuxsoft.cern.ch/cern/slc6X/x86_64/RPM-GPG-KEY-cern && \
+    wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo && \
+    yum install -y \
+        "perl(Time::HiRes)" \
+        autoconf \
+        cmake \
+        cmake3 \
+        devtoolset-2-toolchain \
+        doxygen \
+        expat-devel \
+        gcc \
+        gcc-c++ \
+        gdb \
+        gettext-devel \
+        krb5-devel \
+        libedit-devel \
+        libidn-devel \
+        libmetalink-devel \
+        libnghttp2-devel \
+        libssh2-devel \
+        libunwind-devel \
+        libuuid-devel \
+        lttng-ust-devel \
+        lzma \
+        ncurses-devel \
+        openssl-devel \
+        perl-devel \
+        python-argparse \
+        python27 \
+        readline-devel \
+        swig \
+        xz \
+        zlib-devel \
+    && \
+    yum clean all
+
+# Build and install clang and lldb 3.9.1
+
+RUN wget ftp://sourceware.org/pub/binutils/snapshots/binutils-2.29.1.tar.xz && \
+    wget http://releases.llvm.org/3.9.1/cfe-3.9.1.src.tar.xz && \
+    wget http://releases.llvm.org/3.9.1/llvm-3.9.1.src.tar.xz && \
+    wget http://releases.llvm.org/3.9.1/lldb-3.9.1.src.tar.xz && \
+    wget http://releases.llvm.org/3.9.1/compiler-rt-3.9.1.src.tar.xz && \
+    \
+    tar -xf binutils-2.29.1.tar.xz && \
+    tar -xf llvm-3.9.1.src.tar.xz && \
+    mkdir llvm-3.9.1.src/tools/clang && \
+    mkdir llvm-3.9.1.src/tools/lldb && \
+    mkdir llvm-3.9.1.src/projects/compiler-rt && \
+    tar -xf cfe-3.9.1.src.tar.xz --strip 1 -C llvm-3.9.1.src/tools/clang && \
+    tar -xf lldb-3.9.1.src.tar.xz --strip 1 -C llvm-3.9.1.src/tools/lldb && \
+    tar -xf compiler-rt-3.9.1.src.tar.xz --strip 1 -C llvm-3.9.1.src/projects/compiler-rt && \
+    rm binutils-2.29.1.tar.xz && \
+    rm cfe-3.9.1.src.tar.xz && \
+    rm lldb-3.9.1.src.tar.xz && \
+    rm llvm-3.9.1.src.tar.xz && \
+    rm compiler-rt-3.9.1.src.tar.xz && \
+    \
+    mkdir llvmbuild && \
+    cd llvmbuild && \
+    scl enable python27 devtoolset-2 \
+    ' \
+        cmake3 \
+            -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/g++ \
+            -DCMAKE_C_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/gcc \
+            -DCMAKE_LINKER=/opt/rh/devtoolset-2/root/usr/bin/ld \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DLLVM_LIBDIR_SUFFIX=64 \
+            -DLLVM_ENABLE_EH=1 \
+            -DLLVM_ENABLE_RTTI=1 \
+            -DLLVM_BINUTILS_INCDIR=../binutils-2.29.1/include \
+            ../llvm-3.9.1.src \
+        && \
+        make -j $(($(getconf _NPROCESSORS_ONLN)+1)) && \
+        make install \
+    ' && \
+    cd .. && \
+    rm -r llvmbuild && \
+    rm -r llvm-3.9.1.src && \
+    rm -r binutils-2.29.1
+
+# Build and install curl 7.45.0
+
+RUN wget https://curl.haxx.se/download/curl-7.45.0.tar.lzma && \
+    tar -xf curl-7.45.0.tar.lzma && \
+    rm curl-7.45.0.tar.lzma && \
+    cd curl-7.45.0 && \
+    scl enable python27 devtoolset-2 \
+    ' \
+        ./configure \
+            --disable-dict \
+            --disable-ftp \
+            --disable-gopher \
+            --disable-imap \
+            --disable-ldap \
+            --disable-ldaps \
+            --disable-libcurl-option \
+            --disable-manual \
+            --disable-pop3 \
+            --disable-rtsp \
+            --disable-smb \
+            --disable-smtp \
+            --disable-telnet \
+            --disable-tftp \
+            --enable-ipv6 \
+            --enable-optimize \
+            --enable-symbol-hiding \
+            --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \
+            --with-nghttp2 \
+            --with-gssapi \
+            --with-ssl \
+            --without-librtmp \
+        && \
+        make install \
+    ' && \
+    cd .. && \
+    rm -r curl-7.45.0
+
+# Install ICU 57.1
+
+RUN wget http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-RHEL6-x64.tgz && \
+    tar -xf icu4c-57_1-RHEL6-x64.tgz -C / && \
+    rm icu4c-57_1-RHEL6-x64.tgz
+
+# Compile and install a version of the git that supports the features that cli repo build needs
+# NOTE: The git needs to be built after the curl so that it can use the libcurl to add https
+# protocol support.
+RUN \
+    wget https://www.kernel.org/pub/software/scm/git/git-2.9.5.tar.gz && \
+    tar -xf git-2.9.5.tar.gz && \
+    rm git-2.9.5.tar.gz && \
+    cd  git-2.9.5 && \
+    make configure && \
+    ./configure --prefix=/usr/local --without-tcltk && \
+    make -j $(nproc --all) all && \
+    make install && \
+    cd .. && \
+    rm -r git-2.9.5
+
+ENV LD_LIBRARY_PATH=/usr/local/lib

nonwindows.template.yml

@@ -0,0 +1,33 @@
+parameters:
+  targetRuntime: ''
+
+steps:
+
+# Build agent layout
+- script: ./dev.sh layout Release ${{ parameters.targetRuntime }}
+  workingDirectory: src
+  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
+#   displayName: Publish Test Results **/*.trx
+#   condition: always()
+#   inputs:
+#     testRunner: VSTest
+#     testResultsFiles: '**/*.trx'
+#     testRunTitle: 'Agent Tests'
+
+# # Upload test log
+# - task: PublishBuildArtifacts@1
+#   displayName: Publish Test logs
+#   condition: always()
+#   inputs:
+#     pathToPublish: src/Test/TestLogs
+#     artifactName: $(System.JobId)
+#     artifactType: container

releaseNote.md

@@ -1,70 +1,58 @@
 ## Features
-  - Remove runner flow: Change from PAT to "deletion token" in prompt (#225) 
-  - Expose github.run_id and github.run_number to action runtime env. (#224)
+  - Added packages for Linux ARM32 (linux-arm) and Linux ARM64 (linux-arm64) (#184)
+    - Note that these packages are pre-release status and may not work with all existing actions
 
 ## Bugs
-  - Clean up error messages for container scenarios (#221)
-  - Pick shell from prependpath (#231)
+  - Fixed a bug where problem matchers were not treating FromPath as a file path (#183)
 
 ## Misc
-  - Runner code cleanup  (#218 #227, #228, #229, #230) 
-  - Consume dotnet core 3.1 in runner. (#213)
+  - Fixed code warnings in the Runner (#174)
+  - Fixed code warnings in the Runner tests (#178)
+  - Added support for building the Runner in Visual Studio (#173)
+
+## Agent Downloads  
+
+|         | Package                                                                                                       |
+| ------- | ----------------------------------------------------------------------------------------------------------- |
+| Windows x64 | [actions-runner-win-x64-<RUNNER_VERSION>.zip](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip)      |
+| macOS   | [actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz)   |
+| Linux x64  | [actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz) |
+| Linux arm64  | [actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz) |
+| Linux arm  | [actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz](https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz) |
+
+After Download:  
 
 ## Windows x64
-We recommend configuring the runner under "<DRIVE>:\actions-runner". This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows
-``` 
-// Create a folder under the drive root
-mkdir \actions-runner ; cd \actions-runner
-// Download the latest runner package
-Invoke-WebRequest -Uri https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip -OutFile actions-runner-win-x64-<RUNNER_VERSION>.zip
-// Extract the installer
-Add-Type -AssemblyName System.IO.Compression.FileSystem ; 
-[System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
+
+``` bash
+C:\> mkdir myagent && cd myagent
+C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
 ```
 
 ## OSX
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
 ```
 
 ## Linux x64
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 ```
 
-## Linux arm64 (Pre-release)
+## Linux arm64
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
 ```
 
-## Linux arm (Pre-release)
+## Linux arm
 
 ``` bash
-// Create a folder
-mkdir actions-runner && cd actions-runner
-// Download the latest runner package
-curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
-// Extract the installer
-tar xzf ./actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
-```
-
-## Using your self hosted runner
-For additional details about configuring, running, or shutting down the runner please check out our [product docs.](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/adding-self-hosted-runners)
+~/$ mkdir myagent && cd myagent
+~/myagent$ tar xzf ~/Downloads/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
+```

releaseVersion

@@ -1 +0,0 @@
-2.164.0

src/Directory.Build.props

@@ -47,8 +47,8 @@
     <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
   </PropertyGroup>
 
-  <!-- Set Treat tarnings as errors -->
-  <PropertyGroup>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  <!-- Set OS specific config -->
+  <PropertyGroup Condition="'$(BUILD_OS)' == 'OSX'">
+    <UseHardenedRuntime>true</UseHardenedRuntime>
   </PropertyGroup>
 </Project>

src/Misc/dotnet-install.ps1

@@ -167,7 +167,7 @@ function Get-CLIArchitecture-From-Architecture([string]$Architecture) {
         { $_ -eq "x86" } { return "x86" }
         { $_ -eq "arm" } { return "arm" }
         { $_ -eq "arm64" } { return "arm64" }
-        default { throw "Architecture not supported. If you think this is a bug, report it at https://github.com/dotnet/sdk/issues" }
+        default { throw "Architecture not supported. If you think this is a bug, report it at https://github.com/dotnet/cli/issues" }
     }
 }
 
@@ -309,12 +309,14 @@ function Parse-Jsonfile-For-Version([string]$JSonFile) {
 
     If (-Not (Test-Path $JSonFile)) {
         throw "Unable to find '$JSonFile'"
+        exit 0
     }
     try {
         $JSonContent = Get-Content($JSonFile) -Raw | ConvertFrom-Json | Select-Object -expand "sdk" -ErrorAction SilentlyContinue
     }
     catch {
         throw "Json file unreadable: '$JSonFile'"
+        exit 0
     }
     if ($JSonContent) {
         try {
@@ -328,13 +330,16 @@ function Parse-Jsonfile-For-Version([string]$JSonFile) {
         }
         catch {
             throw "Unable to parse the SDK node in '$JSonFile'"
+            exit 0
         }
     }
     else {
         throw "Unable to find the SDK node in '$JSonFile'"
+        exit 0
     }
     If ($Version -eq $null) {
         throw "Unable to find the SDK:version node in '$JSonFile'"
+        exit 0
     }
     return $Version
 }
@@ -425,7 +430,7 @@ function Is-Dotnet-Package-Installed([string]$InstallRoot, [string]$RelativePath
     Say-Invocation $MyInvocation
 
     $DotnetPackagePath = Join-Path -Path $InstallRoot -ChildPath $RelativePathToPackage | Join-Path -ChildPath $SpecificVersion
-    Say-Verbose "Is-Dotnet-Package-Installed: DotnetPackagePath=$DotnetPackagePath"
+    Say-Verbose "Is-Dotnet-Package-Installed: Path to a package: $DotnetPackagePath"
     return Test-Path $DotnetPackagePath -PathType Container
 }
 
@@ -658,22 +663,8 @@ if ($DownloadFailed) {
 Say "Extracting zip from $DownloadLink"
 Extract-Dotnet-Package -ZipPath $ZipPath -OutPath $InstallRoot
 
-#  Check if the SDK version is installed; if not, fail the installation.
-$isAssetInstalled = $false
-
-# if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed.
-if ($SpecificVersion -Match "rtm" -or $SpecificVersion -Match "servicing") {
-    $ReleaseVersion = $SpecificVersion.Split("-")[0]
-    Say-Verbose "Checking installation: version = $ReleaseVersion"
-    $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $ReleaseVersion
-}
-
-#  Check if the SDK version is installed.
-if (!$isAssetInstalled) {
-    Say-Verbose "Checking installation: version = $SpecificVersion"
-    $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion
-}
-
+#  Check if the SDK version is now installed; if not, fail the installation.
+$isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion
 if (!$isAssetInstalled) {
     throw "`"$assetName`" with version = $SpecificVersion failed to install with an unknown error."
 }

src/Misc/dotnet-install.sh

@@ -144,7 +144,7 @@ get_linux_platform_name() {
     else
         if [ -e /etc/os-release ]; then
             . /etc/os-release
-            echo "$ID${VERSION_ID:+.${VERSION_ID}}"
+            echo "$ID.$VERSION_ID"
             return 0
         elif [ -e /etc/redhat-release ]; then
             local redhatRelease=$(</etc/redhat-release)
@@ -159,10 +159,6 @@ get_linux_platform_name() {
     return 1
 }
 
-is_musl_based_distro() {
-    (ldd --version 2>&1 || true) | grep -q musl
-}
-
 get_current_os_name() {
     eval $invocation
 
@@ -177,10 +173,10 @@ get_current_os_name() {
         local linux_platform_name
         linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; }
 
-        if [ "$linux_platform_name" = "rhel.6" ]; then
+        if [[ $linux_platform_name == "rhel.6" ]]; then
             echo $linux_platform_name
             return 0
-        elif is_musl_based_distro; then
+        elif [[ $linux_platform_name == alpine* ]]; then
             echo "linux-musl"
             return 0
         else
@@ -206,7 +202,7 @@ get_legacy_os_name() {
     else
         if [ -e /etc/os-release ]; then
             . /etc/os-release
-            os=$(get_legacy_os_name_from_platform "$ID${VERSION_ID:+.${VERSION_ID}}" || echo "")
+            os=$(get_legacy_os_name_from_platform "$ID.$VERSION_ID" || echo "")
             if [ -n "$os" ]; then
                 echo "$os"
                 return 0
@@ -249,29 +245,20 @@ check_pre_reqs() {
     fi
 
     if [ "$(uname)" = "Linux" ]; then
-        if is_musl_based_distro; then
-            if ! command -v scanelf > /dev/null; then
-                say_warning "scanelf not found, please install pax-utils package."
-                return 0
-            fi
-            LDCONFIG_COMMAND="scanelf --ldpath -BF '%f'"
-            [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libintl)" ] && say_warning "Unable to locate libintl. Probable prerequisite missing; install libintl (or gettext)."
+        if [ ! -x "$(command -v ldconfig)" ]; then
+            echo "ldconfig is not in PATH, trying /sbin/ldconfig."
+            LDCONFIG_COMMAND="/sbin/ldconfig"
         else
-            if [ ! -x "$(command -v ldconfig)" ]; then
-                say_verbose "ldconfig is not in PATH, trying /sbin/ldconfig."
-                LDCONFIG_COMMAND="/sbin/ldconfig"
-            else
-                LDCONFIG_COMMAND="ldconfig"
-            fi
-            local librarypath=${LD_LIBRARY_PATH:-}
-            LDCONFIG_COMMAND="$LDCONFIG_COMMAND -NXv ${librarypath//:/ }"
+            LDCONFIG_COMMAND="ldconfig"
         fi
 
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep zlib)" ] && say_warning "Unable to locate zlib. Probable prerequisite missing; install zlib."
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep ssl)" ] && say_warning "Unable to locate libssl. Probable prerequisite missing; install libssl."
+        local librarypath=${LD_LIBRARY_PATH:-}
+        LDCONFIG_COMMAND="$LDCONFIG_COMMAND -NXv ${librarypath//:/ }"
+
+        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libunwind)" ] && say_warning "Unable to locate libunwind. Probable prerequisite missing; install libunwind."
+        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libssl)" ] && say_warning "Unable to locate libssl. Probable prerequisite missing; install libssl."
         [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libicu)" ] && say_warning "Unable to locate libicu. Probable prerequisite missing; install libicu."
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep lttng)" ] && say_warning "Unable to locate liblttng. Probable prerequisite missing; install libcurl."
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libcurl)" ] && say_warning "Unable to locate libcurl. Probable prerequisite missing; install libcurl."
+        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep -F libcurl.so)" ] && say_warning "Unable to locate libcurl. Probable prerequisite missing; install libcurl."
     fi
 
     return 0
@@ -373,7 +360,7 @@ get_normalized_architecture_from_architecture() {
             ;;
     esac
 
-    say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/sdk/issues"
+    say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/cli/issues"
     return 1
 }
 
@@ -484,7 +471,6 @@ parse_jsonfile_for_version() {
         return 1
     fi
 
-    unset IFS;
     echo "$version_info"
     return 0
 }
@@ -645,7 +631,7 @@ copy_files_or_dirs_from_list() {
     local osname="$(get_current_os_name)"
     local override_switch=$(
         if [ "$override" = false ]; then
-            if [ "$osname" = "linux-musl" ]; then
+            if [[ "$osname" == "linux-musl" ]]; then
                 printf -- "-u";
             else
                 printf -- "-n";
@@ -854,27 +840,13 @@ install_dotnet() {
     say "Extracting zip from $download_link"
     extract_dotnet_package "$zip_path" "$install_root"
 
-    #  Check if the SDK version is installed; if not, fail the installation.
-    # if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed.
-    if [[ $specific_version == *"rtm"* || $specific_version == *"servicing"* ]]; then
-        IFS='-'
-        read -ra verArr <<< "$specific_version"
-        release_version="${verArr[0]}"
-        unset IFS;
-        say_verbose "Checking installation: version = $release_version"
-        if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$release_version"; then
-            return 0
-        fi
+    #  Check if the SDK version is now installed; if not, fail the installation.
+    if ! is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_version"; then
+        say_err "\`$asset_name\` with version = $specific_version failed to install with an unknown error."
+        return 1
     fi
 
-    #  Check if the standard SDK version is installed.
-    say_verbose "Checking installation: version = $specific_version"
-    if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_version"; then
-        return 0
-    fi
-
-    say_err "\`$asset_name\` with version = $specific_version failed to install with an unknown error."
-    return 1
+    return 0
 }
 
 args=("$@")

src/Misc/externals.sh

@@ -3,7 +3,7 @@ PACKAGERUNTIME=$1
 PRECACHE=$2
 
 NODE_URL=https://nodejs.org/dist
-NODE12_VERSION="12.13.1"
+NODE12_VERSION="12.4.0"
 
 get_abs_path() {
   # exploits the fact that pwd will print abs path when no args
@@ -139,13 +139,20 @@ fi
 # Download the external tools for Linux PACKAGERUNTIMEs.
 if [[ "$PACKAGERUNTIME" == "linux-x64" ]]; then
     acquireExternalTool "$NODE_URL/v${NODE12_VERSION}/node-v${NODE12_VERSION}-linux-x64.tar.gz" node12 fix_nested_dir
-    acquireExternalTool "https://vstsagenttools.blob.core.windows.net/tools/nodejs/${NODE12_VERSION}/alpine/x64/node-${NODE12_VERSION}-alpine-x64.tar.gz" node12_alpine
+    # 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

src/Misc/layoutroot/config.sh

@@ -3,7 +3,7 @@
 user_id=`id -u`
 
 # we want to snapshot the environment of the config user
-if [ $user_id -eq 0 -a -z "$RUNNER_ALLOW_RUNASROOT" ]; then
+if [ $user_id -eq 0 -a -z "$AGENT_ALLOW_RUNASROOT" ]; then
     echo "Must not run with sudo"
     exit 1
 fi

src/Misc/layoutroot/env.sh

@@ -9,6 +9,9 @@ varCheckList=(
     'GRADLE_HOME' 
     'NVM_BIN' 
     'NVM_PATH'
+    'VSTS_HTTP_PROXY'
+    'VSTS_HTTP_PROXY_USERNAME'
+    'VSTS_HTTP_PROXY_PASSWORD'
     'LD_LIBRARY_PATH'
     'PERL5LIB'
     )

src/Misc/layoutroot/run.sh

@@ -2,7 +2,7 @@
 
 # Validate not sudo
 user_id=`id -u`
-if [ $user_id -eq 0 -a -z "$RUNNER_ALLOW_RUNASROOT" ]; then
+if [ $user_id -eq 0 -a -z "$AGENT_ALLOW_RUNASROOT" ]; then
     echo "Must not run interactively with sudo"
     exit 1
 fi
@@ -26,8 +26,8 @@ if [[ "$1" == "localRun" ]]; then
 else
     "$DIR"/bin/Runner.Listener run $*
 
-# Return code 4 means the run once runner received an update message.
-# Sleep 5 seconds to wait for the update process finish and run the runner again.
+# Return code 4 means the run once agent received an update message.
+# Sleep 5 seconds to wait for the update process finish and run the agent again.
     returnCode=$?
     if [[ $returnCode == 4 ]]; then
         if [ ! -x "$(command -v sleep)" ]; then

src/Runner.Common/AsyncManualResetEvent.cs

@@ -0,0 +1,33 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace GitHub.Runner.Common
+{
+    //Stephen Toub: http://blogs.msdn.com/b/pfxteam/archive/2012/02/11/10266920.aspx
+    
+    public class AsyncManualResetEvent
+    {
+        private volatile TaskCompletionSource<bool> m_tcs = new TaskCompletionSource<bool>();
+
+        public Task WaitAsync() { return m_tcs.Task; }
+
+        public void Set()
+        {
+            var tcs = m_tcs;
+            Task.Factory.StartNew(s => ((TaskCompletionSource<bool>)s).TrySetResult(true),
+                tcs, CancellationToken.None, TaskCreationOptions.PreferFairness, TaskScheduler.Default);
+            tcs.Task.Wait();
+        }
+
+        public void Reset()
+        {
+            while (true)
+            {
+                var tcs = m_tcs;
+                if (!tcs.Task.IsCompleted ||
+                    Interlocked.CompareExchange(ref m_tcs, new TaskCompletionSource<bool>(), tcs) == tcs)
+                    return;
+            }
+        }
+    }
+}

src/Runner.Common/ConfigurationStore.cs

@@ -1,8 +1,6 @@
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
-using System;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
@@ -15,12 +13,24 @@ namespace GitHub.Runner.Common
     [DataContract]
     public sealed class RunnerSettings
     {
+        [DataMember(EmitDefaultValue = false)]
+        public bool AcceptTeeEula { get; set; }
+
         [DataMember(EmitDefaultValue = false)]
         public int AgentId { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
         public string AgentName { get; set; }
 
+        [DataMember(EmitDefaultValue = false)]
+        public string NotificationPipeName { get; set; }
+
+        [DataMember(EmitDefaultValue = false)]
+        public string NotificationSocketAddress { get; set; }
+
+        [DataMember(EmitDefaultValue = false)]
+        public bool SkipCapabilitiesScan { get; set; }
+
         [DataMember(EmitDefaultValue = false)]
         public bool SkipSessionRecover { get; set; }
 
@@ -41,34 +51,15 @@ namespace GitHub.Runner.Common
 
         [DataMember(EmitDefaultValue = false)]
         public string MonitorSocketAddress { get; set; }
+    }
 
-        /// <summary>
-        // Computed property for convenience. Can either return:
-        // 1. If runner was configured at the repo level, returns something like: "myorg/myrepo"
-        // 2. If runner was configured at the org level, returns something like: "myorg"
-        /// </summary>
-        public string RepoOrOrgName
-        {
-            get
-            {
-                Uri accountUri = new Uri(this.ServerUrl);
-                string repoOrOrgName = string.Empty;
-
-                if (accountUri.Host.EndsWith(".githubusercontent.com", StringComparison.OrdinalIgnoreCase))
-                {
-                    Uri gitHubUrl = new Uri(this.GitHubUrl);
-
-                    // Use the "NWO part" from the GitHub URL path
-                    repoOrOrgName = gitHubUrl.AbsolutePath.Trim('/');
-                }
-                else
-                {
-                    repoOrOrgName = accountUri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
-                }
-
-                return repoOrOrgName;
-            }
-        }
+    [DataContract]
+    public sealed class RunnerRuntimeOptions
+    {
+#if OS_WINDOWS
+        [DataMember(EmitDefaultValue = false)]
+        public bool GitUseSecureChannel { get; set; }
+#endif
     }
 
     [ServiceLocator(Default = typeof(ConfigurationStore))]
@@ -83,6 +74,9 @@ namespace GitHub.Runner.Common
         void SaveSettings(RunnerSettings settings);
         void DeleteCredential();
         void DeleteSettings();
+        RunnerRuntimeOptions GetRunnerRuntimeOptions();
+        void SaveRunnerRuntimeOptions(RunnerRuntimeOptions options);
+        void DeleteRunnerRuntimeOptions();
     }
 
     public sealed class ConfigurationStore : RunnerService, IConfigurationStore
@@ -91,9 +85,11 @@ namespace GitHub.Runner.Common
         private string _configFilePath;
         private string _credFilePath;
         private string _serviceConfigFilePath;
+        private string _runtimeOptionsFilePath;
 
         private CredentialData _creds;
         private RunnerSettings _settings;
+        private RunnerRuntimeOptions _runtimeOptions;
 
         public override void Initialize(IHostContext hostContext)
         {
@@ -116,12 +112,16 @@ namespace GitHub.Runner.Common
 
             _serviceConfigFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Service);
             Trace.Info("ServiceConfigFilePath: {0}", _serviceConfigFilePath);
+
+            _runtimeOptionsFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Options);
+            Trace.Info("RuntimeOptionsFilePath: {0}", _runtimeOptionsFilePath);
         }
 
         public string RootFolder { get; private set; }
 
         public bool HasCredentials()
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             Trace.Info("HasCredentials()");
             bool credsStored = (new FileInfo(_credFilePath)).Exists;
             Trace.Info("stored {0}", credsStored);
@@ -131,13 +131,14 @@ namespace GitHub.Runner.Common
         public bool IsConfigured()
         {
             Trace.Info("IsConfigured()");
-            bool configured = new FileInfo(_configFilePath).Exists;
+            bool configured = HostContext.RunMode == RunMode.Local || (new FileInfo(_configFilePath)).Exists;
             Trace.Info("IsConfigured: {0}", configured);
             return configured;
         }
 
         public bool IsServiceConfigured()
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             Trace.Info("IsServiceConfigured()");
             bool serviceConfigured = (new FileInfo(_serviceConfigFilePath)).Exists;
             Trace.Info($"IsServiceConfigured: {serviceConfigured}");
@@ -146,6 +147,7 @@ namespace GitHub.Runner.Common
 
         public CredentialData GetCredentials()
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             if (_creds == null)
             {
                 _creds = IOUtil.LoadObject<CredentialData>(_credFilePath);
@@ -175,6 +177,7 @@ namespace GitHub.Runner.Common
 
         public void SaveCredential(CredentialData credential)
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             Trace.Info("Saving {0} credential @ {1}", credential.Scheme, _credFilePath);
             if (File.Exists(_credFilePath))
             {
@@ -190,6 +193,7 @@ namespace GitHub.Runner.Common
 
         public void SaveSettings(RunnerSettings settings)
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             Trace.Info("Saving runner settings.");
             if (File.Exists(_configFilePath))
             {
@@ -205,12 +209,44 @@ namespace GitHub.Runner.Common
 
         public void DeleteCredential()
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             IOUtil.Delete(_credFilePath, default(CancellationToken));
         }
 
         public void DeleteSettings()
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             IOUtil.Delete(_configFilePath, default(CancellationToken));
         }
+
+        public RunnerRuntimeOptions GetRunnerRuntimeOptions()
+        {
+            if (_runtimeOptions == null && File.Exists(_runtimeOptionsFilePath))
+            {
+                _runtimeOptions = IOUtil.LoadObject<RunnerRuntimeOptions>(_runtimeOptionsFilePath);
+            }
+
+            return _runtimeOptions;
+        }
+
+        public void SaveRunnerRuntimeOptions(RunnerRuntimeOptions options)
+        {
+            Trace.Info("Saving runtime options.");
+            if (File.Exists(_runtimeOptionsFilePath))
+            {
+                // Delete existing runtime options file first, since the file is hidden and not able to overwrite.
+                Trace.Info("Delete exist runtime options file.");
+                IOUtil.DeleteFile(_runtimeOptionsFilePath);
+            }
+
+            IOUtil.SaveObject(options, _runtimeOptionsFilePath);
+            Trace.Info("Options Saved.");
+            File.SetAttributes(_runtimeOptionsFilePath, File.GetAttributes(_runtimeOptionsFilePath) | FileAttributes.Hidden);
+        }
+
+        public void DeleteRunnerRuntimeOptions()
+        {
+            IOUtil.Delete(_runtimeOptionsFilePath, default(CancellationToken));
+        }
     }
 }

src/Runner.Common/Constants.cs

@@ -2,6 +2,12 @@
 
 namespace GitHub.Runner.Common
 {
+    public enum RunMode
+    {
+        Normal, // Keep "Normal" first (default value).
+        Local,
+    }
+
     public enum WellKnownDirectory
     {
         Bin,
@@ -23,6 +29,9 @@ namespace GitHub.Runner.Common
         Service,
         CredentialStore,
         Certificates,
+        Proxy,
+        ProxyCredentials,
+        ProxyBypass,
         Options,
     }
 
@@ -84,21 +93,44 @@ namespace GitHub.Runner.Common
                 //validArgs array as well present in the CommandSettings.cs
                 public static class Args
                 {
+                    public static readonly string Agent = "agent";
                     public static readonly string Auth = "auth";
+                    public static readonly string CollectionName = "collectionname";
+                    public static readonly string DeploymentGroupName = "deploymentgroupname";
+                    public static readonly string DeploymentPoolName = "deploymentpoolname";
+                    public static readonly string DeploymentGroupTags = "deploymentgrouptags";
+                    public static readonly string MachineGroupName = "machinegroupname";
+                    public static readonly string MachineGroupTags = "machinegrouptags";
+                    public static readonly string Matrix = "matrix";
                     public static readonly string MonitorSocketAddress = "monitorsocketaddress";
-                    public static readonly string Name = "name";
+                    public static readonly string NotificationPipeName = "notificationpipename";
+                    public static readonly string NotificationSocketAddress = "notificationsocketaddress";
                     public static readonly string Pool = "pool";
+                    public static readonly string ProjectName = "projectname";
+                    public static readonly string ProxyUrl = "proxyurl";
+                    public static readonly string ProxyUserName = "proxyusername";
+                    public static readonly string SslCACert = "sslcacert";
+                    public static readonly string SslClientCert = "sslclientcert";
+                    public static readonly string SslClientCertKey = "sslclientcertkey";
+                    public static readonly string SslClientCertArchive = "sslclientcertarchive";
+                    public static readonly string SslClientCertPassword = "sslclientcertpassword";
                     public static readonly string StartupType = "startuptype";
                     public static readonly string Url = "url";
                     public static readonly string UserName = "username";
                     public static readonly string WindowsLogonAccount = "windowslogonaccount";
                     public static readonly string Work = "work";
+                    public static readonly string Yml = "yml";
 
                     // Secret args. Must be added to the "Secrets" getter as well.
+                    public static readonly string Password = "password";
+                    public static readonly string ProxyPassword = "proxypassword";
                     public static readonly string Token = "token";
                     public static readonly string WindowsLogonPassword = "windowslogonpassword";
                     public static string[] Secrets => new[]
                     {
+                        Password,
+                        ProxyPassword,
+                        SslClientCertPassword,
                         Token,
                         WindowsLogonPassword,
                     };
@@ -107,6 +139,7 @@ namespace GitHub.Runner.Common
                 public static class Commands
                 {
                     public static readonly string Configure = "configure";
+                    public static readonly string LocalRun = "localRun";
                     public static readonly string Remove = "remove";
                     public static readonly string Run = "run";
                     public static readonly string Warmup = "warmup";
@@ -116,13 +149,26 @@ namespace GitHub.Runner.Common
                 //validFlags array as well present in the CommandSettings.cs
                 public static class Flags
                 {
+                    public static readonly string AcceptTeeEula = "acceptteeeula";
+                    public static readonly string AddDeploymentGroupTags = "adddeploymentgrouptags";
+                    public static readonly string AddMachineGroupTags = "addmachinegrouptags";
                     public static readonly string Commit = "commit";
+                    public static readonly string DeploymentGroup = "deploymentgroup";
+                    public static readonly string DeploymentPool = "deploymentpool";
+                    public static readonly string OverwriteAutoLogon = "overwriteautologon";
+                    public static readonly string GitUseSChannel = "gituseschannel";
                     public static readonly string Help = "help";
+                    public static readonly string MachineGroup = "machinegroup";
                     public static readonly string Replace = "replace";
+                    public static readonly string NoRestart = "norestart";
+                    public static readonly string LaunchBrowser = "launchbrowser";
                     public static readonly string Once = "once";
+                    public static readonly string RunAsAutoLogon = "runasautologon";
                     public static readonly string RunAsService = "runasservice";
+                    public static readonly string SslSkipCertValidation = "sslskipcertvalidation";
                     public static readonly string Unattended = "unattended";
                     public static readonly string Version = "version";
+                    public static readonly string WhatIf = "whatif";
                 }
             }
 
@@ -147,16 +193,23 @@ namespace GitHub.Runner.Common
 
         public static class Configuration
         {
+            public static readonly string AAD = "AAD";
             public static readonly string OAuthAccessToken = "OAuthAccessToken";
+            public static readonly string PAT = "PAT";
             public static readonly string OAuth = "OAuth";
         }
 
         public static class Expressions
         {
             public static readonly string Always = "always";
+            public static readonly string Canceled = "canceled";
             public static readonly string Cancelled = "cancelled";
+            public static readonly string Failed = "failed";
             public static readonly string Failure = "failure";
             public static readonly string Success = "success";
+            public static readonly string Succeeded = "succeeded";
+            public static readonly string SucceededOrFailed = "succeededOrFailed";
+            public static readonly string Variables = "variables";
         }
 
         public static class Path
@@ -168,7 +221,9 @@ namespace GitHub.Runner.Common
             public static readonly string ExternalsDirectory = "externals";
             public static readonly string RunnerDiagnosticLogPrefix = "Runner_";
             public static readonly string TempDirectory = "_temp";
+            public static readonly string TeeDirectory = "tee";
             public static readonly string ToolDirectory = "_tool";
+            public static readonly string TaskJsonFile = "task.json";
             public static readonly string UpdateDirectory = "_update";
             public static readonly string WorkDirectory = "_work";
             public static readonly string WorkerDiagnosticLogPrefix = "Worker_";
@@ -191,17 +246,97 @@ namespace GitHub.Runner.Common
 
             public static class Agent
             {
+                //
+                // Keep alphabetical
+                //
+                public static readonly string AcceptTeeEula = "agent.acceptteeeula";
+                public static readonly string AllowAllEndpoints = "agent.allowAllEndpoints"; // remove after sprint 120 or so.
+                public static readonly string AllowAllSecureFiles = "agent.allowAllSecureFiles"; // remove after sprint 121 or so.
+                public static readonly string BuildDirectory = "agent.builddirectory";
+                public static readonly string ContainerId = "agent.containerid";
+                public static readonly string ContainerNetwork = "agent.containernetwork";
+                public static readonly string HomeDirectory = "agent.homedirectory";
+                public static readonly string Id = "agent.id";
+                public static readonly string GitUseSChannel = "agent.gituseschannel";
+                public static readonly string JobName = "agent.jobname";
+                public static readonly string MachineName = "agent.machinename";
+                public static readonly string Name = "agent.name";
+                public static readonly string OS = "agent.os";
+                public static readonly string OSArchitecture = "agent.osarchitecture";
+                public static readonly string OSVersion = "agent.osversion";
+                public static readonly string ProxyUrl = "agent.proxyurl";
+                public static readonly string ProxyUsername = "agent.proxyusername";
+                public static readonly string ProxyPassword = "agent.proxypassword";
+                public static readonly string ProxyBypassList = "agent.proxybypasslist";
+                public static readonly string RetainDefaultEncoding = "agent.retainDefaultEncoding";
+                public static readonly string RootDirectory = "agent.RootDirectory";
+                public static readonly string RunMode = "agent.runmode";
+                public static readonly string ServerOMDirectory = "agent.ServerOMDirectory";
+                public static readonly string ServicePortPrefix = "agent.services";
+                public static readonly string SslCAInfo = "agent.cainfo";
+                public static readonly string SslClientCert = "agent.clientcert";
+                public static readonly string SslClientCertKey = "agent.clientcertkey";
+                public static readonly string SslClientCertArchive = "agent.clientcertarchive";
+                public static readonly string SslClientCertPassword = "agent.clientcertpassword";
+                public static readonly string SslSkipCertValidation = "agent.skipcertvalidation";
+                public static readonly string TempDirectory = "agent.TempDirectory";
                 public static readonly string ToolsDirectory = "agent.ToolsDirectory";
+                public static readonly string Version = "agent.version";
+                public static readonly string WorkFolder = "agent.workfolder";
+                public static readonly string WorkingDirectory = "agent.WorkingDirectory";
             }
 
+            public static class Build
+            {
+                //
+                // Keep alphabetical
+                //
+                public static readonly string ArtifactStagingDirectory = "build.artifactstagingdirectory";
+                public static readonly string BinariesDirectory = "build.binariesdirectory";
+                public static readonly string Number = "build.buildNumber";
+                public static readonly string Clean = "build.clean";
+                public static readonly string DefinitionName = "build.definitionname";
+                public static readonly string GatedRunCI = "build.gated.runci";
+                public static readonly string GatedShelvesetName = "build.gated.shelvesetname";
+                public static readonly string RepoClean = "build.repository.clean";
+                public static readonly string RepoGitSubmoduleCheckout = "build.repository.git.submodulecheckout";
+                public static readonly string RepoId = "build.repository.id";
+                public static readonly string RepoLocalPath = "build.repository.localpath";
+                public static readonly string RepoName = "build.Repository.name";
+                public static readonly string RepoProvider = "build.repository.provider";
+                public static readonly string RepoTfvcWorkspace = "build.repository.tfvc.workspace";
+                public static readonly string RepoUri = "build.repository.uri";
+                public static readonly string SourceBranch = "build.sourcebranch";
+                public static readonly string SourceTfvcShelveset = "build.sourcetfvcshelveset";
+                public static readonly string SourceVersion = "build.sourceversion";
+                public static readonly string SourcesDirectory = "build.sourcesdirectory";
+                public static readonly string StagingDirectory = "build.stagingdirectory";
+                public static readonly string SyncSources = "build.syncSources";
+            }
+
+
             public static class System
             {
                 //
                 // Keep alphabetical
                 //
                 public static readonly string AccessToken = "system.accessToken";
+                public static readonly string ArtifactsDirectory = "system.artifactsdirectory";
+                public static readonly string CollectionId = "system.collectionid";
                 public static readonly string Culture = "system.culture";
+                public static readonly string DefaultWorkingDirectory = "system.defaultworkingdirectory";
+                public static readonly string DefinitionId = "system.definitionid";
+                public static readonly string EnableAccessToken = "system.enableAccessToken";
+                public static readonly string HostType = "system.hosttype";
                 public static readonly string PhaseDisplayName = "system.phaseDisplayName";
+                public static readonly string PreferGitFromPath = "system.prefergitfrompath";
+                public static readonly string PullRequestTargetBranchName = "system.pullrequest.targetbranch";
+                public static readonly string SelfManageGitCreds = "system.selfmanagegitcreds";
+                public static readonly string ServerType = "system.servertype";
+                public static readonly string TFServerUrl = "system.TeamFoundationServerUri"; // back compat variable, do not document
+                public static readonly string TeamProject = "system.teamproject";
+                public static readonly string TeamProjectId = "system.teamProjectId";
+                public static readonly string WorkFolder = "system.workfolder";
             }
         }
     }

src/Runner.Common/HostContext.cs

@@ -20,12 +20,12 @@ namespace GitHub.Runner.Common
 {
     public interface IHostContext : IDisposable
     {
+        RunMode RunMode { get; set; }
         StartupType StartupType { get; set; }
         CancellationToken RunnerShutdownToken { get; }
         ShutdownReason RunnerShutdownReason { get; }
         ISecretMasker SecretMasker { get; }
         ProductInfoHeaderValue UserAgent { get; }
-        RunnerWebProxy WebProxy { get; }
         string GetDirectory(WellKnownDirectory directory);
         string GetConfigFile(WellKnownConfigFile configFile);
         Tracing GetTrace(string name);
@@ -57,23 +57,22 @@ namespace GitHub.Runner.Common
         private readonly ProductInfoHeaderValue _userAgent = new ProductInfoHeaderValue($"GitHubActionsRunner-{BuildConstants.RunnerPackage.PackageName}", BuildConstants.RunnerPackage.Version);
         private CancellationTokenSource _runnerShutdownTokenSource = new CancellationTokenSource();
         private object _perfLock = new object();
+        private RunMode _runMode = RunMode.Normal;
         private Tracing _trace;
-        private Tracing _actionsHttpTrace;
-        private Tracing _netcoreHttpTrace;
+        private Tracing _vssTrace;
+        private Tracing _httpTrace;
         private ITraceManager _traceManager;
         private AssemblyLoadContext _loadContext;
         private IDisposable _httpTraceSubscription;
         private IDisposable _diagListenerSubscription;
         private StartupType _startupType;
         private string _perfFile;
-        private RunnerWebProxy _webProxy = new RunnerWebProxy();
 
         public event EventHandler Unloading;
         public CancellationToken RunnerShutdownToken => _runnerShutdownTokenSource.Token;
         public ShutdownReason RunnerShutdownReason { get; private set; }
         public ISecretMasker SecretMasker => _secretMasker;
         public ProductInfoHeaderValue UserAgent => _userAgent;
-        public RunnerWebProxy WebProxy => _webProxy;
         public HostContext(string hostType, string logFile = null)
         {
             // Validate args.
@@ -117,7 +116,8 @@ namespace GitHub.Runner.Common
             }
 
             _trace = GetTrace(nameof(HostContext));
-            _actionsHttpTrace = GetTrace("GitHubActionsService");
+            _vssTrace = GetTrace("GitHubActionsRunner");  // VisualStudioService
+
             // Enable Http trace
             bool enableHttpTrace;
             if (bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_HTTPTRACE"), out enableHttpTrace) && enableHttpTrace)
@@ -129,7 +129,7 @@ namespace GitHub.Runner.Common
                 _trace.Warning("**                                                                                     **");
                 _trace.Warning("*****************************************************************************************");
 
-                _netcoreHttpTrace = GetTrace("HttpTrace");
+                _httpTrace = GetTrace("HttpTrace");
                 _diagListenerSubscription = DiagnosticListener.AllListeners.Subscribe(this);
             }
 
@@ -147,47 +147,19 @@ namespace GitHub.Runner.Common
                     _trace.Error(ex);
                 }
             }
+        }
 
-            // Check and trace proxy info
-            if (!string.IsNullOrEmpty(WebProxy.HttpProxyAddress))
+        public RunMode RunMode
+        {
+            get
             {
-                if (string.IsNullOrEmpty(WebProxy.HttpProxyUsername) && string.IsNullOrEmpty(WebProxy.HttpProxyPassword))
-                {
-                    _trace.Info($"Configuring anonymous proxy {WebProxy.HttpProxyAddress} for all HTTP requests.");
-                }
-                else
-                {
-                    // Register proxy password as secret
-                    if (!string.IsNullOrEmpty(WebProxy.HttpProxyPassword))
-                    {
-                        this.SecretMasker.AddValue(WebProxy.HttpProxyPassword);
-                    }
-
-                    _trace.Info($"Configuring authenticated proxy {WebProxy.HttpProxyAddress} for all HTTP requests.");
-                }
+                return _runMode;
             }
 
-            if (!string.IsNullOrEmpty(WebProxy.HttpsProxyAddress))
+            set
             {
-                if (string.IsNullOrEmpty(WebProxy.HttpsProxyUsername) && string.IsNullOrEmpty(WebProxy.HttpsProxyPassword))
-                {
-                    _trace.Info($"Configuring anonymous proxy {WebProxy.HttpsProxyAddress} for all HTTPS requests.");
-                }
-                else
-                {
-                    // Register proxy password as secret
-                    if (!string.IsNullOrEmpty(WebProxy.HttpsProxyPassword))
-                    {
-                        this.SecretMasker.AddValue(WebProxy.HttpsProxyPassword);
-                    }
-
-                    _trace.Info($"Configuring authenticated proxy {WebProxy.HttpsProxyAddress} for all HTTPS requests.");
-                }
-            }
-
-            if (string.IsNullOrEmpty(WebProxy.HttpProxyAddress) && string.IsNullOrEmpty(WebProxy.HttpsProxyAddress))
-            {
-                _trace.Info($"No proxy settings were found based on environmental variables (http_proxy/https_proxy/HTTP_PROXY/HTTPS_PROXY)");
+                _trace.Info($"Set run mode: {value}");
+                _runMode = value;
             }
         }
 
@@ -231,7 +203,6 @@ namespace GitHub.Runner.Common
                 case WellKnownDirectory.Tools:
                     // TODO: Coallesce to just check RUNNER_TOOL_CACHE when images stabilize
                     path = Environment.GetEnvironmentVariable("RUNNER_TOOL_CACHE") ?? Environment.GetEnvironmentVariable("RUNNER_TOOLSDIRECTORY") ?? Environment.GetEnvironmentVariable("AGENT_TOOLSDIRECTORY") ?? Environment.GetEnvironmentVariable(Constants.Variables.Agent.ToolsDirectory);
-
                     if (string.IsNullOrEmpty(path))
                     {
                         path = Path.Combine(
@@ -311,6 +282,24 @@ namespace GitHub.Runner.Common
                         ".certificates");
                     break;
 
+                case WellKnownConfigFile.Proxy:
+                    path = Path.Combine(
+                        GetDirectory(WellKnownDirectory.Root),
+                        ".proxy");
+                    break;
+
+                case WellKnownConfigFile.ProxyCredentials:
+                    path = Path.Combine(
+                        GetDirectory(WellKnownDirectory.Root),
+                        ".proxycredentials");
+                    break;
+
+                case WellKnownConfigFile.ProxyBypass:
+                    path = Path.Combine(
+                        GetDirectory(WellKnownDirectory.Root),
+                        ".proxybypass");
+                    break;
+
                 case WellKnownConfigFile.Options:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Root),
@@ -478,12 +467,12 @@ namespace GitHub.Runner.Common
 
         void IObserver<DiagnosticListener>.OnCompleted()
         {
-            _netcoreHttpTrace.Info("DiagListeners finished transmitting data.");
+            _httpTrace.Info("DiagListeners finished transmitting data.");
         }
 
         void IObserver<DiagnosticListener>.OnError(Exception error)
         {
-            _netcoreHttpTrace.Error(error);
+            _httpTrace.Error(error);
         }
 
         void IObserver<DiagnosticListener>.OnNext(DiagnosticListener listener)
@@ -496,22 +485,22 @@ namespace GitHub.Runner.Common
 
         void IObserver<KeyValuePair<string, object>>.OnCompleted()
         {
-            _netcoreHttpTrace.Info("HttpHandlerDiagnosticListener finished transmitting data.");
+            _httpTrace.Info("HttpHandlerDiagnosticListener finished transmitting data.");
         }
 
         void IObserver<KeyValuePair<string, object>>.OnError(Exception error)
         {
-            _netcoreHttpTrace.Error(error);
+            _httpTrace.Error(error);
         }
 
         void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object> value)
         {
-            _netcoreHttpTrace.Info($"Trace {value.Key} event:{Environment.NewLine}{value.Value.ToString()}");
+            _httpTrace.Info($"Trace {value.Key} event:{Environment.NewLine}{value.Value.ToString()}");
         }
 
         protected override void OnEventSourceCreated(EventSource source)
         {
-            if (source.Name.Equals("GitHub-Actions-Http"))
+            if (source.Name.Equals("Microsoft-VSS-Http"))
             {
                 EnableEvents(source, EventLevel.Verbose);
             }
@@ -551,24 +540,24 @@ namespace GitHub.Runner.Common
                 {
                     case EventLevel.Critical:
                     case EventLevel.Error:
-                        _actionsHttpTrace.Error(message);
+                        _vssTrace.Error(message);
                         break;
                     case EventLevel.Warning:
-                        _actionsHttpTrace.Warning(message);
+                        _vssTrace.Warning(message);
                         break;
                     case EventLevel.Informational:
-                        _actionsHttpTrace.Info(message);
+                        _vssTrace.Info(message);
                         break;
                     default:
-                        _actionsHttpTrace.Verbose(message);
+                        _vssTrace.Verbose(message);
                         break;
                 }
             }
             catch (Exception ex)
             {
-                _actionsHttpTrace.Error(ex);
-                _actionsHttpTrace.Info(eventData.Message);
-                _actionsHttpTrace.Info(string.Join(", ", eventData.Payload?.ToArray() ?? new string[0]));
+                _vssTrace.Error(ex);
+                _vssTrace.Info(eventData.Message);
+                _vssTrace.Info(string.Join(", ", eventData.Payload?.ToArray() ?? new string[0]));
             }
         }
 
@@ -591,7 +580,8 @@ namespace GitHub.Runner.Common
         public static HttpClientHandler CreateHttpClientHandler(this IHostContext context)
         {
             HttpClientHandler clientHandler = new HttpClientHandler();
-            clientHandler.Proxy = context.WebProxy;
+            var runnerWebProxy = context.GetService<IRunnerWebProxy>();
+            clientHandler.Proxy = runnerWebProxy.WebProxy;
             return clientHandler;
         }
     }

src/Runner.Common/JobNotification.cs

@@ -12,21 +12,53 @@ namespace GitHub.Runner.Common
     [ServiceLocator(Default = typeof(JobNotification))]
     public interface IJobNotification : IRunnerService, IDisposable
     {
-        void JobStarted(Guid jobId, string accessToken, Uri serverUrl);
+        Task JobStarted(Guid jobId, string accessToken, Uri serverUrl);
         Task JobCompleted(Guid jobId);
-        void StartClient(string monitorSocketAddress);
+        void StartClient(string pipeName, string monitorSocketAddress, CancellationToken cancellationToken);
+        void StartClient(string socketAddress, string monitorSocketAddress);
     }
 
     public sealed class JobNotification : RunnerService, IJobNotification
     {
+        private NamedPipeClientStream _outClient;
+        private StreamWriter _writeStream;
+        private Socket _socket;
         private Socket _monitorSocket;
+        private bool _configured = false;
+        private bool _useSockets = false;
         private bool _isMonitorConfigured = false;
 
-        public void JobStarted(Guid jobId, string accessToken, Uri serverUrl)
+        public async Task JobStarted(Guid jobId, string accessToken, Uri serverUrl)
         {
             Trace.Info("Entering JobStarted Notification");
 
             StartMonitor(jobId, accessToken, serverUrl);
+
+            if (_configured)
+            {
+                String message = $"Starting job: {jobId.ToString()}";
+                if (_useSockets)
+                {
+                    try
+                    {
+                        Trace.Info("Writing JobStarted to socket");
+                        _socket.Send(Encoding.UTF8.GetBytes(message));
+                        Trace.Info("Finished JobStarted writing to socket");
+                    }
+                    catch (SocketException e)
+                    {
+                        Trace.Error($"Failed sending message \"{message}\" on socket!");
+                        Trace.Error(e);
+                    }
+                }
+                else
+                {
+                    Trace.Info("Writing JobStarted to pipe");
+                    await _writeStream.WriteLineAsync(message);
+                    await _writeStream.FlushAsync();
+                    Trace.Info("Finished JobStarted writing to pipe");  
+                }
+            }
         }
 
         public async Task JobCompleted(Guid jobId)
@@ -34,10 +66,95 @@ namespace GitHub.Runner.Common
             Trace.Info("Entering JobCompleted Notification");
 
             await EndMonitor();
+            
+            if (_configured)
+            {
+                String message = $"Finished job: {jobId.ToString()}";
+                if (_useSockets)
+                {
+                    try
+                    {
+                        Trace.Info("Writing JobCompleted to socket");
+                        _socket.Send(Encoding.UTF8.GetBytes(message));
+                        Trace.Info("Finished JobCompleted writing to socket");
+                    }
+                    catch (SocketException e)
+                    {
+                        Trace.Error($"Failed sending message \"{message}\" on socket!");
+                        Trace.Error(e);
+                    }
+                }
+                else
+                {
+                    Trace.Info("Writing JobCompleted to pipe");
+                    await _writeStream.WriteLineAsync(message);
+                    await _writeStream.FlushAsync();
+                    Trace.Info("Finished JobCompleted writing to pipe");
+                }
+            }
         }
 
-        public void StartClient(string monitorSocketAddress)
+        public async void StartClient(string pipeName, string monitorSocketAddress, CancellationToken cancellationToken)
         {
+            if (pipeName != null && !_configured)
+            {
+                Trace.Info("Connecting to named pipe {0}", pipeName);
+                _outClient = new NamedPipeClientStream(".", pipeName, PipeDirection.Out, PipeOptions.Asynchronous);
+                await _outClient.ConnectAsync(cancellationToken);
+                _writeStream = new StreamWriter(_outClient, Encoding.UTF8);
+                _configured = true;
+                Trace.Info("Connection successful to named pipe {0}", pipeName);
+            }
+
+            ConnectMonitor(monitorSocketAddress);
+        }
+
+        public void StartClient(string socketAddress, string monitorSocketAddress)
+        {
+            if (!_configured)
+            {
+                try
+                {
+                    string[] splitAddress = socketAddress.Split(':');
+                    if (splitAddress.Length != 2)
+                    {
+                        Trace.Error("Invalid socket address {0}. Job Notification will be disabled.", socketAddress);
+                        return;
+                    }
+
+                    IPAddress address;
+                    try
+                    {
+                        address = IPAddress.Parse(splitAddress[0]);
+                    }
+                    catch (FormatException e)
+                    {
+                        Trace.Error("Invalid socket ip address {0}. Job Notification will be disabled",splitAddress[0]);
+                        Trace.Error(e);
+                        return;
+                    }
+
+                    int port = -1;
+                    Int32.TryParse(splitAddress[1], out port);
+                    if (port < IPEndPoint.MinPort || port > IPEndPoint.MaxPort)
+                    {
+                        Trace.Error("Invalid tcp socket port {0}. Job Notification will be disabled.", splitAddress[1]);
+                        return;
+                    }
+
+                    _socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
+                    _socket.Connect(address, port);
+                    Trace.Info("Connection successful to socket {0}", socketAddress);
+                    _useSockets = true;
+                    _configured = true;
+                }
+                catch (SocketException e)
+                {
+                    Trace.Error("Connection to socket {0} failed!", socketAddress);
+                    Trace.Error(e);
+                }
+            }
+
             ConnectMonitor(monitorSocketAddress);
         }
         
@@ -158,6 +275,15 @@ namespace GitHub.Runner.Common
         {
             if (disposing)
             {
+                _outClient?.Dispose();
+
+                if (_socket != null)
+                {
+                    _socket.Send(Encoding.UTF8.GetBytes("<EOF>"));
+                    _socket.Shutdown(SocketShutdown.Both);
+                    _socket = null;
+                }
+
                 if (_monitorSocket != null)
                 {
                     _monitorSocket.Send(Encoding.UTF8.GetBytes("<EOF>"));

src/Runner.Common/JobServer.cs

@@ -32,6 +32,11 @@ namespace GitHub.Runner.Common
 
         public async Task ConnectAsync(VssConnection jobConnection)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return;
+            }
+
             _connection = jobConnection;
             int attemptCount = 5;
             while (!_connection.HasAuthenticated && attemptCount-- > 0)
@@ -68,48 +73,88 @@ namespace GitHub.Runner.Common
 
         public Task<TaskLog> AppendLogContentAsync(Guid scopeIdentifier, string hubName, Guid planId, int logId, Stream uploadStream, CancellationToken cancellationToken)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult<TaskLog>(null);
+            }
+
             CheckConnection();
             return _taskClient.AppendLogContentAsync(scopeIdentifier, hubName, planId, logId, uploadStream, cancellationToken: cancellationToken);
         }
 
         public Task AppendTimelineRecordFeedAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, Guid stepId, IList<string> lines, CancellationToken cancellationToken)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.CompletedTask;
+            }
+
             CheckConnection();
             return _taskClient.AppendTimelineRecordFeedAsync(scopeIdentifier, hubName, planId, timelineId, timelineRecordId, stepId, lines, cancellationToken: cancellationToken);
         }
 
         public Task<TaskAttachment> CreateAttachmentAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, string type, string name, Stream uploadStream, CancellationToken cancellationToken)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult<TaskAttachment>(null);
+            }
+
             CheckConnection();
             return _taskClient.CreateAttachmentAsync(scopeIdentifier, hubName, planId, timelineId, timelineRecordId, type, name, uploadStream, cancellationToken: cancellationToken);
         }
 
         public Task<TaskLog> CreateLogAsync(Guid scopeIdentifier, string hubName, Guid planId, TaskLog log, CancellationToken cancellationToken)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult<TaskLog>(null);
+            }
+
             CheckConnection();
             return _taskClient.CreateLogAsync(scopeIdentifier, hubName, planId, log, cancellationToken: cancellationToken);
         }
 
         public Task<Timeline> CreateTimelineAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, CancellationToken cancellationToken)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult<Timeline>(null);
+            }
+
             CheckConnection();
             return _taskClient.CreateTimelineAsync(scopeIdentifier, hubName, planId, new Timeline(timelineId), cancellationToken: cancellationToken);
         }
 
         public Task<List<TimelineRecord>> UpdateTimelineRecordsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, IEnumerable<TimelineRecord> records, CancellationToken cancellationToken)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult<List<TimelineRecord>>(null);
+            }
+
             CheckConnection();
             return _taskClient.UpdateTimelineRecordsAsync(scopeIdentifier, hubName, planId, timelineId, records, cancellationToken: cancellationToken);
         }
 
         public Task RaisePlanEventAsync<T>(Guid scopeIdentifier, string hubName, Guid planId, T eventData, CancellationToken cancellationToken) where T : JobEvent
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.CompletedTask;
+            }
+
             CheckConnection();
             return _taskClient.RaisePlanEventAsync(scopeIdentifier, hubName, planId, eventData, cancellationToken: cancellationToken);
         }
 
         public Task<Timeline> GetTimelineAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, CancellationToken cancellationToken)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult<Timeline>(null);
+            }
+
             CheckConnection();
             return _taskClient.GetTimelineAsync(scopeIdentifier, hubName, planId, timelineId, includeRecords: true, cancellationToken: cancellationToken);
         }

src/Runner.Common/JobServerQueue.cs

@@ -63,6 +63,7 @@ namespace GitHub.Runner.Common
         private Task[] _allDequeueTasks;
         private readonly TaskCompletionSource<int> _jobCompletionSource = new TaskCompletionSource<int>();
         private bool _queueInProcess = false;
+        private ITerminal _term;
 
         public event EventHandler<ThrottlingEventArgs> JobServerQueueThrottling;
 
@@ -84,6 +85,11 @@ namespace GitHub.Runner.Common
         public void Start(Pipelines.AgentJobRequestMessage jobRequest)
         {
             Trace.Entering();
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                _term = HostContext.GetService<ITerminal>();
+                return;
+            }
 
             if (_queueInProcess)
             {
@@ -123,6 +129,11 @@ namespace GitHub.Runner.Common
         // TimelineUpdate queue error will become critical when timeline records contain output variabls.
         public async Task ShutdownAsync()
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return;
+            }
+
             if (!_queueInProcess)
             {
                 Trace.Info("No-op, all queue process tasks have been stopped.");
@@ -158,11 +169,32 @@ namespace GitHub.Runner.Common
         public void QueueWebConsoleLine(Guid stepRecordId, string line)
         {
             Trace.Verbose("Enqueue web console line queue: {0}", line);
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                if ((line ?? string.Empty).StartsWith("##[section]"))
+                {
+                    Console.WriteLine("******************************************************************************");
+                    Console.WriteLine(line.Substring("##[section]".Length));
+                    Console.WriteLine("******************************************************************************");
+                }
+                else
+                {
+                    Console.WriteLine(line);
+                }
+
+                return;
+            }
+
             _webConsoleLineQueue.Enqueue(new ConsoleLineInfo(stepRecordId, line));
         }
 
         public void QueueFileUpload(Guid timelineId, Guid timelineRecordId, string type, string name, string path, bool deleteSource)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return;
+            }
+
             ArgUtil.NotEmpty(timelineId, nameof(timelineId));
             ArgUtil.NotEmpty(timelineRecordId, nameof(timelineRecordId));
 
@@ -183,6 +215,11 @@ namespace GitHub.Runner.Common
 
         public void QueueTimelineRecordUpdate(Guid timelineId, TimelineRecord timelineRecord)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return;
+            }
+
             ArgUtil.NotEmpty(timelineId, nameof(timelineId));
             ArgUtil.NotNull(timelineRecord, nameof(timelineRecord));
             ArgUtil.NotEmpty(timelineRecord.Id, nameof(timelineRecord.Id));

src/Runner.Common/Runner.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>

src/Runner.Common/RunnerCertificateManager.cs

@@ -0,0 +1,231 @@
+using System;
+using GitHub.Runner.Common.Util;
+using System.IO;
+using System.Runtime.Serialization;
+using GitHub.Services.Common;
+using System.Security.Cryptography.X509Certificates;
+using System.Net;
+using System.Net.Security;
+using System.Net.Http;
+using GitHub.Services.WebApi;
+using GitHub.Runner.Sdk;
+
+namespace GitHub.Runner.Common
+{
+    [ServiceLocator(Default = typeof(RunnerCertificateManager))]
+    public interface IRunnerCertificateManager : IRunnerService
+    {
+        bool SkipServerCertificateValidation { get; }
+        string CACertificateFile { get; }
+        string ClientCertificateFile { get; }
+        string ClientCertificatePrivateKeyFile { get; }
+        string ClientCertificateArchiveFile { get; }
+        string ClientCertificatePassword { get; }
+        IVssClientCertificateManager VssClientCertificateManager { get; }
+    }
+
+    public class RunnerCertificateManager : RunnerService, IRunnerCertificateManager
+    {
+        private RunnerClientCertificateManager _runnerClientCertificateManager = new RunnerClientCertificateManager();
+
+        public bool SkipServerCertificateValidation { private set; get; }
+        public string CACertificateFile { private set; get; }
+        public string ClientCertificateFile { private set; get; }
+        public string ClientCertificatePrivateKeyFile { private set; get; }
+        public string ClientCertificateArchiveFile { private set; get; }
+        public string ClientCertificatePassword { private set; get; }
+        public IVssClientCertificateManager VssClientCertificateManager => _runnerClientCertificateManager;
+
+        public override void Initialize(IHostContext hostContext)
+        {
+            base.Initialize(hostContext);
+            LoadCertificateSettings();
+        }
+
+        // This should only be called from config
+        public void SetupCertificate(bool skipCertValidation, string caCert, string clientCert, string clientCertPrivateKey, string clientCertArchive, string clientCertPassword)
+        {
+            Trace.Info("Setup runner certificate setting base on configuration inputs.");
+
+            if (skipCertValidation)
+            {
+                Trace.Info("Ignore SSL server certificate validation error");
+                SkipServerCertificateValidation = true;
+                VssClientHttpRequestSettings.Default.ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
+            }
+
+            if (!string.IsNullOrEmpty(caCert))
+            {
+                ArgUtil.File(caCert, nameof(caCert));
+                Trace.Info($"Self-Signed CA '{caCert}'");
+            }
+
+            if (!string.IsNullOrEmpty(clientCert))
+            {
+                ArgUtil.File(clientCert, nameof(clientCert));
+                ArgUtil.File(clientCertPrivateKey, nameof(clientCertPrivateKey));
+                ArgUtil.File(clientCertArchive, nameof(clientCertArchive));
+
+                Trace.Info($"Client cert '{clientCert}'");
+                Trace.Info($"Client cert private key '{clientCertPrivateKey}'");
+                Trace.Info($"Client cert archive '{clientCertArchive}'");
+            }
+
+            CACertificateFile = caCert;
+            ClientCertificateFile = clientCert;
+            ClientCertificatePrivateKeyFile = clientCertPrivateKey;
+            ClientCertificateArchiveFile = clientCertArchive;
+            ClientCertificatePassword = clientCertPassword;
+
+            _runnerClientCertificateManager.AddClientCertificate(ClientCertificateArchiveFile, ClientCertificatePassword);
+        }
+
+        // This should only be called from config
+        public void SaveCertificateSetting()
+        {
+            string certSettingFile = HostContext.GetConfigFile(WellKnownConfigFile.Certificates);
+            IOUtil.DeleteFile(certSettingFile);
+
+            var setting = new RunnerCertificateSetting();
+            if (SkipServerCertificateValidation)
+            {
+                Trace.Info($"Store Skip ServerCertificateValidation setting to '{certSettingFile}'");
+                setting.SkipServerCertValidation = true;
+            }
+
+            if (!string.IsNullOrEmpty(CACertificateFile))
+            {
+                Trace.Info($"Store CA cert setting to '{certSettingFile}'");
+                setting.CACert = CACertificateFile;
+            }
+
+            if (!string.IsNullOrEmpty(ClientCertificateFile) &&
+                !string.IsNullOrEmpty(ClientCertificatePrivateKeyFile) &&
+                !string.IsNullOrEmpty(ClientCertificateArchiveFile))
+            {
+                Trace.Info($"Store client cert settings to '{certSettingFile}'");
+
+                setting.ClientCert = ClientCertificateFile;
+                setting.ClientCertPrivatekey = ClientCertificatePrivateKeyFile;
+                setting.ClientCertArchive = ClientCertificateArchiveFile;
+
+                if (!string.IsNullOrEmpty(ClientCertificatePassword))
+                {
+                    string lookupKey = Guid.NewGuid().ToString("D").ToUpperInvariant();
+                    Trace.Info($"Store client cert private key password with lookup key {lookupKey}");
+
+                    var credStore = HostContext.GetService<IRunnerCredentialStore>();
+                    credStore.Write($"GITHUB_ACTIONS_RUNNER_CLIENT_CERT_PASSWORD_{lookupKey}", "GitHub", ClientCertificatePassword);
+
+                    setting.ClientCertPasswordLookupKey = lookupKey;
+                }
+            }
+
+            if (SkipServerCertificateValidation ||
+                !string.IsNullOrEmpty(CACertificateFile) ||
+                !string.IsNullOrEmpty(ClientCertificateFile))
+            {
+                IOUtil.SaveObject(setting, certSettingFile);
+                File.SetAttributes(certSettingFile, File.GetAttributes(certSettingFile) | FileAttributes.Hidden);
+            }
+        }
+
+        // This should only be called from unconfig
+        public void DeleteCertificateSetting()
+        {
+            string certSettingFile = HostContext.GetConfigFile(WellKnownConfigFile.Certificates);
+            if (File.Exists(certSettingFile))
+            {
+                Trace.Info($"Load runner certificate setting from '{certSettingFile}'");
+                var certSetting = IOUtil.LoadObject<RunnerCertificateSetting>(certSettingFile);
+
+                if (certSetting != null && !string.IsNullOrEmpty(certSetting.ClientCertPasswordLookupKey))
+                {
+                    Trace.Info("Delete client cert private key password from credential store.");
+                    var credStore = HostContext.GetService<IRunnerCredentialStore>();
+                    credStore.Delete($"GITHUB_ACTIONS_RUNNER_CLIENT_CERT_PASSWORD_{certSetting.ClientCertPasswordLookupKey}");
+                }
+
+                Trace.Info($"Delete cert setting file: {certSettingFile}");
+                IOUtil.DeleteFile(certSettingFile);
+            }
+        }
+
+        public void LoadCertificateSettings()
+        {
+            string certSettingFile = HostContext.GetConfigFile(WellKnownConfigFile.Certificates);
+            if (File.Exists(certSettingFile))
+            {
+                Trace.Info($"Load runner certificate setting from '{certSettingFile}'");
+                var certSetting = IOUtil.LoadObject<RunnerCertificateSetting>(certSettingFile);
+                ArgUtil.NotNull(certSetting, nameof(RunnerCertificateSetting));
+
+                if (certSetting.SkipServerCertValidation)
+                {
+                    Trace.Info("Ignore SSL server certificate validation error");
+                    SkipServerCertificateValidation = true;
+                    VssClientHttpRequestSettings.Default.ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
+                }
+
+                if (!string.IsNullOrEmpty(certSetting.CACert))
+                {
+                    // make sure all settings file exist
+                    ArgUtil.File(certSetting.CACert, nameof(certSetting.CACert));
+                    Trace.Info($"CA '{certSetting.CACert}'");
+                    CACertificateFile = certSetting.CACert;
+                }
+
+                if (!string.IsNullOrEmpty(certSetting.ClientCert))
+                {
+                    // make sure all settings file exist
+                    ArgUtil.File(certSetting.ClientCert, nameof(certSetting.ClientCert));
+                    ArgUtil.File(certSetting.ClientCertPrivatekey, nameof(certSetting.ClientCertPrivatekey));
+                    ArgUtil.File(certSetting.ClientCertArchive, nameof(certSetting.ClientCertArchive));
+
+                    Trace.Info($"Client cert '{certSetting.ClientCert}'");
+                    Trace.Info($"Client cert private key '{certSetting.ClientCertPrivatekey}'");
+                    Trace.Info($"Client cert archive '{certSetting.ClientCertArchive}'");
+
+                    ClientCertificateFile = certSetting.ClientCert;
+                    ClientCertificatePrivateKeyFile = certSetting.ClientCertPrivatekey;
+                    ClientCertificateArchiveFile = certSetting.ClientCertArchive;
+
+                    if (!string.IsNullOrEmpty(certSetting.ClientCertPasswordLookupKey))
+                    {
+                        var cerdStore = HostContext.GetService<IRunnerCredentialStore>();
+                        ClientCertificatePassword = cerdStore.Read($"GITHUB_ACTIONS_RUNNER_CLIENT_CERT_PASSWORD_{certSetting.ClientCertPasswordLookupKey}").Password;
+                        HostContext.SecretMasker.AddValue(ClientCertificatePassword);
+                    }
+
+                    _runnerClientCertificateManager.AddClientCertificate(ClientCertificateArchiveFile, ClientCertificatePassword);
+                }
+            }
+            else
+            {
+                Trace.Info("No certificate setting found.");
+            }
+        }
+    }
+
+    [DataContract]
+    internal class RunnerCertificateSetting
+    {
+        [DataMember]
+        public bool SkipServerCertValidation { get; set; }
+
+        [DataMember]
+        public string CACert { get; set; }
+
+        [DataMember]
+        public string ClientCert { get; set; }
+
+        [DataMember]
+        public string ClientCertPrivatekey { get; set; }
+
+        [DataMember]
+        public string ClientCertArchive { get; set; }
+
+        [DataMember]
+        public string ClientCertPasswordLookupKey { get; set; }
+    }
+}

src/Runner.Common/RunnerCredentialStore.cs

@@ -0,0 +1,948 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Net;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using GitHub.Runner.Common.Util;
+using Newtonsoft.Json;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Security.Cryptography;
+using GitHub.Runner.Sdk;
+
+namespace GitHub.Runner.Common
+{
+    // The purpose of this class is to store user's credential during runner configuration and retrive the credential back at runtime.
+#if OS_WINDOWS
+    [ServiceLocator(Default = typeof(WindowsRunnerCredentialStore))]
+#elif OS_OSX
+    [ServiceLocator(Default = typeof(MacOSRunnerCredentialStore))]
+#else
+    [ServiceLocator(Default = typeof(LinuxRunnerCredentialStore))]
+#endif
+    public interface IRunnerCredentialStore : IRunnerService
+    {
+        NetworkCredential Write(string target, string username, string password);
+
+        // throw exception when target not found from cred store
+        NetworkCredential Read(string target);
+
+        // throw exception when target not found from cred store
+        void Delete(string target);
+    }
+
+#if OS_WINDOWS
+    // Windows credential store is per user.
+    // This is a limitation for user configure the runner run as windows service, when user's current login account is different with the service run as account.
+    // Ex: I login the box as domain\admin, configure the runner as windows service and run as domian\buildserver
+    // domain\buildserver won't read the stored credential from domain\admin's windows credential store.
+    // To workaround this limitation.
+    // Anytime we try to save a credential:
+    //   1. store it into current user's windows credential store 
+    //   2. use DP-API do a machine level encrypt and store the encrypted content on disk.
+    // At the first time we try to read the credential:
+    //   1. read from current user's windows credential store, delete the DP-API encrypted backup content on disk if the windows credential store read succeed.
+    //   2. if credential not found in current user's windows credential store, read from the DP-API encrypted backup content on disk, 
+    //      write the credential back the current user's windows credential store and delete the backup on disk.
+    public sealed class WindowsRunnerCredentialStore : RunnerService, IRunnerCredentialStore
+    {
+        private string _credStoreFile;
+        private Dictionary<string, string> _credStore;
+
+        public override void Initialize(IHostContext hostContext)
+        {
+            base.Initialize(hostContext);
+
+            _credStoreFile = hostContext.GetConfigFile(WellKnownConfigFile.CredentialStore);
+            if (File.Exists(_credStoreFile))
+            {
+                _credStore = IOUtil.LoadObject<Dictionary<string, string>>(_credStoreFile);
+            }
+            else
+            {
+                _credStore = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            }
+        }
+
+        public NetworkCredential Write(string target, string username, string password)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+            ArgUtil.NotNullOrEmpty(username, nameof(username));
+            ArgUtil.NotNullOrEmpty(password, nameof(password));
+
+            // save to .credential_store file first, then Windows credential store
+            string usernameBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(username));
+            string passwordBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(password));
+
+            // Base64Username:Base64Password -> DP-API machine level encrypt -> Base64Encoding
+            string encryptedUsernamePassword = Convert.ToBase64String(ProtectedData.Protect(Encoding.UTF8.GetBytes($"{usernameBase64}:{passwordBase64}"), null, DataProtectionScope.LocalMachine));
+            Trace.Info($"Credentials for '{target}' written to credential store file.");
+            _credStore[target] = encryptedUsernamePassword;
+
+            // save to .credential_store file
+            SyncCredentialStoreFile();
+
+            // save to Windows Credential Store
+            return WriteInternal(target, username, password);
+        }
+
+        public NetworkCredential Read(string target)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+            IntPtr credPtr = IntPtr.Zero;
+            try
+            {
+                if (CredRead(target, CredentialType.Generic, 0, out credPtr))
+                {
+                    Credential credStruct = (Credential)Marshal.PtrToStructure(credPtr, typeof(Credential));
+                    int passwordLength = (int)credStruct.CredentialBlobSize;
+                    string password = passwordLength > 0 ? Marshal.PtrToStringUni(credStruct.CredentialBlob, passwordLength / sizeof(char)) : String.Empty;
+                    string username = Marshal.PtrToStringUni(credStruct.UserName);
+                    Trace.Info($"Credentials for '{target}' read from windows credential store.");
+
+                    // delete from .credential_store file since we are able to read it from windows credential store
+                    if (_credStore.Remove(target))
+                    {
+                        Trace.Info($"Delete credentials for '{target}' from credential store file.");
+                        SyncCredentialStoreFile();
+                    }
+
+                    return new NetworkCredential(username, password);
+                }
+                else
+                {
+                    // Can't read from Windows Credential Store, fail back to .credential_store file
+                    if (_credStore.ContainsKey(target) && !string.IsNullOrEmpty(_credStore[target]))
+                    {
+                        Trace.Info($"Credentials for '{target}' read from credential store file.");
+
+                        // Base64Decode -> DP-API machine level decrypt -> Base64Username:Base64Password -> Base64Decode
+                        string decryptedUsernamePassword = Encoding.UTF8.GetString(ProtectedData.Unprotect(Convert.FromBase64String(_credStore[target]), null, DataProtectionScope.LocalMachine));
+
+                        string[] credential = decryptedUsernamePassword.Split(':');
+                        if (credential.Length == 2 && !string.IsNullOrEmpty(credential[0]) && !string.IsNullOrEmpty(credential[1]))
+                        {
+                            string username = Encoding.UTF8.GetString(Convert.FromBase64String(credential[0]));
+                            string password = Encoding.UTF8.GetString(Convert.FromBase64String(credential[1]));
+
+                            // store back to windows credential store for current user
+                            NetworkCredential creds = WriteInternal(target, username, password);
+
+                            // delete from .credential_store file since we are able to write the credential to windows credential store for current user.
+                            if (_credStore.Remove(target))
+                            {
+                                Trace.Info($"Delete credentials for '{target}' from credential store file.");
+                                SyncCredentialStoreFile();
+                            }
+
+                            return creds;
+                        }
+                        else
+                        {
+                            throw new ArgumentOutOfRangeException(nameof(decryptedUsernamePassword));
+                        }
+                    }
+
+                    throw new Win32Exception(Marshal.GetLastWin32Error(), $"CredRead throw an error for '{target}'");
+                }
+            }
+            finally
+            {
+                if (credPtr != IntPtr.Zero)
+                {
+                    CredFree(credPtr);
+                }
+            }
+        }
+
+        public void Delete(string target)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+
+            // remove from .credential_store file
+            if (_credStore.Remove(target))
+            {
+                Trace.Info($"Delete credentials for '{target}' from credential store file.");
+                SyncCredentialStoreFile();
+            }
+
+            // remove from windows credential store
+            if (!CredDelete(target, CredentialType.Generic, 0))
+            {
+                throw new Win32Exception(Marshal.GetLastWin32Error(), $"Failed to delete credentials for {target}");
+            }
+            else
+            {
+                Trace.Info($"Credentials for '{target}' deleted from windows credential store.");
+            }
+        }
+
+        private NetworkCredential WriteInternal(string target, string username, string password)
+        {
+            // save to Windows Credential Store
+            Credential credential = new Credential()
+            {
+                Type = CredentialType.Generic,
+                Persist = (UInt32)CredentialPersist.LocalMachine,
+                TargetName = Marshal.StringToCoTaskMemUni(target),
+                UserName = Marshal.StringToCoTaskMemUni(username),
+                CredentialBlob = Marshal.StringToCoTaskMemUni(password),
+                CredentialBlobSize = (UInt32)Encoding.Unicode.GetByteCount(password),
+                AttributeCount = 0,
+                Comment = IntPtr.Zero,
+                Attributes = IntPtr.Zero,
+                TargetAlias = IntPtr.Zero
+            };
+
+            try
+            {
+                if (CredWrite(ref credential, 0))
+                {
+                    Trace.Info($"Credentials for '{target}' written to windows credential store.");
+                    return new NetworkCredential(username, password);
+                }
+                else
+                {
+                    int error = Marshal.GetLastWin32Error();
+                    throw new Win32Exception(error, "Failed to write credentials");
+                }
+            }
+            finally
+            {
+                if (credential.CredentialBlob != IntPtr.Zero)
+                {
+                    Marshal.FreeCoTaskMem(credential.CredentialBlob);
+                }
+                if (credential.TargetName != IntPtr.Zero)
+                {
+                    Marshal.FreeCoTaskMem(credential.TargetName);
+                }
+                if (credential.UserName != IntPtr.Zero)
+                {
+                    Marshal.FreeCoTaskMem(credential.UserName);
+                }
+            }
+        }
+
+        private void SyncCredentialStoreFile()
+        {
+            Trace.Info("Sync in-memory credential store with credential store file.");
+
+            // delete the cred store file first anyway, since it's a readonly file.
+            IOUtil.DeleteFile(_credStoreFile);
+
+            // delete cred store file when all creds gone
+            if (_credStore.Count == 0)
+            {
+                return;
+            }
+            else
+            {
+                IOUtil.SaveObject(_credStore, _credStoreFile);
+                File.SetAttributes(_credStoreFile, File.GetAttributes(_credStoreFile) | FileAttributes.Hidden);
+            }
+        }
+
+        [DllImport("Advapi32.dll", EntryPoint = "CredDeleteW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern bool CredDelete(string target, CredentialType type, int reservedFlag);
+
+        [DllImport("Advapi32.dll", EntryPoint = "CredReadW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern bool CredRead(string target, CredentialType type, int reservedFlag, out IntPtr CredentialPtr);
+
+        [DllImport("Advapi32.dll", EntryPoint = "CredWriteW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern bool CredWrite([In] ref Credential userCredential, [In] UInt32 flags);
+
+        [DllImport("Advapi32.dll", EntryPoint = "CredFree", SetLastError = true)]
+        internal static extern bool CredFree([In] IntPtr cred);
+
+        internal enum CredentialPersist : UInt32
+        {
+            Session = 0x01,
+            LocalMachine = 0x02
+        }
+
+        internal enum CredentialType : uint
+        {
+            Generic = 0x01,
+            DomainPassword = 0x02,
+            DomainCertificate = 0x03
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct Credential
+        {
+            public UInt32 Flags;
+            public CredentialType Type;
+            public IntPtr TargetName;
+            public IntPtr Comment;
+            public System.Runtime.InteropServices.ComTypes.FILETIME LastWritten;
+            public UInt32 CredentialBlobSize;
+            public IntPtr CredentialBlob;
+            public UInt32 Persist;
+            public UInt32 AttributeCount;
+            public IntPtr Attributes;
+            public IntPtr TargetAlias;
+            public IntPtr UserName;
+        }
+    }
+#elif OS_OSX
+    public sealed class MacOSRunnerCredentialStore : RunnerService, IRunnerCredentialStore
+    {
+        private const string _osxRunnerCredStoreKeyChainName = "_GITHUB_ACTIONS_RUNNER_CREDSTORE_INTERNAL_";
+
+        // Keychain requires a password, but this is not intended to add security
+        private const string _osxRunnerCredStoreKeyChainPassword = "C46F23C36AF94B72B1EAEE32C68670A0";
+
+        private string _securityUtil;
+
+        private string _runnerCredStoreKeyChain;
+
+        public override void Initialize(IHostContext hostContext)
+        {
+            base.Initialize(hostContext);
+
+            _securityUtil = WhichUtil.Which("security", true, Trace);
+
+            _runnerCredStoreKeyChain = hostContext.GetConfigFile(WellKnownConfigFile.CredentialStore);
+
+            // Create osx key chain if it doesn't exists.
+            if (!File.Exists(_runnerCredStoreKeyChain))
+            {
+                List<string> securityOut = new List<string>();
+                List<string> securityError = new List<string>();
+                object outputLock = new object();
+                using (var p = HostContext.CreateService<IProcessInvoker>())
+                {
+                    p.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                    {
+                        if (!string.IsNullOrEmpty(stdout.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityOut.Add(stdout.Data);
+                            }
+                        }
+                    };
+
+                    p.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
+                    {
+                        if (!string.IsNullOrEmpty(stderr.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityError.Add(stderr.Data);
+                            }
+                        }
+                    };
+
+                    // make sure the 'security' has access to the key so we won't get prompt at runtime.
+                    int exitCode = p.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
+                                                  fileName: _securityUtil,
+                                                  arguments: $"create-keychain -p {_osxRunnerCredStoreKeyChainPassword} \"{_runnerCredStoreKeyChain}\"",
+                                                  environment: null,
+                                                  cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+                    if (exitCode == 0)
+                    {
+                        Trace.Info($"Successfully create-keychain for {_runnerCredStoreKeyChain}");
+                    }
+                    else
+                    {
+                        if (securityOut.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityOut));
+                        }
+                        if (securityError.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityError));
+                        }
+
+                        throw new InvalidOperationException($"'security create-keychain' failed with exit code {exitCode}.");
+                    }
+                }
+            }
+            else
+            {
+                // Try unlock and lock the keychain, make sure it's still in good stage
+                UnlockKeyChain();
+                LockKeyChain();
+            }
+        }
+
+        public NetworkCredential Write(string target, string username, string password)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+            ArgUtil.NotNullOrEmpty(username, nameof(username));
+            ArgUtil.NotNullOrEmpty(password, nameof(password));
+
+            try
+            {
+                UnlockKeyChain();
+
+                // base64encode username + ':' + base64encode password
+                // OSX keychain requires you provide -s target and -a username to retrieve password
+                // So, we will trade both username and password as 'secret' store into keychain
+                string usernameBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(username));
+                string passwordBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(password));
+                string secretForKeyChain = $"{usernameBase64}:{passwordBase64}";
+
+                List<string> securityOut = new List<string>();
+                List<string> securityError = new List<string>();
+                object outputLock = new object();
+                using (var p = HostContext.CreateService<IProcessInvoker>())
+                {
+                    p.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                    {
+                        if (!string.IsNullOrEmpty(stdout.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityOut.Add(stdout.Data);
+                            }
+                        }
+                    };
+
+                    p.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
+                    {
+                        if (!string.IsNullOrEmpty(stderr.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityError.Add(stderr.Data);
+                            }
+                        }
+                    };
+
+                    // make sure the 'security' has access to the key so we won't get prompt at runtime.
+                    int exitCode = p.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
+                                                fileName: _securityUtil,
+                                                arguments: $"add-generic-password -s {target} -a GITHUBACTIONSRUNNER -w {secretForKeyChain} -T \"{_securityUtil}\" \"{_runnerCredStoreKeyChain}\"",
+                                                environment: null,
+                                                cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+                    if (exitCode == 0)
+                    {
+                        Trace.Info($"Successfully add-generic-password for {target} (GITHUBACTIONSRUNNER)");
+                    }
+                    else
+                    {
+                        if (securityOut.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityOut));
+                        }
+                        if (securityError.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityError));
+                        }
+
+                        throw new InvalidOperationException($"'security add-generic-password' failed with exit code {exitCode}.");
+                    }
+                }
+
+                return new NetworkCredential(username, password);
+            }
+            finally
+            {
+                LockKeyChain();
+            }
+        }
+
+        public NetworkCredential Read(string target)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+
+            try
+            {
+                UnlockKeyChain();
+
+                string username;
+                string password;
+
+                List<string> securityOut = new List<string>();
+                List<string> securityError = new List<string>();
+                object outputLock = new object();
+                using (var p = HostContext.CreateService<IProcessInvoker>())
+                {
+                    p.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                    {
+                        if (!string.IsNullOrEmpty(stdout.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityOut.Add(stdout.Data);
+                            }
+                        }
+                    };
+
+                    p.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
+                    {
+                        if (!string.IsNullOrEmpty(stderr.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityError.Add(stderr.Data);
+                            }
+                        }
+                    };
+
+                    int exitCode = p.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
+                                                  fileName: _securityUtil,
+                                                  arguments: $"find-generic-password -s {target} -a GITHUBACTIONSRUNNER -w -g \"{_runnerCredStoreKeyChain}\"",
+                                                  environment: null,
+                                                  cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+                    if (exitCode == 0)
+                    {
+                        string keyChainSecret = securityOut.First();
+                        string[] secrets = keyChainSecret.Split(':');
+                        if (secrets.Length == 2 && !string.IsNullOrEmpty(secrets[0]) && !string.IsNullOrEmpty(secrets[1]))
+                        {
+                            Trace.Info($"Successfully find-generic-password for {target} (GITHUBACTIONSRUNNER)");
+                            username = Encoding.UTF8.GetString(Convert.FromBase64String(secrets[0]));
+                            password = Encoding.UTF8.GetString(Convert.FromBase64String(secrets[1]));
+                            return new NetworkCredential(username, password);
+                        }
+                        else
+                        {
+                            throw new ArgumentOutOfRangeException(nameof(keyChainSecret));
+                        }
+                    }
+                    else
+                    {
+                        if (securityOut.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityOut));
+                        }
+                        if (securityError.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityError));
+                        }
+
+                        throw new InvalidOperationException($"'security find-generic-password' failed with exit code {exitCode}.");
+                    }
+                }
+            }
+            finally
+            {
+                LockKeyChain();
+            }
+        }
+
+        public void Delete(string target)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+
+            try
+            {
+                UnlockKeyChain();
+
+                List<string> securityOut = new List<string>();
+                List<string> securityError = new List<string>();
+                object outputLock = new object();
+
+                using (var p = HostContext.CreateService<IProcessInvoker>())
+                {
+                    p.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                    {
+                        if (!string.IsNullOrEmpty(stdout.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityOut.Add(stdout.Data);
+                            }
+                        }
+                    };
+
+                    p.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
+                    {
+                        if (!string.IsNullOrEmpty(stderr.Data))
+                        {
+                            lock (outputLock)
+                            {
+                                securityError.Add(stderr.Data);
+                            }
+                        }
+                    };
+
+                    int exitCode = p.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
+                                                  fileName: _securityUtil,
+                                                  arguments: $"delete-generic-password -s {target} -a GITHUBACTIONSRUNNER \"{_runnerCredStoreKeyChain}\"",
+                                                  environment: null,
+                                                  cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+                    if (exitCode == 0)
+                    {
+                        Trace.Info($"Successfully delete-generic-password for {target} (GITHUBACTIONSRUNNER)");
+                    }
+                    else
+                    {
+                        if (securityOut.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityOut));
+                        }
+                        if (securityError.Count > 0)
+                        {
+                            Trace.Error(string.Join(Environment.NewLine, securityError));
+                        }
+
+                        throw new InvalidOperationException($"'security delete-generic-password' failed with exit code {exitCode}.");
+                    }
+                }
+            }
+            finally
+            {
+                LockKeyChain();
+            }
+        }
+
+        private void UnlockKeyChain()
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(_securityUtil, nameof(_securityUtil));
+            ArgUtil.NotNullOrEmpty(_runnerCredStoreKeyChain, nameof(_runnerCredStoreKeyChain));
+
+            List<string> securityOut = new List<string>();
+            List<string> securityError = new List<string>();
+            object outputLock = new object();
+            using (var p = HostContext.CreateService<IProcessInvoker>())
+            {
+                p.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                {
+                    if (!string.IsNullOrEmpty(stdout.Data))
+                    {
+                        lock (outputLock)
+                        {
+                            securityOut.Add(stdout.Data);
+                        }
+                    }
+                };
+
+                p.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
+                {
+                    if (!string.IsNullOrEmpty(stderr.Data))
+                    {
+                        lock (outputLock)
+                        {
+                            securityError.Add(stderr.Data);
+                        }
+                    }
+                };
+
+                // make sure the 'security' has access to the key so we won't get prompt at runtime.
+                int exitCode = p.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
+                                              fileName: _securityUtil,
+                                              arguments: $"unlock-keychain -p {_osxRunnerCredStoreKeyChainPassword} \"{_runnerCredStoreKeyChain}\"",
+                                              environment: null,
+                                              cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+                if (exitCode == 0)
+                {
+                    Trace.Info($"Successfully unlock-keychain for {_runnerCredStoreKeyChain}");
+                }
+                else
+                {
+                    if (securityOut.Count > 0)
+                    {
+                        Trace.Error(string.Join(Environment.NewLine, securityOut));
+                    }
+                    if (securityError.Count > 0)
+                    {
+                        Trace.Error(string.Join(Environment.NewLine, securityError));
+                    }
+
+                    throw new InvalidOperationException($"'security unlock-keychain' failed with exit code {exitCode}.");
+                }
+            }
+        }
+
+        private void LockKeyChain()
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(_securityUtil, nameof(_securityUtil));
+            ArgUtil.NotNullOrEmpty(_runnerCredStoreKeyChain, nameof(_runnerCredStoreKeyChain));
+
+            List<string> securityOut = new List<string>();
+            List<string> securityError = new List<string>();
+            object outputLock = new object();
+            using (var p = HostContext.CreateService<IProcessInvoker>())
+            {
+                p.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                {
+                    if (!string.IsNullOrEmpty(stdout.Data))
+                    {
+                        lock (outputLock)
+                        {
+                            securityOut.Add(stdout.Data);
+                        }
+                    }
+                };
+
+                p.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
+                {
+                    if (!string.IsNullOrEmpty(stderr.Data))
+                    {
+                        lock (outputLock)
+                        {
+                            securityError.Add(stderr.Data);
+                        }
+                    }
+                };
+
+                // make sure the 'security' has access to the key so we won't get prompt at runtime.
+                int exitCode = p.ExecuteAsync(workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
+                                              fileName: _securityUtil,
+                                              arguments: $"lock-keychain \"{_runnerCredStoreKeyChain}\"",
+                                              environment: null,
+                                              cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+                if (exitCode == 0)
+                {
+                    Trace.Info($"Successfully lock-keychain for {_runnerCredStoreKeyChain}");
+                }
+                else
+                {
+                    if (securityOut.Count > 0)
+                    {
+                        Trace.Error(string.Join(Environment.NewLine, securityOut));
+                    }
+                    if (securityError.Count > 0)
+                    {
+                        Trace.Error(string.Join(Environment.NewLine, securityError));
+                    }
+
+                    throw new InvalidOperationException($"'security lock-keychain' failed with exit code {exitCode}.");
+                }
+            }
+        }
+    }
+#else
+    public sealed class LinuxRunnerCredentialStore : RunnerService, IRunnerCredentialStore
+    {
+        // 'ghrunner' 128 bits iv
+        private readonly byte[] iv = new byte[] { 0x67, 0x68, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x67, 0x68, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72 };
+
+        // 256 bits key
+        private byte[] _symmetricKey;
+        private string _credStoreFile;
+        private Dictionary<string, Credential> _credStore;
+
+        public override void Initialize(IHostContext hostContext)
+        {
+            base.Initialize(hostContext);
+
+            _credStoreFile = hostContext.GetConfigFile(WellKnownConfigFile.CredentialStore);
+            if (File.Exists(_credStoreFile))
+            {
+                _credStore = IOUtil.LoadObject<Dictionary<string, Credential>>(_credStoreFile);
+            }
+            else
+            {
+                _credStore = new Dictionary<string, Credential>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            string machineId;
+            if (File.Exists("/etc/machine-id"))
+            {
+                // try use machine-id as encryption key
+                // this helps avoid accidental information disclosure, but isn't intended for true security
+                machineId = File.ReadAllLines("/etc/machine-id").FirstOrDefault();
+                Trace.Info($"machine-id length {machineId?.Length ?? 0}.");
+
+                // machine-id doesn't exist or machine-id is not 256 bits
+                if (string.IsNullOrEmpty(machineId) || machineId.Length != 32)
+                {
+                    Trace.Warning("Can not get valid machine id from '/etc/machine-id'.");
+                    machineId = "43e7fe5da07740cf914b90f1dac51c2a";
+                }
+            }
+            else
+            {
+                // /etc/machine-id not exist
+                Trace.Warning("/etc/machine-id doesn't exist.");
+                machineId = "43e7fe5da07740cf914b90f1dac51c2a";
+            }
+
+            List<byte> keyBuilder = new List<byte>();
+            foreach (var c in machineId)
+            {
+                keyBuilder.Add(Convert.ToByte(c));
+            }
+
+            _symmetricKey = keyBuilder.ToArray();
+        }
+
+        public NetworkCredential Write(string target, string username, string password)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+            ArgUtil.NotNullOrEmpty(username, nameof(username));
+            ArgUtil.NotNullOrEmpty(password, nameof(password));
+
+            Trace.Info($"Store credential for '{target}' to cred store.");
+            Credential cred = new Credential(username, Encrypt(password));
+            _credStore[target] = cred;
+            SyncCredentialStoreFile();
+            return new NetworkCredential(username, password);
+        }
+
+        public NetworkCredential Read(string target)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+            Trace.Info($"Read credential for '{target}' from cred store.");
+            if (_credStore.ContainsKey(target))
+            {
+                Credential cred = _credStore[target];
+                if (!string.IsNullOrEmpty(cred.UserName) && !string.IsNullOrEmpty(cred.Password))
+                {
+                    Trace.Info($"Return credential for '{target}' from cred store.");
+                    return new NetworkCredential(cred.UserName, Decrypt(cred.Password));
+                }
+            }
+
+            throw new KeyNotFoundException(target);
+        }
+
+        public void Delete(string target)
+        {
+            Trace.Entering();
+            ArgUtil.NotNullOrEmpty(target, nameof(target));
+
+            if (_credStore.ContainsKey(target))
+            {
+                Trace.Info($"Delete credential for '{target}' from cred store.");
+                _credStore.Remove(target);
+                SyncCredentialStoreFile();
+            }
+            else
+            {
+                throw new KeyNotFoundException(target);
+            }
+        }
+
+        private void SyncCredentialStoreFile()
+        {
+            Trace.Entering();
+            Trace.Info("Sync in-memory credential store with credential store file.");
+
+            // delete cred store file when all creds gone
+            if (_credStore.Count == 0)
+            {
+                IOUtil.DeleteFile(_credStoreFile);
+                return;
+            }
+
+            if (!File.Exists(_credStoreFile))
+            {
+                CreateCredentialStoreFile();
+            }
+
+            IOUtil.SaveObject(_credStore, _credStoreFile);
+        }
+
+        private string Encrypt(string secret)
+        {
+            using (Aes aes = Aes.Create())
+            {
+                aes.Key = _symmetricKey;
+                aes.IV = iv;
+
+                // Create a decrytor to perform the stream transform.
+                ICryptoTransform encryptor = aes.CreateEncryptor();
+
+                // Create the streams used for encryption.
+                using (MemoryStream msEncrypt = new MemoryStream())
+                {
+                    using (CryptoStream csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write))
+                    {
+                        using (StreamWriter swEncrypt = new StreamWriter(csEncrypt))
+                        {
+                            swEncrypt.Write(secret);
+                        }
+
+                        return Convert.ToBase64String(msEncrypt.ToArray());
+                    }
+                }
+            }
+        }
+
+        private string Decrypt(string encryptedText)
+        {
+            using (Aes aes = Aes.Create())
+            {
+                aes.Key = _symmetricKey;
+                aes.IV = iv;
+
+                // Create a decrytor to perform the stream transform.
+                ICryptoTransform decryptor = aes.CreateDecryptor();
+
+                // Create the streams used for decryption.
+                using (MemoryStream msDecrypt = new MemoryStream(Convert.FromBase64String(encryptedText)))
+                {
+                    using (CryptoStream csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
+                    {
+                        using (StreamReader srDecrypt = new StreamReader(csDecrypt))
+                        {
+                            // Read the decrypted bytes from the decrypting stream and place them in a string.
+                            return srDecrypt.ReadToEnd();
+                        }
+                    }
+                }
+            }
+        }
+
+        private void CreateCredentialStoreFile()
+        {
+            File.WriteAllText(_credStoreFile, "");
+            File.SetAttributes(_credStoreFile, File.GetAttributes(_credStoreFile) | FileAttributes.Hidden);
+
+            // Try to lock down the .credentials_store file to the owner/group
+            var chmodPath = WhichUtil.Which("chmod", trace: Trace);
+            if (!String.IsNullOrEmpty(chmodPath))
+            {
+                var arguments = $"600 {new FileInfo(_credStoreFile).FullName}";
+                using (var invoker = HostContext.CreateService<IProcessInvoker>())
+                {
+                    var exitCode = invoker.ExecuteAsync(HostContext.GetDirectory(WellKnownDirectory.Root), chmodPath, arguments, null, default(CancellationToken)).GetAwaiter().GetResult();
+                    if (exitCode == 0)
+                    {
+                        Trace.Info("Successfully set permissions for credentials store file {0}", _credStoreFile);
+                    }
+                    else
+                    {
+                        Trace.Warning("Unable to successfully set permissions for credentials store file {0}. Received exit code {1} from {2}", _credStoreFile, exitCode, chmodPath);
+                    }
+                }
+            }
+            else
+            {
+                Trace.Warning("Unable to locate chmod to set permissions for credentials store file {0}.", _credStoreFile);
+            }
+        }
+    }
+
+    [DataContract]
+    internal class Credential
+    {
+        public Credential()
+        { }
+
+        public Credential(string userName, string password)
+        {
+            UserName = userName;
+            Password = password;
+        }
+
+        [DataMember(IsRequired = true)]
+        public string UserName { get; set; }
+
+        [DataMember(IsRequired = true)]
+        public string Password { get; set; }
+    }
+#endif
+}

src/Runner.Common/RunnerServer.cs

@@ -66,6 +66,11 @@ namespace GitHub.Runner.Common
 
         public async Task ConnectAsync(Uri serverUrl, VssCredentials credentials)
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return;
+            }
+
             var createGenericConnection = EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(100));
             var createMessageConnection = EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(60));
             var createRequestConnection = EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(60));
@@ -298,18 +303,29 @@ namespace GitHub.Runner.Common
 
         public Task<TaskAgentJobRequest> RenewAgentRequestAsync(int poolId, long requestId, Guid lockToken, CancellationToken cancellationToken = default(CancellationToken))
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult(JsonUtility.FromString<TaskAgentJobRequest>("{ lockedUntil: \"" + DateTime.Now.Add(TimeSpan.FromMinutes(5)).ToString("u") + "\" }"));
+            }
+
             CheckConnection(RunnerConnectionType.JobRequest);
             return _requestTaskAgentClient.RenewAgentRequestAsync(poolId, requestId, lockToken, cancellationToken: cancellationToken);
         }
 
         public Task<TaskAgentJobRequest> FinishAgentRequestAsync(int poolId, long requestId, Guid lockToken, DateTime finishTime, TaskResult result, CancellationToken cancellationToken = default(CancellationToken))
         {
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                return Task.FromResult<TaskAgentJobRequest>(null);
+            }
+
             CheckConnection(RunnerConnectionType.JobRequest);
             return _requestTaskAgentClient.FinishAgentRequestAsync(poolId, requestId, lockToken, finishTime, result, cancellationToken: cancellationToken);
         }
 
         public Task<TaskAgentJobRequest> GetAgentRequestAsync(int poolId, long requestId, CancellationToken cancellationToken = default(CancellationToken))
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             CheckConnection(RunnerConnectionType.JobRequest);
             return _requestTaskAgentClient.GetAgentRequestAsync(poolId, requestId, cancellationToken: cancellationToken);
         }
@@ -319,6 +335,7 @@ namespace GitHub.Runner.Common
         //-----------------------------------------------------------------
         public Task<List<PackageMetadata>> GetPackagesAsync(string packageType, string platform, int top, CancellationToken cancellationToken)
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             CheckConnection(RunnerConnectionType.Generic);
             return _genericTaskAgentClient.GetPackagesAsync(packageType, platform, top, cancellationToken: cancellationToken);
         }

src/Runner.Common/RunnerWebProxy.cs

@@ -0,0 +1,196 @@
+using GitHub.Runner.Common.Util;
+using System;
+using System.Linq;
+using System.Net;
+using System.IO;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using GitHub.Runner.Sdk;
+
+namespace GitHub.Runner.Common
+{
+    [ServiceLocator(Default = typeof(RunnerWebProxy))]
+    public interface IRunnerWebProxy : IRunnerService
+    {
+        string ProxyAddress { get; }
+        string ProxyUsername { get; }
+        string ProxyPassword { get; }
+        List<string> ProxyBypassList { get; }
+        IWebProxy WebProxy { get; }
+    }
+
+    public class RunnerWebProxy : RunnerService, IRunnerWebProxy
+    {
+        private readonly List<Regex> _regExBypassList = new List<Regex>();
+        private readonly List<string> _bypassList = new List<string>();
+        private RunnerWebProxyCore _runnerWebProxy = new RunnerWebProxyCore();
+
+        public string ProxyAddress { get; private set; }
+        public string ProxyUsername { get; private set; }
+        public string ProxyPassword { get; private set; }
+        public List<string> ProxyBypassList => _bypassList;
+        public IWebProxy WebProxy => _runnerWebProxy;
+
+        public override void Initialize(IHostContext context)
+        {
+            base.Initialize(context);
+            LoadProxySetting();
+        }
+
+        // This should only be called from config
+        public void SetupProxy(string proxyAddress, string proxyUsername, string proxyPassword)
+        {
+            ArgUtil.NotNullOrEmpty(proxyAddress, nameof(proxyAddress));
+            Trace.Info($"Update proxy setting from '{ProxyAddress ?? string.Empty}' to'{proxyAddress}'");
+            ProxyAddress = proxyAddress;
+            ProxyUsername = proxyUsername;
+            ProxyPassword = proxyPassword;
+
+            if (string.IsNullOrEmpty(ProxyUsername) || string.IsNullOrEmpty(ProxyPassword))
+            {
+                Trace.Info($"Config proxy use DefaultNetworkCredentials.");
+            }
+            else
+            {
+                Trace.Info($"Config authentication proxy as: {ProxyUsername}.");
+            }
+
+            _runnerWebProxy.Update(ProxyAddress, ProxyUsername, ProxyPassword, ProxyBypassList);
+        }
+
+        // This should only be called from config
+        public void SaveProxySetting()
+        {
+            if (!string.IsNullOrEmpty(ProxyAddress))
+            {
+                string proxyConfigFile = HostContext.GetConfigFile(WellKnownConfigFile.Proxy);
+                IOUtil.DeleteFile(proxyConfigFile);
+                Trace.Info($"Store proxy configuration to '{proxyConfigFile}' for proxy '{ProxyAddress}'");
+                File.WriteAllText(proxyConfigFile, ProxyAddress);
+                File.SetAttributes(proxyConfigFile, File.GetAttributes(proxyConfigFile) | FileAttributes.Hidden);
+
+                string proxyCredFile = HostContext.GetConfigFile(WellKnownConfigFile.ProxyCredentials);
+                IOUtil.DeleteFile(proxyCredFile);
+                if (!string.IsNullOrEmpty(ProxyUsername) && !string.IsNullOrEmpty(ProxyPassword))
+                {
+                    string lookupKey = Guid.NewGuid().ToString("D").ToUpperInvariant();
+                    Trace.Info($"Store proxy credential lookup key '{lookupKey}' to '{proxyCredFile}'");
+                    File.WriteAllText(proxyCredFile, lookupKey);
+                    File.SetAttributes(proxyCredFile, File.GetAttributes(proxyCredFile) | FileAttributes.Hidden);
+
+                    var credStore = HostContext.GetService<IRunnerCredentialStore>();
+                    credStore.Write($"GITHUB_ACTIONS_RUNNER_PROXY_{lookupKey}", ProxyUsername, ProxyPassword);
+                }
+            }
+            else
+            {
+                Trace.Info("No proxy configuration exist.");
+            }
+        }
+
+        // This should only be called from unconfig
+        public void DeleteProxySetting()
+        {
+            string proxyCredFile = HostContext.GetConfigFile(WellKnownConfigFile.ProxyCredentials);
+            if (File.Exists(proxyCredFile))
+            {
+                Trace.Info("Delete proxy credential from credential store.");
+                string lookupKey = File.ReadAllLines(proxyCredFile).FirstOrDefault();
+                if (!string.IsNullOrEmpty(lookupKey))
+                {
+                    var credStore = HostContext.GetService<IRunnerCredentialStore>();
+                    credStore.Delete($"GITHUB_ACTIONS_RUNNER_PROXY_{lookupKey}");
+                }
+
+                Trace.Info($"Delete .proxycredentials file: {proxyCredFile}");
+                IOUtil.DeleteFile(proxyCredFile);
+            }
+
+            string proxyBypassFile = HostContext.GetConfigFile(WellKnownConfigFile.ProxyBypass);
+            if (File.Exists(proxyBypassFile))
+            {
+                Trace.Info($"Delete .proxybypass file: {proxyBypassFile}");
+                IOUtil.DeleteFile(proxyBypassFile);
+            }
+
+            string proxyConfigFile = HostContext.GetConfigFile(WellKnownConfigFile.Proxy);
+            Trace.Info($"Delete .proxy file: {proxyConfigFile}");
+            IOUtil.DeleteFile(proxyConfigFile);
+        }
+
+        private void LoadProxySetting()
+        {
+            string proxyConfigFile = HostContext.GetConfigFile(WellKnownConfigFile.Proxy);
+            if (File.Exists(proxyConfigFile))
+            {
+                // we expect the first line of the file is the proxy url
+                Trace.Verbose($"Try read proxy setting from file: {proxyConfigFile}.");
+                ProxyAddress = File.ReadLines(proxyConfigFile).FirstOrDefault() ?? string.Empty;
+                ProxyAddress = ProxyAddress.Trim();
+                Trace.Verbose($"{ProxyAddress}");
+            }
+
+            if (!string.IsNullOrEmpty(ProxyAddress) && !Uri.IsWellFormedUriString(ProxyAddress, UriKind.Absolute))
+            {
+                Trace.Info($"The proxy url is not a well formed absolute uri string: {ProxyAddress}.");
+                ProxyAddress = string.Empty;
+            }
+
+            if (!string.IsNullOrEmpty(ProxyAddress))
+            {
+                Trace.Info($"Config proxy at: {ProxyAddress}.");
+
+                string proxyCredFile = HostContext.GetConfigFile(WellKnownConfigFile.ProxyCredentials);
+                if (File.Exists(proxyCredFile))
+                {
+                    string lookupKey = File.ReadAllLines(proxyCredFile).FirstOrDefault();
+                    if (!string.IsNullOrEmpty(lookupKey))
+                    {
+                        var credStore = HostContext.GetService<IRunnerCredentialStore>();
+                        var proxyCred = credStore.Read($"GITHUB_ACTIONS_RUNNER_PROXY_{lookupKey}");
+                        ProxyUsername = proxyCred.UserName;
+                        ProxyPassword = proxyCred.Password;
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(ProxyPassword))
+                {
+                    HostContext.SecretMasker.AddValue(ProxyPassword);
+                }
+
+                if (string.IsNullOrEmpty(ProxyUsername) || string.IsNullOrEmpty(ProxyPassword))
+                {
+                    Trace.Info($"Config proxy use DefaultNetworkCredentials.");
+                }
+                else
+                {
+                    Trace.Info($"Config authentication proxy as: {ProxyUsername}.");
+                }
+
+                string proxyBypassFile = HostContext.GetConfigFile(WellKnownConfigFile.ProxyBypass);
+                if (File.Exists(proxyBypassFile))
+                {
+                    Trace.Verbose($"Try read proxy bypass list from file: {proxyBypassFile}.");
+                    foreach (string bypass in File.ReadAllLines(proxyBypassFile))
+                    {
+                        if (string.IsNullOrWhiteSpace(bypass))
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            Trace.Info($"Bypass proxy for: {bypass}.");
+                            ProxyBypassList.Add(bypass.Trim());
+                        }
+                    }
+                }
+
+                _runnerWebProxy.Update(ProxyAddress, ProxyUsername, ProxyPassword, ProxyBypassList);
+            }
+            else
+            {
+                Trace.Info($"No proxy setting found.");
+            }
+        }
+    }
+}

src/Runner.Common/Tracing.cs

@@ -50,13 +50,6 @@ namespace GitHub.Runner.Common
         public void Error(Exception exception)
         {
             Trace(TraceEventType.Error, exception.ToString());
-            var innerEx = exception.InnerException;
-            while (innerEx != null)
-            {
-                Trace(TraceEventType.Error, "#####################################################");
-                Trace(TraceEventType.Error, innerEx.ToString());
-                innerEx = innerEx.InnerException;
-            }
         }
 
         // Do not remove the non-format overload.

src/Runner.Listener/Agent.cs

@@ -37,7 +37,9 @@ namespace GitHub.Runner.Listener
         {
             try
             {
-                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, HostContext.WebProxy);
+                var runnerWebProxy = HostContext.GetService<IRunnerWebProxy>();
+                var runnerCertManager = HostContext.GetService<IRunnerCertificateManager>();
+                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, runnerWebProxy.WebProxy, runnerCertManager.VssClientCertificateManager);
 
                 _inConfigStage = true;
                 _completedCommand.Reset();
@@ -189,6 +191,25 @@ namespace GitHub.Runner.Listener
                         }
                     }
 
+#if !OS_WINDOWS
+                    // Fix the work folder setting on Linux
+                    if (settings.WorkFolder.Contains("vsts", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var workFolder = "/runner/work";
+                        var unix = HostContext.GetService<IUnixUtil>();
+
+                        // create new work folder /runner/work
+                        await unix.ExecAsync(HostContext.GetDirectory(WellKnownDirectory.Root), "sh", $"-c \"sudo mkdir -p {workFolder}\"");
+
+                        // fix permission
+                        await unix.ExecAsync(HostContext.GetDirectory(WellKnownDirectory.Root), "sh", $"-c \"sudo chown -R $USER {workFolder}\"");
+
+                        // update settings
+                        settings.WorkFolder = workFolder;
+                        store.SaveSettings(settings);
+                    }
+#endif
+
                     Trace.Info($"Set runner startup type - {startType}");
                     HostContext.StartupType = startType;
 
@@ -272,8 +293,14 @@ namespace GitHub.Runner.Listener
                 try
                 {
                     var notification = HostContext.GetService<IJobNotification>();
-
-                    notification.StartClient(settings.MonitorSocketAddress);
+                    if (!String.IsNullOrEmpty(settings.NotificationSocketAddress))
+                    {
+                        notification.StartClient(settings.NotificationSocketAddress, settings.MonitorSocketAddress);
+                    }
+                    else
+                    {
+                        notification.StartClient(settings.NotificationPipeName, settings.MonitorSocketAddress, HostContext.RunnerShutdownToken);
+                    }
 
                     bool autoUpdateInProgress = false;
                     Task<bool> selfUpdateTask = null;
@@ -433,7 +460,7 @@ namespace GitHub.Runner.Listener
             }
             catch (TaskAgentAccessTokenExpiredException)
             {
-                Trace.Info("Runner OAuth token has been revoked. Shutting down.");
+                Trace.Info("Agent OAuth token has been revoked. Shutting down.");
             }
 
             return Constants.Runner.ReturnCode.Success;

src/Runner.Listener/CommandSettings.cs

@@ -28,20 +28,34 @@ namespace GitHub.Runner.Listener
         private readonly string[] validFlags =
         {
             Constants.Runner.CommandLine.Flags.Commit,
+#if OS_WINDOWS
+            Constants.Runner.CommandLine.Flags.GitUseSChannel,
+#endif
             Constants.Runner.CommandLine.Flags.Help,
             Constants.Runner.CommandLine.Flags.Replace,
             Constants.Runner.CommandLine.Flags.RunAsService,
             Constants.Runner.CommandLine.Flags.Once,
+            Constants.Runner.CommandLine.Flags.SslSkipCertValidation,
             Constants.Runner.CommandLine.Flags.Unattended,
             Constants.Runner.CommandLine.Flags.Version
         };
 
         private readonly string[] validArgs =
         {
+            Constants.Runner.CommandLine.Args.Agent,
             Constants.Runner.CommandLine.Args.Auth,
             Constants.Runner.CommandLine.Args.MonitorSocketAddress,
-            Constants.Runner.CommandLine.Args.Name,
+            Constants.Runner.CommandLine.Args.NotificationPipeName,
+            Constants.Runner.CommandLine.Args.Password,
             Constants.Runner.CommandLine.Args.Pool,
+            Constants.Runner.CommandLine.Args.ProxyPassword,
+            Constants.Runner.CommandLine.Args.ProxyUrl,
+            Constants.Runner.CommandLine.Args.ProxyUserName,
+            Constants.Runner.CommandLine.Args.SslCACert,
+            Constants.Runner.CommandLine.Args.SslClientCert,
+            Constants.Runner.CommandLine.Args.SslClientCertKey,
+            Constants.Runner.CommandLine.Args.SslClientCertArchive,
+            Constants.Runner.CommandLine.Args.SslClientCertPassword,
             Constants.Runner.CommandLine.Args.StartupType,
             Constants.Runner.CommandLine.Args.Token,
             Constants.Runner.CommandLine.Args.Url,
@@ -63,6 +77,9 @@ namespace GitHub.Runner.Listener
         public bool Unattended => TestFlag(Constants.Runner.CommandLine.Flags.Unattended);
         public bool Version => TestFlag(Constants.Runner.CommandLine.Flags.Version);
 
+#if OS_WINDOWS
+        public bool GitUseSChannel => TestFlag(Constants.Runner.CommandLine.Flags.GitUseSChannel);
+#endif
         public bool RunOnce => TestFlag(Constants.Runner.CommandLine.Flags.Once);
 
         // Constructor.
@@ -147,9 +164,25 @@ namespace GitHub.Runner.Listener
                 defaultValue: false);
         }
 
+        public bool GetAutoLaunchBrowser()
+        {
+            return TestFlagOrPrompt(
+                name: Constants.Runner.CommandLine.Flags.LaunchBrowser,
+                description: "Would you like to launch your browser for AAD Device Code Flow? (Y/N)",
+                defaultValue: true);
+        }
         //
         // Args.
         //
+        public string GetAgentName()
+        {
+            return GetArgOrPrompt(
+                name: Constants.Runner.CommandLine.Args.Agent,
+                description: "Enter the name of runner:",
+                defaultValue: Environment.MachineName ?? "myagent",
+                validator: Validators.NonEmptyValidator);
+        }
+
         public string GetAuth(string defaultValue)
         {
             return GetArgOrPrompt(
@@ -159,12 +192,21 @@ namespace GitHub.Runner.Listener
                 validator: Validators.AuthSchemeValidator);
         }
 
-        public string GetRunnerName()
+        public string GetPassword()
         {
             return GetArgOrPrompt(
-                name: Constants.Runner.CommandLine.Args.Name,
-                description: "Enter the name of runner:",
-                defaultValue: Environment.MachineName ?? "myrunner",
+                name: Constants.Runner.CommandLine.Args.Password,
+                description: "What is your GitHub password?",
+                defaultValue: string.Empty,
+                validator: Validators.NonEmptyValidator);
+        }
+
+        public string GetPool()
+        {
+            return GetArgOrPrompt(
+                name: Constants.Runner.CommandLine.Args.Pool,
+                description: "Enter the name of your runner pool:",
+                defaultValue: "default",
                 validator: Validators.NonEmptyValidator);
         }
 
@@ -172,7 +214,7 @@ namespace GitHub.Runner.Listener
         {
             return GetArgOrPrompt(
                 name: Constants.Runner.CommandLine.Args.Token,
-                description: "What is your pool admin oauth access token?",
+                description: "Enter your personal access token:",
                 defaultValue: string.Empty,
                 validator: Validators.NonEmptyValidator);
         }
@@ -181,16 +223,7 @@ namespace GitHub.Runner.Listener
         {
             return GetArgOrPrompt(
                 name: Constants.Runner.CommandLine.Args.Token,
-                description: "What is your runner register token?",
-                defaultValue: string.Empty,
-                validator: Validators.NonEmptyValidator);
-        }
-
-        public string GetRunnerDeletionToken()
-        {
-            return GetArgOrPrompt(
-                name: Constants.Runner.CommandLine.Args.Token,
-                description: "Enter runner deletion token:",
+                description: "Enter runner register token:",
                 defaultValue: string.Empty,
                 validator: Validators.NonEmptyValidator);
         }
@@ -211,6 +244,15 @@ namespace GitHub.Runner.Listener
                 validator: Validators.ServerUrlValidator);
         }
 
+        public string GetUserName()
+        {
+            return GetArgOrPrompt(
+                name: Constants.Runner.CommandLine.Args.UserName,
+                description: "What is your GitHub username?",
+                defaultValue: string.Empty,
+                validator: Validators.NonEmptyValidator);
+        }
+
         public string GetWindowsLogonAccount(string defaultValue, string descriptionMsg)
         {
             return GetArgOrPrompt(
@@ -243,12 +285,67 @@ namespace GitHub.Runner.Listener
             return GetArg(Constants.Runner.CommandLine.Args.MonitorSocketAddress);
         }
 
+        public string GetNotificationPipeName()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.NotificationPipeName);
+        }
+
+        public string GetNotificationSocketAddress()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.NotificationSocketAddress);
+        }
+
         // This is used to find out the source from where the Runner.Listener.exe was launched at the time of run
         public string GetStartupType()
         {
             return GetArg(Constants.Runner.CommandLine.Args.StartupType);
         }
 
+        public string GetProxyUrl()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.ProxyUrl);
+        }
+
+        public string GetProxyUserName()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.ProxyUserName);
+        }
+
+        public string GetProxyPassword()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.ProxyPassword);
+        }
+
+        public bool GetSkipCertificateValidation()
+        {
+            return TestFlag(Constants.Runner.CommandLine.Flags.SslSkipCertValidation);
+        }
+
+        public string GetCACertificate()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.SslCACert);
+        }
+
+        public string GetClientCertificate()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.SslClientCert);
+        }
+
+        public string GetClientCertificatePrivateKey()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.SslClientCertKey);
+        }
+
+        public string GetClientCertificateArchrive()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.SslClientCertArchive);
+        }
+
+        public string GetClientCertificatePassword()
+        {
+            return GetArg(Constants.Runner.CommandLine.Args.SslClientCertPassword);
+        }
+
         //
         // Private helpers.
         //

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -79,12 +79,79 @@ namespace GitHub.Runner.Listener.Configuration
             _term.WriteLine("|                                                                              |", ConsoleColor.White);
             _term.WriteLine("--------------------------------------------------------------------------------", ConsoleColor.White);
 
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             Trace.Info(nameof(ConfigureAsync));
             if (IsConfigured())
             {
                 throw new InvalidOperationException("Cannot configure the runner because it is already configured. To reconfigure the runner, run 'config.cmd remove' or './config.sh remove' first.");
             }
 
+            // Populate proxy setting from commandline args
+            var runnerProxy = HostContext.GetService<IRunnerWebProxy>();
+            bool saveProxySetting = false;
+            string proxyUrl = command.GetProxyUrl();
+            if (!string.IsNullOrEmpty(proxyUrl))
+            {
+                if (!Uri.IsWellFormedUriString(proxyUrl, UriKind.Absolute))
+                {
+                    throw new ArgumentOutOfRangeException(nameof(proxyUrl));
+                }
+
+                Trace.Info("Reset proxy base on commandline args.");
+                string proxyUserName = command.GetProxyUserName();
+                string proxyPassword = command.GetProxyPassword();
+                (runnerProxy as RunnerWebProxy).SetupProxy(proxyUrl, proxyUserName, proxyPassword);
+                saveProxySetting = true;
+            }
+
+            // Populate cert setting from commandline args
+            var runnerCertManager = HostContext.GetService<IRunnerCertificateManager>();
+            bool saveCertSetting = false;
+            bool skipCertValidation = command.GetSkipCertificateValidation();
+            string caCert = command.GetCACertificate();
+            string clientCert = command.GetClientCertificate();
+            string clientCertKey = command.GetClientCertificatePrivateKey();
+            string clientCertArchive = command.GetClientCertificateArchrive();
+            string clientCertPassword = command.GetClientCertificatePassword();
+
+            // We require all Certificate files are under agent root.
+            // So we can set ACL correctly when configure as service
+            if (!string.IsNullOrEmpty(caCert))
+            {
+                caCert = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), caCert);
+                ArgUtil.File(caCert, nameof(caCert));
+            }
+
+            if (!string.IsNullOrEmpty(clientCert) &&
+                !string.IsNullOrEmpty(clientCertKey) &&
+                !string.IsNullOrEmpty(clientCertArchive))
+            {
+                // Ensure all client cert pieces are there.
+                clientCert = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), clientCert);
+                clientCertKey = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), clientCertKey);
+                clientCertArchive = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), clientCertArchive);
+
+                ArgUtil.File(clientCert, nameof(clientCert));
+                ArgUtil.File(clientCertKey, nameof(clientCertKey));
+                ArgUtil.File(clientCertArchive, nameof(clientCertArchive));
+            }
+            else if (!string.IsNullOrEmpty(clientCert) ||
+                     !string.IsNullOrEmpty(clientCertKey) ||
+                     !string.IsNullOrEmpty(clientCertArchive))
+            {
+                // Print out which args are missing.
+                ArgUtil.NotNullOrEmpty(Constants.Runner.CommandLine.Args.SslClientCert, Constants.Runner.CommandLine.Args.SslClientCert);
+                ArgUtil.NotNullOrEmpty(Constants.Runner.CommandLine.Args.SslClientCertKey, Constants.Runner.CommandLine.Args.SslClientCertKey);
+                ArgUtil.NotNullOrEmpty(Constants.Runner.CommandLine.Args.SslClientCertArchive, Constants.Runner.CommandLine.Args.SslClientCertArchive);
+            }
+
+            if (skipCertValidation || !string.IsNullOrEmpty(caCert) || !string.IsNullOrEmpty(clientCert))
+            {
+                Trace.Info("Reset runner cert setting base on commandline args.");
+                (runnerCertManager as RunnerCertificateManager).SetupCertificate(skipCertValidation, caCert, clientCert, clientCertKey, clientCertArchive, clientCertPassword);
+                saveCertSetting = true;
+            }
+
             RunnerSettings runnerSettings = new RunnerSettings();
 
             bool isHostedServer = false;
@@ -165,7 +232,7 @@ namespace GitHub.Runner.Listener.Configuration
             TaskAgent agent;
             while (true)
             {
-                runnerSettings.AgentName = command.GetRunnerName();
+                runnerSettings.AgentName = command.GetAgentName();
 
                 _term.WriteLine();
 
@@ -300,14 +367,46 @@ namespace GitHub.Runner.Listener.Configuration
             // We will Combine() what's stored with root.  Defaults to string a relative path
             runnerSettings.WorkFolder = command.GetWork();
 
+            // notificationPipeName for Hosted agent provisioner.
+            runnerSettings.NotificationPipeName = command.GetNotificationPipeName();
+
             runnerSettings.MonitorSocketAddress = command.GetMonitorSocketAddress();
 
+            runnerSettings.NotificationSocketAddress = command.GetNotificationSocketAddress();
+
             _store.SaveSettings(runnerSettings);
 
+            if (saveProxySetting)
+            {
+                Trace.Info("Save proxy setting to disk.");
+                (runnerProxy as RunnerWebProxy).SaveProxySetting();
+            }
+
+            if (saveCertSetting)
+            {
+                Trace.Info("Save agent cert setting to disk.");
+                (runnerCertManager as RunnerCertificateManager).SaveCertificateSetting();
+            }
+
             _term.WriteLine();
             _term.WriteSuccessMessage("Settings Saved.");
             _term.WriteLine();
 
+            bool saveRuntimeOptions = false;
+            var runtimeOptions = new RunnerRuntimeOptions();
+#if OS_WINDOWS
+            if (command.GitUseSChannel)
+            {
+                saveRuntimeOptions = true;
+                runtimeOptions.GitUseSecureChannel = true;
+            }
+#endif
+            if (saveRuntimeOptions)
+            {
+                Trace.Info("Save agent runtime options to disk.");
+                _store.SaveRunnerRuntimeOptions(runtimeOptions);
+            }
+
 #if OS_WINDOWS
             // config windows service
             bool runAsService = command.GetRunAsService();
@@ -327,6 +426,7 @@ namespace GitHub.Runner.Listener.Configuration
 
         public async Task UnconfigureAsync(CommandSettings command)
         {
+            ArgUtil.Equal(RunMode.Normal, HostContext.RunMode, nameof(HostContext.RunMode));
             string currentAction = string.Empty;
 
             _term.WriteSection("Runner removal");
@@ -372,7 +472,7 @@ namespace GitHub.Runner.Listener.Configuration
                     }
                     else
                     {
-                        var githubToken = command.GetRunnerDeletionToken();
+                        var githubToken = command.GetToken();
                         GitHubAuthResult authResult = await GetTenantCredential(settings.GitHubUrl, githubToken);
                         creds = authResult.ToVssCredentials();
                         Trace.Info("cred retrieved via GitHub auth");
@@ -420,6 +520,15 @@ namespace GitHub.Runner.Listener.Configuration
                 currentAction = "Removing .runner";
                 if (isConfigured)
                 {
+                    // delete proxy setting
+                    (HostContext.GetService<IRunnerWebProxy>() as RunnerWebProxy).DeleteProxySetting();
+
+                    // delete agent cert setting
+                    (HostContext.GetService<IRunnerCertificateManager>() as RunnerCertificateManager).DeleteCertificateSetting();
+
+                    // delete agent runtime option
+                    _store.DeleteRunnerRuntimeOptions();
+
                     _store.DeleteSettings();
                     _term.WriteSuccessMessage("Removed .runner");
                 }
@@ -442,7 +551,7 @@ namespace GitHub.Runner.Listener.Configuration
             Trace.Info(nameof(GetCredentialProvider));
 
             var credentialManager = HostContext.GetService<ICredentialManager>();
-            string authType = command.GetAuth(defaultValue: Constants.Configuration.OAuthAccessToken);
+            string authType = command.GetAuth(defaultValue: Constants.Configuration.AAD);
 
             // Create the credential.
             Trace.Info("Creating credential for auth: {0}", authType);
@@ -465,7 +574,7 @@ namespace GitHub.Runner.Listener.Configuration
                 PublicKey = new TaskAgentPublicKey(publicKey.Exponent, publicKey.Modulus),
             };
 
-            // update - update instead of delete so we don't lose labels etc...
+            // update - update instead of delete so we don't lose user capabilities etc...
             agent.Version = BuildConstants.RunnerPackage.Version;
             agent.OSDescription = RuntimeInformation.OSDescription;
 

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -20,6 +20,8 @@ namespace GitHub.Runner.Listener.Configuration
     {
         public static readonly Dictionary<string, Type> CredentialTypes = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase)
         {
+            { Constants.Configuration.AAD, typeof(AadDeviceCodeAccessToken)},
+            { Constants.Configuration.PAT, typeof(PersonalAccessToken)},
             { Constants.Configuration.OAuth, typeof(OAuthCredential)},
             { Constants.Configuration.OAuthAccessToken, typeof(OAuthAccessTokenCredential)},
         };
@@ -78,7 +80,7 @@ namespace GitHub.Runner.Listener.Configuration
 
             if (string.Equals(TokenSchema, "OAuthAccessToken", StringComparison.OrdinalIgnoreCase))
             {
-                return new VssCredentials(new VssOAuthAccessTokenCredential(Token), CredentialPromptType.DoNotPrompt);
+                return new VssCredentials(null, new VssOAuthAccessTokenCredential(Token), CredentialPromptType.DoNotPrompt);
             }
             else
             {

src/Runner.Listener/Configuration/CredentialProvider.cs

@@ -1,5 +1,13 @@
 using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using GitHub.Runner.Common.Util;
+using GitHub.Services.Client;
 using GitHub.Services.Common;
+using GitHub.Services.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using GitHub.Services.OAuth;
@@ -29,6 +37,125 @@ namespace GitHub.Runner.Listener.Configuration
         public abstract void EnsureCredential(IHostContext context, CommandSettings command, string serverUrl);
     }
 
+    public sealed class AadDeviceCodeAccessToken : CredentialProvider
+    {
+        private string _azureDevOpsClientId = "97877f11-0fc6-4aee-b1ff-febb0519dd00";
+
+        public override Boolean RequireInteractive => true;
+
+        public AadDeviceCodeAccessToken() : base(Constants.Configuration.AAD) { }
+
+        public override VssCredentials GetVssCredentials(IHostContext context)
+        {
+            ArgUtil.NotNull(context, nameof(context));
+            Tracing trace = context.GetTrace(nameof(AadDeviceCodeAccessToken));
+            trace.Info(nameof(GetVssCredentials));
+            ArgUtil.NotNull(CredentialData, nameof(CredentialData));
+
+            CredentialData.Data.TryGetValue(Constants.Runner.CommandLine.Args.Url, out string serverUrl);
+            ArgUtil.NotNullOrEmpty(serverUrl, nameof(serverUrl));
+
+            var tenantAuthorityUrl = GetTenantAuthorityUrl(context, serverUrl);
+            if (tenantAuthorityUrl == null)
+            {
+                throw new NotSupportedException($"'{serverUrl}' is not backed by Azure Active Directory.");
+            }
+
+            LoggerCallbackHandler.LogCallback = ((LogLevel level, string message, bool containsPii) =>
+            {
+                switch (level)
+                {
+                    case LogLevel.Information:
+                        trace.Info(message);
+                        break;
+                    case LogLevel.Error:
+                        trace.Error(message);
+                        break;
+                    case LogLevel.Warning:
+                        trace.Warning(message);
+                        break;
+                    default:
+                        trace.Verbose(message);
+                        break;
+                }
+            });
+
+            LoggerCallbackHandler.UseDefaultLogging = false;
+            AuthenticationContext ctx = new AuthenticationContext(tenantAuthorityUrl.AbsoluteUri);
+            var queryParameters = $"redirect_uri={Uri.EscapeDataString(new Uri(serverUrl).GetLeftPart(UriPartial.Authority))}";
+            DeviceCodeResult codeResult = ctx.AcquireDeviceCodeAsync("https://management.core.windows.net/", _azureDevOpsClientId, queryParameters).GetAwaiter().GetResult();
+
+            var term = context.GetService<ITerminal>();
+            term.WriteLine($"Please finish AAD device code flow in browser ({codeResult.VerificationUrl}), user code: {codeResult.UserCode}");
+            if (string.Equals(CredentialData.Data[Constants.Runner.CommandLine.Flags.LaunchBrowser], bool.TrueString, StringComparison.OrdinalIgnoreCase))
+            {
+                try
+                {
+#if OS_WINDOWS
+                    Process.Start(new ProcessStartInfo() { FileName = codeResult.VerificationUrl, UseShellExecute = true });
+#elif OS_LINUX
+                    Process.Start(new ProcessStartInfo() { FileName = "xdg-open", Arguments = codeResult.VerificationUrl });
+#else
+                    Process.Start(new ProcessStartInfo() { FileName = "open", Arguments = codeResult.VerificationUrl });
+#endif
+                }
+                catch (Exception ex)
+                {
+                    // not able to open browser, ex: xdg-open/open is not installed.
+                    trace.Error(ex);
+                    term.WriteLine($"Fail to open browser. {codeResult.Message}");
+                }
+            }
+
+            AuthenticationResult authResult = ctx.AcquireTokenByDeviceCodeAsync(codeResult).GetAwaiter().GetResult();
+            ArgUtil.NotNull(authResult, nameof(authResult));
+            trace.Info($"receive AAD auth result with {authResult.AccessTokenType} token");
+
+            var aadCred = new VssAadCredential(new VssAadToken(authResult));
+            VssCredentials creds = new VssCredentials(null, aadCred, CredentialPromptType.DoNotPrompt);
+            trace.Info("cred created");
+
+            return creds;
+        }
+
+        public override void EnsureCredential(IHostContext context, CommandSettings command, string serverUrl)
+        {
+            ArgUtil.NotNull(context, nameof(context));
+            Tracing trace = context.GetTrace(nameof(AadDeviceCodeAccessToken));
+            trace.Info(nameof(EnsureCredential));
+            ArgUtil.NotNull(command, nameof(command));
+            CredentialData.Data[Constants.Runner.CommandLine.Args.Url] = serverUrl;
+            CredentialData.Data[Constants.Runner.CommandLine.Flags.LaunchBrowser] = command.GetAutoLaunchBrowser().ToString();
+        }
+
+        private Uri GetTenantAuthorityUrl(IHostContext context, string serverUrl)
+        {
+            using (var client = new HttpClient(context.CreateHttpClientHandler()))
+            {
+                client.DefaultRequestHeaders.Accept.Clear();
+                client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                client.DefaultRequestHeaders.Add("X-TFS-FedAuthRedirect", "Suppress");
+                client.DefaultRequestHeaders.UserAgent.Clear();
+                client.DefaultRequestHeaders.UserAgent.AddRange(VssClientHttpRequestSettings.Default.UserAgent);
+                var requestMessage = new HttpRequestMessage(HttpMethod.Head, $"{serverUrl.Trim('/')}/_apis/connectiondata");
+                var response = client.SendAsync(requestMessage).GetAwaiter().GetResult();
+
+                // Get the tenant from the Login URL, MSA backed accounts will not return `Bearer` www-authenticate header.
+                var bearerResult = response.Headers.WwwAuthenticate.Where(p => p.Scheme.Equals("Bearer", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+                if (bearerResult != null && bearerResult.Parameter.StartsWith("authorization_uri=", StringComparison.OrdinalIgnoreCase))
+                {
+                    var authorizationUri = bearerResult.Parameter.Substring("authorization_uri=".Length);
+                    if (Uri.TryCreate(authorizationUri, UriKind.Absolute, out Uri aadTenantUrl))
+                    {
+                        return aadTenantUrl;
+                    }
+                }
+
+                return null;
+            }
+        }
+    }
+
     public sealed class OAuthAccessTokenCredential : CredentialProvider
     {
         public OAuthAccessTokenCredential() : base(Constants.Configuration.OAuthAccessToken) { }
@@ -48,7 +175,7 @@ namespace GitHub.Runner.Listener.Configuration
             ArgUtil.NotNullOrEmpty(token, nameof(token));
 
             trace.Info("token retrieved: {0} chars", token.Length);
-            VssCredentials creds = new VssCredentials(new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
+            VssCredentials creds = new VssCredentials(null, new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
             trace.Info("cred created");
 
             return creds;
@@ -63,4 +190,42 @@ namespace GitHub.Runner.Listener.Configuration
             CredentialData.Data[Constants.Runner.CommandLine.Args.Token] = command.GetToken();
         }
     }
+
+    public sealed class PersonalAccessToken : CredentialProvider
+    {
+        public PersonalAccessToken() : base(Constants.Configuration.PAT) { }
+
+        public override VssCredentials GetVssCredentials(IHostContext context)
+        {
+            ArgUtil.NotNull(context, nameof(context));
+            Tracing trace = context.GetTrace(nameof(PersonalAccessToken));
+            trace.Info(nameof(GetVssCredentials));
+            ArgUtil.NotNull(CredentialData, nameof(CredentialData));
+            string token;
+            if (!CredentialData.Data.TryGetValue(Constants.Runner.CommandLine.Args.Token, out token))
+            {
+                token = null;
+            }
+
+            ArgUtil.NotNullOrEmpty(token, nameof(token));
+
+            trace.Info("token retrieved: {0} chars", token.Length);
+
+            // PAT uses a basic credential
+            VssBasicCredential basicCred = new VssBasicCredential("ActionsRunner", token);
+            VssCredentials creds = new VssCredentials(null, basicCred, CredentialPromptType.DoNotPrompt);
+            trace.Info("cred created");
+
+            return creds;
+        }
+
+        public override void EnsureCredential(IHostContext context, CommandSettings command, string serverUrl)
+        {
+            ArgUtil.NotNull(context, nameof(context));
+            Tracing trace = context.GetTrace(nameof(PersonalAccessToken));
+            trace.Info(nameof(EnsureCredential));
+            ArgUtil.NotNull(command, nameof(command));
+            CredentialData.Data[Constants.Runner.CommandLine.Args.Token] = command.GetToken();
+        }
+    }
 }

src/Runner.Listener/Configuration/IRSAKeyManager.cs

@@ -6,7 +6,7 @@ using GitHub.Runner.Common;
 namespace GitHub.Runner.Listener.Configuration
 {
     /// <summary>
-    /// Manages an RSA key for the runner using the most appropriate store for the target platform.
+    /// Manages an RSA key for the agent using the most appropriate store for the target platform.
     /// </summary>
 #if OS_WINDOWS
     [ServiceLocator(Default = typeof(RSAEncryptedFileKeyManager))]
@@ -16,10 +16,10 @@ namespace GitHub.Runner.Listener.Configuration
     public interface IRSAKeyManager : IRunnerService
     {
         /// <summary>
-        /// Creates a new <c>RSACryptoServiceProvider</c> instance for the current runner. If a key file is found then the current
+        /// Creates a new <c>RSACryptoServiceProvider</c> instance for the current agent. If a key file is found then the current
         /// key is returned to the caller.
         /// </summary>
-        /// <returns>An <c>RSACryptoServiceProvider</c> instance representing the key for the runner</returns>
+        /// <returns>An <c>RSACryptoServiceProvider</c> instance representing the key for the agent</returns>
         RSACryptoServiceProvider CreateKey();
 
         /// <summary>
@@ -30,7 +30,7 @@ namespace GitHub.Runner.Listener.Configuration
         /// <summary>
         /// Gets the <c>RSACryptoServiceProvider</c> instance currently stored by the key manager. 
         /// </summary>
-        /// <returns>An <c>RSACryptoServiceProvider</c> instance representing the key for the runner</returns>
+        /// <returns>An <c>RSACryptoServiceProvider</c> instance representing the key for the agent</returns>
         /// <exception cref="CryptographicException">No key exists in the store</exception>
         RSACryptoServiceProvider GetKey();
     }

src/Runner.Listener/Configuration/NativeWindowsServiceHelper.cs

@@ -447,7 +447,7 @@ namespace GitHub.Runner.Listener.Configuration
         {
             Trace.Entering();
 
-            string runnerServiceExecutable = "\"" + Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Bin), WindowsServiceControlManager.WindowsServiceControllerName) + "\"";
+            string agentServiceExecutable = "\"" + Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Bin), WindowsServiceControlManager.WindowsServiceControllerName) + "\"";
             IntPtr scmHndl = IntPtr.Zero;
             IntPtr svcHndl = IntPtr.Zero;
             IntPtr tmpBuf = IntPtr.Zero;
@@ -468,7 +468,7 @@ namespace GitHub.Runner.Listener.Configuration
                     };
 
                     processInvoker.ExecuteAsync(workingDirectory: string.Empty,
-                                                fileName: runnerServiceExecutable,
+                                                fileName: agentServiceExecutable,
                                                 arguments: "init",
                                                 environment: null,
                                                 requireExitCodeZero: true,
@@ -490,7 +490,7 @@ namespace GitHub.Runner.Listener.Configuration
                                         SERVICE_WIN32_OWN_PROCESS,
                                         ServiceBootFlag.AutoStart,
                                         ServiceError.Normal,
-                                        runnerServiceExecutable,
+                                        agentServiceExecutable,
                                         null,
                                         IntPtr.Zero,
                                         null,
@@ -678,17 +678,6 @@ namespace GitHub.Runner.Listener.Configuration
                 if (service != null)
                 {
                     service.Start();
-
-                    try
-                    {
-                        _term.WriteLine("Waiting for service to start...");
-                        service.WaitForStatus(ServiceControllerStatus.Running, TimeSpan.FromSeconds(60));
-                    }
-                    catch (System.ServiceProcess.TimeoutException)
-                    {
-                        throw new InvalidOperationException($"Cannot start the service {serviceName} in a timely fashion.");
-                    }
-
                     _term.WriteLine($"Service {serviceName} started successfully");
                 }
                 else

src/Runner.Listener/Configuration/OAuthCredential.cs

@@ -43,7 +43,7 @@ namespace GitHub.Runner.Listener.Configuration
 
             // Construct a credentials cache with a single OAuth credential for communication. The windows credential
             // is explicitly set to null to ensure we never do that negotiation.
-            return new VssCredentials(agentCredential, CredentialPromptType.DoNotPrompt);
+            return new VssCredentials(null, agentCredential, CredentialPromptType.DoNotPrompt);
         }
     }
 }

src/Runner.Listener/Configuration/OsxServiceControlManager.cs

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

src/Runner.Listener/Configuration/ServiceControlManager.cs

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

src/Runner.Listener/Configuration/SystemdControlManager.cs

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

src/Runner.Listener/Configuration/Validators.cs

@@ -38,6 +38,25 @@ namespace GitHub.Runner.Listener.Configuration
             return CredentialManager.CredentialTypes.ContainsKey(value);
         }
 
+        public static bool FilePathValidator(string value)
+        {
+            var directoryInfo = new DirectoryInfo(value);
+
+            if (!directoryInfo.Exists)
+            {
+                try
+                {
+                    Directory.CreateDirectory(value);
+                }
+                catch (Exception)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         public static bool BoolValidator(string value)
         {
             return string.Equals(value, "true", StringComparison.OrdinalIgnoreCase) ||

src/Runner.Listener/Configuration/WindowsServiceControlManager.cs

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

src/Runner.Listener/JobDispatcher.cs

@@ -22,6 +22,7 @@ namespace GitHub.Runner.Listener
         void Run(Pipelines.AgentJobRequestMessage message, bool runOnce = false);
         bool Cancel(JobCancelMessage message);
         Task WaitAsync(CancellationToken token);
+        TaskResult GetLocalRunJobResult(AgentJobRequestMessage message);
         Task ShutdownAsync();
     }
 
@@ -164,6 +165,11 @@ namespace GitHub.Runner.Listener
             }
         }
 
+        public TaskResult GetLocalRunJobResult(AgentJobRequestMessage message)
+        {
+            return _localRunJobResult.Value[message.RequestId];
+        }
+
         public async Task ShutdownAsync()
         {
             Trace.Info($"Shutting down JobDispatcher. Make sure all WorkerDispatcher has finished.");
@@ -367,29 +373,37 @@ namespace GitHub.Runner.Listener
                             ArgUtil.NotNullOrEmpty(pipeHandleOut, nameof(pipeHandleOut));
                             ArgUtil.NotNullOrEmpty(pipeHandleIn, nameof(pipeHandleIn));
 
-                            // Save STDOUT from worker, worker will use STDOUT report unhandle exception.
-                            processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
+                            if (HostContext.RunMode == RunMode.Normal)
                             {
-                                if (!string.IsNullOrEmpty(stdout.Data))
+                                // Save STDOUT from worker, worker will use STDOUT report unhandle exception.
+                                processInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
                                 {
-                                    lock (_outputLock)
+                                    if (!string.IsNullOrEmpty(stdout.Data))
                                     {
-                                        workerOutput.Add(stdout.Data);
+                                        lock (_outputLock)
+                                        {
+                                            workerOutput.Add(stdout.Data);
+                                        }
                                     }
-                                }
-                            };
+                                };
 
-                            // Save STDERR from worker, worker will use STDERR on crash.
-                            processInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
-                            {
-                                if (!string.IsNullOrEmpty(stderr.Data))
+                                // Save STDERR from worker, worker will use STDERR on crash.
+                                processInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
                                 {
-                                    lock (_outputLock)
+                                    if (!string.IsNullOrEmpty(stderr.Data))
                                     {
-                                        workerOutput.Add(stderr.Data);
+                                        lock (_outputLock)
+                                        {
+                                            workerOutput.Add(stderr.Data);
+                                        }
                                     }
-                                }
-                            };
+                                };
+                            }
+                            else if (HostContext.RunMode == RunMode.Local)
+                            {
+                                processInvoker.OutputDataReceived += (object sender, ProcessDataReceivedEventArgs e) => Console.WriteLine(e.Data);
+                                processInvoker.ErrorDataReceived += (object sender, ProcessDataReceivedEventArgs e) => Console.WriteLine(e.Data);
+                            }
 
                             // Start the child process.
                             HostContext.WritePerfCounter("StartingWorkerProcess");
@@ -454,7 +468,7 @@ namespace GitHub.Runner.Listener
                     // send notification to machine provisioner.
                     var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
                     var accessToken = systemConnection?.Authorization?.Parameters["AccessToken"];
-                    notification.JobStarted(message.JobId, accessToken, systemConnection.Url);
+                    await notification.JobStarted(message.JobId, accessToken, systemConnection.Url);
 
                     HostContext.WritePerfCounter($"SentJobToWorker_{requestId.ToString()}");
 
@@ -716,6 +730,11 @@ namespace GitHub.Runner.Listener
         private async Task CompleteJobRequestAsync(int poolId, Pipelines.AgentJobRequestMessage message, Guid lockToken, TaskResult result, string detailInfo = null)
         {
             Trace.Entering();
+            if (HostContext.RunMode == RunMode.Local)
+            {
+                _localRunJobResult.Value[message.RequestId] = result;
+                return;
+            }
 
             if (PlanUtil.GetFeatures(message.Plan).HasFlag(PlanFeatures.JobCompletedPlanEvent))
             {
@@ -768,41 +787,38 @@ namespace GitHub.Runner.Listener
 
                 var jobServer = HostContext.GetService<IJobServer>();
                 VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
-                VssConnection jobConnection = VssUtil.CreateConnection(systemConnection.Url, jobServerCredential);
+                Uri jobServerUrl = systemConnection.Url;
 
-                /* Below is the legacy 'OnPremises' code that is currently unused by the runner
-                   ToDo: re-implement code as appropriate once GHES support is added.
-                // Make sure SystemConnection Url match Config Url base for OnPremises server	
-                if (!message.Variables.ContainsKey(Constants.Variables.System.ServerType) ||	
-                    string.Equals(message.Variables[Constants.Variables.System.ServerType]?.Value, "OnPremises", StringComparison.OrdinalIgnoreCase))	
-                {	
-                    try	
-                    {	
-                        Uri result = null;	
-                        Uri configUri = new Uri(_runnerSetting.ServerUrl);	
-                        if (Uri.TryCreate(new Uri(configUri.GetComponents(UriComponents.SchemeAndServer, UriFormat.Unescaped)), jobServerUrl.PathAndQuery, out result))	
-                        {	
-                            //replace the schema and host portion of messageUri with the host from the	
-                            //server URI (which was set at config time)	
-                            jobServerUrl = result;	
-                        }	
-                    }	
-                    catch (InvalidOperationException ex)	
-                    {	
-                        //cannot parse the Uri - not a fatal error	
-                        Trace.Error(ex);	
-                    }	
-                    catch (UriFormatException ex)	
-                    {	
-                        //cannot parse the Uri - not a fatal error	
-                        Trace.Error(ex);	
-                    }	
-                } */
+                // Make sure SystemConnection Url match Config Url base for OnPremises server
+                if (!message.Variables.ContainsKey(Constants.Variables.System.ServerType) ||
+                    string.Equals(message.Variables[Constants.Variables.System.ServerType]?.Value, "OnPremises", StringComparison.OrdinalIgnoreCase))
+                {
+                    try
+                    {
+                        Uri result = null;
+                        Uri configUri = new Uri(_runnerSetting.ServerUrl);
+                        if (Uri.TryCreate(new Uri(configUri.GetComponents(UriComponents.SchemeAndServer, UriFormat.Unescaped)), jobServerUrl.PathAndQuery, out result))
+                        {
+                            //replace the schema and host portion of messageUri with the host from the
+                            //server URI (which was set at config time)
+                            jobServerUrl = result;
+                        }
+                    }
+                    catch (InvalidOperationException ex)
+                    {
+                        //cannot parse the Uri - not a fatal error
+                        Trace.Error(ex);
+                    }
+                    catch (UriFormatException ex)
+                    {
+                        //cannot parse the Uri - not a fatal error
+                        Trace.Error(ex);
+                    }
+                }
 
+                VssConnection jobConnection = VssUtil.CreateConnection(jobServerUrl, jobServerCredential);
                 await jobServer.ConnectAsync(jobConnection);
-
                 var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
-
                 ArgUtil.NotNull(timeline, nameof(timeline));
                 TimelineRecord jobRecord = timeline.Records.FirstOrDefault(x => x.Id == message.JobId && x.RecordType == "Job");
                 ArgUtil.NotNull(jobRecord, nameof(jobRecord));

src/Runner.Listener/MessageListener.cs

@@ -80,7 +80,7 @@ namespace GitHub.Runner.Listener
                 Trace.Info($"Attempt to create session.");
                 try
                 {
-                    Trace.Info("Connecting to the Runner Server...");
+                    Trace.Info("Connecting to the Agent Server...");
                     await _runnerServer.ConnectAsync(new Uri(serverUrl), creds);
                     Trace.Info("VssConnection created");
                     
@@ -110,7 +110,7 @@ namespace GitHub.Runner.Listener
                 }
                 catch (TaskAgentAccessTokenExpiredException)
                 {
-                    Trace.Info("Runner OAuth token has been revoked. Session creation failed.");
+                    Trace.Info("Agent OAuth token has been revoked. Session creation failed.");
                     throw;
                 }
                 catch (Exception ex)
@@ -190,7 +190,7 @@ namespace GitHub.Runner.Listener
                 }
                 catch (TaskAgentAccessTokenExpiredException)
                 {
-                    Trace.Info("Runner OAuth token has been revoked. Unable to pull message.");
+                    Trace.Info("Agent OAuth token has been revoked. Unable to pull message.");
                     throw;
                 }
                 catch (Exception ex)
@@ -336,7 +336,7 @@ namespace GitHub.Runner.Listener
         {
             if (ex is TaskAgentNotFoundException)
             {
-                Trace.Info("The runner no longer exists on the server. Stopping the runner.");
+                Trace.Info("The agent no longer exists on the server. Stopping the runner.");
                 _term.WriteError("The runner no longer exists on the server. Please reconfigure the runner.");
                 return false;
             }
@@ -364,7 +364,7 @@ namespace GitHub.Runner.Listener
             }
             else if (ex is VssOAuthTokenRequestException && ex.Message.Contains("Current server time is"))
             {
-                Trace.Info("Local clock might be skewed.");
+                Trace.Info("Local clock might skewed.");
                 _term.WriteError("The local machine's clock may be out of sync with the server time by more than five minutes. Please sync your clock with your domain or internet time and try again.");
                 if (_sessionCreationExceptionTracker.ContainsKey(nameof(VssOAuthTokenRequestException)))
                 {

src/Runner.Listener/Program.cs

@@ -4,7 +4,6 @@ using GitHub.Runner.Sdk;
 using System;
 using System.Globalization;
 using System.IO;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,9 +14,6 @@ namespace GitHub.Runner.Listener
     {
         public static int Main(string[] args)
         {
-            // Add environment variables from .env file
-            LoadAndSetEnv();
-
             using (HostContext context = new HostContext("Runner"))
             {
                 return MainAsync(context, args).GetAwaiter().GetResult();
@@ -29,7 +25,7 @@ namespace GitHub.Runner.Listener
         // 1: Terminate failure
         // 2: Retriable failure
         // 3: Exit for self update
-        private async static Task<int> MainAsync(IHostContext context, string[] args)
+        public async static Task<int> MainAsync(IHostContext context, string[] args)
         {
             Tracing trace = context.GetTrace(nameof(GitHub.Runner.Listener));
             trace.Info($"Runner is built for {Constants.Runner.Platform} ({Constants.Runner.PlatformArchitecture}) - {BuildConstants.RunnerPackage.PackageName}.");
@@ -87,6 +83,22 @@ namespace GitHub.Runner.Listener
                     return Constants.Runner.ReturnCode.TerminatedError;
                 }
 
+                // Add environment variables from .env file
+                string envFile = Path.Combine(context.GetDirectory(WellKnownDirectory.Root), ".env");
+                if (File.Exists(envFile))
+                {
+                    var envContents = File.ReadAllLines(envFile);
+                    foreach (var env in envContents)
+                    {
+                        if (!string.IsNullOrEmpty(env) && env.IndexOf('=') > 0)
+                        {
+                            string envKey = env.Substring(0, env.IndexOf('='));
+                            string envValue = env.Substring(env.IndexOf('=') + 1);
+                            Environment.SetEnvironmentVariable(envKey, envValue);
+                        }
+                    }
+                }
+
                 // Parse the command line args.
                 var command = new CommandSettings(context, args);
                 trace.Info("Arguments parsed");
@@ -124,34 +136,5 @@ namespace GitHub.Runner.Listener
                 return Constants.Runner.ReturnCode.RetryableError;
             }
         }
-
-        private static void LoadAndSetEnv()
-        {
-            var binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            var rootDir = new DirectoryInfo(binDir).Parent.FullName;
-            string envFile = Path.Combine(rootDir, ".env");
-            if (File.Exists(envFile))
-            {
-                var envContents = File.ReadAllLines(envFile);
-                foreach (var env in envContents)
-                {
-                    if (!string.IsNullOrEmpty(env))
-                    {
-                        var separatorIndex = env.IndexOf('=');
-                        if (separatorIndex > 0)
-                        {
-                            string envKey = env.Substring(0, separatorIndex);
-                            string envValue = null;
-                            if (env.Length > separatorIndex + 1)
-                            {
-                                envValue = env.Substring(separatorIndex + 1);
-                            }
-
-                            Environment.SetEnvironmentVariable(envKey, envValue);
-                        }
-                    }
-                }
-            }
-        }
     }
 }

src/Runner.Listener/Runner.Listener.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
@@ -24,6 +24,7 @@
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.4" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.PluginHost/Runner.PluginHost.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>

src/Runner.Plugins/Artifact/BuildServer.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.Runner.Sdk;
+using GitHub.Services.WebApi;
+using GitHub.Build.WebApi;
+
+namespace GitHub.Runner.Plugins.Artifact
+{
+    // A client wrapper interacting with Build's Artifact API
+    public class BuildServer
+    {
+        private readonly BuildHttpClient _buildHttpClient;
+
+        public BuildServer(VssConnection connection)
+        {
+            ArgUtil.NotNull(connection, nameof(connection));
+            _buildHttpClient = connection.GetClient<BuildHttpClient>();
+        }
+
+        // Associate the specified artifact with a build, along with custom data.
+        public async Task<BuildArtifact> AssociateArtifact(
+            Guid projectId,
+            int pipelineId,
+            string jobId,
+            string name,
+            string type,
+            string data,
+            Dictionary<string, string> propertiesDictionary,
+            CancellationToken cancellationToken = default(CancellationToken))
+        {
+            BuildArtifact artifact = new BuildArtifact()
+            {
+                Name = name,
+                Source = jobId,
+                Resource = new ArtifactResource()
+                {
+                    Data = data,
+                    Type = type,
+                    Properties = propertiesDictionary
+                }
+            };
+
+            return await _buildHttpClient.CreateArtifactAsync(artifact, projectId, pipelineId, cancellationToken: cancellationToken);
+        }
+
+        // Get named artifact from a build
+        public async Task<BuildArtifact> GetArtifact(
+            Guid projectId,
+            int pipelineId,
+            string name,
+            CancellationToken cancellationToken)
+        {
+            return await _buildHttpClient.GetArtifactAsync(projectId, pipelineId, name, cancellationToken: cancellationToken);
+        }
+    }
+}

src/Runner.Plugins/Artifact/DownloadArtifact.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using GitHub.Build.WebApi;
 using GitHub.Services.Common;
 using GitHub.Runner.Sdk;
 
@@ -39,32 +40,38 @@ namespace GitHub.Runner.Plugins.Artifact
 
             targetPath = Path.IsPathFullyQualified(targetPath) ? targetPath : Path.GetFullPath(Path.Combine(defaultWorkingDirectory, targetPath));
 
+            // Project ID
+            Guid projectId = new Guid(context.Variables.GetValueOrDefault(BuildVariables.TeamProjectId)?.Value ?? Guid.Empty.ToString());
+
             // Build ID
-            string buildIdStr = context.Variables.GetValueOrDefault(SdkConstants.Variables.Build.BuildId)?.Value ?? string.Empty;
+            string buildIdStr = context.Variables.GetValueOrDefault(BuildVariables.BuildId)?.Value ?? string.Empty;
             if (!int.TryParse(buildIdStr, out int buildId))
             {
                 throw new ArgumentException($"Run Id is not an Int32: {buildIdStr}");
             }
 
-            context.Output($"Downloading artifact '{artifactName}' to: '{targetPath}'");
+            context.Output($"Download artifact '{artifactName}' to: '{targetPath}'");
 
-            // Definition ID is a dummy value only used by HTTP client routing purposes
-            int definitionId = 1;
+            BuildServer buildHelper = new BuildServer(context.VssConnection);
+            BuildArtifact buildArtifact = await buildHelper.GetArtifact(projectId, buildId, artifactName, token);
 
-            var pipelinesHelper = new PipelinesServer(context.VssConnection);
-
-            var actionsStorageArtifact = await pipelinesHelper.GetActionsStorageArtifact(definitionId, buildId, artifactName, token);
-
-            if (actionsStorageArtifact == null)
+            if (string.Equals(buildArtifact.Resource.Type, "Container", StringComparison.OrdinalIgnoreCase))
             {
-                throw new Exception($"The actions storage artifact for '{artifactName}' could not be found, or is no longer available");
+                string containerUrl = buildArtifact.Resource.Data;
+                string[] parts = containerUrl.Split(new[] { '/' }, 3);
+                if (parts.Length < 3 || !long.TryParse(parts[1], out long containerId))
+                {
+                    throw new ArgumentOutOfRangeException($"Invalid container url '{containerUrl}' for artifact '{buildArtifact.Name}'");
+                }
+
+                string containerPath = parts[2];
+                FileContainerServer fileContainerServer = new FileContainerServer(context.VssConnection, projectId, containerId, containerPath);
+                await fileContainerServer.DownloadFromContainerAsync(context, targetPath, token);
+            }
+            else
+            {
+                throw new NotSupportedException($"Invalid artifact type: {buildArtifact.Resource.Type}");
             }
-
-            string containerPath = actionsStorageArtifact.Name; // In actions storage artifacts, name equals the path
-            long containerId = actionsStorageArtifact.ContainerId;
-
-            FileContainerServer fileContainerServer = new FileContainerServer(context.VssConnection, projectId: new Guid(), containerId, containerPath);
-            await fileContainerServer.DownloadFromContainerAsync(context, targetPath, token);
 
             context.Output("Artifact download finished.");
         }

src/Runner.Plugins/Artifact/PipelinesServer.cs

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

src/Runner.Plugins/Artifact/PublishArtifact.cs

@@ -4,7 +4,9 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using GitHub.Build.WebApi;
 using GitHub.Services.Common;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 
 namespace GitHub.Runner.Plugins.Artifact
@@ -43,8 +45,11 @@ namespace GitHub.Runner.Plugins.Artifact
                 throw new ArgumentException($"Artifact name is not valid: {artifactName}. It cannot contain '\\', '/', \"', ':', '<', '>', '|', '*', and '?'");
             }
 
+            // Project ID
+            Guid projectId = new Guid(context.Variables.GetValueOrDefault(BuildVariables.TeamProjectId)?.Value ?? Guid.Empty.ToString());
+
             // Build ID
-            string buildIdStr = context.Variables.GetValueOrDefault(SdkConstants.Variables.Build.BuildId)?.Value ?? string.Empty;
+            string buildIdStr = context.Variables.GetValueOrDefault(BuildVariables.BuildId)?.Value ?? string.Empty;
             if (!int.TryParse(buildIdStr, out int buildId))
             {
                 throw new ArgumentException($"Run Id is not an Int32: {buildIdStr}");
@@ -60,44 +65,30 @@ namespace GitHub.Runner.Plugins.Artifact
             }
 
             // Container ID
-            string containerIdStr = context.Variables.GetValueOrDefault(SdkConstants.Variables.Build.ContainerId)?.Value ?? string.Empty;
+            string containerIdStr = context.Variables.GetValueOrDefault(BuildVariables.ContainerId)?.Value ?? string.Empty;
             if (!long.TryParse(containerIdStr, out long containerId))
             {
-                throw new ArgumentException($"Container Id is not an Int64: {containerIdStr}");
+                throw new ArgumentException($"Container Id is not a Int64: {containerIdStr}");
             }
 
             context.Output($"Uploading artifact '{artifactName}' from '{fullPath}' for run #{buildId}");
 
-            FileContainerServer fileContainerHelper = new FileContainerServer(context.VssConnection, projectId: Guid.Empty, containerId, artifactName);
+            FileContainerServer fileContainerHelper = new FileContainerServer(context.VssConnection, projectId, containerId, artifactName);
             var propertiesDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            long size = 0;
-
             try
             {
-                size = await fileContainerHelper.CopyToContainerAsync(context, fullPath, token);
-
+                long size = await fileContainerHelper.CopyToContainerAsync(context, fullPath, token);
                 propertiesDictionary.Add("artifactsize", size.ToString());
-
                 context.Output($"Uploaded '{size}' bytes from '{fullPath}' to server");
             }
             // if any of the results were successful, make sure to attach them to the build
             finally
             {
-                // Definition ID is a dummy value only used by HTTP client routing purposes
-                int definitionId = 1;
-
-                PipelinesServer pipelinesHelper = new PipelinesServer(context.VssConnection);
-
-                var artifact = await pipelinesHelper.AssociateActionsStorageArtifactAsync(
-                    definitionId,
-                    buildId,
-                    containerId,
-                    artifactName,
-                    size,
-                    token);
-
-                context.Output($"Associated artifact {artifactName} ({artifact.ContainerId}) with run #{buildId}"); 
+                string fileContainerFullPath = StringUtil.Format($"#/{containerId}/{artifactName}");
+                BuildServer buildHelper = new BuildServer(context.VssConnection);
+                string jobId = context.Variables.GetValueOrDefault(WellKnownDistributedTaskVariables.JobId).Value ?? string.Empty;
+                var artifact = await buildHelper.AssociateArtifact(projectId, buildId, jobId, artifactName, ArtifactResourceTypes.Container, fileContainerFullPath, propertiesDictionary, token);
+                context.Output($"Associated artifact {artifactName} ({artifact.Id}) with run #{buildId}");
             }
         }
     }

src/Runner.Plugins/Repository/v1.0/GitSourceProvider.cs

@@ -79,6 +79,13 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
         {
             // Validate args.
             ArgUtil.NotNull(executionContext, nameof(executionContext));
+            Uri proxyUrlWithCred = null;
+            string proxyUrlWithCredString = null;
+            bool useSelfSignedCACert = false;
+            bool useClientCert = false;
+            string clientCertPrivateKeyAskPassFile = null;
+            bool acceptUntrustedCerts = false;
+
             executionContext.Output($"Syncing repository: {repoFullName}");
             Uri repositoryUrl = new Uri($"https://github.com/{repoFullName}");
             if (!repositoryUrl.IsAbsoluteUri)
@@ -107,6 +114,9 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                 }
             }
 
+            var runnerCert = executionContext.GetCertConfiguration();
+            acceptUntrustedCerts = runnerCert?.SkipServerCertificateValidation ?? false;
+
             executionContext.Debug($"repository url={repositoryUrl}");
             executionContext.Debug($"targetPath={targetPath}");
             executionContext.Debug($"sourceBranch={sourceBranch}");
@@ -116,6 +126,12 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
             executionContext.Debug($"checkoutNestedSubmodules={checkoutNestedSubmodules}");
             executionContext.Debug($"fetchDepth={fetchDepth}");
             executionContext.Debug($"gitLfsSupport={gitLfsSupport}");
+            executionContext.Debug($"acceptUntrustedCerts={acceptUntrustedCerts}");
+
+#if OS_WINDOWS
+            bool schannelSslBackend = StringUtil.ConvertToBoolean(executionContext.GetRunnerContext("gituseschannel"));
+            executionContext.Debug($"schannelSslBackend={schannelSslBackend}");
+#endif            
 
             // Initialize git command manager with additional environment variables.
             Dictionary<string, string> gitEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
@@ -148,8 +164,75 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
             // 3. git version greater than 2.14.2 if use SChannel for SSL backend (Windows only)
             RequirementCheck(executionContext, gitCommandManager, gitLfsSupport);
 
+            // prepare credentail embedded urls
+            var runnerProxy = executionContext.GetProxyConfiguration();
+            if (runnerProxy != null && !string.IsNullOrEmpty(runnerProxy.ProxyAddress) && !runnerProxy.WebProxy.IsBypassed(repositoryUrl))
+            {
+                proxyUrlWithCred = UrlUtil.GetCredentialEmbeddedUrl(new Uri(runnerProxy.ProxyAddress), runnerProxy.ProxyUsername, runnerProxy.ProxyPassword);
+
+                // uri.absoluteuri will not contains port info if the scheme is http/https and the port is 80/443
+                // however, git.exe always require you provide port info, if nothing passed in, it will use 1080 as default
+                // as result, we need prefer the uri.originalstring when it's different than uri.absoluteuri.
+                if (string.Equals(proxyUrlWithCred.AbsoluteUri, proxyUrlWithCred.OriginalString, StringComparison.OrdinalIgnoreCase))
+                {
+                    proxyUrlWithCredString = proxyUrlWithCred.AbsoluteUri;
+                }
+                else
+                {
+                    proxyUrlWithCredString = proxyUrlWithCred.OriginalString;
+                }
+            }
+
             // prepare askpass for client cert private key, if the repository's endpoint url match the runner config url
             var systemConnection = executionContext.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
+            if (runnerCert != null && Uri.Compare(repositoryUrl, systemConnection.Url, UriComponents.SchemeAndServer, UriFormat.Unescaped, StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                if (!string.IsNullOrEmpty(runnerCert.CACertificateFile))
+                {
+                    useSelfSignedCACert = true;
+                }
+
+                if (!string.IsNullOrEmpty(runnerCert.ClientCertificateFile) &&
+                    !string.IsNullOrEmpty(runnerCert.ClientCertificatePrivateKeyFile))
+                {
+                    useClientCert = true;
+
+                    // prepare askpass for client cert password
+                    if (!string.IsNullOrEmpty(runnerCert.ClientCertificatePassword))
+                    {
+                        clientCertPrivateKeyAskPassFile = Path.Combine(executionContext.GetRunnerContext("temp"), $"{Guid.NewGuid()}.sh");
+                        List<string> askPass = new List<string>();
+                        askPass.Add("#!/bin/sh");
+                        askPass.Add($"echo \"{runnerCert.ClientCertificatePassword}\"");
+                        File.WriteAllLines(clientCertPrivateKeyAskPassFile, askPass);
+
+#if !OS_WINDOWS
+                        string toolPath = WhichUtil.Which("chmod", true);
+                        string argLine = $"775 {clientCertPrivateKeyAskPassFile}";
+                        executionContext.Command($"chmod {argLine}");
+
+                        var processInvoker = new ProcessInvoker(executionContext);
+                        processInvoker.OutputDataReceived += (object sender, ProcessDataReceivedEventArgs args) =>
+                        {
+                            if (!string.IsNullOrEmpty(args.Data))
+                            {
+                                executionContext.Output(args.Data);
+                            }
+                        };
+                        processInvoker.ErrorDataReceived += (object sender, ProcessDataReceivedEventArgs args) =>
+                        {
+                            if (!string.IsNullOrEmpty(args.Data))
+                            {
+                                executionContext.Output(args.Data);
+                            }
+                        };
+
+                        string workingDirectory = executionContext.GetRunnerContext("workspace");
+                        await processInvoker.ExecuteAsync(workingDirectory, toolPath, argLine, null, true, CancellationToken.None);
+#endif
+                    }
+                }
+            }
 
             // Check the current contents of the root folder to see if there is already a repo
             // If there is a repo, see if it matches the one we are expecting to be there based on the remote fetch url
@@ -290,6 +373,13 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                 await RemoveGitConfig(executionContext, gitCommandManager, targetPath, $"http.{repositoryUrl.AbsoluteUri}.extraheader", string.Empty);
             }
 
+            // always remove any possible left proxy setting from git config, the proxy setting may contains credential
+            if (await gitCommandManager.GitConfigExist(executionContext, targetPath, $"http.proxy"))
+            {
+                executionContext.Debug("Remove any proxy setting from git config.");
+                await RemoveGitConfig(executionContext, gitCommandManager, targetPath, $"http.proxy", string.Empty);
+            }
+
             List<string> additionalFetchArgs = new List<string>();
             List<string> additionalLfsFetchArgs = new List<string>();
 
@@ -299,6 +389,55 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                 additionalFetchArgs.Add($"-c http.extraheader=\"AUTHORIZATION: {GenerateBasicAuthHeader(executionContext, accessToken)}\"");
             }
 
+            // Prepare proxy config for fetch.
+            if (runnerProxy != null && !string.IsNullOrEmpty(runnerProxy.ProxyAddress) && !runnerProxy.WebProxy.IsBypassed(repositoryUrl))
+            {
+                executionContext.Debug($"Config proxy server '{runnerProxy.ProxyAddress}' for git fetch.");
+                ArgUtil.NotNullOrEmpty(proxyUrlWithCredString, nameof(proxyUrlWithCredString));
+                additionalFetchArgs.Add($"-c http.proxy=\"{proxyUrlWithCredString}\"");
+                additionalLfsFetchArgs.Add($"-c http.proxy=\"{proxyUrlWithCredString}\"");
+            }
+
+            // Prepare ignore ssl cert error config for fetch.
+            if (acceptUntrustedCerts)
+            {
+                additionalFetchArgs.Add($"-c http.sslVerify=false");
+                additionalLfsFetchArgs.Add($"-c http.sslVerify=false");
+            }
+
+            // Prepare self-signed CA cert config for fetch from server.
+            if (useSelfSignedCACert)
+            {
+                executionContext.Debug($"Use self-signed certificate '{runnerCert.CACertificateFile}' for git fetch.");
+                additionalFetchArgs.Add($"-c http.sslcainfo=\"{runnerCert.CACertificateFile}\"");
+                additionalLfsFetchArgs.Add($"-c http.sslcainfo=\"{runnerCert.CACertificateFile}\"");
+            }
+
+            // Prepare client cert config for fetch from server.
+            if (useClientCert)
+            {
+                executionContext.Debug($"Use client certificate '{runnerCert.ClientCertificateFile}' for git fetch.");
+
+                if (!string.IsNullOrEmpty(clientCertPrivateKeyAskPassFile))
+                {
+                    additionalFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\" -c http.sslCertPasswordProtected=true -c core.askpass=\"{clientCertPrivateKeyAskPassFile}\"");
+                    additionalLfsFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\" -c http.sslCertPasswordProtected=true -c core.askpass=\"{clientCertPrivateKeyAskPassFile}\"");
+                }
+                else
+                {
+                    additionalFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\"");
+                    additionalLfsFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\"");
+                }
+            }
+
+#if OS_WINDOWS
+            if (schannelSslBackend)
+            {
+                executionContext.Debug("Use SChannel SslBackend for git fetch.");
+                additionalFetchArgs.Add("-c http.sslbackend=\"schannel\"");
+                additionalLfsFetchArgs.Add("-c http.sslbackend=\"schannel\"");
+            }
+#endif
             // Prepare gitlfs url for fetch and checkout
             if (gitLfsSupport)
             {
@@ -400,12 +539,63 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                     additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.extraheader=\"AUTHORIZATION: {GenerateBasicAuthHeader(executionContext, accessToken)}\"");
                 }
 
+                // Prepare proxy config for submodule update.
+                if (runnerProxy != null && !string.IsNullOrEmpty(runnerProxy.ProxyAddress) && !runnerProxy.WebProxy.IsBypassed(repositoryUrl))
+                {
+                    executionContext.Debug($"Config proxy server '{runnerProxy.ProxyAddress}' for git submodule update.");
+                    ArgUtil.NotNullOrEmpty(proxyUrlWithCredString, nameof(proxyUrlWithCredString));
+                    additionalSubmoduleUpdateArgs.Add($"-c http.proxy=\"{proxyUrlWithCredString}\"");
+                }
+
+                // Prepare ignore ssl cert error config for fetch.
+                if (acceptUntrustedCerts)
+                {
+                    additionalSubmoduleUpdateArgs.Add($"-c http.sslVerify=false");
+                }
+
+                // Prepare self-signed CA cert config for submodule update.
+                if (useSelfSignedCACert)
+                {
+                    executionContext.Debug($"Use self-signed CA certificate '{runnerCert.CACertificateFile}' for git submodule update.");
+                    string authorityUrl = repositoryUrl.AbsoluteUri.Replace(repositoryUrl.PathAndQuery, string.Empty);
+                    additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.sslcainfo=\"{runnerCert.CACertificateFile}\"");
+                }
+
+                // Prepare client cert config for submodule update.
+                if (useClientCert)
+                {
+                    executionContext.Debug($"Use client certificate '{runnerCert.ClientCertificateFile}' for git submodule update.");
+                    string authorityUrl = repositoryUrl.AbsoluteUri.Replace(repositoryUrl.PathAndQuery, string.Empty);
+
+                    if (!string.IsNullOrEmpty(clientCertPrivateKeyAskPassFile))
+                    {
+                        additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.{authorityUrl}.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\" -c http.{authorityUrl}.sslCertPasswordProtected=true -c core.askpass=\"{clientCertPrivateKeyAskPassFile}\"");
+                    }
+                    else
+                    {
+                        additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.{authorityUrl}.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\"");
+                    }
+                }
+#if OS_WINDOWS
+                if (schannelSslBackend)
+                {
+                    executionContext.Debug("Use SChannel SslBackend for git submodule update.");
+                    additionalSubmoduleUpdateArgs.Add("-c http.sslbackend=\"schannel\"");
+                }
+#endif                    
+
                 int exitCode_submoduleUpdate = await gitCommandManager.GitSubmoduleUpdate(executionContext, targetPath, fetchDepth, string.Join(" ", additionalSubmoduleUpdateArgs), checkoutNestedSubmodules, cancellationToken);
                 if (exitCode_submoduleUpdate != 0)
                 {
                     throw new InvalidOperationException($"Git submodule update failed with exit code: {exitCode_submoduleUpdate}");
                 }
             }
+
+            if (useClientCert && !string.IsNullOrEmpty(clientCertPrivateKeyAskPassFile))
+            {
+                executionContext.Debug("Remove git.sslkey askpass file.");
+                IOUtil.DeleteFile(clientCertPrivateKeyAskPassFile);
+            }
         }
 
         private async Task<bool> IsRepositoryOriginUrlMatch(RunnerActionPluginExecutionContext context, GitCliManager gitCommandManager, string repositoryPath, Uri expectedRepositoryOriginUrl)
@@ -447,7 +637,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
             int exitCode_configUnset = await gitCommandManager.GitConfigUnset(executionContext, targetPath, configKey);
             if (exitCode_configUnset != 0)
             {
-                // if unable to use git.exe unset http.extraheader or core.askpass, modify git config file on disk. make sure we don't left credential.
+                // if unable to use git.exe unset http.extraheader, http.proxy or core.askpass, modify git config file on disk. make sure we don't left credential.
                 if (!string.IsNullOrEmpty(configValue))
                 {
                     executionContext.Warning("An unsuccessful attempt was made using git command line to remove \"http.extraheader\" from the git config. Attempting to modify the git config file directly to remove the credential.");
@@ -460,6 +650,9 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                             string setting = $"extraheader = {configValue}";
                             gitConfigContent = Regex.Replace(gitConfigContent, setting, string.Empty, RegexOptions.IgnoreCase);
 
+                            setting = $"proxy = {configValue}";
+                            gitConfigContent = Regex.Replace(gitConfigContent, setting, string.Empty, RegexOptions.IgnoreCase);
+
                             setting = $"askpass = {configValue}";
                             gitConfigContent = Regex.Replace(gitConfigContent, setting, string.Empty, RegexOptions.IgnoreCase);
 

src/Runner.Plugins/Repository/v1.1/GitSourceProvider.cs

@@ -65,6 +65,13 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
             // Validate args.
             ArgUtil.NotNull(executionContext, nameof(executionContext));
             Dictionary<string, string> configModifications = new Dictionary<string, string>();
+            Uri proxyUrlWithCred = null;
+            string proxyUrlWithCredString = null;
+            bool useSelfSignedCACert = false;
+            bool useClientCert = false;
+            string clientCertPrivateKeyAskPassFile = null;
+            bool acceptUntrustedCerts = false;
+
             executionContext.Output($"Syncing repository: {repoFullName}");
             Uri repositoryUrl = new Uri($"https://github.com/{repoFullName}");
             if (!repositoryUrl.IsAbsoluteUri)
@@ -93,6 +100,9 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                 }
             }
 
+            var runnerCert = executionContext.GetCertConfiguration();
+            acceptUntrustedCerts = runnerCert?.SkipServerCertificateValidation ?? false;
+
             executionContext.Debug($"repository url={repositoryUrl}");
             executionContext.Debug($"targetPath={targetPath}");
             executionContext.Debug($"sourceBranch={sourceBranch}");
@@ -102,6 +112,12 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
             executionContext.Debug($"checkoutNestedSubmodules={checkoutNestedSubmodules}");
             executionContext.Debug($"fetchDepth={fetchDepth}");
             executionContext.Debug($"gitLfsSupport={gitLfsSupport}");
+            executionContext.Debug($"acceptUntrustedCerts={acceptUntrustedCerts}");
+
+#if OS_WINDOWS
+            bool schannelSslBackend = StringUtil.ConvertToBoolean(executionContext.GetRunnerContext("gituseschannel"));
+            executionContext.Debug($"schannelSslBackend={schannelSslBackend}");
+#endif            
 
             // Initialize git command manager with additional environment variables.
             Dictionary<string, string> gitEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
@@ -137,8 +153,68 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
             // 3. git version greater than 2.14.2 if use SChannel for SSL backend (Windows only)
             RequirementCheck(executionContext, gitCommandManager, gitLfsSupport);
 
+            // prepare credentail embedded urls
+            var runnerProxy = executionContext.GetProxyConfiguration();
+            if (runnerProxy != null && !string.IsNullOrEmpty(runnerProxy.ProxyAddress) && !runnerProxy.WebProxy.IsBypassed(repositoryUrl))
+            {
+                proxyUrlWithCred = UrlUtil.GetCredentialEmbeddedUrl(new Uri(runnerProxy.ProxyAddress), runnerProxy.ProxyUsername, runnerProxy.ProxyPassword);
+
+                // uri.absoluteuri will not contains port info if the scheme is http/https and the port is 80/443
+                // however, git.exe always require you provide port info, if nothing passed in, it will use 1080 as default
+                // as result, we need prefer the uri.originalstring over uri.absoluteuri.
+                proxyUrlWithCredString = proxyUrlWithCred.OriginalString;
+            }
+
             // prepare askpass for client cert private key, if the repository's endpoint url match the runner config url
             var systemConnection = executionContext.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
+            if (runnerCert != null && Uri.Compare(repositoryUrl, systemConnection.Url, UriComponents.SchemeAndServer, UriFormat.Unescaped, StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                if (!string.IsNullOrEmpty(runnerCert.CACertificateFile))
+                {
+                    useSelfSignedCACert = true;
+                }
+
+                if (!string.IsNullOrEmpty(runnerCert.ClientCertificateFile) &&
+                    !string.IsNullOrEmpty(runnerCert.ClientCertificatePrivateKeyFile))
+                {
+                    useClientCert = true;
+
+                    // prepare askpass for client cert password
+                    if (!string.IsNullOrEmpty(runnerCert.ClientCertificatePassword))
+                    {
+                        clientCertPrivateKeyAskPassFile = Path.Combine(executionContext.GetRunnerContext("temp"), $"{Guid.NewGuid()}.sh");
+                        List<string> askPass = new List<string>();
+                        askPass.Add("#!/bin/sh");
+                        askPass.Add($"echo \"{runnerCert.ClientCertificatePassword}\"");
+                        File.WriteAllLines(clientCertPrivateKeyAskPassFile, askPass);
+
+#if !OS_WINDOWS
+                        string toolPath = WhichUtil.Which("chmod", true);
+                        string argLine = $"775 {clientCertPrivateKeyAskPassFile}";
+                        executionContext.Command($"chmod {argLine}");
+
+                        var processInvoker = new ProcessInvoker(executionContext);
+                        processInvoker.OutputDataReceived += (object sender, ProcessDataReceivedEventArgs args) =>
+                        {
+                            if (!string.IsNullOrEmpty(args.Data))
+                            {
+                                executionContext.Output(args.Data);
+                            }
+                        };
+                        processInvoker.ErrorDataReceived += (object sender, ProcessDataReceivedEventArgs args) =>
+                        {
+                            if (!string.IsNullOrEmpty(args.Data))
+                            {
+                                executionContext.Output(args.Data);
+                            }
+                        };
+
+                        string workingDirectory = executionContext.GetRunnerContext("workspace");
+                        await processInvoker.ExecuteAsync(workingDirectory, toolPath, argLine, null, true, CancellationToken.None);
+#endif
+                    }
+                }
+            }
 
             // Check the current contents of the root folder to see if there is already a repo
             // If there is a repo, see if it matches the one we are expecting to be there based on the remote fetch url
@@ -279,6 +355,13 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                 await RemoveGitConfig(executionContext, gitCommandManager, targetPath, $"http.{repositoryUrl.AbsoluteUri}.extraheader", string.Empty);
             }
 
+            // always remove any possible left proxy setting from git config, the proxy setting may contains credential
+            if (await gitCommandManager.GitConfigExist(executionContext, targetPath, $"http.proxy"))
+            {
+                executionContext.Debug("Remove any proxy setting from git config.");
+                await RemoveGitConfig(executionContext, gitCommandManager, targetPath, $"http.proxy", string.Empty);
+            }
+
             List<string> additionalFetchArgs = new List<string>();
             List<string> additionalLfsFetchArgs = new List<string>();
 
@@ -293,6 +376,55 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                 throw new InvalidOperationException($"Git config failed with exit code: {exitCode_config}");
             }
 
+            // Prepare proxy config for fetch.
+            if (runnerProxy != null && !string.IsNullOrEmpty(runnerProxy.ProxyAddress) && !runnerProxy.WebProxy.IsBypassed(repositoryUrl))
+            {
+                executionContext.Debug($"Config proxy server '{runnerProxy.ProxyAddress}' for git fetch.");
+                ArgUtil.NotNullOrEmpty(proxyUrlWithCredString, nameof(proxyUrlWithCredString));
+                additionalFetchArgs.Add($"-c http.proxy=\"{proxyUrlWithCredString}\"");
+                additionalLfsFetchArgs.Add($"-c http.proxy=\"{proxyUrlWithCredString}\"");
+            }
+
+            // Prepare ignore ssl cert error config for fetch.
+            if (acceptUntrustedCerts)
+            {
+                additionalFetchArgs.Add($"-c http.sslVerify=false");
+                additionalLfsFetchArgs.Add($"-c http.sslVerify=false");
+            }
+
+            // Prepare self-signed CA cert config for fetch from server.
+            if (useSelfSignedCACert)
+            {
+                executionContext.Debug($"Use self-signed certificate '{runnerCert.CACertificateFile}' for git fetch.");
+                additionalFetchArgs.Add($"-c http.sslcainfo=\"{runnerCert.CACertificateFile}\"");
+                additionalLfsFetchArgs.Add($"-c http.sslcainfo=\"{runnerCert.CACertificateFile}\"");
+            }
+
+            // Prepare client cert config for fetch from server.
+            if (useClientCert)
+            {
+                executionContext.Debug($"Use client certificate '{runnerCert.ClientCertificateFile}' for git fetch.");
+
+                if (!string.IsNullOrEmpty(clientCertPrivateKeyAskPassFile))
+                {
+                    additionalFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\" -c http.sslCertPasswordProtected=true -c core.askpass=\"{clientCertPrivateKeyAskPassFile}\"");
+                    additionalLfsFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\" -c http.sslCertPasswordProtected=true -c core.askpass=\"{clientCertPrivateKeyAskPassFile}\"");
+                }
+                else
+                {
+                    additionalFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\"");
+                    additionalLfsFetchArgs.Add($"-c http.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\"");
+                }
+            }
+
+#if OS_WINDOWS
+            if (schannelSslBackend)
+            {
+                executionContext.Debug("Use SChannel SslBackend for git fetch.");
+                additionalFetchArgs.Add("-c http.sslbackend=\"schannel\"");
+                additionalLfsFetchArgs.Add("-c http.sslbackend=\"schannel\"");
+            }
+#endif
             // Prepare gitlfs url for fetch and checkout
             if (gitLfsSupport)
             {
@@ -382,6 +514,51 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
 
                 List<string> additionalSubmoduleUpdateArgs = new List<string>();
 
+                // Prepare proxy config for submodule update.
+                if (runnerProxy != null && !string.IsNullOrEmpty(runnerProxy.ProxyAddress) && !runnerProxy.WebProxy.IsBypassed(repositoryUrl))
+                {
+                    executionContext.Debug($"Config proxy server '{runnerProxy.ProxyAddress}' for git submodule update.");
+                    ArgUtil.NotNullOrEmpty(proxyUrlWithCredString, nameof(proxyUrlWithCredString));
+                    additionalSubmoduleUpdateArgs.Add($"-c http.proxy=\"{proxyUrlWithCredString}\"");
+                }
+
+                // Prepare ignore ssl cert error config for fetch.
+                if (acceptUntrustedCerts)
+                {
+                    additionalSubmoduleUpdateArgs.Add($"-c http.sslVerify=false");
+                }
+
+                // Prepare self-signed CA cert config for submodule update.
+                if (useSelfSignedCACert)
+                {
+                    executionContext.Debug($"Use self-signed CA certificate '{runnerCert.CACertificateFile}' for git submodule update.");
+                    string authorityUrl = repositoryUrl.AbsoluteUri.Replace(repositoryUrl.PathAndQuery, string.Empty);
+                    additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.sslcainfo=\"{runnerCert.CACertificateFile}\"");
+                }
+
+                // Prepare client cert config for submodule update.
+                if (useClientCert)
+                {
+                    executionContext.Debug($"Use client certificate '{runnerCert.ClientCertificateFile}' for git submodule update.");
+                    string authorityUrl = repositoryUrl.AbsoluteUri.Replace(repositoryUrl.PathAndQuery, string.Empty);
+
+                    if (!string.IsNullOrEmpty(clientCertPrivateKeyAskPassFile))
+                    {
+                        additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.{authorityUrl}.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\" -c http.{authorityUrl}.sslCertPasswordProtected=true -c core.askpass=\"{clientCertPrivateKeyAskPassFile}\"");
+                    }
+                    else
+                    {
+                        additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.sslcert=\"{runnerCert.ClientCertificateFile}\" -c http.{authorityUrl}.sslkey=\"{runnerCert.ClientCertificatePrivateKeyFile}\"");
+                    }
+                }
+#if OS_WINDOWS
+                if (schannelSslBackend)
+                {
+                    executionContext.Debug("Use SChannel SslBackend for git submodule update.");
+                    additionalSubmoduleUpdateArgs.Add("-c http.sslbackend=\"schannel\"");
+                }
+#endif                    
+
                 int exitCode_submoduleUpdate = await gitCommandManager.GitSubmoduleUpdate(executionContext, targetPath, fetchDepth, string.Join(" ", additionalSubmoduleUpdateArgs), checkoutNestedSubmodules, cancellationToken);
                 if (exitCode_submoduleUpdate != 0)
                 {
@@ -389,6 +566,12 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                 }
             }
 
+            if (useClientCert && !string.IsNullOrEmpty(clientCertPrivateKeyAskPassFile))
+            {
+                executionContext.Debug("Remove git.sslkey askpass file.");
+                IOUtil.DeleteFile(clientCertPrivateKeyAskPassFile);
+            }
+
             // Set intra-task variable for post job cleanup
             executionContext.SetIntraActionState("repositoryPath", targetPath);
             executionContext.SetIntraActionState("modifiedgitconfig", JsonUtility.ToString(configModifications.Keys));
@@ -409,7 +592,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
             GitCliManager gitCommandManager = new GitCliManager();
             await gitCommandManager.LoadGitExecutionInfo(executionContext);
 
-            executionContext.Debug("Remove any extraheader setting from git config.");
+            executionContext.Debug("Remove any extraheader and proxy setting from git config.");
             var configKeys = JsonUtility.FromString<List<string>>(Environment.GetEnvironmentVariable("STATE_modifiedgitconfig"));
             if (configKeys?.Count > 0)
             {
@@ -494,7 +677,7 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
             int exitCode_configUnset = await gitCommandManager.GitConfigUnset(executionContext, targetPath, configKey);
             if (exitCode_configUnset != 0)
             {
-                // if unable to use git.exe unset http.extraheader or core.askpass, modify git config file on disk. make sure we don't left credential.
+                // if unable to use git.exe unset http.extraheader, http.proxy or core.askpass, modify git config file on disk. make sure we don't left credential.
                 if (!string.IsNullOrEmpty(configValue))
                 {
                     executionContext.Warning("An unsuccessful attempt was made using git command line to remove \"http.extraheader\" from the git config. Attempting to modify the git config file directly to remove the credential.");

src/Runner.Plugins/Runner.Plugins.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>

src/Runner.Sdk/ActionPlugin.cs

@@ -24,7 +24,6 @@ namespace GitHub.Runner.Sdk
     {
         private readonly string DebugEnvironmentalVariable = "ACTIONS_STEP_DEBUG";
         private VssConnection _connection;
-        private RunnerWebProxy _webProxy;
         private readonly object _stdoutLock = new object();
         private readonly ITraceWriter _trace; // for unit tests
 
@@ -58,19 +57,6 @@ namespace GitHub.Runner.Sdk
             }
         }
 
-        [JsonIgnore]
-        public RunnerWebProxy WebProxy
-        {
-            get
-            {
-                if (_webProxy == null)
-                {
-                    _webProxy = new RunnerWebProxy();
-                }
-                return _webProxy;
-            }
-        }
-
         public VssConnection InitializeVssConnection()
         {
             var headerValues = new List<ProductInfoHeaderValue>();
@@ -83,7 +69,30 @@ namespace GitHub.Runner.Sdk
             }
 
             VssClientHttpRequestSettings.Default.UserAgent = headerValues;
-            VssHttpMessageHandler.DefaultWebProxy = this.WebProxy;
+
+            var certSetting = GetCertConfiguration();
+            if (certSetting != null)
+            {
+                if (!string.IsNullOrEmpty(certSetting.ClientCertificateArchiveFile))
+                {
+                    VssClientHttpRequestSettings.Default.ClientCertificateManager = new RunnerClientCertificateManager(certSetting.ClientCertificateArchiveFile, certSetting.ClientCertificatePassword);
+                }
+
+                if (certSetting.SkipServerCertificateValidation)
+                {
+                    VssClientHttpRequestSettings.Default.ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
+                }
+            }
+
+            var proxySetting = GetProxyConfiguration();
+            if (proxySetting != null)
+            {
+                if (!string.IsNullOrEmpty(proxySetting.ProxyAddress))
+                {
+                    VssHttpMessageHandler.DefaultWebProxy = new RunnerWebProxyCore(proxySetting.ProxyAddress, proxySetting.ProxyUsername, proxySetting.ProxyPassword, proxySetting.ProxyBypassList);
+                }
+            }
+
             ServiceEndpoint systemConnection = this.Endpoints.FirstOrDefault(e => string.Equals(e.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
             ArgUtil.NotNull(systemConnection, nameof(systemConnection));
             ArgUtil.NotNull(systemConnection.Url, nameof(systemConnection.Url));
@@ -212,6 +221,63 @@ namespace GitHub.Runner.Sdk
             }
         }
 
+        public RunnerCertificateSettings GetCertConfiguration()
+        {
+            bool skipCertValidation = StringUtil.ConvertToBoolean(GetRunnerContext("SkipCertValidation"));
+            string caFile = GetRunnerContext("CAInfo");
+            string clientCertFile = GetRunnerContext("ClientCert");
+
+            if (!string.IsNullOrEmpty(caFile) || !string.IsNullOrEmpty(clientCertFile) || skipCertValidation)
+            {
+                var certConfig = new RunnerCertificateSettings();
+                certConfig.SkipServerCertificateValidation = skipCertValidation;
+                certConfig.CACertificateFile = caFile;
+
+                if (!string.IsNullOrEmpty(clientCertFile))
+                {
+                    certConfig.ClientCertificateFile = clientCertFile;
+                    string clientCertKey = GetRunnerContext("ClientCertKey");
+                    string clientCertArchive = GetRunnerContext("ClientCertArchive");
+                    string clientCertPassword = GetRunnerContext("ClientCertPassword");
+
+                    certConfig.ClientCertificatePrivateKeyFile = clientCertKey;
+                    certConfig.ClientCertificateArchiveFile = clientCertArchive;
+                    certConfig.ClientCertificatePassword = clientCertPassword;
+
+                    certConfig.VssClientCertificateManager = new RunnerClientCertificateManager(clientCertArchive, clientCertPassword);
+                }
+
+                return certConfig;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public RunnerWebProxySettings GetProxyConfiguration()
+        {
+            string proxyUrl = GetRunnerContext("ProxyUrl");
+            if (!string.IsNullOrEmpty(proxyUrl))
+            {
+                string proxyUsername = GetRunnerContext("ProxyUsername");
+                string proxyPassword = GetRunnerContext("ProxyPassword");
+                List<string> proxyBypassHosts = StringUtil.ConvertFromJson<List<string>>(GetRunnerContext("ProxyBypassList") ?? "[]");
+                return new RunnerWebProxySettings()
+                {
+                    ProxyAddress = proxyUrl,
+                    ProxyUsername = proxyUsername,
+                    ProxyPassword = proxyPassword,
+                    ProxyBypassList = proxyBypassHosts,
+                    WebProxy = new RunnerWebProxyCore(proxyUrl, proxyUsername, proxyPassword, proxyBypassHosts)
+                };
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         private string Escape(string input)
         {
             foreach (var mapping in _commandEscapeMappings)

src/Runner.Sdk/Runner.Sdk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>

src/Runner.Sdk/RunnerClientCertificateManager.cs

@@ -0,0 +1,40 @@
+
+using System.Security.Cryptography.X509Certificates;
+using GitHub.Services.Common;
+
+namespace GitHub.Runner.Sdk
+{
+    public class RunnerCertificateSettings
+    {
+        public bool SkipServerCertificateValidation { get; set; }
+        public string CACertificateFile { get; set; }
+        public string ClientCertificateFile { get; set; }
+        public string ClientCertificatePrivateKeyFile { get; set; }
+        public string ClientCertificateArchiveFile { get; set; }
+        public string ClientCertificatePassword { get; set; }
+        public IVssClientCertificateManager VssClientCertificateManager { get; set; }
+    }
+
+    public class RunnerClientCertificateManager : IVssClientCertificateManager
+    {
+        private readonly X509Certificate2Collection _clientCertificates = new X509Certificate2Collection();
+        public X509Certificate2Collection ClientCertificates => _clientCertificates;
+
+        public RunnerClientCertificateManager()
+        {
+        }
+
+        public RunnerClientCertificateManager(string clientCertificateArchiveFile, string clientCertificatePassword)
+        {
+            AddClientCertificate(clientCertificateArchiveFile, clientCertificatePassword);
+        }
+
+        public void AddClientCertificate(string clientCertificateArchiveFile, string clientCertificatePassword)
+        {
+            if (!string.IsNullOrEmpty(clientCertificateArchiveFile))
+            {
+                _clientCertificates.Add(new X509Certificate2(clientCertificateArchiveFile, clientCertificatePassword));
+            }
+        }
+    }
+}

src/Runner.Sdk/RunnerWebProxy.cs

@@ -1,224 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Text.RegularExpressions;
-
-namespace GitHub.Runner.Sdk
-{
-    public struct ByPassInfo
-    {
-        public string Host { get; set; }
-
-        public string Port { get; set; }
-    };
-
-    public class RunnerWebProxy : IWebProxy
-    {
-        private string _httpProxyAddress;
-        private string _httpProxyUsername;
-        private string _httpProxyPassword;
-
-        private string _httpsProxyAddress;
-        private string _httpsProxyUsername;
-        private string _httpsProxyPassword;
-
-        private readonly List<ByPassInfo> _noProxyList = new List<ByPassInfo>();
-        private readonly HashSet<string> _noProxyUnique = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        private readonly Regex _validIpRegex = new Regex("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$", RegexOptions.Compiled);
-
-        public string HttpProxyAddress => _httpProxyAddress;
-        public string HttpProxyUsername => _httpProxyUsername;
-        public string HttpProxyPassword => _httpProxyPassword;
-
-        public string HttpsProxyAddress => _httpsProxyAddress;
-        public string HttpsProxyUsername => _httpsProxyUsername;
-        public string HttpsProxyPassword => _httpsProxyPassword;
-
-        public List<ByPassInfo> NoProxyList => _noProxyList;
-
-        public ICredentials Credentials { get; set; }
-
-        public RunnerWebProxy()
-        {
-            Credentials = new CredentialCache();
-
-            var httpProxyAddress = Environment.GetEnvironmentVariable("http_proxy");
-            if (string.IsNullOrEmpty(httpProxyAddress))
-            {
-                httpProxyAddress = Environment.GetEnvironmentVariable("HTTP_PROXY");
-            }
-            httpProxyAddress = httpProxyAddress?.Trim();
-
-            var httpsProxyAddress = Environment.GetEnvironmentVariable("https_proxy");
-            if (string.IsNullOrEmpty(httpsProxyAddress))
-            {
-                httpsProxyAddress = Environment.GetEnvironmentVariable("HTTPS_PROXY");
-            }
-            httpsProxyAddress = httpsProxyAddress?.Trim();
-
-            var noProxyList = Environment.GetEnvironmentVariable("no_proxy");
-            if (string.IsNullOrEmpty(noProxyList))
-            {
-                noProxyList = Environment.GetEnvironmentVariable("NO_PROXY");
-            }
-
-            if (string.IsNullOrEmpty(httpProxyAddress) && string.IsNullOrEmpty(httpsProxyAddress))
-            {
-                return;
-            }
-
-            if (!string.IsNullOrEmpty(httpProxyAddress) && Uri.TryCreate(httpProxyAddress, UriKind.Absolute, out var proxyHttpUri))
-            {
-                _httpProxyAddress = proxyHttpUri.AbsoluteUri;
-
-                // the proxy url looks like http://[user:pass@]127.0.0.1:8888
-                var userInfo = Uri.UnescapeDataString(proxyHttpUri.UserInfo).Split(':', 2, StringSplitOptions.RemoveEmptyEntries);
-                if (userInfo.Length == 2)
-                {
-                    _httpProxyUsername = userInfo[0];
-                    _httpProxyPassword = userInfo[1];
-                }
-                else if (userInfo.Length == 1)
-                {
-                    _httpProxyUsername = userInfo[0];
-                }
-
-                if (!string.IsNullOrEmpty(_httpProxyUsername) || !string.IsNullOrEmpty(_httpProxyPassword))
-                {
-                    var credentials = new NetworkCredential(_httpProxyUsername, _httpProxyPassword);
-
-                    // Replace the entry in the credential cache if it exists
-                    (Credentials as CredentialCache).Remove(proxyHttpUri, "Basic");
-                    (Credentials as CredentialCache).Add(proxyHttpUri, "Basic", credentials);
-                }
-            }
-
-            if (!string.IsNullOrEmpty(httpsProxyAddress) && Uri.TryCreate(httpsProxyAddress, UriKind.Absolute, out var proxyHttpsUri))
-            {
-                _httpsProxyAddress = proxyHttpsUri.AbsoluteUri;
-
-                // the proxy url looks like http://[user:pass@]127.0.0.1:8888
-                var userInfo = Uri.UnescapeDataString(proxyHttpsUri.UserInfo).Split(':', 2, StringSplitOptions.RemoveEmptyEntries);
-                if (userInfo.Length == 2)
-                {
-                    _httpsProxyUsername = userInfo[0];
-                    _httpsProxyPassword = userInfo[1];
-                }
-                else if (userInfo.Length == 1)
-                {
-                    _httpsProxyUsername = userInfo[0];
-                }
-
-                if (!string.IsNullOrEmpty(_httpsProxyUsername) || !string.IsNullOrEmpty(_httpsProxyPassword))
-                {
-                    var credentials = new NetworkCredential(_httpsProxyUsername, _httpsProxyPassword);
-
-                    // Replace the entry in the credential cache if it exists
-                    (Credentials as CredentialCache).Remove(proxyHttpsUri, "Basic");
-                    (Credentials as CredentialCache).Add(proxyHttpsUri, "Basic", credentials);
-                }
-            }
-
-            if (!string.IsNullOrEmpty(noProxyList))
-            {
-                var noProxyListSplit = noProxyList.Split(',', StringSplitOptions.RemoveEmptyEntries);
-                foreach (string noProxy in noProxyListSplit)
-                {
-                    var noProxyTrim = noProxy.Trim();
-                    if (string.IsNullOrEmpty(noProxyTrim))
-                    {
-                        continue;
-                    }
-                    else if (_noProxyUnique.Add(noProxyTrim))
-                    {
-                        var noProxyInfo = new ByPassInfo();
-                        var noProxyHostPort = noProxyTrim.Split(':', 2, StringSplitOptions.RemoveEmptyEntries);
-                        if (noProxyHostPort.Length == 1)
-                        {
-                            noProxyInfo.Host = noProxyHostPort[0];
-                        }
-                        else if (noProxyHostPort.Length == 2)
-                        {
-                            noProxyInfo.Host = noProxyHostPort[0];
-                            noProxyInfo.Port = noProxyHostPort[1];
-                        }
-
-                        // We don't support IP address for no_proxy 
-                        if (_validIpRegex.IsMatch(noProxyInfo.Host))
-                        {
-                            continue;
-                        }
-
-                        _noProxyList.Add(noProxyInfo);
-                    }
-                }
-            }
-        }
-
-        public Uri GetProxy(Uri destination)
-        {
-            if (IsBypassed(destination))
-            {
-                return null;
-            }
-
-            if (destination.Scheme == Uri.UriSchemeHttps)
-            {
-                return new Uri(_httpsProxyAddress);
-            }
-            else
-            {
-                return new Uri(_httpProxyAddress);
-            }
-        }
-
-        public bool IsBypassed(Uri uri)
-        {
-            if (uri.Scheme == Uri.UriSchemeHttps && string.IsNullOrEmpty(_httpsProxyAddress))
-            {
-                return true;
-            }
-
-            if (uri.Scheme == Uri.UriSchemeHttp && string.IsNullOrEmpty(_httpProxyAddress))
-            {
-                return true;
-            }
-
-            return uri.IsLoopback || IsUriInBypassList(uri);
-        }
-
-        private bool IsUriInBypassList(Uri input)
-        {
-            foreach (var noProxy in _noProxyList)
-            {
-                var matchHost = false;
-                var matchPort = false;
-
-                if (string.IsNullOrEmpty(noProxy.Port))
-                {
-                    matchPort = true;
-                }
-                else
-                {
-                    matchPort = string.Equals(noProxy.Port, input.Port.ToString());
-                }
-
-                if (noProxy.Host.StartsWith('.'))
-                {
-                    matchHost = input.Host.EndsWith(noProxy.Host, StringComparison.OrdinalIgnoreCase);
-                }
-                else
-                {
-                    matchHost = string.Equals(input.Host, noProxy.Host, StringComparison.OrdinalIgnoreCase) || input.Host.EndsWith($".{noProxy.Host}", StringComparison.OrdinalIgnoreCase);
-                }
-
-                if (matchHost && matchPort)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}

src/Runner.Sdk/RunnerWebProxyCore.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text.RegularExpressions;
+
+namespace GitHub.Runner.Sdk
+{
+    public class RunnerWebProxySettings
+    {
+        public string ProxyAddress { get; set; }
+        public string ProxyUsername { get; set; }
+        public string ProxyPassword { get; set; }
+        public List<string> ProxyBypassList { get; set; }
+        public IWebProxy WebProxy { get; set; }
+    }
+
+    public class RunnerWebProxyCore : IWebProxy
+    {
+        private string _proxyAddress;
+        private readonly List<Regex> _regExBypassList = new List<Regex>();
+
+        public ICredentials Credentials { get; set; }
+
+        public RunnerWebProxyCore()
+        {
+        }
+
+        public RunnerWebProxyCore(string proxyAddress, string proxyUsername, string proxyPassword, List<string> proxyBypassList)
+        {
+            Update(proxyAddress, proxyUsername, proxyPassword, proxyBypassList);
+        }
+
+        public void Update(string proxyAddress, string proxyUsername, string proxyPassword, List<string> proxyBypassList)
+        {
+            _proxyAddress = proxyAddress?.Trim();
+
+            if (string.IsNullOrEmpty(proxyUsername) || string.IsNullOrEmpty(proxyPassword))
+            {
+                Credentials = CredentialCache.DefaultNetworkCredentials;
+            }
+            else
+            {
+                Credentials = new NetworkCredential(proxyUsername, proxyPassword);
+            }
+
+            if (proxyBypassList != null)
+            {
+                foreach (string bypass in proxyBypassList)
+                {
+                    if (string.IsNullOrWhiteSpace(bypass))
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            Regex bypassRegex = new Regex(bypass.Trim(), RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.ECMAScript);
+                            _regExBypassList.Add(bypassRegex);
+                        }
+                        catch (Exception)
+                        {
+                            // eat all exceptions
+                        }
+                    }
+                }
+            }
+        }
+
+        public Uri GetProxy(Uri destination)
+        {
+            if (IsBypassed(destination))
+            {
+                return destination;
+            }
+            else
+            {
+                return new Uri(_proxyAddress);
+            }
+        }
+
+        public bool IsBypassed(Uri uri)
+        {
+            return string.IsNullOrEmpty(_proxyAddress) || uri.IsLoopback || IsMatchInBypassList(uri);
+        }
+
+        private bool IsMatchInBypassList(Uri input)
+        {
+            string matchUriString = input.IsDefaultPort ?
+                input.Scheme + "://" + input.Host :
+                input.Scheme + "://" + input.Host + ":" + input.Port.ToString();
+
+            foreach (Regex r in _regExBypassList)
+            {
+                if (r.IsMatch(matchUriString))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}

src/Runner.Sdk/SdkConstants.cs

@@ -1,19 +0,0 @@
-using System;
-
-namespace GitHub.Runner.Sdk
-{
-    public class SdkConstants
-    {
-        public static class Variables
-        {
-            public static class Build
-            {
-                // Legacy "build" variables historically used by the runner
-                // DO NOT add new variables here -- instead use either the Actions or Runner namespaces
-                public const String BuildId = "build.buildId";
-                public const String BuildNumber = "build.buildNumber";
-                public const String ContainerId = "build.containerId";
-            }
-        }
-    }
-}

src/Runner.Sdk/Util/StringUtil.cs

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

src/Runner.Sdk/Util/VssUtil.cs

@@ -14,7 +14,7 @@ namespace GitHub.Runner.Sdk
 {
     public static class VssUtil
     {
-        public static void InitializeVssClientSettings(ProductInfoHeaderValue additionalUserAgent, IWebProxy proxy)
+        public static void InitializeVssClientSettings(ProductInfoHeaderValue additionalUserAgent, IWebProxy proxy, IVssClientCertificateManager clientCert)
         {
             var headerValues = new List<ProductInfoHeaderValue>();
             headerValues.Add(additionalUserAgent);
@@ -26,6 +26,7 @@ namespace GitHub.Runner.Sdk
             }
 
             VssClientHttpRequestSettings.Default.UserAgent = headerValues;
+            VssClientHttpRequestSettings.Default.ClientCertificateManager = clientCert;
             VssHttpMessageHandler.DefaultWebProxy = proxy;
         }
 
@@ -82,7 +83,7 @@ namespace GitHub.Runner.Sdk
             if (serviceEndpoint.Authorization.Scheme == EndpointAuthorizationSchemes.OAuth &&
                 serviceEndpoint.Authorization.Parameters.TryGetValue(EndpointAuthorizationParameters.AccessToken, out accessToken))
             {
-                credentials = new VssCredentials(new VssOAuthAccessTokenCredential(accessToken), CredentialPromptType.DoNotPrompt);
+                credentials = new VssCredentials(null, new VssOAuthAccessTokenCredential(accessToken), CredentialPromptType.DoNotPrompt);
             }
 
             return credentials;

src/Runner.Sdk/Util/WhichUtil.cs

@@ -7,7 +7,7 @@ namespace GitHub.Runner.Sdk
 {
     public static class WhichUtil
     {
-        public static string Which(string command, bool require = false, ITraceWriter trace = null, string prependPath = null)
+        public static string Which(string command, bool require = false, ITraceWriter trace = null)
         {
             ArgUtil.NotNullOrEmpty(command, nameof(command));
             trace?.Info($"Which: '{command}'");
@@ -17,10 +17,6 @@ namespace GitHub.Runner.Sdk
                 trace?.Info("PATH environment variable not defined.");
                 path = path ?? string.Empty;
             }
-            if (!string.IsNullOrEmpty(prependPath))
-            {
-                path = PathUtil.PrependPath(prependPath, path);
-            }
 
             string[] pathSegments = path.Split(new Char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries);
             for (int i = 0; i < pathSegments.Length; i++)

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));
 
@@ -307,10 +309,9 @@ namespace GitHub.Runner.Worker.Container
                 }
             };
 
-            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
-            {
-                throw new NotSupportedException("Container operations are only supported on Linux runners");
-            }
+#if OS_WINDOWS || OS_OSX
+            throw new NotSupportedException($"Container operation is only supported on Linux");
+#else
             return await processInvoker.ExecuteAsync(
                             workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Work),
                             fileName: DockerPath,
@@ -319,6 +320,7 @@ namespace GitHub.Runner.Worker.Container
                             requireExitCodeZero: false,
                             outputEncoding: null,
                             cancellationToken: CancellationToken.None);
+#endif
         }
 
         public async Task<List<string>> DockerInspect(IExecutionContext context, string dockerObject, string options)
@@ -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}");
@@ -347,10 +351,9 @@ namespace GitHub.Runner.Worker.Container
             processInvoker.ErrorDataReceived += stderrDataReceived;
 
 
-            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
-            {
-                throw new NotSupportedException("Container operations are only supported on Linux runners");
-            }
+#if OS_WINDOWS || OS_OSX
+            throw new NotSupportedException($"Container operation is only supported on Linux");
+#else
             return await processInvoker.ExecuteAsync(
                 workingDirectory: context.GetGitHubContext("workspace"),
                 fileName: DockerPath,
@@ -360,9 +363,12 @@ namespace GitHub.Runner.Worker.Container
                 outputEncoding: null,
                 killProcessOnCancel: false,
                 cancellationToken: cancellationToken);
+#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}");
@@ -378,10 +384,9 @@ namespace GitHub.Runner.Worker.Container
                 context.Output(message.Data);
             };
 
-            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
-            {
-                throw new NotSupportedException("Container operations are only supported on Linux runners");
-            }
+#if OS_WINDOWS || OS_OSX
+            throw new NotSupportedException($"Container operation is only supported on Linux");
+#else
             return await processInvoker.ExecuteAsync(
                 workingDirectory: workingDirectory ?? context.GetGitHubContext("workspace"),
                 fileName: DockerPath,
@@ -392,6 +397,7 @@ namespace GitHub.Runner.Worker.Container
                 killProcessOnCancel: false,
                 redirectStandardIn: null,
                 cancellationToken: cancellationToken);
+#endif
         }
 
         private async Task<List<string>> ExecuteDockerCommandAsync(IExecutionContext context, string command, string options)

src/Runner.Worker/ContainerOperationProvider.cs

@@ -35,10 +35,6 @@ namespace GitHub.Runner.Worker
         public async Task StartContainersAsync(IExecutionContext executionContext, object data)
         {
             Trace.Entering();
-            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
-            {
-                throw new NotSupportedException("Container operations are only supported on Linux runners");
-            }
             ArgUtil.NotNull(executionContext, nameof(executionContext));
             List<ContainerInfo> containers = data as List<ContainerInfo>;
             ArgUtil.NotNull(containers, nameof(containers));
@@ -48,7 +44,7 @@ namespace GitHub.Runner.Worker
                                                 displayName: "Stop containers",
                                                 data: data);
             
-            executionContext.Debug($"Register post job cleanup for stopping/deleting containers.");
+            executionContext.Debug($"Register post job cleanup for stoping/deleting containers.");
             executionContext.RegisterPostJobStep(nameof(StopContainersAsync), postJobStep);
 
             // Check whether we are inside a container.
@@ -61,16 +57,11 @@ namespace GitHub.Runner.Worker
             {
                 throw new NotSupportedException("Container feature is not supported when runner is already running inside container.");
             }
-#else       
-            var path = "/proc/1/cgroup";
-            // OSX does not have this file, but you cannot run OSX as a base image for docker containers currently.
-            if (File.Exists(path))
+#else
+            var initProcessCgroup = File.ReadLines("/proc/1/cgroup");
+            if (initProcessCgroup.Any(x => x.IndexOf(":/docker/", StringComparison.OrdinalIgnoreCase) >= 0))
             {
-                var initProcessCgroup = File.ReadLines(path);
-                if (initProcessCgroup.Any(x => x.IndexOf(":/docker/", StringComparison.OrdinalIgnoreCase) >= 0))
-                {
-                    throw new NotSupportedException("Container feature is not supported when runner is already running inside container.");
-                }
+                throw new NotSupportedException("Container feature is not supported when runner is already running inside container.");
             }
 #endif
 
@@ -134,7 +125,7 @@ namespace GitHub.Runner.Worker
                 executionContext.Warning($"Delete stale container networks failed, docker network prune fail with exit code {networkPruneExitCode}");
             }
 
-            // Create local docker network for this job to avoid port conflict when multiple runners run on same machine.
+            // Create local docker network for this job to avoid port conflict when multiple agents run on same machine.
             // All containers within a job join the same network
             var containerNetwork = $"github_network_{Guid.NewGuid().ToString("N")}";
             await CreateContainerNetworkAsync(executionContext, containerNetwork);

src/Runner.Worker/DiagnosticLogManager.cs

@@ -15,7 +15,7 @@ namespace GitHub.Runner.Worker
     [ServiceLocator(Default = typeof(DiagnosticLogManager))]
     public interface IDiagnosticLogManager : IRunnerService
     {
-        void UploadDiagnosticLogs(IExecutionContext executionContext,
+        Task UploadDiagnosticLogsAsync(IExecutionContext executionContext,
                                     IExecutionContext parentContext,
                                     Pipelines.AgentJobRequestMessage message,
                                     DateTime jobStartTimeUtc);
@@ -31,10 +31,12 @@ namespace GitHub.Runner.Worker
     public sealed class DiagnosticLogManager : RunnerService, IDiagnosticLogManager
     {
         private static string DateTimeFormat = "yyyyMMdd-HHmmss";
-        public void UploadDiagnosticLogs(IExecutionContext executionContext,
-                                         IExecutionContext parentContext, 
-                                         Pipelines.AgentJobRequestMessage message,
-                                         DateTime jobStartTimeUtc)
+#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)
         {
             executionContext.Debug("Starting diagnostic file upload.");
 

src/Runner.Worker/ExecutionContext.cs

@@ -41,6 +41,7 @@ namespace GitHub.Runner.Worker
         TaskResult? CommandResult { get; set; }
         CancellationToken CancellationToken { get; }
         List<ServiceEndpoint> Endpoints { get; }
+        List<SecureFile> SecureFiles { get; }
 
         PlanFeatures Features { get; }
         Variables Variables { get; }
@@ -135,6 +136,7 @@ namespace GitHub.Runner.Worker
         public Task ForceCompleted => _forceCompleted.Task;
         public CancellationToken CancellationToken => _cancellationTokenSource.Token;
         public List<ServiceEndpoint> Endpoints { get; private set; }
+        public List<SecureFile> SecureFiles { get; private set; }
         public Variables Variables { get; private set; }
         public Dictionary<string, string> IntraActionState { get; private set; }
         public HashSet<string> OutputVariables => _outputvariables;
@@ -255,6 +257,7 @@ namespace GitHub.Runner.Worker
             child.Features = Features;
             child.Variables = Variables;
             child.Endpoints = Endpoints;
+            child.SecureFiles = SecureFiles;
             if (intraActionState == null)
             {
                 child.IntraActionState = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
@@ -546,6 +549,9 @@ namespace GitHub.Runner.Worker
             // Endpoints
             Endpoints = message.Resources.Endpoints;
 
+            // SecureFiles
+            SecureFiles = message.Resources.SecureFiles;
+
             // Variables
             Variables = new Variables(HostContext, message.Variables);
 
@@ -610,6 +616,67 @@ namespace GitHub.Runner.Worker
 
             // PostJobSteps for job ExecutionContext
             PostJobSteps = new Stack<IStep>();
+            // Proxy variables
+            //             var agentWebProxy = HostContext.GetService<IRunnerWebProxy>();
+            //             if (!string.IsNullOrEmpty(agentWebProxy.ProxyAddress))
+            //             {
+            //                 SetRunnerContext("proxyurl", agentWebProxy.ProxyAddress);
+
+            //                 if (!string.IsNullOrEmpty(agentWebProxy.ProxyUsername))
+            //                 {
+            //                     SetRunnerContext("proxyusername", agentWebProxy.ProxyUsername);
+            //                 }
+
+            //                 if (!string.IsNullOrEmpty(agentWebProxy.ProxyPassword))
+            //                 {
+            //                     HostContext.SecretMasker.AddValue(agentWebProxy.ProxyPassword);
+            //                     SetRunnerContext("proxypassword", agentWebProxy.ProxyPassword);
+            //                 }
+
+            //                 if (agentWebProxy.ProxyBypassList.Count > 0)
+            //                 {
+            //                     SetRunnerContext("proxybypasslist", JsonUtility.ToString(agentWebProxy.ProxyBypassList));
+            //                 }
+            //             }
+
+            //             // Certificate variables
+            //             var agentCert = HostContext.GetService<IRunnerCertificateManager>();
+            //             if (agentCert.SkipServerCertificateValidation)
+            //             {
+            //                 SetRunnerContext("sslskipcertvalidation", bool.TrueString);
+            //             }
+
+            //             if (!string.IsNullOrEmpty(agentCert.CACertificateFile))
+            //             {
+            //                 SetRunnerContext("sslcainfo", agentCert.CACertificateFile);
+            //             }
+
+            //             if (!string.IsNullOrEmpty(agentCert.ClientCertificateFile) &&
+            //                 !string.IsNullOrEmpty(agentCert.ClientCertificatePrivateKeyFile) &&
+            //                 !string.IsNullOrEmpty(agentCert.ClientCertificateArchiveFile))
+            //             {
+            //                 SetRunnerContext("clientcertfile", agentCert.ClientCertificateFile);
+            //                 SetRunnerContext("clientcertprivatekey", agentCert.ClientCertificatePrivateKeyFile);
+            //                 SetRunnerContext("clientcertarchive", agentCert.ClientCertificateArchiveFile);
+
+            //                 if (!string.IsNullOrEmpty(agentCert.ClientCertificatePassword))
+            //                 {
+            //                     HostContext.SecretMasker.AddValue(agentCert.ClientCertificatePassword);
+            //                     SetRunnerContext("clientcertpassword", agentCert.ClientCertificatePassword);
+            //                 }
+            //             }
+
+            //             // Runtime option variables
+            //             var runtimeOptions = HostContext.GetService<IConfigurationStore>().GetRunnerRuntimeOptions();
+            //             if (runtimeOptions != null)
+            //             {
+            // #if OS_WINDOWS
+            //                 if (runtimeOptions.GitUseSecureChannel)
+            //                 {
+            //                     SetRunnerContext("gituseschannel", runtimeOptions.GitUseSecureChannel.ToString());
+            //                 }
+            // #endif                
+            //             }
 
             // Job timeline record.
             InitializeTimelineRecord(
@@ -807,6 +874,33 @@ namespace GitHub.Runner.Worker
             {
                 this.Warning(string.Format("The job is currently being throttled by the server. You may experience delays in console line output, job status reporting, and action log uploads."));
 
+                if (!String.IsNullOrEmpty(this.Variables.System_TFCollectionUrl))
+                {
+                    // Construct a URL to the resource utilization page, to aid the user debug throttling issues
+                    UriBuilder uriBuilder = new UriBuilder(Variables.System_TFCollectionUrl);
+                    NameValueCollection query = HttpUtility.ParseQueryString(uriBuilder.Query);
+                    DateTime endTime = DateTime.UtcNow;
+                    string queryDate = endTime.AddHours(-1).ToString("s") + "," + endTime.ToString("s");
+
+                    uriBuilder.Path += (Variables.System_TFCollectionUrl.EndsWith("/") ? "" : "/") + "_usersSettings/usage";
+                    query["tab"] = "pipelines";
+                    query["queryDate"] = queryDate;
+
+                    // Global RU link
+                    uriBuilder.Query = query.ToString();
+                    string global = $"Link to resource utilization page (global 1-hour view): {uriBuilder.ToString()}.";
+
+                    if (!String.IsNullOrEmpty(this.Variables.Build_DefinitionName))
+                    {
+                        query["keywords"] = this.Variables.Build_Number;
+                        query["definition"] = this.Variables.Build_DefinitionName;
+                    }
+
+                    // RU link scoped for the build/release
+                    uriBuilder.Query = query.ToString();
+                    this.Warning($"{global}\nLink to resource utilization page (1-hour view by pipeline): {uriBuilder.ToString()}.");
+                }
+
                 _throttlingReported = true;
             }
         }

src/Runner.Worker/GitHubContext.cs

@@ -16,8 +16,6 @@ namespace GitHub.Runner.Worker
             "head_ref",
             "ref",
             "repository",
-            "run_id",
-            "run_number",
             "sha",
             "workflow",
             "workspace",

src/Runner.Worker/Handlers/HandlerFactory.cs

@@ -62,7 +62,7 @@ namespace GitHub.Runner.Worker.Handlers
             }
             else if (data.ExecutionType == ActionExecutionType.Plugin)
             {
-                // Runner plugin
+                // Agent plugin
                 handler = HostContext.CreateService<IRunnerPluginHandler>();
                 (handler as IRunnerPluginHandler).Data = data as PluginActionExecutionData;
             }

src/Runner.Worker/Handlers/OutputManager.cs

@@ -18,46 +18,44 @@ namespace GitHub.Runner.Worker.Handlers
         private static readonly Regex _colorCodeRegex = new Regex(@"\x0033\[[0-9;]*m?", RegexOptions.Compiled | RegexOptions.CultureInvariant);
         private readonly IActionCommandManager _commandManager;
         private readonly IExecutionContext _executionContext;
-        private readonly int _failsafe = 50;
         private readonly object _matchersLock = new object();
         private readonly TimeSpan _timeout;
         private IssueMatcher[] _matchers = Array.Empty<IssueMatcher>();
-        // Mapping that indicates whether a directory belongs to the workflow repository
-        private readonly Dictionary<string, string> _directoryMap = new Dictionary<string, string>();
 
         public OutputManager(IExecutionContext executionContext, IActionCommandManager commandManager)
         {
+            //executionContext.Debug("ENTERING OutputManager ctor");
             _executionContext = executionContext;
             _commandManager = commandManager;
 
-            // Recursion failsafe (test override)
-            var failsafeString = Environment.GetEnvironmentVariable("RUNNER_TEST_GET_REPOSITORY_PATH_FAILSAFE");
-            if (!string.IsNullOrEmpty(failsafeString))
-            {
-                _failsafe = int.Parse(failsafeString, NumberStyles.None);
-            }
-
+            //_executionContext.Debug("OutputManager ctor - determine timeout from variable");
             // Determine the timeout
             var timeoutStr = _executionContext.Variables.Get(_timeoutKey);
             if (string.IsNullOrEmpty(timeoutStr) ||
                 !TimeSpan.TryParse(timeoutStr, CultureInfo.InvariantCulture, out _timeout) ||
                 _timeout <= TimeSpan.Zero)
             {
+                //_executionContext.Debug("OutputManager ctor - determine timeout from env var");
                 timeoutStr = Environment.GetEnvironmentVariable(_timeoutKey);
                 if (string.IsNullOrEmpty(timeoutStr) ||
                     !TimeSpan.TryParse(timeoutStr, CultureInfo.InvariantCulture, out _timeout) ||
                     _timeout <= TimeSpan.Zero)
                 {
+                    //_executionContext.Debug("OutputManager ctor - set timeout to default");
                     _timeout = TimeSpan.FromSeconds(1);
                 }
             }
 
+            //_executionContext.Debug("OutputManager ctor - adding matchers");
             // Lock
             lock (_matchersLock)
             {
+                //_executionContext.Debug("OutputManager ctor - adding OnMatcherChanged");
                 _executionContext.Add(OnMatcherChanged);
+                //_executionContext.Debug("OutputManager ctor - getting matchers");
                 _matchers = _executionContext.GetMatchers().Select(x => new IssueMatcher(x, _timeout)).ToArray();
             }
+            //_executionContext.Debug("LEAVING OutputManager ctor");
         }
 
         public void Dispose()
@@ -73,6 +71,7 @@ namespace GitHub.Runner.Worker.Handlers
 
         public void OnDataReceived(object sender, ProcessDataReceivedEventArgs e)
         {
+            //_executionContext.Debug("ENTERING OutputManager OnDataReceived");
             var line = e.Data;
 
             // ## commands
@@ -83,6 +82,7 @@ namespace GitHub.Runner.Worker.Handlers
                 // The logging queues and command handlers are thread-safe.
                 if (_commandManager.TryProcessCommand(_executionContext, line))
                 {
+                    //_executionContext.Debug("LEAVING OutputManager OnDataReceived - command processed");
                     return;
                 }
             }
@@ -142,6 +142,7 @@ namespace GitHub.Runner.Worker.Handlers
                             // Log issue
                             _executionContext.AddIssue(issue, stripped);
 
+                            //_executionContext.Debug("LEAVING OutputManager OnDataReceived - issue logged");
                             return;
                         }
                     }
@@ -150,6 +151,7 @@ namespace GitHub.Runner.Worker.Handlers
 
             // Regular output
             _executionContext.Output(line);
+            //_executionContext.Debug("LEAVING OutputManager OnDataReceived");
         }
 
         private void OnMatcherChanged(object sender, MatcherChangedEventArgs e)
@@ -259,7 +261,7 @@ namespace GitHub.Runner.Worker.Handlers
                     var file = match.File;
 
                     // Root using fromPath
-                    if (!string.IsNullOrWhiteSpace(match.FromPath) && !Path.IsPathFullyQualified(file))
+                    if (!string.IsNullOrWhiteSpace(match.FromPath) && !Path.IsPathRooted(file))
                     {
                         var fromDirectory = Path.GetDirectoryName(match.FromPath);
                         if (!string.IsNullOrWhiteSpace(fromDirectory))
@@ -269,7 +271,7 @@ namespace GitHub.Runner.Worker.Handlers
                     }
 
                     // Root using workspace
-                    if (!Path.IsPathFullyQualified(file))
+                    if (!Path.IsPathRooted(file))
                     {
                         var workspace = _executionContext.GetGitHubContext("workspace");
                         ArgUtil.NotNullOrEmpty(workspace, "workspace");
@@ -277,27 +279,31 @@ namespace GitHub.Runner.Worker.Handlers
                         file = Path.Combine(workspace, file);
                     }
 
-                    // Remove relative pathing and normalize slashes
-                    file = Path.GetFullPath(file);
+                    // Normalize slashes
+                    file = file.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
 
-                    // Check whether the file exists
+                    // File exists
                     if (File.Exists(file))
                     {
-                        // Check whether the file is under the workflow repository
-                        var repositoryPath = GetRepositoryPath(file);
-                        if (!string.IsNullOrEmpty(repositoryPath))
-                        {
-                            // Get the relative file path
-                            var relativePath = file.Substring(repositoryPath.Length).TrimStart(Path.DirectorySeparatorChar);
+                        // Repository path
+                        var repositoryPath = _executionContext.GetGitHubContext("workspace");
+                        ArgUtil.NotNullOrEmpty(repositoryPath, nameof(repositoryPath));
 
-                            // Prefer `/` on all platforms
-                            issue.Data["file"] = relativePath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+                        // Normalize slashes
+                        repositoryPath = repositoryPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
+
+                        if (!file.StartsWith(repositoryPath, IOUtil.FilePathStringComparison))
+                        {
+                            // File is not under repo
+                            _executionContext.Debug($"Dropping file value '{file}'. Path is not under the repo.");
                         }
                         else
                         {
-                            _executionContext.Debug($"Dropping file value '{file}'. Path is not under the workflow repo.");
+                            // Prefer `/` on all platforms
+                            issue.Data["file"] = file.Substring(repositoryPath.Length).TrimStart(Path.DirectorySeparatorChar).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
                         }
                     }
+                    // File does not exist
                     else
                     {
                         _executionContext.Debug($"Dropping file value '{file}'. Path does not exist");
@@ -311,60 +317,5 @@ namespace GitHub.Runner.Worker.Handlers
 
             return issue;
         }
-
-        private string GetRepositoryPath(string filePath, int recursion = 0)
-        {
-            // Prevent the cache from growing too much
-            if (_directoryMap.Count > 100)
-            {
-                _directoryMap.Clear();
-            }
-
-            // Empty directory means we hit the root of the drive
-            var directoryPath = Path.GetDirectoryName(filePath);
-            if (string.IsNullOrEmpty(directoryPath) || recursion > _failsafe)
-            {
-                return null;
-            }
-
-            // Check the cache
-            if (_directoryMap.TryGetValue(directoryPath, out string repositoryPath))
-            {
-                return repositoryPath;
-            }
-
-            try
-            {
-                // Check if .git/config exists
-                var gitConfigPath = Path.Combine(directoryPath, ".git", "config");
-                if (File.Exists(gitConfigPath))
-                {
-                    // Check if the config contains the workflow repository url
-                    var qualifiedRepository = _executionContext.GetGitHubContext("repository");
-                    var configMatch = $"url = https://github.com/{qualifiedRepository}";
-                    var content = File.ReadAllText(gitConfigPath);
-                    foreach (var line in content.Split("\n").Select(x => x.Trim()))
-                    {
-                        if (String.Equals(line, configMatch, StringComparison.OrdinalIgnoreCase))
-                        {
-                            repositoryPath = directoryPath;
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    // Recursive call
-                    repositoryPath = GetRepositoryPath(directoryPath, recursion + 1);
-                }
-            }
-            catch (Exception ex)
-            {
-                _executionContext.Debug($"Error when attempting to determine whether the path '{filePath}' is under the workflow repository: {ex.Message}");
-            }
-
-            _directoryMap[directoryPath] = repositoryPath;
-            return repositoryPath;
-        }
     }
 }

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using System.Linq;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
@@ -57,7 +56,6 @@ namespace GitHub.Runner.Worker.Handlers
             string shellCommand;
             string shellCommandPath = null;
             bool validateShellOnHost = !(StepHost is ContainerStepHost);
-            string prependPath = string.Join(Path.PathSeparator.ToString(), ExecutionContext.PrependPath.Reverse<string>());
             Inputs.TryGetValue("shell", out var shell);
             if (string.IsNullOrEmpty(shell))
             {
@@ -65,19 +63,19 @@ namespace GitHub.Runner.Worker.Handlers
                 shellCommand = "pwsh";
                 if(validateShellOnHost)
                 {
-                    shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
+                    shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace);
                     if (string.IsNullOrEmpty(shellCommandPath))
                     {
                         shellCommand = "powershell";
                         Trace.Info($"Defaulting to {shellCommand}");
-                        shellCommandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
+                        shellCommandPath = WhichUtil.Which(shellCommand, require: true, Trace);
                     }
                 }
 #else
                 shellCommand = "sh";
                 if (validateShellOnHost)
                 {
-                    shellCommandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
+                    shellCommandPath = WhichUtil.Which("bash") ?? WhichUtil.Which("sh", true, Trace);
                 }
 #endif
                 argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand);
@@ -88,7 +86,7 @@ namespace GitHub.Runner.Worker.Handlers
                 shellCommand = parsed.shellCommand;
                 if (validateShellOnHost)
                 {
-                    shellCommandPath = WhichUtil.Which(parsed.shellCommand, true, Trace, prependPath);
+                    shellCommandPath = WhichUtil.Which(parsed.shellCommand, true, Trace);
                 }
 
                 argFormat = $"{parsed.shellArgs}".TrimStart();
@@ -146,24 +144,23 @@ namespace GitHub.Runner.Worker.Handlers
             Inputs.TryGetValue("shell", out var shell);
             var isContainerStepHost = StepHost is ContainerStepHost;
 
-            string prependPath = string.Join(Path.PathSeparator.ToString(), ExecutionContext.PrependPath.Reverse<string>());
             string commandPath, argFormat, shellCommand;
             // Set up default command and arguments
             if (string.IsNullOrEmpty(shell))
             {
 #if OS_WINDOWS
                 shellCommand = "pwsh";
-                commandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
+                commandPath = WhichUtil.Which(shellCommand, require: false, Trace);
                 if (string.IsNullOrEmpty(commandPath))
                 {
                     shellCommand = "powershell";
                     Trace.Info($"Defaulting to {shellCommand}");
-                    commandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
+                    commandPath = WhichUtil.Which(shellCommand, require: true, Trace);
                 }
                 ArgUtil.NotNullOrEmpty(commandPath, "Default Shell");
 #else
                 shellCommand = "sh";
-                commandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
+                commandPath = WhichUtil.Which("bash", false, Trace) ?? WhichUtil.Which("sh", true, Trace);
 #endif
                 argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand);
             }
@@ -172,7 +169,7 @@ namespace GitHub.Runner.Worker.Handlers
                 var parsed = ScriptHandlerHelpers.ParseShellOptionString(shell);
                 shellCommand = parsed.shellCommand;
                 // For non-ContainerStepHost, the command must be located on the host by Which
-                commandPath = WhichUtil.Which(parsed.shellCommand, !isContainerStepHost, Trace, prependPath);
+                commandPath = WhichUtil.Which(parsed.shellCommand, !isContainerStepHost, Trace);
                 argFormat = $"{parsed.shellArgs}".TrimStart();
                 if (string.IsNullOrEmpty(argFormat))
                 {

src/Runner.Worker/Handlers/StepHost.cs

@@ -141,13 +141,6 @@ namespace GitHub.Runner.Worker.Handlers
                     executionContext.Debug(line);
                     if (line.ToLower().Contains("alpine"))
                     {
-                        if (!Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.X64))
-                        {
-                            var os = Constants.Runner.Platform.ToString();
-                            var arch = Constants.Runner.PlatformArchitecture.ToString();
-                            var msg = $"JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected {os} {arch}";
-                            throw new NotSupportedException(msg);
-                        }
                         nodeExternal = "node12_alpine";
                         executionContext.Output($"Container distribution is alpine. Running JavaScript Action with external tool: {nodeExternal}");
                         return nodeExternal;

src/Runner.Worker/IssueMatcher.cs

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

src/Runner.Worker/JobExtension.cs

@@ -19,7 +19,7 @@ namespace GitHub.Runner.Worker
     public interface IJobExtension : IRunnerService
     {
         Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message);
-        void FinalizeJob(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, DateTime jobStartTimeUtc);
+        Task FinalizeJob(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, DateTime jobStartTimeUtc);
     }
 
     public sealed class JobExtension : RunnerService, IJobExtension
@@ -42,6 +42,7 @@ namespace GitHub.Runner.Worker
 
             List<IStep> preJobSteps = new List<IStep>();
             List<IStep> jobSteps = new List<IStep>();
+            List<IStep> postJobSteps = new List<IStep>();
             using (var register = jobContext.CancellationToken.Register(() => { context.CancelToken(); }))
             {
                 try
@@ -54,13 +55,10 @@ namespace GitHub.Runner.Worker
                     context.Debug($"Primary repository: {repoFullName}");
 
                     // Print proxy setting information for better diagnostic experience
-                    if (!string.IsNullOrEmpty(HostContext.WebProxy.HttpProxyAddress))
+                    var runnerWebProxy = HostContext.GetService<IRunnerWebProxy>();
+                    if (!string.IsNullOrEmpty(runnerWebProxy.ProxyAddress))
                     {
-                        context.Output($"Runner is running behind proxy server '{HostContext.WebProxy.HttpProxyAddress}' for all HTTP requests.");
-                    }
-                    if (!string.IsNullOrEmpty(HostContext.WebProxy.HttpsProxyAddress))
-                    {
-                        context.Output($"Runner is running behind proxy server '{HostContext.WebProxy.HttpsProxyAddress}' for all HTTPS requests.");
+                        context.Output($"Runner is running behind proxy server: '{runnerWebProxy.ProxyAddress}'");
                     }
 
                     // Prepare the workflow directory
@@ -230,7 +228,7 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        public void FinalizeJob(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, DateTime jobStartTimeUtc)
+        public async Task FinalizeJob(IExecutionContext jobContext, Pipelines.AgentJobRequestMessage message, DateTime jobStartTimeUtc)
         {
             Trace.Entering();
             ArgUtil.NotNull(jobContext, nameof(jobContext));
@@ -244,6 +242,19 @@ namespace GitHub.Runner.Worker
                     context.Start();
                     context.Debug("Starting: Complete job");
 
+                    // Wait for agent log plugin process exits
+                    // var logPlugin = HostContext.GetService<IAgentLogPlugin>();
+                    // try
+                    // {
+                    //     await logPlugin.WaitAsync(context);
+                    // }
+                    // catch (Exception ex)
+                    // {
+                    //     // Log and ignore the error from log plugin finalization.
+                    //     Trace.Error($"Caught exception from log plugin finalization: {ex}");
+                    //     context.Output(ex.Message);
+                    // }
+
                     if (context.Variables.GetBoolean(Constants.Variables.Actions.RunnerDebug) ?? false)
                     {
                         Trace.Info("Support log upload starting.");
@@ -253,7 +264,7 @@ namespace GitHub.Runner.Worker
 
                         try
                         {
-                            diagnosticLogManager.UploadDiagnosticLogs(executionContext: context, parentContext: jobContext, message: message, jobStartTimeUtc: jobStartTimeUtc);
+                            await diagnosticLogManager.UploadDiagnosticLogsAsync(executionContext: context, parentContext: jobContext, message: message, jobStartTimeUtc: jobStartTimeUtc);
 
                             Trace.Info("Support log upload complete.");
                             context.Output("Completed runner diagnostic log upload");

src/Runner.Worker/JobRunner.cs

@@ -113,6 +113,10 @@ namespace GitHub.Runner.Worker
                 Directory.CreateDirectory(toolsDirectory);
                 jobContext.SetRunnerContext("tool_cache", toolsDirectory);
 
+                // remove variable from env
+                Environment.SetEnvironmentVariable("AGENT_TOOLSDIRECTORY", null);
+                Environment.SetEnvironmentVariable(Constants.Variables.Agent.ToolsDirectory, null);
+
                 // Setup TEMP directories
                 _tempDirectoryManager = HostContext.GetService<ITempDirectoryManager>();
                 _tempDirectoryManager.InitializeTempDirectory(jobContext);
@@ -179,7 +183,7 @@ namespace GitHub.Runner.Worker
                 finally
                 {
                     Trace.Info("Finalize job.");
-                    jobExtension.FinalizeJob(jobContext, message, jobStartTimeUtc);
+                    await jobExtension.FinalizeJob(jobContext, message, jobStartTimeUtc);
                 }
 
                 Trace.Info($"Job result after all job steps finish: {jobContext.Result ?? TaskResult.Succeeded}");

src/Runner.Worker/Runner.Worker.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>

src/Runner.Worker/Variables.cs

@@ -1,12 +1,12 @@
-using System;
+using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Common.Util;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using GitHub.DistributedTask.WebApi;
 using GitHub.DistributedTask.Logging;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 
 namespace GitHub.Runner.Worker
@@ -62,7 +62,10 @@ namespace GitHub.Runner.Worker
 
         // DO NOT add file path variable to here.
         // All file path variables needs to be retrive and set through ExecutionContext, so it can handle container file path translation.
-        public string Build_Number => Get(SdkConstants.Variables.Build.BuildNumber);
+
+        public string Build_DefinitionName => Get(Constants.Variables.Build.DefinitionName);
+
+        public string Build_Number => Get(Constants.Variables.Build.Number);
 
 #if OS_WINDOWS
         public bool Retain_Default_Encoding => false;
@@ -70,10 +73,44 @@ namespace GitHub.Runner.Worker
         public bool Retain_Default_Encoding => true;
 #endif
 
+        public string System_CollectionId => Get(Constants.Variables.System.CollectionId);
+
         public bool? Step_Debug => GetBoolean(Constants.Variables.Actions.StepDebug);
 
+        public string System_DefinitionId => Get(Constants.Variables.System.DefinitionId);
+
         public string System_PhaseDisplayName => Get(Constants.Variables.System.PhaseDisplayName);
 
+        public string System_TFCollectionUrl => Get(WellKnownDistributedTaskVariables.TFCollectionUrl);
+
+        public static readonly HashSet<string> PiiVariables = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "Build.AuthorizeAs",
+            "Build.QueuedBy",
+            "Build.RequestedFor",
+            "Build.RequestedForEmail",
+            "Build.SourceBranch",
+            "Build.SourceBranchName",
+            "Build.SourceTfvcShelveset",
+            "Build.SourceVersion",
+            "Build.SourceVersionAuthor",
+            "Job.AuthorizeAs",
+            "Release.Deployment.RequestedFor",
+            "Release.Deployment.RequestedForEmail",
+            "Release.RequestedFor",
+            "Release.RequestedForEmail",
+        };
+
+        public static readonly string PiiArtifactVariablePrefix = "Release.Artifacts";
+
+        public static readonly List<string> PiiArtifactVariableSuffixes = new List<string>()
+        {
+            "SourceBranch",
+            "SourceBranchName",
+            "SourceVersion",
+            "RequestedFor"
+        };
+
         public string Get(string name)
         {
             Variable variable;

src/Runner.Worker/Worker.cs

@@ -40,7 +40,9 @@ namespace GitHub.Runner.Worker
                 // Validate args.
                 ArgUtil.NotNullOrEmpty(pipeIn, nameof(pipeIn));
                 ArgUtil.NotNullOrEmpty(pipeOut, nameof(pipeOut));
-                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, HostContext.WebProxy);
+                var runnerWebProxy = HostContext.GetService<IRunnerWebProxy>();
+                var runnerCertManager = HostContext.GetService<IRunnerCertificateManager>();
+                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, runnerWebProxy.WebProxy, runnerCertManager.VssClientCertificateManager);
                 var jobRunner = HostContext.CreateService<IJobRunner>();
 
                 using (var channel = HostContext.CreateService<IProcessChannel>())
@@ -72,7 +74,7 @@ namespace GitHub.Runner.Worker
                     SetCulture(jobMessage);
 
                     // Start the job.
-                    Trace.Info($"Job message:{Environment.NewLine} {StringUtil.ConvertToJson(jobMessage)}");
+                    Trace.Info($"Job message:{Environment.NewLine} {StringUtil.ConvertToJson(WorkerUtilities.ScrubPiiData(jobMessage))}");
                     Task<TaskResult> jobRunnerTask = jobRunner.RunAsync(jobMessage, jobRequestCancellationToken.Token);
 
                     // Start listening for a cancel message from the channel.
@@ -177,6 +179,15 @@ namespace GitHub.Runner.Worker
                     }
                 }
             }
+
+            // Add masks for secure file download tickets
+            foreach (SecureFile file in message.Resources.SecureFiles ?? new List<SecureFile>())
+            {
+                if (!string.IsNullOrEmpty(file.Ticket))
+                {
+                    HostContext.SecretMasker.AddValue(file.Ticket);
+                }
+            }
         }
 
         private void SetCulture(Pipelines.AgentJobRequestMessage message)

src/Runner.Worker/WorkerUtilties.cs

@@ -0,0 +1,92 @@
+using GitHub.DistributedTask.Pipelines.ContextData;
+using GitHub.DistributedTask.WebApi;
+using Pipelines = GitHub.DistributedTask.Pipelines;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using GitHub.Runner.Sdk;
+
+namespace GitHub.Runner.Worker
+{
+    public class WorkerUtilities
+    {
+        public static Pipelines.AgentJobRequestMessage ScrubPiiData(Pipelines.AgentJobRequestMessage message)
+        {
+            ArgUtil.NotNull(message, nameof(message));
+
+            var scrubbedVariables = new Dictionary<string, VariableValue>();
+
+            // Scrub the known PII variables
+            foreach (var variable in message.Variables)
+            {
+                if (Variables.PiiVariables.Contains(variable.Key) ||
+                    (variable.Key.StartsWith(Variables.PiiArtifactVariablePrefix, StringComparison.OrdinalIgnoreCase)
+                    && Variables.PiiArtifactVariableSuffixes.Any(varSuffix => variable.Key.EndsWith(varSuffix, StringComparison.OrdinalIgnoreCase))))
+                {
+                    scrubbedVariables[variable.Key] = "[PII]";
+                }
+                else
+                {
+                    scrubbedVariables[variable.Key] = variable.Value;
+                }
+            }
+
+            var scrubbedRepositories = new List<Pipelines.RepositoryResource>();
+
+            // Scrub the repository resources
+            foreach (var repository in message.Resources.Repositories)
+            {
+                Pipelines.RepositoryResource scrubbedRepository = repository.Clone();
+
+                var versionInfo = repository.Properties.Get<Pipelines.VersionInfo>(Pipelines.RepositoryPropertyNames.VersionInfo);
+
+                if (versionInfo != null)
+                {
+                    scrubbedRepository.Properties.Set(
+                        Pipelines.RepositoryPropertyNames.VersionInfo,
+                        new Pipelines.VersionInfo()
+                        {
+                            Author = "[PII]",
+                            Message = versionInfo.Message
+                        });
+                }
+
+                scrubbedRepositories.Add(scrubbedRepository);
+            }
+
+            var scrubbedJobResources = new Pipelines.JobResources();
+
+            scrubbedJobResources.Containers.AddRange(message.Resources.Containers);
+            scrubbedJobResources.Endpoints.AddRange(message.Resources.Endpoints);
+            scrubbedJobResources.Repositories.AddRange(scrubbedRepositories);
+            scrubbedJobResources.SecureFiles.AddRange(message.Resources.SecureFiles);
+
+            var contextData = new DictionaryContextData();
+            if (message.ContextData?.Count > 0)
+            {
+                foreach (var pair in message.ContextData)
+                {
+                    contextData[pair.Key] = pair.Value;
+                }
+            }
+
+            // Reconstitute a new agent job request message from the scrubbed parts
+            return new Pipelines.AgentJobRequestMessage(
+                plan: message.Plan,
+                timeline: message.Timeline,
+                jobId: message.JobId,
+                jobDisplayName: message.JobDisplayName,
+                jobName: message.JobName,
+                jobContainer: message.JobContainer,
+                jobServiceContainers: message.JobServiceContainers,
+                environmentVariables: message.EnvironmentVariables,
+                variables: scrubbedVariables,
+                maskHints: message.MaskHints,
+                jobResources: scrubbedJobResources,
+                contextData: contextData,
+                workspaceOptions: message.Workspace,
+                steps: message.Steps,
+                scopes: message.Scopes);
+        }
+    }
+}

src/Sdk/AadAuthentication/CookieUtility.cs

@@ -0,0 +1,264 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Runtime.InteropServices;
+using System.Text;
+using GitHub.Services.Common;
+
+namespace GitHub.Services.Client
+{
+    internal static class CookieUtility
+    {
+        public static readonly String AcsMetadataRetrievalExceptionText = "Unable to retrieve ACS Metadata from '{0}'";
+        public static readonly String FedAuthCookieName = "FedAuth";
+        public static readonly String WindowsLiveSignOutUrl = "https://login.live.com/uilogout.srf";
+        public static readonly Uri WindowsLiveCookieDomain = new Uri("https://login.live.com/");
+
+        public static CookieCollection GetFederatedCookies(Uri cookieDomainAndPath)
+        {
+            CookieCollection result = null;
+
+            Cookie cookie = GetCookieEx(cookieDomainAndPath, FedAuthCookieName).FirstOrDefault();
+
+            if (cookie != null)
+            {
+                result = new CookieCollection();
+                result.Add(cookie);
+
+                for (Int32 x = 1; x < 50; x++)
+                {
+                    String cookieName = FedAuthCookieName + x;
+                    cookie = GetCookieEx(cookieDomainAndPath, cookieName).FirstOrDefault();
+
+                    if (cookie != null)
+                    {
+                        result.Add(cookie);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public static CookieCollection GetFederatedCookies(String[] token)
+        {
+            CookieCollection result = null;
+
+            if (token != null && token.Length > 0 && token[0] != null)
+            {
+                result = new CookieCollection();
+                result.Add(new Cookie(FedAuthCookieName, token[0]));
+
+                for (Int32 x = 1; x < token.Length; x++)
+                {
+                    String cookieName = FedAuthCookieName + x;
+
+                    if (token[x] != null)
+                    {
+                        Cookie cookie = new Cookie(cookieName, token[x]);
+                        cookie.HttpOnly = true;
+                        result.Add(cookie);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public static CookieCollection GetFederatedCookies(IHttpResponse webResponse)
+        {
+            CookieCollection result = null;
+            IEnumerable<String> cookies = null;
+
+            if (webResponse.Headers.TryGetValues("Set-Cookie", out cookies))
+            {
+                foreach (String cookie in cookies)
+                {
+                    if (cookie != null && cookie.StartsWith(CookieUtility.FedAuthCookieName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        // Only take the security token field of the cookie, and discard the rest
+                        String fedAuthToken = cookie.Split(';').FirstOrDefault();
+                        Int32 index = fedAuthToken.IndexOf('=');
+
+                        if (index > 0 && index < fedAuthToken.Length - 1)
+                        {
+                            String name = fedAuthToken.Substring(0, index);
+                            String value = fedAuthToken.Substring(index + 1);
+
+                            result = result ?? new CookieCollection();
+                            result.Add(new Cookie(name, value));
+                        }
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public static CookieCollection GetAllCookies(Uri cookieDomainAndPath)
+        {
+            CookieCollection result = null;
+            List<Cookie> cookies = GetCookieEx(cookieDomainAndPath, null);
+            foreach (Cookie cookie in cookies)
+            {
+                if (result == null)
+                {
+                    result = new CookieCollection();
+                }
+
+                result.Add(cookie);
+            }
+
+            return result;
+        }
+
+        public static void DeleteFederatedCookies(Uri cookieDomainAndPath)
+        {
+            CookieCollection cookies = GetFederatedCookies(cookieDomainAndPath);
+
+            if (cookies != null)
+            {
+                foreach (Cookie cookie in cookies)
+                {
+                    DeleteCookieEx(cookieDomainAndPath, cookie.Name);
+                }
+            }
+        }
+
+        public static void DeleteWindowsLiveCookies()
+        {
+            DeleteAllCookies(WindowsLiveCookieDomain);
+        }
+
+        public static void DeleteAllCookies(Uri cookieDomainAndPath)
+        {
+            CookieCollection cookies = GetAllCookies(cookieDomainAndPath);
+
+            if (cookies != null)
+            {
+                foreach (Cookie cookie in cookies)
+                {
+                    DeleteCookieEx(cookieDomainAndPath, cookie.Name);
+                }
+            }
+        }
+
+        public const UInt32 INTERNET_COOKIE_HTTPONLY = 0x00002000;
+
+        [DllImport("wininet.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        static extern bool InternetGetCookieEx(
+        String url, String cookieName, StringBuilder cookieData, ref Int32 size, UInt32 flags, IntPtr reserved);
+
+        [DllImport("wininet.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        static extern bool InternetSetCookieEx(
+        String url, String cookieName, String cookieData, UInt32 flags, IntPtr reserved);
+
+        public static Boolean DeleteCookieEx(Uri cookiePath, String cookieName)
+        {
+            UInt32 flags = INTERNET_COOKIE_HTTPONLY;
+
+            String path = cookiePath.ToString();
+            if (!path.EndsWith("/", StringComparison.Ordinal))
+            {
+                path = path + "/";
+            }
+
+            DateTime expiration = DateTime.UtcNow.AddYears(-1);
+            String cookieData = String.Format(CultureInfo.InvariantCulture, "{0}=0;expires={1};path=/;domain={2};httponly", cookieName, expiration.ToString("R"), cookiePath.Host);
+
+            return InternetSetCookieEx(path, null, cookieData, flags, IntPtr.Zero);
+        }
+
+        public static Boolean SetCookiesEx(
+            Uri cookiePath,
+            CookieCollection cookies)
+        {
+            String path = cookiePath.ToString();
+            if (!path.EndsWith("/", StringComparison.Ordinal))
+            {
+                path = path + "/";
+            }
+
+            Boolean successful = true;
+            foreach (Cookie cookie in cookies)
+            {
+                // This means it doesn't expire
+                if (cookie.Expires.Year == 1)
+                {
+                    continue;
+                }
+
+                String cookieData = String.Format(CultureInfo.InvariantCulture,
+                                                  "{0}; path={1}; domain={2}; expires={3}; httponly",
+                                                  cookie.Value,
+                                                  cookie.Path,
+                                                  cookie.Domain,
+                                                  cookie.Expires.ToString("ddd, dd-MMM-yyyy HH:mm:ss 'GMT'"));
+
+                successful &= InternetSetCookieEx(path, cookie.Name, cookieData, INTERNET_COOKIE_HTTPONLY, IntPtr.Zero);
+            }
+            return successful;
+        }
+
+        public static List<Cookie> GetCookieEx(Uri cookiePath, String cookieName)
+        {
+            UInt32 flags = INTERNET_COOKIE_HTTPONLY;
+
+            List<Cookie> cookies = new List<Cookie>();
+            Int32 size = 256;
+            StringBuilder cookieData = new StringBuilder(size);
+            String path = cookiePath.ToString();
+            if (!path.EndsWith("/", StringComparison.Ordinal))
+            {
+                path = path + "/";
+            }
+
+            if (!InternetGetCookieEx(path, cookieName, cookieData, ref size, flags, IntPtr.Zero))
+            {
+                if (size < 0)
+                {
+                    return cookies;
+                }
+
+                cookieData = new StringBuilder(size);
+
+                if (!InternetGetCookieEx(path, cookieName, cookieData, ref size, flags, IntPtr.Zero))
+                {
+                    return cookies;
+                }
+            }
+
+            if (cookieData.Length > 0)
+            {
+                String[] cookieSections = cookieData.ToString().Split(new char[] { ';' });
+
+                foreach (String cookieSection in cookieSections)
+                {
+                    String[] cookieParts = cookieSection.Split(new char[] { '=' }, 2);
+
+                    if (cookieParts.Length == 2)
+                    {
+                        Cookie cookie = new Cookie();
+                        cookie.Name = cookieParts[0].TrimStart();
+                        cookie.Value = cookieParts[1];
+                        cookie.HttpOnly = true;
+                        cookies.Add(cookie);
+                    }
+                }
+            }
+
+            return cookies;
+        }
+    }
+}

src/Sdk/AadAuthentication/VssAadCredential.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Net.Http;
+using System.Security;
+using GitHub.Services.Common;
+
+namespace GitHub.Services.Client
+{
+    /// <summary>
+    /// Currently it is impossible to get whether prompting is allowed from the credential itself without reproducing the logic
+    /// used by VssClientCredentials. Since this is a stop gap solution to get Windows integrated authentication to work against
+    /// AAD via ADFS for now this class will only support that one, non-interactive flow. We need to assess how much we want to
+    /// invest in this legacy stack rather than recommending people move to the VssConnect API for future authentication needs.
+    /// </summary>
+    [Serializable]
+    public sealed class VssAadCredential : FederatedCredential
+    {
+        private string username;
+        private SecureString password;
+
+        public VssAadCredential()
+            : base(null)
+        {
+        }
+
+        public VssAadCredential(VssAadToken initialToken)
+            : base(initialToken)
+        {
+        }
+
+        public VssAadCredential(string username)
+            : base(null)
+        {
+            this.username = username;
+        }
+
+        public VssAadCredential(string username, string password)
+            : base(null)
+        {
+            this.username = username;
+
+            if (password != null)
+            {
+                this.password = new SecureString();
+
+                foreach (char character in password)
+                {
+                    this.password.AppendChar(character);
+                }
+            }
+        }
+
+        public VssAadCredential(string username, SecureString password)
+            : base(null)
+        {
+            this.username = username;
+            this.password = password;
+        }
+
+        public override VssCredentialsType CredentialType
+        {
+            get
+            {
+                return VssCredentialsType.Aad;
+            }
+        }
+
+        internal string Username
+        {
+            get
+            {
+                return username;
+            }
+        }
+
+        internal SecureString Password => password;
+
+        public override bool IsAuthenticationChallenge(IHttpResponse webResponse)
+        {
+            bool isNonAuthenticationChallenge = false;
+            return VssFederatedCredential.IsVssFederatedAuthenticationChallenge(webResponse, out isNonAuthenticationChallenge) ?? false;
+        }
+
+        protected override IssuedTokenProvider OnCreateTokenProvider(
+            Uri serverUrl, 
+            IHttpResponse response)
+        {
+            if (response == null && base.InitialToken == null)
+            {
+                return null;
+            }
+
+            return new VssAadTokenProvider(this);
+        }
+    }
+}

src/Sdk/AadAuthentication/VssAadSettings.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Diagnostics;
+using GitHub.Services.WebApi;
+using GitHub.Services.WebApi.Internal;
+
+namespace GitHub.Services.Client
+{
+    internal static class VssAadSettings
+    {
+        public const string DefaultAadInstance = "https://login.microsoftonline.com/";
+
+        public const string CommonTenant = "common";
+
+        // VSTS service principal.
+        public const string Resource = "499b84ac-1321-427f-aa17-267ca6975798";
+
+        // Visual Studio IDE client ID originally provisioned by Azure Tools.
+        public const string Client = "872cd9fa-d31f-45e0-9eab-6e460a02d1f1";
+
+        // AAD Production Application tenant.
+        private const string ApplicationTenantId = "f8cdef31-a31e-4b4a-93e4-5f571e91255a";
+
+#if !NETSTANDARD
+        public static Uri NativeClientRedirectUri
+        {
+            get
+            {
+                Uri nativeClientRedirect = null;
+
+                try
+                {
+                    string nativeRedirect = VssClientEnvironment.GetSharedConnectedUserValue<string>(VssConnectionParameterOverrideKeys.AadNativeClientRedirect);
+                    if (!string.IsNullOrEmpty(nativeRedirect))
+                    {
+                        Uri.TryCreate(nativeRedirect, UriKind.RelativeOrAbsolute, out nativeClientRedirect);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine(string.Format("NativeClientRedirectUri: {0}", e));
+                }
+
+                return nativeClientRedirect ?? new Uri("urn:ietf:wg:oauth:2.0:oob");
+            }
+        }
+
+        public static string ClientId
+        {
+            get
+            {
+                string nativeRedirect = VssClientEnvironment.GetSharedConnectedUserValue<string>(VssConnectionParameterOverrideKeys.AadNativeClientIdentifier);
+                return nativeRedirect ?? VssAadSettings.Client;
+            }
+        }
+#endif
+
+        public static string AadInstance
+        {
+            get
+            {
+#if !NETSTANDARD
+                string aadInstance = VssClientEnvironment.GetSharedConnectedUserValue<string>(VssConnectionParameterOverrideKeys.AadInstance);
+#else
+                string aadInstance = null;
+#endif
+
+                if (string.IsNullOrWhiteSpace(aadInstance))
+                {
+                    aadInstance = DefaultAadInstance;
+                }
+                else if (!aadInstance.EndsWith("/"))
+                {
+                    aadInstance = aadInstance + "/";
+                }
+
+                return aadInstance;
+            }
+        }
+
+#if !NETSTANDARD
+        /// <summary>
+        /// Application tenant either from a registry override or a constant
+        /// </summary>
+        public static string ApplicationTenant => 
+            VssClientEnvironment.GetSharedConnectedUserValue<string>(VssConnectionParameterOverrideKeys.AadApplicationTenant) 
+            ?? VssAadSettings.ApplicationTenantId;
+#endif
+    }
+}

src/Sdk/AadAuthentication/VssAadToken.cs

@@ -0,0 +1,124 @@
+using System;
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using GitHub.Services.Common;
+
+namespace GitHub.Services.Client
+{
+    [Serializable]
+    public class VssAadToken : IssuedToken
+    {
+        private string accessToken;
+        private string accessTokenType;
+
+        private AuthenticationContext authenticationContext;
+        private UserCredential userCredential;
+        private VssAadTokenOptions options;
+
+        public VssAadToken(AuthenticationResult authentication)
+        {
+            // Prevent any attempt to store this token.
+            this.FromStorage = true;
+
+            if (!string.IsNullOrWhiteSpace(authentication.AccessToken))
+            {
+                this.Authenticated();
+            }
+
+            this.accessToken = authentication.AccessToken;
+            this.accessTokenType = authentication.AccessTokenType;
+        }
+
+        public VssAadToken(
+            string accessTokenType, 
+            string accessToken)
+        {
+            // Prevent any attempt to store this token.
+            this.FromStorage = true;
+
+            if (!string.IsNullOrWhiteSpace(accessToken) && !string.IsNullOrWhiteSpace(accessTokenType))
+            {
+                this.Authenticated();
+            }
+
+            this.accessToken = accessToken;
+            this.accessTokenType = accessTokenType;
+        }
+
+        public VssAadToken(
+            AuthenticationContext authenticationContext, 
+            UserCredential userCredential = null, 
+            VssAadTokenOptions options = VssAadTokenOptions.None)
+        {
+            // Prevent any attempt to store this token.
+            this.FromStorage = true;
+
+            this.authenticationContext = authenticationContext;
+            this.userCredential = userCredential;
+            this.options = options;
+        }
+
+        protected internal override VssCredentialsType CredentialType
+        {
+            get
+            {
+                return VssCredentialsType.Aad;
+            }
+        }
+
+        public AuthenticationResult AcquireToken()
+        {
+            if (this.authenticationContext == null)
+            {
+                return null;
+            }
+
+            AuthenticationResult authenticationResult = null;
+
+            for (int index = 0; index < 3; index++)
+            {
+                try
+                {
+                    if (this.userCredential == null && !options.HasFlag(VssAadTokenOptions.AllowDialog))
+                    {
+                        authenticationResult = authenticationContext.AcquireTokenSilentAsync(VssAadSettings.Resource, VssAadSettings.Client).ConfigureAwait(false).GetAwaiter().GetResult();
+                    }
+                    else
+                    {
+                        authenticationResult = authenticationContext.AcquireTokenAsync(VssAadSettings.Resource, VssAadSettings.Client, this.userCredential).ConfigureAwait(false).GetAwaiter().GetResult();
+                    }
+
+                    if (authenticationResult != null)
+                    {
+                        break;
+                    }
+                }
+                catch (Exception x)
+                {
+                    System.Diagnostics.Debug.WriteLine("Failed to get ADFS token: " + x.ToString());
+                }
+            }
+
+            return authenticationResult;
+        }
+
+        internal override void ApplyTo(IHttpRequest request)
+        {
+            AuthenticationResult authenticationResult = AcquireToken();
+            if (authenticationResult != null)
+            {
+                request.Headers.SetValue(Common.Internal.HttpHeaders.Authorization, $"{authenticationResult.AccessTokenType} {authenticationResult.AccessToken}");
+            }
+            else if (!string.IsNullOrEmpty(this.accessTokenType) && !string.IsNullOrEmpty(this.accessToken))
+            {
+                request.Headers.SetValue(Common.Internal.HttpHeaders.Authorization, $"{this.accessTokenType} {this.accessToken}");
+            }
+        }
+    }
+
+    [Flags]
+    public enum VssAadTokenOptions
+    {
+        None = 0,
+        AllowDialog = 1
+    }
+}

src/Sdk/AadAuthentication/VssAadTokenProvider.cs

@@ -0,0 +1,77 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using GitHub.Services.Common;
+
+namespace GitHub.Services.Client
+{
+    internal sealed class VssAadTokenProvider : IssuedTokenProvider
+    {
+        public VssAadTokenProvider(VssAadCredential credential)
+            : base(credential, null, null)
+        {
+        }
+
+        public override bool GetTokenIsInteractive
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        private VssAadToken GetVssAadToken()
+        {
+            AuthenticationContext authenticationContext = new AuthenticationContext(string.Concat(VssAadSettings.AadInstance, VssAadSettings.CommonTenant));
+            UserCredential userCredential = null;
+
+            VssAadCredential credential = this.Credential as VssAadCredential;
+
+            if (credential?.Username != null)
+            {
+#if  NETSTANDARD
+                // UserPasswordCredential does not currently exist for ADAL 3.13.5 for any non-desktop build.
+                userCredential = new UserCredential(credential.Username);
+#else
+                if (credential.Password != null)
+                {
+                    userCredential = new UserPasswordCredential(credential.Username, credential.Password);
+
+                }
+                else
+                {
+                    userCredential = new UserCredential(credential.Username);
+                }
+#endif
+            }
+            else
+            {
+                userCredential = new UserCredential();
+            }
+
+            return new VssAadToken(authenticationContext, userCredential);            
+        }
+
+        /// <summary>
+        /// Temporary implementation since we don't have a good configuration story here at the moment.
+        /// </summary>
+        protected override Task<IssuedToken> OnGetTokenAsync(IssuedToken failedToken, CancellationToken cancellationToken)
+        {
+            // If we have already tried to authenticate with an AAD token retrieved from Windows integrated authentication and it is not working, clear out state.
+            if (failedToken != null && failedToken.CredentialType == VssCredentialsType.Aad && failedToken.IsAuthenticated)
+            {
+                this.CurrentToken = null;
+                return Task.FromResult<IssuedToken>(null);
+            }
+
+            try
+            {
+                return Task.FromResult<IssuedToken>(GetVssAadToken());
+            }
+            catch
+            { }
+
+            return Task.FromResult<IssuedToken>(null);
+        }
+    }
+}

src/Sdk/AadAuthentication/VssFederatedCredential.cs

@@ -0,0 +1,172 @@
+using System;
+using System.Linq;
+using System.Net;
+using GitHub.Services.Common;
+using GitHub.Services.Common.Internal;
+
+namespace GitHub.Services.Client
+{
+    /// <summary>
+    /// Provides federated authentication with a hosted <c>VssConnection</c> instance using cookies.
+    /// </summary>
+    [Serializable]
+    public sealed class VssFederatedCredential : FederatedCredential
+    {
+        /// <summary>
+        /// Initializes a new <c>VssFederatedCredential</c> instance.
+        /// </summary>
+        public VssFederatedCredential()
+            : this(true)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <c>VssFederatedCredential</c> instance.
+        /// </summary>
+        public VssFederatedCredential(Boolean useCache)
+            : this(useCache, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <c>VssFederatedCredential</c> instance.
+        /// </summary>
+        /// <param name="initialToken">The initial token if available</param>
+        public VssFederatedCredential(VssFederatedToken initialToken)
+            : this(false, initialToken)
+        {
+        }
+
+        public VssFederatedCredential(
+            Boolean useCache,
+            VssFederatedToken initialToken)
+            : base(initialToken)
+        {
+#if !NETSTANDARD
+            if (useCache)
+            {
+                Storage = new VssClientCredentialStorage();
+            }
+#endif
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override VssCredentialsType CredentialType
+        {
+            get 
+            { 
+                return VssCredentialsType.Federated; 
+            }
+        }
+
+        public override Boolean IsAuthenticationChallenge(IHttpResponse webResponse)
+        {
+            bool isNonAuthenticationChallenge = false;
+            return IsVssFederatedAuthenticationChallenge(webResponse, out isNonAuthenticationChallenge) ?? isNonAuthenticationChallenge;
+        }
+
+        protected override IssuedTokenProvider OnCreateTokenProvider(
+            Uri serverUrl, 
+            IHttpResponse response)
+        {
+            // The response is only null when attempting to determine the most appropriate token provider to
+            // use for the connection. The only way we should do anything here is if we have an initial token
+            // since that means we can present something without making a server call.
+            if (response == null && base.InitialToken == null)
+            {
+                return null;
+            }
+
+            Uri signInUrl = null;
+            String realm = String.Empty;
+            String issuer = String.Empty;
+
+            if (response != null)
+            {
+                var location = response.Headers.GetValues(HttpHeaders.Location).FirstOrDefault();
+                if (location == null)
+                {
+                    location = response.Headers.GetValues(HttpHeaders.TfsFedAuthRedirect).FirstOrDefault();
+                }
+
+                if (!String.IsNullOrEmpty(location))
+                {
+                    signInUrl = new Uri(location);
+                }
+
+                // Inform the server that we support the javascript notify "smart client" pattern for ACS auth
+                AddParameter(ref signInUrl, "protocol", "javascriptnotify");
+
+                // Do not automatically sign in with existing FedAuth cookie
+                AddParameter(ref signInUrl, "force", "1");
+
+                GetRealmAndIssuer(response, out realm, out issuer);
+            }
+
+            return new VssFederatedTokenProvider(this, serverUrl, signInUrl, issuer, realm);
+        }
+
+        internal static void GetRealmAndIssuer(
+            IHttpResponse response, 
+            out String realm,
+            out String issuer)
+        {
+            realm = response.Headers.GetValues(HttpHeaders.TfsFedAuthRealm).FirstOrDefault();
+            issuer = response.Headers.GetValues(HttpHeaders.TfsFedAuthIssuer).FirstOrDefault();
+
+            if (!String.IsNullOrWhiteSpace(issuer))
+            {
+                issuer = new Uri(issuer).GetLeftPart(UriPartial.Authority);
+            }
+        }
+
+        internal static Boolean? IsVssFederatedAuthenticationChallenge(
+            IHttpResponse webResponse, 
+            out Boolean isNonAuthenticationChallenge)
+        {
+            isNonAuthenticationChallenge = false;
+
+            if (webResponse == null)
+            {
+                return false;
+            }
+
+            // Check to make sure that the redirect was issued from the Tfs service. We include the TfsServiceError
+            // header to avoid the possibility that a redirect from a non-tfs service is issued and we incorrectly
+            // launch the credentials UI.
+            if (webResponse.StatusCode == HttpStatusCode.Found ||
+                webResponse.StatusCode == HttpStatusCode.Redirect)
+            {
+                return webResponse.Headers.GetValues(HttpHeaders.Location).Any() && webResponse.Headers.GetValues(HttpHeaders.TfsFedAuthRealm).Any();
+            }
+            else if (webResponse.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                return webResponse.Headers.GetValues(HttpHeaders.WwwAuthenticate).Any(x => x.StartsWith("TFS-Federated", StringComparison.OrdinalIgnoreCase));
+            }
+            else if (webResponse.StatusCode == HttpStatusCode.Forbidden)
+            {
+                // This is not strictly an "authentication challenge" but it is a state the user can do something about so they can get access to the resource
+                // they are attempting to access. Specifically, the user will hit this when they need to update or create a profile required by business policy.
+                isNonAuthenticationChallenge = webResponse.Headers.GetValues(HttpHeaders.TfsFedAuthRedirect).Any();
+                if (isNonAuthenticationChallenge)
+                {
+                    return null;
+                }
+            }
+
+            return false;
+        }
+
+        private static void AddParameter(ref Uri uri, String name, String value)
+        {
+            if (uri.Query.IndexOf(String.Concat(name, "="), StringComparison.OrdinalIgnoreCase) < 0)
+            {
+                UriBuilder builder = new UriBuilder(uri);
+                builder.Query = String.Concat(builder.Query.TrimStart('?'), "&", name, "=", value);
+                uri = builder.Uri;
+            }
+        }
+    }
+}

src/Sdk/AadAuthentication/VssFederatedToken.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Net;
+using GitHub.Services.Common;
+
+namespace GitHub.Services.Client
+{
+    /// <summary>
+    /// Provides a cookie-based authentication token.
+    /// </summary>
+    [Serializable]
+    public sealed class VssFederatedToken : IssuedToken
+    {
+        /// <summary>
+        /// Initializes a new <c>VssFederatedToken</c> instance using the specified cookies.
+        /// </summary>
+        /// <param name="cookies"></param>
+        public VssFederatedToken(CookieCollection cookies)
+        {
+            ArgumentUtility.CheckForNull(cookies, "cookies");
+            m_cookies = cookies;
+        }
+
+        /// <summary>
+        /// Returns the CookieCollection contained within this token. For internal use only.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public CookieCollection CookieCollection
+        {
+            get 
+            { 
+                return m_cookies; 
+            }
+        }
+
+        protected internal override VssCredentialsType CredentialType
+        {
+            get
+            {
+                return VssCredentialsType.Federated;
+            }
+        }
+
+        internal override void ApplyTo(IHttpRequest request)
+        {
+            // From http://www.ietf.org/rfc/rfc2109.txt:
+            //      Note: For backward compatibility, the separator in the Cookie header 
+            //      is semi-colon (;) everywhere.
+            //
+            // HttpRequestHeaders uses comma as the default separator, so instead of returning 
+            // a list of cookies, the method returns one semicolon separated string.
+            IEnumerable<String> values = request.Headers.GetValues(s_cookieHeader);
+            request.Headers.SetValue(s_cookieHeader, GetHeaderValue(values));
+        }
+
+        private String GetHeaderValue(IEnumerable<String> cookieHeaders)
+        {
+            List<String> currentCookies = new List<String>();
+            if (cookieHeaders != null)
+            {
+                foreach (String value in cookieHeaders)
+                {
+                    currentCookies.AddRange(value.Split(';').Select(x => x.Trim()));
+                }
+            }
+
+            currentCookies.RemoveAll(x => String.IsNullOrEmpty(x));
+
+            foreach (Cookie cookie in m_cookies)
+            {
+                // Remove all existing cookies that match the name of the cookie we are going to add.
+                currentCookies.RemoveAll(x => String.Equals(x.Substring(0, x.IndexOf('=')), cookie.Name, StringComparison.OrdinalIgnoreCase));
+                currentCookies.Add(String.Concat(cookie.Name, "=", cookie.Value));
+            }
+
+            return String.Join("; ", currentCookies);
+        }
+
+        private CookieCollection m_cookies;
+        private static readonly String s_cookieHeader = HttpRequestHeader.Cookie.ToString();
+    }
+}

src/Sdk/AadAuthentication/VssFederatedTokenProvider.cs

@@ -0,0 +1,157 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using GitHub.Services.Common;
+using System.Globalization;
+
+namespace GitHub.Services.Client
+{
+    /// <summary>
+    /// Provides authentication for internet identities using single-sign-on cookies.
+    /// </summary>
+    internal sealed class VssFederatedTokenProvider : IssuedTokenProvider, ISupportSignOut
+    {
+        public VssFederatedTokenProvider(
+            VssFederatedCredential credential,
+            Uri serverUrl,
+            Uri signInUrl,
+            String issuer, 
+            String realm)
+            : base(credential, serverUrl, signInUrl)
+        {
+            Issuer = issuer;
+            Realm = realm;
+        }
+
+        protected override String AuthenticationScheme
+        {
+            get 
+            {
+                return "TFS-Federated";
+            }
+        }
+
+        protected override String AuthenticationParameter
+        {
+            get
+            {
+                if (String.IsNullOrEmpty(this.Issuer) && String.IsNullOrEmpty(this.Realm))
+                {
+                    return String.Empty;
+                }
+                else
+                {
+                    return String.Format(CultureInfo.InvariantCulture, "issuer=\"{0}\", realm=\"{1}\"", this.Issuer, this.Realm);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the federated credential from which this provider was created.
+        /// </summary>
+        public new VssFederatedCredential Credential
+        {
+            get
+            {
+                return (VssFederatedCredential)base.Credential;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether or not a call to get token will require interactivity.
+        /// </summary>
+        public override Boolean GetTokenIsInteractive
+        {
+            get
+            {
+                return this.CurrentToken == null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the issuer for the token provider.
+        /// </summary>
+        public String Issuer
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets the realm for the token provider.
+        /// </summary>
+        public String Realm
+        {
+            get;
+            private set;
+        }
+
+        protected internal override Boolean IsAuthenticationChallenge(IHttpResponse webResponse)
+        {
+            if (!base.IsAuthenticationChallenge(webResponse))
+            {
+                return false;
+            }
+
+            // This means we were proactively constructed without any connection information. In this case
+            // we return false to ensure that a new provider is reconstructed with all appropriate configuration
+            // to retrieve a new token.
+            if (this.SignInUrl == null)
+            {
+                return false;
+            }
+
+            String realm, issuer;
+            VssFederatedCredential.GetRealmAndIssuer(webResponse, out realm, out issuer);
+
+            return this.Realm.Equals(realm, StringComparison.OrdinalIgnoreCase) &&
+                   this.Issuer.Equals(issuer, StringComparison.OrdinalIgnoreCase);
+        }
+
+        protected override IssuedToken OnValidatingToken(
+            IssuedToken token, 
+            IHttpResponse webResponse)
+        {
+            // If the response has Set-Cookie headers, attempt to retrieve the FedAuth cookie from the response
+            // and replace the current token with the new FedAuth cookie. Note that the server only reissues the
+            // FedAuth cookie if it is issued for more than an hour.
+            CookieCollection fedAuthCookies = CookieUtility.GetFederatedCookies(webResponse);
+
+            if (fedAuthCookies != null) 
+            {
+                // The reissued token should have the same user information as the previous one.
+                VssFederatedToken federatedToken = new VssFederatedToken(fedAuthCookies)
+                {
+                    Properties = token.Properties,
+                    UserId = token.UserId,
+                    UserName = token.UserName
+                };
+
+                token = federatedToken;
+            }
+
+            return token;
+        }
+
+        public void SignOut(Uri signOutUrl, Uri replyToUrl, String identityProvider)
+        {
+            // The preferred implementation is to follow the signOutUrl with a browser and kill the browser whenever it
+            // arrives at the replyToUrl (or if it bombs out somewhere along the way).
+            // This will work for all Web-based identity providers (Live, Google, Yahoo, Facebook) supported by ACS provided that
+            // the TFS server has registered sign-out urls (in the TF Registry) for each of these.
+            // This is the long-term approach that should be pursued and probably the approach recommended to other
+            // clients which don't have direct access to the cookie store (TEE?)
+
+            // In the short term we are simply going to delete the TFS cookies and the Windows Live cookies that are exposed to this
+            // session. This has the drawback of not properly signing out of Live (you'd still be signed in to e.g. Hotmail, Xbox, MSN, etc.)
+            // but will allow the user to re-enter their live credentials and sign-in again to TFS.
+            // The other drawback is that the clients will have to be updated again when we pursue the implementation outlined above.
+
+            CookieUtility.DeleteFederatedCookies(replyToUrl);
+            if (!String.IsNullOrEmpty(identityProvider) && identityProvider.Equals("Windows Live ID", StringComparison.OrdinalIgnoreCase))
+            {
+                CookieUtility.DeleteWindowsLiveCookies();
+            }
+        }
+    }
+}

src/Sdk/BuildWebApi/Api/AgentTargetExecutionType.cs

@@ -0,0 +1,12 @@
+using System;
+using GitHub.Services.Common;
+
+namespace GitHub.Build.WebApi {
+
+    [GenerateAllConstants]
+    public static class AgentTargetExecutionType {
+        public const Int32 Normal = 0;
+        public const Int32 VariableMultipliers = 1;
+        public const Int32 MultipleAgents = 2;
+    }
+}