.

* Treat warnings as errors

* fix warnings

.github/ISSUE_TEMPLATE.md

@@ -1,10 +0,0 @@
-## 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

@@ -0,0 +1,34 @@
+---
+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

@@ -0,0 +1,27 @@
+---
+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,9 +5,13 @@ on:
     branches:
     - master
     - releases/*
+    paths-ignore:
+    - '**.md'    
   pull_request:
     branches:
     - '*'
+    paths-ignore:
+    - '**.md'    
 
 jobs:
   build:

.github/workflows/release.yml

@@ -3,10 +3,47 @@ name: Runner CD
 on:
   push:
     paths:
-    - src/runnerversion_block # Change this to src/runnerversion when we are ready.
+    - 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 ]
@@ -52,7 +89,7 @@ jobs:
     - name: Package Release
       if: github.event_name != 'pull_request'
       run: |
-        ${{ matrix.devScript }} package Release
+        ${{ matrix.devScript }} package Release ${{ matrix.runtime }}
       working-directory: src
 
     # Upload runner package tar.gz/zip as artifact.
@@ -66,14 +103,17 @@ jobs:
 
   release:
     needs: build
-    runs-on: linux-latest
+    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
@@ -82,103 +122,74 @@ jobs:
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
+          const core = require('@actions/core')
           const fs = require('fs');
-          // Get runner version from ./src/runnerVersion file
-          const versionContent = await github.repos.getContents({
-            owner: '${{ github.event.repository.owner.name }}',
-            repo: '${{ github.event.repository.name }}',
-            path: 'src/runnerversion'
-            ref: ${{ github.sha }}
-          })
-          const runnerVersion = Buffer.from(versionContent.data.content, 'base64').toString()
-          console.log("Runner Version ' + runnerVersion)
+          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);
-
-          // Query GitHub release ensure version is bumped 
-          const latestRelease = await github.repos.getLatestRelease({
-            owner: '${{ github.event.repository.owner.name }}',
-            repo: '${{ github.event.repository.name }}'
-          })
-          console.log(latestRelease.name)
-          const latestReleaseVersion = latestRelease.name.substring(1)
-          const vLatest = latestReleaseVersion.split('.')
-          const vNew = runnerVersion.split('.')
-          let versionBumped = true
-          for (let i = 0; i < 3; ++i) {
-            var v1 = parseInt(vLatest[i], 10);
-            var v2 = parseInt(vNew[i], 10);
-            if (v2 > v1) {
-              console.log(runnerVersion + " > " + latestReleaseVersion + "(Latest)")
-              break
-            }
-            
-            if (v1 > v2) {
-              versionBumped = false  
-              core.setFailed(runnerVersion + " < " + latestReleaseVersion + "(Latest)")
-              break
-            }
-          }
-
-          // Generate release note
-          if (versionBumped) {
-            const releaseNoteContent = await github.repos.getContents({
-              owner: '${{ github.event.repository.owner.name }}',
-              repo: '${{ github.event.repository.name }}',
-              path: 'releaseNote.md'
-              ref: ${{ github.sha }}
-            })
-            const releaseNote = Buffer.from(releaseNoteContent.data.content, 'base64').toString().replace("<RUNNER_VERSION>", runnerVersion)
-            console.log(releaseNote)
-            core.setOutput('note', releaseNote);
-          }
-
+          core.setOutput('note', releaseNote);
+        
     # Create GitHub release
-    - uses: actions/create-release@v1
+    - 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 }}
+        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: ./actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip
+        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: ./actions-runner-linux-x64-${{ steps.releaseNote.outputs.version }}.zip
-        asset_name: actions-runner-linux-x64-${{ steps.releaseNote.outputs.version }}.zip
+        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 (mac-x64)
+    - 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: ./actions-runner-mac-x64-${{ steps.releaseNote.outputs.version }}.zip
-        asset_name: actions-runner-mac-x64-${{ steps.releaseNote.outputs.version }}.zip
+        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: ./actions-runner-linux-arm-${{ steps.releaseNote.outputs.version }}.zip
-        asset_name: actions-runner-linux-arm-${{ steps.releaseNote.outputs.version }}.zip
+        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: ./actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.zip
-        asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.zip
+        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,12 +1,18 @@
+# build output
 **/bin
 **/obj
 **/libs
+
+# editors
 **/*.xproj
 **/*.xproj.user
 **/.vs
 **/.vscode
 **/*.error
 **/*.json.pretty
+.idea/
+
+# output
 node_modules
 _downloads
 _layout
@@ -19,4 +25,3 @@ TestLogs
 
 #generated
 src/Runner.Sdk/BuildConstants.cs
-

LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) Microsoft Corporation
+Copyright (c) 2019 GitHub
 
 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,31 +1,25 @@
-# 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
 
-![win](docs/res/win_sm.png) [Pre-reqs](docs/start/envwin.md) | [Download](https://github.com/actions/runner/releases/latest)  
+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)
 
-![macOS](docs/res/apple_sm.png)  [Pre-reqs](docs/start/envosx.md) | [Download](https://github.com/actions/runner/releases/latest)  
+Runner releases:
 
-![linux](docs/res/linux_sm.png)  [Pre-reqs](docs/start/envlinux.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)  
 
-**Configure:**
+![macOS](docs/res/apple_sm.png)  [Pre-reqs](docs/start/envosx.md) | [Download](https://github.com/actions/runner/releases)  
 
-*MacOS and Linux*
-```bash
-./config.sh
-```
-
-*Windows*
-```bash
-config.cmd
-```
+![linux](docs/res/linux_sm.png)  [Pre-reqs](docs/start/envlinux.md) | [Download](https://github.com/actions/runner/releases)
 
 ## Contribute
 
-For developers that want to contribute, [read here](docs/contribute.md) on how to build and test.
+We accept contributions in the form of issues and pull requests.  [Read more here](docs/contribute.md) before contributing.

assets.json

@@ -1,32 +0,0 @@
-[
-    {
-        "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

@@ -1,237 +0,0 @@
-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
-        Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/runners" | ForEach-Object {
-          Write-Host "Uploading $_ as GitHub release assets"
-          $assetsParams = @{
-            Uri = "https://uploads.github.com/repos/actions/runner/releases/$releaseId/assets?name=$($_.Name)"
-            Method = 'POST';
-            Headers = @{
-              Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("github:$(GithubToken)"));
-            }
-            ContentType = 'application/octet-stream';
-            Body = [System.IO.File]::ReadAllBytes($_.FullName)
-          }  
-          Invoke-RestMethod @assetsParams
-        }
-      displayName: Create agent release on Github

azure-pipelines.yml

@@ -1,95 +0,0 @@
-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/0263-proxy-support.md

@@ -0,0 +1,61 @@
+# ADR 263: Self Hosted Runner Proxies
+**Date**: 2019-11-13
+
+**Status**: Accepted
+
+## Context
+
+- Proxy support is required for some enterprises and organizations to start using their own self hosted runners
+- While there is not a standard convention, many applications support setting proxies via the environmental variables `http_proxy`, `https_proxy`, `no_proxy`, such as curl, wget, perl, python, docker, git, R, ect
+  - Some of these applications use `HTTPS_PROXY` versus `https_proxy`, but most understand or primarily support the lowercase variant
+
+
+## Decisions
+
+We will update the Runner to use the conventional environment variables for proxies: `http_proxy`, `https_proxy` and `no_proxy` if they are set.
+These are described in detail below:
+- `https_proxy` a proxy URL for all https traffic. It may contain basic authentication credentials. For example:
+  - http://proxy.com
+  - http://127.0.0.1:8080
+  - http://user:password@proxy.com
+- `http_proxy` a proxy URL for all http traffic. It may contain basic authentication credentials. For example:
+  - http://proxy.com
+  - http://127.0.0.1:8080
+  - http://user:password@proxy.com
+- `no_proxy` a comma seperated list of hosts that should not use the proxy. An optional port may be specified
+  - `google.com`
+  - `yahoo.com:443`
+  - `google.com,bing.com`
+
+We won't use `http_proxy` for https traffic when `https_proxy` is not set, this behavior lines up with any libcurl based tools (curl, git) and wget.
+Otherwise action authors and workflow users need to adjust to differences between the runner proxy convention, and tools used by their actions and scripts.  
+
+Example:  
+  Customer set `http_proxy=http://127.0.0.1:8888` and configure the runner against `https://github.com/owner/repo`, with the `https_proxy` -> `http_proxy` fallback, the runner will connect to server without any problem. However, if user runs `git push` to `https://github.com/owner/repo`, `git` won't use the proxy since it require `https_proxy` to be set for any https traffic.
+
+> `golang`, `node.js` and other dev tools from the linux community use `http_proxy` for both http and https traffic base on my research.
+
+A majority of our users are using Linux where these variables are commonly required to be set by various programs. By reading these values, we simplify the process for self hosted runners to set up proxy, and expose it in a way users are already familiar with.
+
+A password provided for a proxy will be masked in the logs.
+
+We will support the lowercase and uppercase variants, with lowercase taking priority if both are set.
+
+### No Proxy Format
+
+While exact implementations are different per application on handle `no_proxy` env, most applications accept a comma separated list of hosts. Some accept wildcard characters (*). We are going to do exact case-insentive matches, and not support wildcards at this time.
+For example:
+- example.com will match example.com, foo.example.com, foo.bar.example.com
+- foo.example.com will match bar.foo.example.com and foo.example.com
+
+We will not support IP addresses for `no_proxy`, only hostnames.
+
+## Consequences
+
+1. Enterprises and organizations needing proxy support will be able to embrace self hosted runners
+2. Users will need to set these environmental variables before configuring the runner in order to use a proxy when configuring
+3. The runner will read from the environmental variables during config and runtime and use the provided proxy if it exists
+4. Users may need to pass these environmental variables into other applications if they do not natively take these variables
+5. Action authors may need to update their workflows to react to the these environment variables
+6. We will document the way of setting environmental variables for runners using the environmental variables and how the runner uses them
+7. Like all other secrets, users will be able to relatively easily figure out proxy password if they can modify a workflow file running on a self hosted machine

docs/adrs/README.md

@@ -0,0 +1,19 @@
+# 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,10 +1,31 @@
-# Contribution guide for developers
+# Contributions
 
-## Required Dev Dependencies
+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
 
 ![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:
 
@@ -14,27 +35,27 @@ Navigate to the `src` directory and run the following command:
   
 **Commands:**  
 
-* `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
+* `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
 
 Sample developer flow:
 
 ```bash
 git clone https://github.com/actions/runner
 cd ./src
-./dev.(sh/cmd) layout # the agent that build from source is in {root}/_layout
+./dev.(sh/cmd) layout # the runner 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 2019](https://www.visualstudio.com/vs/)  
 [Using Visual Studio Code](https://code.visualstudio.com/)
+[Using Visual Studio 2019](https://www.visualstudio.com/vs/)  
 
-## 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`). 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)
+> Note: The `installdependencies.sh` script will try to use the default package management mechanism on your Linux flavor (ex. `yum`/`apt-get`/`apt`).
 
 ### 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

@@ -1,7 +0,0 @@
-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

@@ -1,150 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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,13 +1,14 @@
 ## Features
-  - Added the "severity" keyword to allow action authors to set the default severity for problem matchers (#203)
+  - 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)
 
 ## Bugs
-  - Fixed generated self-hosted runner names to never go over 80 characters (helps Windows customers) (#193)
-  - Fixed `PrepareActions_DownloadActionFromGraph` test by pointing to an active Actions repository (#205)
+  - Clean up error messages for container scenarios (#221)
+  - Pick shell from prependpath (#231)
 
 ## Misc
-  - Updated the publish and download artifact actions to use the v2 endpoint (#188)
-  - Updated the service name on self-hosted runner name to include repository or organization information (#193)
+  - Runner code cleanup  (#218 #227, #228, #229, #230) 
+  - Consume dotnet core 3.1 in runner. (#213)
 
 ## 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
@@ -15,7 +16,7 @@ We recommend configuring the runner under "<DRIVE>:\actions-runner". This will h
 // Create a folder under the drive root
 mkdir \actions-runner ; cd \actions-runner
 // Download the latest runner package
-Invoke-WebRequest -Uri https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip -OutFile actions-runner-win-x64-<RUNNER_VERSION>.zip
+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")
@@ -27,7 +28,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ;
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
+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
 ```
@@ -38,7 +39,7 @@ tar xzf ./actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
+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
 ```
@@ -49,7 +50,7 @@ tar xzf ./actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
+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
 ```
@@ -60,7 +61,7 @@ tar xzf ./actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O https://githubassets.azureedge.net/runners/<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
+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
 ```

releaseVersion

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

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

src/Directory.Build.props

@@ -46,4 +46,9 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
   </PropertyGroup>
+
+  <!-- Set Treat tarnings as errors -->
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
 </Project>

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 "$AGENT_ALLOW_RUNASROOT" ]; then
+if [ $user_id -eq 0 -a -z "$RUNNER_ALLOW_RUNASROOT" ]; then
     echo "Must not run with sudo"
     exit 1
 fi

src/Misc/layoutroot/run.sh

@@ -2,7 +2,7 @@
 
 # Validate not sudo
 user_id=`id -u`
-if [ $user_id -eq 0 -a -z "$AGENT_ALLOW_RUNASROOT" ]; then
+if [ $user_id -eq 0 -a -z "$RUNNER_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 agent received an update message.
-# Sleep 5 seconds to wait for the update process finish and run the agent again.
+# 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.
     returnCode=$?
     if [[ $returnCode == 4 ]]; then
         if [ ! -x "$(command -v sleep)" ]; then

src/Runner.Common/ActionCommand.cs

@@ -9,26 +9,27 @@ namespace GitHub.Runner.Common
     {
         private static readonly EscapeMapping[] _escapeMappings = new[]
         {
-            new EscapeMapping(token: "%", replacement: "%25"),
             new EscapeMapping(token: ";", replacement: "%3B"),
             new EscapeMapping(token: "\r", replacement: "%0D"),
             new EscapeMapping(token: "\n", replacement: "%0A"),
             new EscapeMapping(token: "]", replacement: "%5D"),
+            new EscapeMapping(token: "%", replacement: "%25"),
         };
 
         private static readonly EscapeMapping[] _escapeDataMappings = new[]
         {
             new EscapeMapping(token: "\r", replacement: "%0D"),
             new EscapeMapping(token: "\n", replacement: "%0A"),
+            new EscapeMapping(token: "%", replacement: "%25"),
         };
 
         private static readonly EscapeMapping[] _escapePropertyMappings = new[]
         {
-            new EscapeMapping(token: "%", replacement: "%25"),
             new EscapeMapping(token: "\r", replacement: "%0D"),
             new EscapeMapping(token: "\n", replacement: "%0A"),
             new EscapeMapping(token: ":", replacement: "%3A"),
             new EscapeMapping(token: ",", replacement: "%2C"),
+            new EscapeMapping(token: "%", replacement: "%25"),
         };
 
         private readonly Dictionary<string, string> _properties = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

src/Runner.Common/AsyncManualResetEvent.cs

@@ -1,33 +0,0 @@
-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

@@ -71,15 +71,6 @@ namespace GitHub.Runner.Common
         }
     }
 
-    [DataContract]
-    public sealed class RunnerRuntimeOptions
-    {
-#if OS_WINDOWS
-        [DataMember(EmitDefaultValue = false)]
-        public bool GitUseSecureChannel { get; set; }
-#endif
-    }
-
     [ServiceLocator(Default = typeof(ConfigurationStore))]
     public interface IConfigurationStore : IRunnerService
     {
@@ -92,9 +83,6 @@ 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
@@ -103,11 +91,9 @@ 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)
         {
@@ -130,9 +116,6 @@ 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; }
@@ -229,35 +212,5 @@ namespace GitHub.Runner.Common
         {
             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

@@ -88,10 +88,6 @@ namespace GitHub.Runner.Common
                     public static readonly string MonitorSocketAddress = "monitorsocketaddress";
                     public static readonly string Name = "name";
                     public static readonly string Pool = "pool";
-                    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 StartupType = "startuptype";
                     public static readonly string Url = "url";
                     public static readonly string UserName = "username";
@@ -99,14 +95,10 @@ namespace GitHub.Runner.Common
                     public static readonly string Work = "work";
 
                     // Secret args. Must be added to the "Secrets" getter as well.
-                    public static readonly string Password = "password";
-                    public static readonly string SslClientCertPassword = "sslclientcertpassword";
                     public static readonly string Token = "token";
                     public static readonly string WindowsLogonPassword = "windowslogonpassword";
                     public static string[] Secrets => new[]
                     {
-                        Password,
-                        SslClientCertPassword,
                         Token,
                         WindowsLogonPassword,
                     };
@@ -125,13 +117,10 @@ namespace GitHub.Runner.Common
                 public static class Flags
                 {
                     public static readonly string Commit = "commit";
-                    public static readonly string GitUseSChannel = "gituseschannel";
                     public static readonly string Help = "help";
                     public static readonly string Replace = "replace";
-                    public static readonly string LaunchBrowser = "launchbrowser";
                     public static readonly string Once = "once";
                     public static readonly string RunAsService = "runasservice";
-                    public static readonly string SslSkipCertValidation = "sslskipcertvalidation";
                     public static readonly string Unattended = "unattended";
                     public static readonly string Version = "version";
                 }
@@ -200,6 +189,11 @@ namespace GitHub.Runner.Common
                 public static readonly string StepDebug = "ACTIONS_STEP_DEBUG";
             }
 
+            public static class Agent
+            {
+                public static readonly string ToolsDirectory = "agent.ToolsDirectory";
+            }
+
             public static class System
             {
                 //

src/Runner.Common/HostContext.cs

@@ -58,8 +58,8 @@ namespace GitHub.Runner.Common
         private CancellationTokenSource _runnerShutdownTokenSource = new CancellationTokenSource();
         private object _perfLock = new object();
         private Tracing _trace;
-        private Tracing _vssTrace;
-        private Tracing _httpTrace;
+        private Tracing _actionsHttpTrace;
+        private Tracing _netcoreHttpTrace;
         private ITraceManager _traceManager;
         private AssemblyLoadContext _loadContext;
         private IDisposable _httpTraceSubscription;
@@ -117,8 +117,7 @@ namespace GitHub.Runner.Common
             }
 
             _trace = GetTrace(nameof(HostContext));
-            _vssTrace = GetTrace("GitHubActionsRunner");  // VisualStudioService
-
+            _actionsHttpTrace = GetTrace("GitHubActionsService");
             // Enable Http trace
             bool enableHttpTrace;
             if (bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_HTTPTRACE"), out enableHttpTrace) && enableHttpTrace)
@@ -130,7 +129,7 @@ namespace GitHub.Runner.Common
                 _trace.Warning("**                                                                                     **");
                 _trace.Warning("*****************************************************************************************");
 
-                _httpTrace = GetTrace("HttpTrace");
+                _netcoreHttpTrace = GetTrace("HttpTrace");
                 _diagListenerSubscription = DiagnosticListener.AllListeners.Subscribe(this);
             }
 
@@ -230,8 +229,9 @@ namespace GitHub.Runner.Common
                     break;
 
                 case WellKnownDirectory.Tools:
-                    path = Environment.GetEnvironmentVariable("RUNNER_TOOL_CACHE");
-                    
+                    // 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(
@@ -478,12 +478,12 @@ namespace GitHub.Runner.Common
 
         void IObserver<DiagnosticListener>.OnCompleted()
         {
-            _httpTrace.Info("DiagListeners finished transmitting data.");
+            _netcoreHttpTrace.Info("DiagListeners finished transmitting data.");
         }
 
         void IObserver<DiagnosticListener>.OnError(Exception error)
         {
-            _httpTrace.Error(error);
+            _netcoreHttpTrace.Error(error);
         }
 
         void IObserver<DiagnosticListener>.OnNext(DiagnosticListener listener)
@@ -496,22 +496,22 @@ namespace GitHub.Runner.Common
 
         void IObserver<KeyValuePair<string, object>>.OnCompleted()
         {
-            _httpTrace.Info("HttpHandlerDiagnosticListener finished transmitting data.");
+            _netcoreHttpTrace.Info("HttpHandlerDiagnosticListener finished transmitting data.");
         }
 
         void IObserver<KeyValuePair<string, object>>.OnError(Exception error)
         {
-            _httpTrace.Error(error);
+            _netcoreHttpTrace.Error(error);
         }
 
         void IObserver<KeyValuePair<string, object>>.OnNext(KeyValuePair<string, object> value)
         {
-            _httpTrace.Info($"Trace {value.Key} event:{Environment.NewLine}{value.Value.ToString()}");
+            _netcoreHttpTrace.Info($"Trace {value.Key} event:{Environment.NewLine}{value.Value.ToString()}");
         }
 
         protected override void OnEventSourceCreated(EventSource source)
         {
-            if (source.Name.Equals("Microsoft-VSS-Http"))
+            if (source.Name.Equals("GitHub-Actions-Http"))
             {
                 EnableEvents(source, EventLevel.Verbose);
             }
@@ -551,24 +551,24 @@ namespace GitHub.Runner.Common
                 {
                     case EventLevel.Critical:
                     case EventLevel.Error:
-                        _vssTrace.Error(message);
+                        _actionsHttpTrace.Error(message);
                         break;
                     case EventLevel.Warning:
-                        _vssTrace.Warning(message);
+                        _actionsHttpTrace.Warning(message);
                         break;
                     case EventLevel.Informational:
-                        _vssTrace.Info(message);
+                        _actionsHttpTrace.Info(message);
                         break;
                     default:
-                        _vssTrace.Verbose(message);
+                        _actionsHttpTrace.Verbose(message);
                         break;
                 }
             }
             catch (Exception ex)
             {
-                _vssTrace.Error(ex);
-                _vssTrace.Info(eventData.Message);
-                _vssTrace.Info(string.Join(", ", eventData.Payload?.ToArray() ?? new string[0]));
+                _actionsHttpTrace.Error(ex);
+                _actionsHttpTrace.Info(eventData.Message);
+                _actionsHttpTrace.Info(string.Join(", ", eventData.Payload?.ToArray() ?? new string[0]));
             }
         }
 

src/Runner.Common/Logging.cs

@@ -24,7 +24,6 @@ namespace GitHub.Runner.Common
 
         private Guid _timelineId;
         private Guid _timelineRecordId;
-        private string _pageId;
         private FileStream _pageData;
         private StreamWriter _pageWriter;
         private int _byteCount;
@@ -40,7 +39,6 @@ namespace GitHub.Runner.Common
         {
             base.Initialize(hostContext);
             _totalLines = 0;
-            _pageId = Guid.NewGuid().ToString();
             _pagesFolder = Path.Combine(hostContext.GetDirectory(WellKnownDirectory.Diag), PagingFolder);
             _jobServerQueue = HostContext.GetService<IJobServerQueue>();
             Directory.CreateDirectory(_pagesFolder);
@@ -102,7 +100,7 @@ namespace GitHub.Runner.Common
         {
             EndPage();
             _byteCount = 0;
-            _dataFileName = Path.Combine(_pagesFolder, $"{_pageId}_{++_pageCount}.log");
+            _dataFileName = Path.Combine(_pagesFolder, $"{_timelineRecordId}_{++_pageCount}.log");
             _pageData = new FileStream(_dataFileName, FileMode.CreateNew);
             _pageWriter = new StreamWriter(_pageData, System.Text.Encoding.UTF8);
         }

src/Runner.Common/Runner.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</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

@@ -1,231 +0,0 @@
-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

@@ -1,948 +0,0 @@
-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.Listener/CommandSettings.cs

@@ -28,14 +28,10 @@ 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
         };
@@ -45,13 +41,7 @@ namespace GitHub.Runner.Listener
             Constants.Runner.CommandLine.Args.Auth,
             Constants.Runner.CommandLine.Args.MonitorSocketAddress,
             Constants.Runner.CommandLine.Args.Name,
-            Constants.Runner.CommandLine.Args.Password,
             Constants.Runner.CommandLine.Args.Pool,
-            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,
@@ -73,9 +63,6 @@ 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.
@@ -160,13 +147,6 @@ 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.
         //
@@ -179,24 +159,6 @@ namespace GitHub.Runner.Listener
                 validator: Validators.AuthSchemeValidator);
         }
 
-        public string GetPassword()
-        {
-            return GetArgOrPrompt(
-                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);
-        }
-
         public string GetRunnerName()
         {
             return GetArgOrPrompt(
@@ -210,7 +172,7 @@ namespace GitHub.Runner.Listener
         {
             return GetArgOrPrompt(
                 name: Constants.Runner.CommandLine.Args.Token,
-                description: "Enter your personal access token:",
+                description: "What is your pool admin oauth access token?",
                 defaultValue: string.Empty,
                 validator: Validators.NonEmptyValidator);
         }
@@ -219,7 +181,16 @@ namespace GitHub.Runner.Listener
         {
             return GetArgOrPrompt(
                 name: Constants.Runner.CommandLine.Args.Token,
-                description: "Enter runner register 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:",
                 defaultValue: string.Empty,
                 validator: Validators.NonEmptyValidator);
         }
@@ -240,15 +211,6 @@ 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(
@@ -287,36 +249,6 @@ namespace GitHub.Runner.Listener
             return GetArg(Constants.Runner.CommandLine.Args.StartupType);
         }
 
-        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

@@ -85,54 +85,6 @@ namespace GitHub.Runner.Listener.Configuration
                 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 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;
@@ -352,31 +304,10 @@ namespace GitHub.Runner.Listener.Configuration
 
             _store.SaveSettings(runnerSettings);
 
-            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();
@@ -441,7 +372,7 @@ namespace GitHub.Runner.Listener.Configuration
                     }
                     else
                     {
-                        var githubToken = command.GetToken();
+                        var githubToken = command.GetRunnerDeletionToken();
                         GitHubAuthResult authResult = await GetTenantCredential(settings.GitHubUrl, githubToken);
                         creds = authResult.ToVssCredentials();
                         Trace.Info("cred retrieved via GitHub auth");
@@ -489,13 +420,6 @@ namespace GitHub.Runner.Listener.Configuration
                 currentAction = "Removing .runner";
                 if (isConfigured)
                 {
-
-                    // delete agent cert setting
-                    (HostContext.GetService<IRunnerCertificateManager>() as RunnerCertificateManager).DeleteCertificateSetting();
-
-                    // delete agent runtime option
-                    _store.DeleteRunnerRuntimeOptions();
-
                     _store.DeleteSettings();
                     _term.WriteSuccessMessage("Removed .runner");
                 }

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -78,7 +78,7 @@ namespace GitHub.Runner.Listener.Configuration
 
             if (string.Equals(TokenSchema, "OAuthAccessToken", StringComparison.OrdinalIgnoreCase))
             {
-                return new VssCredentials(null, new VssOAuthAccessTokenCredential(Token), CredentialPromptType.DoNotPrompt);
+                return new VssCredentials(new VssOAuthAccessTokenCredential(Token), CredentialPromptType.DoNotPrompt);
             }
             else
             {

src/Runner.Listener/Configuration/CredentialProvider.cs

@@ -48,7 +48,7 @@ namespace GitHub.Runner.Listener.Configuration
             ArgUtil.NotNullOrEmpty(token, nameof(token));
 
             trace.Info("token retrieved: {0} chars", token.Length);
-            VssCredentials creds = new VssCredentials(null, new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
+            VssCredentials creds = new VssCredentials(new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
             trace.Info("cred created");
 
             return creds;

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 agent using the most appropriate store for the target platform.
+    /// Manages an RSA key for the runner 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 agent. If a key file is found then the current
+        /// Creates a new <c>RSACryptoServiceProvider</c> instance for the current runner. 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 agent</returns>
+        /// <returns>An <c>RSACryptoServiceProvider</c> instance representing the key for the runner</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 agent</returns>
+        /// <returns>An <c>RSACryptoServiceProvider</c> instance representing the key for the runner</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 agentServiceExecutable = "\"" + Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Bin), WindowsServiceControlManager.WindowsServiceControllerName) + "\"";
+            string runnerServiceExecutable = "\"" + 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: agentServiceExecutable,
+                                                fileName: runnerServiceExecutable,
                                                 arguments: "init",
                                                 environment: null,
                                                 requireExitCodeZero: true,
@@ -490,7 +490,7 @@ namespace GitHub.Runner.Listener.Configuration
                                         SERVICE_WIN32_OWN_PROCESS,
                                         ServiceBootFlag.AutoStart,
                                         ServiceError.Normal,
-                                        agentServiceExecutable,
+                                        runnerServiceExecutable,
                                         null,
                                         IntPtr.Zero,
                                         null,
@@ -678,6 +678,17 @@ 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(null, agentCredential, CredentialPromptType.DoNotPrompt);
+            return new VssCredentials(agentCredential, CredentialPromptType.DoNotPrompt);
         }
     }
 }

src/Runner.Listener/Configuration/Validators.cs

@@ -38,25 +38,6 @@ 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/JobDispatcher.cs

@@ -568,6 +568,10 @@ namespace GitHub.Runner.Listener
                             {
                                 Trace.Info("worker process has been killed.");
                             }
+
+                            // When worker doesn't exit within cancel timeout, the runner will kill the worker process and worker won't finish upload job logs.
+                            // The runner will try to upload these logs at this time.
+                            await TryUploadUnfinishedLogs(message);
                         }
 
                         Trace.Info($"finish job request for job {message.JobId} with result: {resultOnAbandonOrCancel}");
@@ -712,6 +716,116 @@ namespace GitHub.Runner.Listener
             }
         }
 
+        // Best effort upload any logs for this job.
+        private async Task TryUploadUnfinishedLogs(Pipelines.AgentJobRequestMessage message)
+        {
+            Trace.Entering();
+
+            var logFolder = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Diag), PagingLogger.PagingFolder);
+            if (!Directory.Exists(logFolder))
+            {
+                return;
+            }
+
+            var logs = Directory.GetFiles(logFolder);
+            if (logs.Length == 0)
+            {
+                return;
+            }
+
+            try
+            {
+                var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection));
+                ArgUtil.NotNull(systemConnection, nameof(systemConnection));
+
+                var jobServer = HostContext.GetService<IJobServer>();
+                VssCredentials jobServerCredential = VssUtil.GetVssCredential(systemConnection);
+                VssConnection jobConnection = VssUtil.CreateConnection(systemConnection.Url, jobServerCredential);
+
+                await jobServer.ConnectAsync(jobConnection);
+
+                var timeline = await jobServer.GetTimelineAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, CancellationToken.None);
+
+                var updatedRecords = new List<TimelineRecord>();
+                var logPages = new Dictionary<Guid, Dictionary<int, string>>();
+                var logRecords = new Dictionary<Guid, TimelineRecord>();
+                foreach (var log in logs)
+                {
+                    var logName = Path.GetFileNameWithoutExtension(log);
+                    var logPageSeperator = logName.IndexOf('_');
+                    var logRecordId = Guid.Empty;
+                    var pageNumber = 0;
+                    if (logPageSeperator < 0)
+                    {
+                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_INT'.");
+                        continue;
+                    }
+                    else
+                    {
+                        if (!Guid.TryParse(logName.Substring(0, logPageSeperator), out logRecordId))
+                        {
+                            Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_INT'.");
+                            continue;
+                        }
+
+                        if (!int.TryParse(logName.Substring(logPageSeperator + 1), out pageNumber))
+                        {
+                            Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_INT'.");
+                            continue;
+                        }
+                    }
+
+                    var record = timeline.Records.FirstOrDefault(x => x.Id == logRecordId);
+                    if (record != null)
+                    {
+                        if (!logPages.ContainsKey(record.Id))
+                        {
+                            logPages[record.Id] = new Dictionary<int, string>();
+                            logRecords[record.Id] = record;
+                        }
+
+                        logPages[record.Id][pageNumber] = log;
+                    }
+                }
+
+                foreach (var pages in logPages)
+                {
+                    var record = logRecords[pages.Key];
+                    if (record.Log == null)
+                    {
+                        // Create the log
+                        record.Log = await jobServer.CreateLogAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, new TaskLog(String.Format(@"logs\{0:D}", record.Id)), default(CancellationToken));
+
+                        // Need to post timeline record updates to reflect the log creation
+                        updatedRecords.Add(record.Clone());
+                    }
+
+                    for (var i = 1; i <= pages.Value.Count; i++)
+                    {
+                        var logFile = pages.Value[i];
+                        // Upload the contents
+                        using (FileStream fs = File.Open(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                        {
+                            var logUploaded = await jobServer.AppendLogContentAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, record.Log.Id, fs, default(CancellationToken));
+                        }
+
+                        Trace.Info($"Uploaded unfinished log '{logFile}' for current job.");
+                        IOUtil.DeleteFile(logFile);
+                    }
+                }
+
+                if (updatedRecords.Count > 0)
+                {
+                    await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, updatedRecords, CancellationToken.None);
+                }
+            }
+            catch (Exception ex)
+            {
+                // Ignore any error during log upload since it's best effort
+                Trace.Error(ex);
+            }
+        }
+
         // TODO: We need send detailInfo back to DT in order to add an issue for the job
         private async Task CompleteJobRequestAsync(int poolId, Pipelines.AgentJobRequestMessage message, Guid lockToken, TaskResult result, string detailInfo = null)
         {

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 Agent Server...");
+                    Trace.Info("Connecting to the Runner Server...");
                     await _runnerServer.ConnectAsync(new Uri(serverUrl), creds);
                     Trace.Info("VssConnection created");
                     
@@ -110,7 +110,7 @@ namespace GitHub.Runner.Listener
                 }
                 catch (TaskAgentAccessTokenExpiredException)
                 {
-                    Trace.Info("Agent OAuth token has been revoked. Session creation failed.");
+                    Trace.Info("Runner OAuth token has been revoked. Session creation failed.");
                     throw;
                 }
                 catch (Exception ex)
@@ -190,7 +190,7 @@ namespace GitHub.Runner.Listener
                 }
                 catch (TaskAgentAccessTokenExpiredException)
                 {
-                    Trace.Info("Agent OAuth token has been revoked. Unable to pull message.");
+                    Trace.Info("Runner 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 agent no longer exists on the server. Stopping the runner.");
+                Trace.Info("The runner 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 skewed.");
+                Trace.Info("Local clock might be 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,6 +4,7 @@ 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;
@@ -14,6 +15,9 @@ 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();
@@ -25,7 +29,7 @@ namespace GitHub.Runner.Listener
         // 1: Terminate failure
         // 2: Retriable failure
         // 3: Exit for self update
-        public async static Task<int> MainAsync(IHostContext context, string[] args)
+        private 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}.");
@@ -83,22 +87,6 @@ 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");
@@ -136,5 +124,34 @@ 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.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64</RuntimeIdentifiers>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>

src/Runner.Listener/Runner.cs

@@ -37,8 +37,7 @@ namespace GitHub.Runner.Listener
         {
             try
             {
-                var runnerCertManager = HostContext.GetService<IRunnerCertificateManager>();
-                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, HostContext.WebProxy, runnerCertManager.VssClientCertificateManager);
+                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, HostContext.WebProxy);
 
                 _inConfigStage = true;
                 _completedCommand.Reset();
@@ -434,7 +433,7 @@ namespace GitHub.Runner.Listener
             }
             catch (TaskAgentAccessTokenExpiredException)
             {
-                Trace.Info("Agent OAuth token has been revoked. Shutting down.");
+                Trace.Info("Runner OAuth token has been revoked. Shutting down.");
             }
 
             return Constants.Runner.ReturnCode.Success;

src/Runner.PluginHost/Runner.PluginHost.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</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

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

@@ -4,9 +4,7 @@ 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
@@ -45,11 +43,8 @@ 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(BuildVariables.BuildId)?.Value ?? string.Empty;
+            string buildIdStr = context.Variables.GetValueOrDefault(SdkConstants.Variables.Build.BuildId)?.Value ?? string.Empty;
             if (!int.TryParse(buildIdStr, out int buildId))
             {
                 throw new ArgumentException($"Run Id is not an Int32: {buildIdStr}");
@@ -65,7 +60,7 @@ namespace GitHub.Runner.Plugins.Artifact
             }
 
             // Container ID
-            string containerIdStr = context.Variables.GetValueOrDefault(BuildVariables.ContainerId)?.Value ?? string.Empty;
+            string containerIdStr = context.Variables.GetValueOrDefault(SdkConstants.Variables.Build.ContainerId)?.Value ?? string.Empty;
             if (!long.TryParse(containerIdStr, out long containerId))
             {
                 throw new ArgumentException($"Container Id is not an Int64: {containerIdStr}");
@@ -73,7 +68,7 @@ namespace GitHub.Runner.Plugins.Artifact
 
             context.Output($"Uploading artifact '{artifactName}' from '{fullPath}' for run #{buildId}");
 
-            FileContainerServer fileContainerHelper = new FileContainerServer(context.VssConnection, projectId, containerId, artifactName);
+            FileContainerServer fileContainerHelper = new FileContainerServer(context.VssConnection, projectId: Guid.Empty, containerId, artifactName);
             var propertiesDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
             long size = 0;
@@ -89,38 +84,20 @@ namespace GitHub.Runner.Plugins.Artifact
             // if any of the results were successful, make sure to attach them to the build
             finally
             {
-                // Determine whether to call Pipelines or Build endpoint to publish artifact based on variable setting
-                string usePipelinesArtifactEndpointVar = context.Variables.GetValueOrDefault("Runner.UseActionsArtifactsApis")?.Value;
-                bool.TryParse(usePipelinesArtifactEndpointVar, out bool usePipelinesArtifactEndpoint);
+                // Definition ID is a dummy value only used by HTTP client routing purposes
+                int definitionId = 1;
 
-                if (usePipelinesArtifactEndpoint)
-                {
-                    // Definition ID is a dummy value only used by HTTP client routing purposes
-                    int definitionId = 1;
+                PipelinesServer pipelinesHelper = new PipelinesServer(context.VssConnection);
 
-                    PipelinesServer pipelinesHelper = new PipelinesServer(context.VssConnection);
+                var artifact = await pipelinesHelper.AssociateActionsStorageArtifactAsync(
+                    definitionId,
+                    buildId,
+                    containerId,
+                    artifactName,
+                    size,
+                    token);
 
-                    var artifact = await pipelinesHelper.AssociateActionsStorageArtifactAsync(
-                        definitionId,
-                        buildId,
-                        containerId,
-                        artifactName,
-                        size,
-                        token);
-
-                    context.Output($"Associated artifact {artifactName} ({artifact.ContainerId}) with run #{buildId}"); 
-                    context.Debug($"Associated artifact using v2 endpoint");
-                }
-                else
-                {
-                    string fileContainerFullPath = StringUtil.Format($"#/{containerId}/{artifactName}");
-                    BuildServer buildHelper = new BuildServer(context.VssConnection);
-                    string jobId = context.Variables.GetValueOrDefault(WellKnownDistributedTaskVariables.JobId).Value ?? string.Empty;
-                    var artifact = await buildHelper.AssociateArtifact(projectId, buildId, jobId, artifactName, ArtifactResourceTypes.Container, fileContainerFullPath, propertiesDictionary, token);
-
-                    context.Output($"Associated artifact {artifactName} ({artifact.Id}) with run #{buildId}");
-                    context.Debug($"Associated artifact using v1 endpoint");
-                }
+                context.Output($"Associated artifact {artifactName} ({artifact.ContainerId}) with run #{buildId}"); 
             }
         }
     }

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

@@ -79,11 +79,6 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
         {
             // Validate args.
             ArgUtil.NotNull(executionContext, nameof(executionContext));
-            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)
@@ -112,9 +107,6 @@ 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}");
@@ -124,12 +116,6 @@ 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);
@@ -164,54 +150,6 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
 
             // 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
@@ -361,46 +299,6 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                 additionalFetchArgs.Add($"-c http.extraheader=\"AUTHORIZATION: {GenerateBasicAuthHeader(executionContext, accessToken)}\"");
             }
 
-            // 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)
             {
@@ -502,55 +400,12 @@ namespace GitHub.Runner.Plugins.Repository.v1_0
                     additionalSubmoduleUpdateArgs.Add($"-c http.{authorityUrl}.extraheader=\"AUTHORIZATION: {GenerateBasicAuthHeader(executionContext, accessToken)}\"");
                 }
 
-                // 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)

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

@@ -65,11 +65,6 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
             // Validate args.
             ArgUtil.NotNull(executionContext, nameof(executionContext));
             Dictionary<string, string> configModifications = new Dictionary<string, string>();
-            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)
@@ -98,9 +93,6 @@ 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}");
@@ -110,12 +102,6 @@ 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);
@@ -153,54 +139,6 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
 
             // 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
@@ -355,46 +293,6 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
                 throw new InvalidOperationException($"Git config failed with exit code: {exitCode_config}");
             }
 
-            // 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)
             {
@@ -484,43 +382,6 @@ namespace GitHub.Runner.Plugins.Repository.v1_1
 
                 List<string> additionalSubmoduleUpdateArgs = new List<string>();
 
-                // 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)
                 {
@@ -528,12 +389,6 @@ 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));

src/Runner.Plugins/Runner.Plugins.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</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

@@ -83,21 +83,6 @@ namespace GitHub.Runner.Sdk
             }
 
             VssClientHttpRequestSettings.Default.UserAgent = headerValues;
-
-            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;
-                }
-            }
-
             VssHttpMessageHandler.DefaultWebProxy = this.WebProxy;
             ServiceEndpoint systemConnection = this.Endpoints.FirstOrDefault(e => string.Equals(e.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
             ArgUtil.NotNull(systemConnection, nameof(systemConnection));
@@ -227,40 +212,6 @@ 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;
-            }
-        }
-
         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.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</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

@@ -1,40 +0,0 @@
-
-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/SdkConstants.cs

@@ -0,0 +1,19 @@
+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/VssUtil.cs

@@ -14,7 +14,7 @@ namespace GitHub.Runner.Sdk
 {
     public static class VssUtil
     {
-        public static void InitializeVssClientSettings(ProductInfoHeaderValue additionalUserAgent, IWebProxy proxy, IVssClientCertificateManager clientCert)
+        public static void InitializeVssClientSettings(ProductInfoHeaderValue additionalUserAgent, IWebProxy proxy)
         {
             var headerValues = new List<ProductInfoHeaderValue>();
             headerValues.Add(additionalUserAgent);
@@ -26,7 +26,6 @@ namespace GitHub.Runner.Sdk
             }
 
             VssClientHttpRequestSettings.Default.UserAgent = headerValues;
-            VssClientHttpRequestSettings.Default.ClientCertificateManager = clientCert;
             VssHttpMessageHandler.DefaultWebProxy = proxy;
         }
 
@@ -83,7 +82,7 @@ namespace GitHub.Runner.Sdk
             if (serviceEndpoint.Authorization.Scheme == EndpointAuthorizationSchemes.OAuth &&
                 serviceEndpoint.Authorization.Parameters.TryGetValue(EndpointAuthorizationParameters.AccessToken, out accessToken))
             {
-                credentials = new VssCredentials(null, new VssOAuthAccessTokenCredential(accessToken), CredentialPromptType.DoNotPrompt);
+                credentials = new VssCredentials(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)
+        public static string Which(string command, bool require = false, ITraceWriter trace = null, string prependPath = null)
         {
             ArgUtil.NotNullOrEmpty(command, nameof(command));
             trace?.Info($"Which: '{command}'");
@@ -17,6 +17,10 @@ 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/ActionManifestManager.cs

@@ -116,7 +116,7 @@ namespace GitHub.Runner.Worker
             if (actionDefinition.Execution == null)
             {
                 executionContext.Debug($"Loaded action.yml file: {StringUtil.ConvertToJson(actionDefinition)}");
-                throw new ArgumentException($"Top level 'run:' section is required for {manifestFile}");
+                throw new ArgumentException($"Top level 'runs:' section is required for {manifestFile}");
             }
             else
             {

src/Runner.Worker/Container/ContainerInfo.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using GitHub.Runner.Common.Util;
-using Pipelines = GitHub.DistributedTask.Pipelines;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Worker.Container
 {
@@ -19,7 +19,6 @@ namespace GitHub.Runner.Worker.Container
 
         public ContainerInfo()
         {
-
         }
 
         public ContainerInfo(IHostContext hostContext, Pipelines.JobContainer container, bool isJobContainer = true, string networkAlias = null)

src/Runner.Worker/Container/DockerCommandManager.cs

@@ -276,9 +276,7 @@ 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));
 
@@ -309,9 +307,10 @@ namespace GitHub.Runner.Worker.Container
                 }
             };
 
-#if OS_WINDOWS || OS_OSX
-            throw new NotSupportedException($"Container operation is only supported on Linux");
-#else
+            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
+            {
+                throw new NotSupportedException("Container operations are only supported on Linux runners");
+            }
             return await processInvoker.ExecuteAsync(
                             workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Work),
                             fileName: DockerPath,
@@ -320,7 +319,6 @@ 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)
@@ -339,9 +337,7 @@ 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}");
@@ -351,9 +347,10 @@ namespace GitHub.Runner.Worker.Container
             processInvoker.ErrorDataReceived += stderrDataReceived;
 
 
-#if OS_WINDOWS || OS_OSX
-            throw new NotSupportedException($"Container operation is only supported on Linux");
-#else
+            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
+            {
+                throw new NotSupportedException("Container operations are only supported on Linux runners");
+            }
             return await processInvoker.ExecuteAsync(
                 workingDirectory: context.GetGitHubContext("workspace"),
                 fileName: DockerPath,
@@ -363,12 +360,9 @@ 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}");
@@ -384,9 +378,10 @@ namespace GitHub.Runner.Worker.Container
                 context.Output(message.Data);
             };
 
-#if OS_WINDOWS || OS_OSX
-            throw new NotSupportedException($"Container operation is only supported on Linux");
-#else
+            if (!Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
+            {
+                throw new NotSupportedException("Container operations are only supported on Linux runners");
+            }
             return await processInvoker.ExecuteAsync(
                 workingDirectory: workingDirectory ?? context.GetGitHubContext("workspace"),
                 fileName: DockerPath,
@@ -397,7 +392,6 @@ 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,6 +35,10 @@ 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));
@@ -44,7 +48,7 @@ namespace GitHub.Runner.Worker
                                                 displayName: "Stop containers",
                                                 data: data);
             
-            executionContext.Debug($"Register post job cleanup for stoping/deleting containers.");
+            executionContext.Debug($"Register post job cleanup for stopping/deleting containers.");
             executionContext.RegisterPostJobStep(nameof(StopContainersAsync), postJobStep);
 
             // Check whether we are inside a container.
@@ -125,7 +129,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 agents run on same machine.
+            // Create local docker network for this job to avoid port conflict when multiple runners 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/ExecutionContext.cs

@@ -610,44 +610,6 @@ namespace GitHub.Runner.Worker
 
             // PostJobSteps for job ExecutionContext
             PostJobSteps = new Stack<IStep>();
-            //             // 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(

src/Runner.Worker/GitHubContext.cs

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

src/Runner.Worker/Handlers/ContainerActionHandler.cs

@@ -189,8 +189,8 @@ namespace GitHub.Runner.Worker.Handlers
                 container.ContainerEnvironmentVariables[variable.Key] = container.TranslateToContainerPath(variable.Value);
             }
 
-            using (var stdoutManager = new OutputManager(ExecutionContext, ActionCommandManager))
-            using (var stderrManager = new OutputManager(ExecutionContext, ActionCommandManager))
+            using (var stdoutManager = new OutputManager(ExecutionContext, ActionCommandManager, container))
+            using (var stderrManager = new OutputManager(ExecutionContext, ActionCommandManager, container))
             {
                 var runExitCode = await dockerManger.DockerRun(ExecutionContext, container, stdoutManager.OnDataReceived, stderrManager.OnDataReceived);
                 if (runExitCode != 0)

src/Runner.Worker/Handlers/HandlerFactory.cs

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

src/Runner.Worker/Handlers/OutputManager.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
+using GitHub.Runner.Worker.Container;
 using DTWebApi = GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Worker.Handlers
@@ -17,6 +18,7 @@ namespace GitHub.Runner.Worker.Handlers
         private const string _timeoutKey = "GITHUB_ACTIONS_RUNNER_ISSUE_MATCHER_TIMEOUT";
         private static readonly Regex _colorCodeRegex = new Regex(@"\x0033\[[0-9;]*m?", RegexOptions.Compiled | RegexOptions.CultureInvariant);
         private readonly IActionCommandManager _commandManager;
+        private readonly ContainerInfo _container;
         private readonly IExecutionContext _executionContext;
         private readonly int _failsafe = 50;
         private readonly object _matchersLock = new object();
@@ -25,10 +27,11 @@ namespace GitHub.Runner.Worker.Handlers
         // 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)
+        public OutputManager(IExecutionContext executionContext, IActionCommandManager commandManager, ContainerInfo container = null)
         {
             _executionContext = executionContext;
             _commandManager = commandManager;
+            _container = container ?? executionContext.Container;
 
             // Recursion failsafe (test override)
             var failsafeString = Environment.GetEnvironmentVariable("RUNNER_TEST_GET_REPOSITORY_PATH_FAILSAFE");
@@ -257,6 +260,7 @@ namespace GitHub.Runner.Worker.Handlers
                 if (!string.IsNullOrWhiteSpace(match.File))
                 {
                     var file = match.File;
+                    var translate = _container != null;
 
                     // Root using fromPath
                     if (!string.IsNullOrWhiteSpace(match.FromPath) && !Path.IsPathFullyQualified(file))
@@ -275,11 +279,19 @@ namespace GitHub.Runner.Worker.Handlers
                         ArgUtil.NotNullOrEmpty(workspace, "workspace");
 
                         file = Path.Combine(workspace, file);
+                        translate = false;
                     }
 
                     // Remove relative pathing and normalize slashes
                     file = Path.GetFullPath(file);
 
+                    // Translate to host
+                    if (translate)
+                    {
+                        file = _container.TranslateToHostPath(file);
+                        file = Path.GetFullPath(file);
+                    }
+
                     // Check whether the file exists
                     if (File.Exists(file))
                     {

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -2,6 +2,7 @@
 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;
@@ -56,6 +57,7 @@ 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))
             {
@@ -63,19 +65,19 @@ namespace GitHub.Runner.Worker.Handlers
                 shellCommand = "pwsh";
                 if(validateShellOnHost)
                 {
-                    shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace);
+                    shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
                     if (string.IsNullOrEmpty(shellCommandPath))
                     {
                         shellCommand = "powershell";
                         Trace.Info($"Defaulting to {shellCommand}");
-                        shellCommandPath = WhichUtil.Which(shellCommand, require: true, Trace);
+                        shellCommandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
                     }
                 }
 #else
                 shellCommand = "sh";
                 if (validateShellOnHost)
                 {
-                    shellCommandPath = WhichUtil.Which("bash") ?? WhichUtil.Which("sh", true, Trace);
+                    shellCommandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
                 }
 #endif
                 argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand);
@@ -86,7 +88,7 @@ namespace GitHub.Runner.Worker.Handlers
                 shellCommand = parsed.shellCommand;
                 if (validateShellOnHost)
                 {
-                    shellCommandPath = WhichUtil.Which(parsed.shellCommand, true, Trace);
+                    shellCommandPath = WhichUtil.Which(parsed.shellCommand, true, Trace, prependPath);
                 }
 
                 argFormat = $"{parsed.shellArgs}".TrimStart();
@@ -144,23 +146,24 @@ 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);
+                commandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
                 if (string.IsNullOrEmpty(commandPath))
                 {
                     shellCommand = "powershell";
                     Trace.Info($"Defaulting to {shellCommand}");
-                    commandPath = WhichUtil.Which(shellCommand, require: true, Trace);
+                    commandPath = WhichUtil.Which(shellCommand, require: true, Trace, prependPath);
                 }
                 ArgUtil.NotNullOrEmpty(commandPath, "Default Shell");
 #else
                 shellCommand = "sh";
-                commandPath = WhichUtil.Which("bash", false, Trace) ?? WhichUtil.Which("sh", true, Trace);
+                commandPath = WhichUtil.Which("bash", false, Trace, prependPath) ?? WhichUtil.Which("sh", true, Trace, prependPath);
 #endif
                 argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand);
             }
@@ -169,7 +172,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);
+                commandPath = WhichUtil.Which(parsed.shellCommand, !isContainerStepHost, Trace, prependPath);
                 argFormat = $"{parsed.shellArgs}".TrimStart();
                 if (string.IsNullOrEmpty(argFormat))
                 {

src/Runner.Worker/Handlers/StepHost.cs

@@ -141,6 +141,13 @@ 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/JobRunner.cs

@@ -107,6 +107,11 @@ namespace GitHub.Runner.Worker
                     return await CompleteJobAsync(jobServer, jobContext, message, TaskResult.Failed);
                 }
 
+                if (jobContext.WriteDebug)
+                {
+                    jobContext.SetRunnerContext("debug", "1");
+                }
+
                 jobContext.SetRunnerContext("os", VarUtil.OS);
 
                 string toolsDirectory = HostContext.GetDirectory(WellKnownDirectory.Tools);

src/Runner.Worker/Runner.Worker.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</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

@@ -2,7 +2,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using GitHub.Build.WebApi;
 using GitHub.DistributedTask.WebApi;
 using GitHub.DistributedTask.Logging;
 using GitHub.DistributedTask.Pipelines.ContextData;
@@ -63,7 +62,7 @@ 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(BuildVariables.BuildNumber);
+        public string Build_Number => Get(SdkConstants.Variables.Build.BuildNumber);
 
 #if OS_WINDOWS
         public bool Retain_Default_Encoding => false;

src/Runner.Worker/Worker.cs

@@ -40,8 +40,7 @@ namespace GitHub.Runner.Worker
                 // Validate args.
                 ArgUtil.NotNullOrEmpty(pipeIn, nameof(pipeIn));
                 ArgUtil.NotNullOrEmpty(pipeOut, nameof(pipeOut));
-                var runnerCertManager = HostContext.GetService<IRunnerCertificateManager>();
-                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, HostContext.WebProxy, runnerCertManager.VssClientCertificateManager);
+                VssUtil.InitializeVssClientSettings(HostContext.UserAgent, HostContext.WebProxy);
                 var jobRunner = HostContext.CreateService<IJobRunner>();
 
                 using (var channel = HostContext.CreateService<IProcessChannel>())

src/Sdk/BuildWebApi/Api/ArtifactResourceTypes.cs

@@ -1,14 +0,0 @@
-using System;
-using GitHub.Services.Common;
-
-namespace GitHub.Build.WebApi
-{
-    public static class ArtifactResourceTypes
-    {
-        /// <summary>
-        /// Build container reference
-        /// E.g. #/2121/drop
-        /// </summary>
-        public const String Container = "Container";
-    }
-}

src/Sdk/BuildWebApi/Api/BuildHttpClient.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-using GitHub.Services.WebApi.Patch;
-using GitHub.Services.WebApi.Patch.Json;
-
-namespace GitHub.Build.WebApi
-{
-    public class BuildHttpClient : BuildHttpClientBase
-    {
-        static BuildHttpClient()
-        {
-        }
-
-        public BuildHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials)
-            : base(baseUrl, credentials)
-        {
-        }
-
-        public BuildHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials,
-            VssHttpRequestSettings settings)
-            : base(baseUrl, credentials, settings)
-        {
-        }
-
-        public BuildHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials,
-            params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, handlers)
-        {
-        }
-
-        public BuildHttpClient(
-            Uri baseUrl,
-            VssCredentials credentials,
-            VssHttpRequestSettings settings,
-            params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, settings, handlers)
-        {
-        }
-
-        public BuildHttpClient(
-            Uri baseUrl,
-            HttpMessageHandler pipeline,
-            Boolean disposeHandler)
-            : base(baseUrl, pipeline, disposeHandler)
-        {
-        }
-    }
-}

src/Sdk/BuildWebApi/Api/BuildResourceIds.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace GitHub.Build.WebApi
-{
-    public static class BuildResourceIds
-    {
-        public const String AreaId = "5D6898BB-45EC-463F-95F9-54D49C71752E";
-        public const String AreaName = "build";
-    }
-}

src/Sdk/BuildWebApi/Api/BuildVariables.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace GitHub.Build.WebApi
-{
-    public static class BuildVariables
-    {
-        public const String TeamProjectId = "system.teamProjectId";
-
-        public const String BuildId = "build.buildId";
-        public const String BuildNumber = "build.buildNumber";
-        public const String ContainerId = "build.containerId";
-    }
-}

src/Sdk/BuildWebApi/Api/Contracts/ArtifactResource.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Build.WebApi
-{
-    [DataContract]
-    public class ArtifactResource : BaseSecuredObject
-    {
-        public ArtifactResource()
-        {
-        }
-
-        public ArtifactResource(
-            ISecuredObject securedObject)
-            : base(securedObject)
-        {
-        }
-
-        /// <summary>
-        /// The type of the resource: File container, version control folder, UNC path, etc.
-        /// </summary>
-        [DataMember(EmitDefaultValue = false)]
-        public String Type
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Type-specific data about the artifact.
-        /// </summary>
-        /// <remarks>
-        /// For example, "#/10002/5/drop", "$/drops/5", "\\myshare\myfolder\mydrops\5"
-        /// </remarks>
-        [DataMember(EmitDefaultValue = false)]
-        public String Data
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Type-specific properties of the artifact.
-        /// </summary>
-        [DataMember(IsRequired = false, EmitDefaultValue = false)]
-        public Dictionary<String, String> Properties
-        {
-            get;
-            set;
-        }
-    }
-}

src/Sdk/BuildWebApi/Api/Contracts/BuildArtifact.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Build.WebApi
-{
-    /// <summary>
-    /// Represents an artifact produced by a build.
-    /// </summary>
-    [DataContract]
-    public class BuildArtifact : BaseSecuredObject
-    {
-        public BuildArtifact()
-        {
-        }
-
-        internal BuildArtifact(
-            ISecuredObject securedObject)
-            : base(securedObject)
-        {
-        }
-
-        /// <summary>
-        /// The artifact ID.
-        /// </summary>
-        [DataMember]
-        public Int32 Id
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The name of the artifact.
-        /// </summary>
-        [DataMember]
-        public String Name
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The artifact source, which will be the ID of the job that produced this artifact.
-        /// </summary>
-        [DataMember]
-        public String Source
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The actual resource.
-        /// </summary>
-        [DataMember]
-        public ArtifactResource Resource
-        {
-            get;
-            set;
-        }
-    }
-}

src/Sdk/BuildWebApi/Api/Generated/BuildHttpClientBase.cs

@@ -1,107 +0,0 @@
-/*
- * ---------------------------------------------------------
- * Copyright(C) Microsoft Corporation. All rights reserved.
- * ---------------------------------------------------------
- */
-
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Services.Common;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Build.WebApi
-{
-    [ResourceArea(BuildResourceIds.AreaId)]
-    public abstract class BuildHttpClientBase : VssHttpClientBase
-    {
-        public BuildHttpClientBase(Uri baseUrl, VssCredentials credentials)
-            : base(baseUrl, credentials)
-        {
-        }
-
-        public BuildHttpClientBase(Uri baseUrl, VssCredentials credentials, VssHttpRequestSettings settings)
-            : base(baseUrl, credentials, settings)
-        {
-        }
-
-        public BuildHttpClientBase(Uri baseUrl, VssCredentials credentials, params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, handlers)
-        {
-        }
-
-        public BuildHttpClientBase(Uri baseUrl, VssCredentials credentials, VssHttpRequestSettings settings, params DelegatingHandler[] handlers)
-            : base(baseUrl, credentials, settings, handlers)
-        {
-        }
-
-        public BuildHttpClientBase(Uri baseUrl, HttpMessageHandler pipeline, bool disposeHandler)
-            : base(baseUrl, pipeline, disposeHandler)
-        {
-        }
-
-        /// <summary>
-        /// [Preview API] Associates an artifact with a build.
-        /// </summary>
-        /// <param name="artifact">The artifact.</param>
-        /// <param name="project">Project ID</param>
-        /// <param name="buildId">The ID of the build.</param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<BuildArtifact> CreateArtifactAsync(
-            BuildArtifact artifact,
-            Guid project,
-            int buildId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            Guid locationId = new Guid("1db06c96-014e-44e1-ac91-90b2d4b3e984");
-            object routeValues = new { project = project, buildId = buildId };
-            HttpContent content = new ObjectContent<BuildArtifact>(artifact, new VssJsonMediaTypeFormatter(true));
-
-            return SendAsync<BuildArtifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(5.2, 5),
-                userState: userState,
-                cancellationToken: cancellationToken,
-                content: content);
-        }
-
-        /// <summary>
-        /// [Preview API] Gets a specific artifact for a build.
-        /// </summary>
-        /// <param name="project">Project ID</param>
-        /// <param name="buildId">The ID of the build.</param>
-        /// <param name="artifactName">The name of the artifact.</param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<BuildArtifact> GetArtifactAsync(
-            Guid project,
-            int buildId,
-            string artifactName,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("1db06c96-014e-44e1-ac91-90b2d4b3e984");
-            object routeValues = new { project = project, buildId = buildId };
-
-            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
-            queryParams.Add("artifactName", artifactName);
-
-            return SendAsync<BuildArtifact>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(5.2, 5),
-                queryParameters: queryParams,
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
-    }
-}

src/Sdk/Common/Common/Authentication/FederatedCredential.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Linq;
+using System.Net;
+using GitHub.Services.Common.Internal;
+
+namespace GitHub.Services.Common
+{
+    /// <summary>
+    /// Provides a common implementation for federated credentials.
+    /// </summary>
+    [Serializable]
+    public abstract class FederatedCredential : IssuedTokenCredential
+    {
+        protected FederatedCredential(IssuedToken initialToken)
+            : base(initialToken)
+        { 
+        }
+
+        public override bool IsAuthenticationChallenge(IHttpResponse webResponse)
+        {
+            if (webResponse == null)
+            {
+                return false;
+            }
+
+            if (webResponse.StatusCode == HttpStatusCode.Found ||
+                webResponse.StatusCode == HttpStatusCode.Redirect)
+            {
+                return webResponse.Headers.GetValues(HttpHeaders.TfsFedAuthRealm).Any();
+            }
+
+            return webResponse.StatusCode == HttpStatusCode.Unauthorized;
+        }
+    }
+}

src/Sdk/Common/Common/Authentication/HttpRequestMessageWrapper.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+
+namespace GitHub.Services.Common
+{
+    internal struct HttpRequestMessageWrapper : IHttpRequest, IHttpHeaders
+    {
+        public HttpRequestMessageWrapper(HttpRequestMessage request)
+        {
+            m_request = request;
+        }
+
+        public IHttpHeaders Headers
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        public Uri RequestUri
+        {
+            get
+            {
+                return m_request.RequestUri;
+            }
+        }
+
+        public IDictionary<string, object> Properties
+        {
+            get
+            {
+                return m_request.Properties;
+            }
+        }
+
+        IEnumerable<String> IHttpHeaders.GetValues(String name)
+        {
+            IEnumerable<String> values;
+            if (!m_request.Headers.TryGetValues(name, out values))
+            {
+                values = Enumerable.Empty<String>();
+            }
+            return values;
+        }
+
+        void IHttpHeaders.SetValue(
+            String name,
+            String value)
+        {
+            m_request.Headers.Remove(name);
+            m_request.Headers.Add(name, value);
+        }
+
+        Boolean IHttpHeaders.TryGetValues(
+            String name,
+            out IEnumerable<String> values)
+        {
+            return m_request.Headers.TryGetValues(name, out values);
+        }
+
+        private readonly HttpRequestMessage m_request;
+    }
+}

src/Sdk/Common/Common/Authentication/HttpResponseMessageWrapper.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+
+namespace GitHub.Services.Common
+{
+    internal struct HttpResponseMessageWrapper : IHttpResponse, IHttpHeaders
+    {
+        public HttpResponseMessageWrapper(HttpResponseMessage response)
+        {
+            m_response = response;
+        }
+
+        public IHttpHeaders Headers
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        public HttpStatusCode StatusCode
+        {
+            get
+            {
+                return m_response.StatusCode;
+            }
+        }
+
+        IEnumerable<String> IHttpHeaders.GetValues(String name)
+        {
+            IEnumerable<String> values;
+            if (!m_response.Headers.TryGetValues(name, out values))
+            {
+                values = Enumerable.Empty<String>();
+            }
+            return values;
+        }
+
+        void IHttpHeaders.SetValue(
+            String name,
+            String value)
+        {
+            throw new NotSupportedException();
+        }
+
+        Boolean IHttpHeaders.TryGetValues(
+            String name,
+            out IEnumerable<String> values)
+        {
+            return m_response.Headers.TryGetValues(name, out values);
+        }
+
+        private readonly HttpResponseMessage m_response;
+    }
+}

src/Sdk/Common/Common/Authentication/IHttpHeaders.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace GitHub.Services.Common
+{
+    public interface IHttpHeaders
+    {
+        IEnumerable<String> GetValues(String name);
+
+        void SetValue(String name, String value);
+
+        Boolean TryGetValues(String name, out IEnumerable<String> values);
+    }
+}

src/Sdk/Common/Common/Authentication/IHttpRequest.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace GitHub.Services.Common
+{
+    public interface IHttpRequest
+    {
+        IHttpHeaders Headers
+        {
+            get;
+        }
+
+        Uri RequestUri
+        {
+            get;
+        }
+
+        IDictionary<string, object> Properties
+        {
+            get;
+        }
+    }
+}

src/Sdk/Common/Common/Authentication/IHttpResponse.cs

@@ -0,0 +1,17 @@
+using System.Net;
+
+namespace GitHub.Services.Common
+{
+    public interface IHttpResponse
+    {
+        IHttpHeaders Headers
+        {
+            get;
+        }
+
+        HttpStatusCode StatusCode
+        {
+            get;
+        }
+    }
+}

src/Sdk/Common/Common/Authentication/IVssCredentialPrompt.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace GitHub.Services.Common
+{
+    /// <summary>
+    /// Provide an interface to get a new token for the credentials.
+    /// </summary>
+    public interface IVssCredentialPrompt
+    {
+        /// <summary>
+        /// Get a new token using the specified provider and the previously failed token.
+        /// </summary>
+        /// <param name="provider">The provider for the token to be retrieved</param>
+        /// <param name="failedToken">The token which previously failed authentication, if available</param>
+        /// <returns>The new token</returns>
+        Task<IssuedToken> GetTokenAsync(IssuedTokenProvider provider, IssuedToken failedToken);
+
+        IDictionary<string, string> Parameters { get; set; }
+    }
+
+    public interface IVssCredentialPrompts : IVssCredentialPrompt
+    {
+        IVssCredentialPrompt FederatedPrompt
+        {
+            get;
+        }
+    }
+}

src/Sdk/Common/Common/Authentication/IVssCredentialStorage.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace GitHub.Services.Common
+{
+    public interface IVssCredentialStorage
+    {
+        IssuedToken RetrieveToken(
+            Uri serverUrl,
+            VssCredentialsType credentialsType);
+
+        void StoreToken(
+            Uri serverUrl,
+            IssuedToken token);
+
+        void RemoveToken(
+            Uri serverUrl,
+            IssuedToken token);
+
+        bool RemoveTokenValue(
+            Uri serverUrl,
+            IssuedToken token);
+    }
+}

src/Sdk/Common/Common/Authentication/IssuedToken.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using GitHub.Services.Common.Internal;
+
+namespace GitHub.Services.Common
+{
+    /// <summary>
+    /// Provides a common base class for issued tokens.
+    /// </summary>
+    [Serializable]
+    public abstract class IssuedToken
+    {
+        internal IssuedToken()
+        {
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether or not this token has been successfully authenticated with the remote
+        /// server.
+        /// </summary>
+        public bool IsAuthenticated
+        {
+            get
+            {
+                return m_authenticated == 1;
+            }
+        }
+
+        protected internal abstract VssCredentialsType CredentialType
+        {
+            get;
+        }
+
+        /// <summary>
+        /// True if the token is retrieved from token storage.
+        /// </summary>
+        internal bool FromStorage
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Metadata about the token in a collection of properties.
+        /// </summary>
+        /// <returns></returns>
+        public IDictionary<string, string> Properties
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Id of the owner of the token.
+        /// </summary>
+        internal Guid UserId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Name of the owner of the token.
+        /// </summary>
+        internal string UserName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Invoked when the issued token has been validated by successfully authenticated with the remote server.
+        /// </summary>
+        internal bool Authenticated()
+        {
+            return Interlocked.CompareExchange(ref m_authenticated, 1, 0) == 0;
+        }
+
+        /// <summary>
+        /// Get the value of the <c>HttpHeaders.VssUserData</c> response header and
+        /// populate the <c>UserId</c> and <c>UserName</c> properties. 
+        /// </summary>
+        internal void GetUserData(IHttpResponse response)
+        {
+            IEnumerable<string> headerValues;
+            if (response.Headers.TryGetValues(HttpHeaders.VssUserData, out headerValues))
+            {
+                string userData = headerValues.FirstOrDefault();
+
+                if (!string.IsNullOrWhiteSpace(userData))
+                {
+                    string[] split = userData.Split(':');
+
+                    if (split.Length >= 2)
+                    {
+                        UserId = Guid.Parse(split[0]);
+                        UserName = split[1];
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Applies the token to the HTTP request message.
+        /// </summary>
+        /// <param name="request">The HTTP request message</param>
+        internal abstract void ApplyTo(IHttpRequest request);
+
+        private int m_authenticated;
+    }
+}

src/Sdk/Common/Common/Authentication/IssuedTokenCredential.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace GitHub.Services.Common
+{
+    /// <summary>
+    /// Provides a common base class for issued token credentials.
+    /// </summary>
+    [Serializable]
+    public abstract class IssuedTokenCredential
+    {
+        protected IssuedTokenCredential(IssuedToken initialToken)
+        {
+            InitialToken = initialToken;
+        }
+
+        public abstract VssCredentialsType CredentialType
+        {
+            get;
+        }
+
+        /// <summary>
+        /// The initial token to use to authenticate if available. 
+        /// </summary>
+        internal IssuedToken InitialToken
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the synchronization context which should be used for UI prompts.
+        /// </summary>
+        internal TaskScheduler Scheduler
+        {
+            get
+            {
+                return m_scheduler;
+            }
+            set
+            {
+                m_scheduler = value;
+            }
+        }
+
+        /// <summary>
+        /// The credentials prompt which is used for retrieving a new token.
+        /// </summary>
+        internal IVssCredentialPrompt Prompt
+        {
+            get
+            {
+                return m_prompt;
+            }
+            set
+            {
+                m_prompt = value;
+            }
+        }
+
+        internal IVssCredentialStorage Storage
+        {
+            get
+            {
+                return m_storage;
+            }
+            set
+            {
+                m_storage = value;
+            }
+        }
+
+        /// <summary>
+        /// The base url for the vssconnection to be used in the token storage key.
+        /// </summary>
+        internal Uri TokenStorageUrl { get; set; }
+
+        /// <summary>
+        /// Creates a token provider suitable for handling the challenge presented in the response.
+        /// </summary>
+        /// <param name="serverUrl">The targeted server</param>
+        /// <param name="response">The challenge response</param>
+        /// <param name="failedToken">The failed token</param>
+        /// <returns>An issued token provider instance</returns>
+        internal IssuedTokenProvider CreateTokenProvider(
+            Uri serverUrl,
+            IHttpResponse response,
+            IssuedToken failedToken)
+        {
+            if (response != null && !IsAuthenticationChallenge(response))
+            {
+                throw new InvalidOperationException();
+            }
+
+            if (InitialToken == null && Storage != null)
+            {
+                if (TokenStorageUrl == null)
+                {
+                    throw new InvalidOperationException($"The {nameof(TokenStorageUrl)} property must have a value if the {nameof(Storage)} property is set on this instance of {GetType().Name}.");
+                }
+                InitialToken = Storage.RetrieveToken(TokenStorageUrl, CredentialType);
+            }
+
+            IssuedTokenProvider provider = OnCreateTokenProvider(serverUrl, response);
+            if (provider != null)
+            {
+                provider.TokenStorageUrl = TokenStorageUrl;
+            }
+
+            // If the initial token is the one which failed to authenticate, don't 
+            // use it again and let the token provider get a new token.
+            if (provider != null)
+            {
+                if (InitialToken != null && !Object.ReferenceEquals(InitialToken, failedToken))
+                {
+                    provider.CurrentToken = InitialToken;
+                }
+            }
+
+            return provider;
+        }
+
+        internal virtual string GetAuthenticationChallenge(IHttpResponse webResponse)
+        {
+            IEnumerable<String> values;
+            if (!webResponse.Headers.TryGetValues(Internal.HttpHeaders.WwwAuthenticate, out values))
+            {
+                return String.Empty;
+            }
+
+            return String.Join(", ", values);
+        }
+
+        public abstract bool IsAuthenticationChallenge(IHttpResponse webResponse);
+
+        protected abstract IssuedTokenProvider OnCreateTokenProvider(Uri serverUrl, IHttpResponse response);
+
+        [NonSerialized]
+        private TaskScheduler m_scheduler;
+
+        [NonSerialized]
+        private IVssCredentialPrompt m_prompt;
+
+        [NonSerialized]
+        private IVssCredentialStorage m_storage;
+    }
+}

src/Sdk/Common/Common/Authentication/IssuedTokenProvider.cs

@@ -0,0 +1,545 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.Services.Common.Diagnostics;
+
+namespace GitHub.Services.Common
+{
+    internal interface ISupportSignOut
+    {
+        void SignOut(Uri serverUrl, Uri replyToUrl, string identityProvider);
+    }
+
+    /// <summary>
+    /// Provides a common base class for providers of the token authentication model.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public abstract class IssuedTokenProvider
+    {
+        private const double c_slowTokenAcquisitionTimeInSeconds = 2.0;
+
+        protected IssuedTokenProvider(
+            IssuedTokenCredential credential,
+            Uri serverUrl,
+            Uri signInUrl)
+        {
+            ArgumentUtility.CheckForNull(credential, "credential");
+
+            this.SignInUrl = signInUrl;
+            this.Credential = credential;
+            this.ServerUrl = serverUrl;
+
+            m_thisLock = new object();
+        }
+
+        /// <summary>
+        /// Gets the authentication scheme used to create this token provider.
+        /// </summary>
+        protected virtual String AuthenticationScheme
+        {
+            get
+            {
+                return String.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Gets the authentication parameter or parameters used to create this token provider.
+        /// </summary>
+        protected virtual String AuthenticationParameter
+        {
+            get
+            {
+                return String.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Gets the credential associated with the provider.
+        /// </summary>
+        protected internal IssuedTokenCredential Credential
+        {
+            get;
+        }
+
+        internal VssCredentialsType CredentialType => this.Credential.CredentialType;
+
+        /// <summary>
+        /// Gets the current token.
+        /// </summary>
+        public IssuedToken CurrentToken
+        {
+            get;
+            internal set;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether or not a call to get token will require interactivity.
+        /// </summary>
+        public abstract bool GetTokenIsInteractive
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether or not an ISynchronizeInvoke call is required.
+        /// </summary>
+        private Boolean InvokeRequired
+        {
+            get
+            {
+                return this.GetTokenIsInteractive && this.Credential.Scheduler != null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the sign-in URL for the token provider.
+        /// </summary>
+        public Uri SignInUrl { get; private set; }
+
+        protected Uri ServerUrl { get; }
+
+        /// <summary>
+        /// The base url for the vssconnection to be used in the token storage key.
+        /// </summary>
+        internal Uri TokenStorageUrl { get; set; }
+
+        /// <summary>
+        /// Determines whether the specified web response is an authentication challenge.
+        /// </summary>
+        /// <param name="webResponse">The web response</param>
+        /// <returns>True if the web response is a challenge for token authentication; otherwise, false</returns>
+        protected internal virtual bool IsAuthenticationChallenge(IHttpResponse webResponse)
+        {
+            return this.Credential.IsAuthenticationChallenge(webResponse);
+        }
+
+        /// <summary>
+        /// Formats the authentication challenge string which this token provider handles.
+        /// </summary>
+        /// <returns>A string representing the handled authentication challenge</returns>
+        internal string GetAuthenticationParameters()
+        {
+            if (string.IsNullOrEmpty(this.AuthenticationParameter))
+            {
+                return this.AuthenticationScheme;
+            }
+            else
+            {
+                return string.Format(CultureInfo.InvariantCulture, this.AuthenticationScheme, this.AuthenticationParameter);
+            }
+        }
+
+        /// <summary>
+        /// Validates the current token if the provided reference is the current token and it 
+        /// has not been validated before.
+        /// </summary>
+        /// <param name="token">The token which should be validated</param>
+        /// <param name="webResponse">The web response which used the token</param>
+        internal void ValidateToken(
+            IssuedToken token,
+            IHttpResponse webResponse)
+        {
+            if (token == null)
+            {
+                return;
+            }
+
+            lock (m_thisLock)
+            {
+                IssuedToken tokenToValidate = OnValidatingToken(token, webResponse);
+
+                if (tokenToValidate.IsAuthenticated)
+                {
+                    return;
+                }
+
+                try
+                {
+                    // Perform validation which may include matching user information from the response
+                    // with that from the stored connection. If user information mismatch, an exception
+                    // will be thrown and the token will not be authenticated, which means if the same
+                    // token is ever used again in a different request it will be revalidated and fail.
+                    tokenToValidate.GetUserData(webResponse);
+                    OnTokenValidated(tokenToValidate);
+
+                    // Set the token to be authenticated.
+                    tokenToValidate.Authenticated();
+                }
+                finally
+                {
+                    // When the token fails validation, we null its reference from the token provider so it
+                    // would not be used again by the consumers of both. Note that we only update the current 
+                    // token of the provider if it is the original token being validated, because we do not 
+                    // want to overwrite a different token.
+                    if (object.ReferenceEquals(this.CurrentToken, token))
+                    {
+                        this.CurrentToken = tokenToValidate.IsAuthenticated ? tokenToValidate : null;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Invalidates the current token if the provided reference is the current token.
+        /// </summary>
+        /// <param name="token">The token reference which should be invalidated</param>
+        internal void InvalidateToken(IssuedToken token)
+        {
+            bool invalidated = false;
+            lock (m_thisLock)
+            {
+                if (token != null && object.ReferenceEquals(this.CurrentToken, token))
+                {
+                    this.CurrentToken = null;
+                    invalidated = true;
+                }
+            }
+
+            if (invalidated)
+            {
+                OnTokenInvalidated(token);
+            }
+        }
+
+        /// <summary>
+        /// Retrieves a token for the credentials.
+        /// </summary>
+        /// <param name="failedToken">The token which previously failed authentication, if available</param>
+        /// <param name="cancellationToken">The <c>CancellationToken</c>that will be assigned to the new task</param>
+        /// <returns>A security token for the current credentials</returns>
+        public async Task<IssuedToken> GetTokenAsync(
+            IssuedToken failedToken,
+            CancellationToken cancellationToken)
+        {
+            IssuedToken currentToken = this.CurrentToken;
+            VssTraceActivity traceActivity = VssTraceActivity.Current;
+            Stopwatch aadAuthTokenTimer = Stopwatch.StartNew();
+            try
+            {
+                VssHttpEventSource.Log.AuthenticationStart(traceActivity);
+
+                if (currentToken != null)
+                {
+                    VssHttpEventSource.Log.IssuedTokenRetrievedFromCache(traceActivity, this, currentToken);
+                    return currentToken;
+                }
+                else
+                {
+                    GetTokenOperation operation = null;
+                    try
+                    {
+                        GetTokenOperation operationInProgress;
+                        operation = CreateOperation(traceActivity, failedToken, cancellationToken, out operationInProgress);
+                        if (operationInProgress == null)
+                        {
+                            return await operation.GetTokenAsync(traceActivity).ConfigureAwait(false);
+                        }
+                        else
+                        {
+                            return await operationInProgress.WaitForTokenAsync(traceActivity, cancellationToken).ConfigureAwait(false);
+                        }
+                    }
+                    finally
+                    {
+                        lock (m_thisLock)
+                        {
+                            m_operations.Remove(operation);
+                        }
+
+                        operation?.Dispose();
+                    }
+                }
+            }
+            finally
+            {
+                VssHttpEventSource.Log.AuthenticationStop(traceActivity);
+
+                aadAuthTokenTimer.Stop();
+                TimeSpan getTokenTime = aadAuthTokenTimer.Elapsed;
+
+                if(getTokenTime.TotalSeconds >= c_slowTokenAcquisitionTimeInSeconds)
+                {
+                    // It may seem strange to pass the string value of TotalSeconds into this method, but testing
+                    // showed that ETW is persnickety when you register a method in an EventSource that doesn't
+                    // use strings or integers as its parameters. It is easier to simply give the method a string
+                    // than figure out to get ETW to reliably accept a double or TimeSpan.
+                    VssHttpEventSource.Log.AuthorizationDelayed(getTokenTime.TotalSeconds.ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieves a token for the credentials.
+        /// </summary>
+        /// <param name="failedToken">The token which previously failed authentication, if available</param>
+        /// <param name="cancellationToken">The <c>CancellationToken</c>that will be assigned to the new task</param>
+        /// <returns>A security token for the current credentials</returns>
+        protected virtual Task<IssuedToken> OnGetTokenAsync(
+            IssuedToken failedToken,
+            CancellationToken cancellationToken)
+        {
+            if (this.Credential.Prompt != null)
+            {
+                return this.Credential.Prompt.GetTokenAsync(this, failedToken);
+            }
+            else
+            {
+                return Task.FromResult<IssuedToken>(null);
+            }
+        }
+
+        /// <summary>
+        /// Invoked when the current token is being validated. When overriden in a derived class,
+        /// validate and return the validated token.
+        /// </summary>
+        /// <remarks>Is called inside a lock in <c>ValidateToken</c></remarks>
+        /// <param name="token">The token to validate</param>
+        /// <param name="webResponse">The web response which used the token</param>
+        /// <returns>The validated token</returns>
+        protected virtual IssuedToken OnValidatingToken(
+            IssuedToken token,
+            IHttpResponse webResponse)
+        {
+            return token;
+        }
+
+        protected virtual void OnTokenValidated(IssuedToken token)
+        {
+            // Store the validated token to the token storage if it is not originally from there.
+            if (!token.FromStorage && TokenStorageUrl != null)
+            {
+                Credential.Storage?.StoreToken(TokenStorageUrl, token);
+            }
+
+            VssHttpEventSource.Log.IssuedTokenValidated(VssTraceActivity.Current, this, token);
+        }
+
+        protected virtual void OnTokenInvalidated(IssuedToken token)
+        {
+            if (Credential.Storage != null && TokenStorageUrl != null)
+            {
+                Credential.Storage.RemoveTokenValue(TokenStorageUrl, token);
+            }
+
+            VssHttpEventSource.Log.IssuedTokenInvalidated(VssTraceActivity.Current, this, token);
+        }
+
+        private GetTokenOperation CreateOperation(
+            VssTraceActivity traceActivity,
+            IssuedToken failedToken,
+            CancellationToken cancellationToken,
+            out GetTokenOperation operationInProgress)
+        {
+            operationInProgress = null;
+            GetTokenOperation operation = null;
+            lock (m_thisLock)
+            {
+                if (m_operations == null)
+                {
+                    m_operations = new List<GetTokenOperation>();
+                }
+
+                // Grab the main operation which is doing the work (if any)
+                if (m_operations.Count > 0)
+                {
+                    operationInProgress = m_operations[0];
+
+                    // Use the existing completion source when creating the new operation
+                    operation = new GetTokenOperation(traceActivity, this, failedToken, cancellationToken, operationInProgress.CompletionSource);
+                }
+                else
+                {
+                    operation = new GetTokenOperation(traceActivity, this, failedToken, cancellationToken);
+                }
+
+                m_operations.Add(operation);
+            }
+
+            return operation;
+        }
+
+        private object m_thisLock;
+        private List<GetTokenOperation> m_operations;
+
+        private class DisposableTaskCompletionSource<T> : TaskCompletionSource<T>, IDisposable
+        {
+            public DisposableTaskCompletionSource()
+            {
+                this.Task.ConfigureAwait(false).GetAwaiter().OnCompleted(() => { m_completed = true; });
+            }
+
+            ~DisposableTaskCompletionSource()
+            {
+                TraceErrorIfNotCompleted();
+            }
+
+            public void Dispose()
+            {
+                if (m_disposed)
+                {
+                    return;
+                }
+
+                TraceErrorIfNotCompleted();
+
+                m_disposed = true;
+                GC.SuppressFinalize(this);
+            }
+
+            private void TraceErrorIfNotCompleted()
+            {
+                if (!m_completed)
+                {
+                    VssHttpEventSource.Log.TokenSourceNotCompleted();
+                }
+            }
+
+            private Boolean m_disposed;
+            private Boolean m_completed;
+        }
+
+        private sealed class GetTokenOperation : IDisposable
+        {
+            public GetTokenOperation(
+                VssTraceActivity activity,
+                IssuedTokenProvider provider,
+                IssuedToken failedToken,
+                CancellationToken cancellationToken)
+                : this(activity, provider, failedToken, cancellationToken, new DisposableTaskCompletionSource<IssuedToken>(), true)
+            {
+            }
+
+            public GetTokenOperation(
+                VssTraceActivity activity,
+                IssuedTokenProvider provider,
+                IssuedToken failedToken,
+                CancellationToken cancellationToken,
+                DisposableTaskCompletionSource<IssuedToken> completionSource,
+                Boolean ownsCompletionSource = false)
+            {
+                this.Provider = provider;
+                this.ActivityId = activity?.Id ?? Guid.Empty;
+                this.FailedToken = failedToken;
+                this.CancellationToken = cancellationToken;
+                this.CompletionSource = completionSource;
+                this.OwnsCompletionSource = ownsCompletionSource;
+            }
+
+            public Guid ActivityId { get; }
+
+            public CancellationToken CancellationToken { get; }
+
+            public DisposableTaskCompletionSource<IssuedToken> CompletionSource { get; }
+
+            public Boolean OwnsCompletionSource { get; }
+
+            private IssuedToken FailedToken { get; }
+
+            private IssuedTokenProvider Provider { get; }
+
+            public void Dispose()
+            {
+                if (this.OwnsCompletionSource)
+                {
+                    this.CompletionSource?.Dispose();
+                }
+            }
+
+            public async Task<IssuedToken> GetTokenAsync(VssTraceActivity traceActivity)
+            {
+                IssuedToken token = null;
+                try
+                {
+                    VssHttpEventSource.Log.IssuedTokenAcquiring(traceActivity, this.Provider);
+                    if (this.Provider.InvokeRequired)
+                    {
+                        // Post to the UI thread using the scheduler. This may return a new task object which needs
+                        // to be awaited, since once we get to the UI thread there may be nothing to do if someone else
+                        // preempts us.
+
+                        // The cancellation token source is used to handle race conditions between scheduling and 
+                        // waiting for the UI task to begin execution. The callback is responsible for disposing of
+                        // the token source, since the thought here is that the callback will run eventually as the
+                        // typical reason for not starting execution within the timeout is due to a deadlock with
+                        // the scheduler being used.
+                        var timerTask = new TaskCompletionSource<Object>();
+                        var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(3));
+                        timeoutTokenSource.Token.Register(() => timerTask.SetResult(null), false);
+
+                        var uiTask = Task.Factory.StartNew((state) => PostCallback(state, timeoutTokenSource),
+                                                            this,
+                                                            this.CancellationToken,
+                                                            TaskCreationOptions.None,
+                                                            this.Provider.Credential.Scheduler).Unwrap();
+
+                        var completedTask = await Task.WhenAny(timerTask.Task, uiTask).ConfigureAwait(false);
+                        if (completedTask == uiTask)
+                        {
+                            token = uiTask.Result;
+                        }
+                    }
+                    else
+                    {
+                        token = await this.Provider.OnGetTokenAsync(this.FailedToken, this.CancellationToken).ConfigureAwait(false);
+                    }
+
+                    CompletionSource.TrySetResult(token);
+                    return token;
+                }
+                catch (Exception exception)
+                {
+                    // Mark our completion source as failed so other waiters will get notified in all cases
+                    CompletionSource.TrySetException(exception);
+                    throw;
+                }
+                finally
+                {
+                    this.Provider.CurrentToken = token ?? this.FailedToken;
+                    VssHttpEventSource.Log.IssuedTokenAcquired(traceActivity, this.Provider, token);
+                }
+            }
+
+            public async Task<IssuedToken> WaitForTokenAsync(
+                VssTraceActivity traceActivity,
+                CancellationToken cancellationToken)
+            {
+                IssuedToken token = null;
+                try
+                {
+
+                    VssHttpEventSource.Log.IssuedTokenWaitStart(traceActivity, this.Provider, this.ActivityId);
+                token = await Task.Factory.ContinueWhenAll<IssuedToken>(new Task[] { CompletionSource.Task }, (x) => CompletionSource.Task.Result, cancellationToken).ConfigureAwait(false);
+                }
+                finally
+                {
+                    VssHttpEventSource.Log.IssuedTokenWaitStop(traceActivity, this.Provider, token);
+                }
+
+                return token;
+            }
+
+            private static Task<IssuedToken> PostCallback(
+                Object state,
+                CancellationTokenSource timeoutTokenSource)
+            {
+                // Make sure that we were not cancelled (timed out) before this callback is invoked.
+                using (timeoutTokenSource)
+                {
+                    timeoutTokenSource.CancelAfter(-1);
+                    if (timeoutTokenSource.IsCancellationRequested)
+                    {
+                        return Task.FromResult<IssuedToken>(null);
+                    }
+                }
+
+                GetTokenOperation thisPtr = (GetTokenOperation)state;
+                return thisPtr.Provider.OnGetTokenAsync(thisPtr.FailedToken, thisPtr.CancellationToken);
+            }
+        }
+    }
+}

src/Sdk/Common/Common/Authentication/VssCredentials.cs

@@ -0,0 +1,400 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.Services.Common.Diagnostics;
+using GitHub.Services.Common.Internal;
+
+namespace GitHub.Services.Common
+{
+    /// <summary>
+    /// The type of credentials supported natively by the framework
+    /// </summary>
+    public enum VssCredentialsType
+    {
+        Windows = 0,
+        Federated = 1,
+        Basic = 2,
+        ServiceIdentity = 3,
+        OAuth = 4,
+        S2S = 5,
+        Other = 6,
+        Aad = 7,
+    }
+
+    /// <summary>
+    /// Provides the ability to control when to show or hide the credential prompt user interface.
+    /// </summary>
+    public enum CredentialPromptType
+    {
+        /// <summary>
+        /// Show the UI only if necessary to obtain credentials.
+        /// </summary>
+        PromptIfNeeded = 0,
+
+        /// <summary>
+        /// Never show the UI, even if an error occurs.
+        /// </summary>
+        DoNotPrompt = 2,
+    }
+
+    /// <summary>
+    /// Provides credentials to use when connecting to a Visual Studio Service.
+    /// </summary>
+    public class VssCredentials
+    {
+        /// <summary>
+        /// Initializes a new <c>VssCredentials</c> instance with default credentials.
+        /// </summary>
+        public VssCredentials()
+            : this(null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <c>VssCredentials</c> instance with the specified windows and issued token 
+        /// credential.
+        /// </summary>
+        /// <param name="federatedCredential">The federated credential to use for authentication</param>
+        public VssCredentials(FederatedCredential federatedCredential)
+            : this(federatedCredential, EnvironmentUserInteractive
+                  ? CredentialPromptType.PromptIfNeeded : CredentialPromptType.DoNotPrompt)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <c>VssCredentials</c> instance with the specified windows and issued token 
+        /// credential.
+        /// </summary>
+        /// <param name="federatedCredential">The federated credential to use for authentication</param>
+        /// <param name="promptType">CredentialPromptType.PromptIfNeeded if interactive prompts are allowed, otherwise CredentialProptType.DoNotPrompt</param>
+        public VssCredentials(
+            FederatedCredential federatedCredential,
+            CredentialPromptType promptType)
+            : this(federatedCredential, promptType, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <c>VssCredentials</c> instance with the specified windows and issued token 
+        /// credential.
+        /// </summary>
+        /// <param name="federatedCredential">The federated credential to use for authentication</param>
+        /// <param name="promptType">CredentialPromptType.PromptIfNeeded if interactive prompts are allowed; otherwise, CredentialProptType.DoNotPrompt</param>
+        /// <param name="scheduler">An optional <c>TaskScheduler</c> to ensure credentials prompting occurs on the UI thread</param>
+        public VssCredentials(
+            FederatedCredential federatedCredential,
+            CredentialPromptType promptType,
+            TaskScheduler scheduler)
+            : this(federatedCredential, promptType, scheduler, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <c>VssCredentials</c> instance with the specified windows and issued token 
+        /// credential.
+        /// </summary>
+        /// <param name="federatedCredential">The federated credential to use for authentication</param>
+        /// <param name="promptType">CredentialPromptType.PromptIfNeeded if interactive prompts are allowed; otherwise, CredentialProptType.DoNotPrompt</param>
+        /// <param name="scheduler">An optional <c>TaskScheduler</c> to ensure credentials prompting occurs on the UI thread</param>
+        /// <param name="credentialPrompt">An optional <c>IVssCredentialPrompt</c> to perform prompting for credentials</param>
+        public VssCredentials(
+            FederatedCredential federatedCredential,
+            CredentialPromptType promptType,
+            TaskScheduler scheduler,
+            IVssCredentialPrompt credentialPrompt)
+        {
+            this.PromptType = promptType;
+
+            if (promptType == CredentialPromptType.PromptIfNeeded && scheduler == null)
+            {
+                // If we use TaskScheduler.FromCurrentSynchronizationContext() here and this is executing under the UI 
+                // thread, for example from an event handler in a WinForms applications, this TaskScheduler will capture 
+                // the UI SyncrhonizationContext whose MaximumConcurrencyLevel is 1 and only has a single thread to 
+                // execute queued work. Then, if the UI thread invokes one of our synchronous methods that are just 
+                // wrappers that block until the asynchronous overload returns, and if the async Task queues work to 
+                // this TaskScheduler, like GitHub.Services.CommonGetTokenOperation.GetTokenAsync does, 
+                // this will produce an immediate deadlock. It is a much safer choice to use TaskScheduler.Default here 
+                // as it uses the .NET Framework ThreadPool to execute queued work. 
+                scheduler = TaskScheduler.Default;
+            }
+
+            if (federatedCredential != null)
+            {
+                m_federatedCredential = federatedCredential;
+                m_federatedCredential.Scheduler = scheduler;
+                m_federatedCredential.Prompt = credentialPrompt;
+            }
+
+            m_thisLock = new object();
+        }
+
+        /// <summary>
+        /// Implicitly converts a <c>FederatedCredential</c> instance into a <c>VssCredentials</c> instance.
+        /// </summary>
+        /// <param name="credential">The federated credential instance</param>
+        /// <returns>A new <c>VssCredentials</c> instance which wraps the specified credential</returns>
+        public static implicit operator VssCredentials(FederatedCredential credential)
+        {
+            return new VssCredentials(credential);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not interactive prompts are allowed.
+        /// </summary>
+        public CredentialPromptType PromptType
+        {
+            get
+            {
+                return m_promptType;
+            }
+            set
+            {
+                if (value == CredentialPromptType.PromptIfNeeded && !EnvironmentUserInteractive)
+                {
+                    throw new ArgumentException(CommonResources.CannotPromptIfNonInteractive(), "PromptType");
+                }
+
+                m_promptType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating the issued token credentials to use for authentication with the server.
+        /// </summary>
+        public FederatedCredential Federated
+        {
+            get
+            {
+                return m_federatedCredential;
+            }
+        }
+
+        /// <summary>
+        /// A pluggable credential store.
+        /// Simply assign a storage implementation to this property
+        /// and the <c>VssCredentials</c> will use it to store and retrieve tokens
+        /// during authentication.
+        /// </summary>
+        public IVssCredentialStorage Storage
+        {
+            get
+            {
+                return m_credentialStorage;
+            }
+            set
+            {
+                m_credentialStorage = value;
+
+                if (m_federatedCredential != null)
+                {
+                    m_federatedCredential.Storage = value;
+                }
+            }
+        }
+
+        /// <summary>
+        ///Attempts to find appropriate Access token for IDE user and add to prompt's parameter
+        /// Actual implementation in override.
+        /// </summary>
+        internal virtual bool TryGetValidAdalToken(IVssCredentialPrompt prompt)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a token provider for the configured issued token credentials.
+        /// </summary>
+        /// <param name="serverUrl">The targeted server</param>
+        /// <param name="webResponse">The failed web response</param>
+        /// <param name="failedToken">The failed token</param>
+        /// <returns>A provider for retrieving tokens for the configured credential</returns>
+        internal IssuedTokenProvider CreateTokenProvider(
+            Uri serverUrl,
+            IHttpResponse webResponse,
+            IssuedToken failedToken)
+        {
+            ArgumentUtility.CheckForNull(serverUrl, "serverUrl");
+
+            IssuedTokenProvider tokenProvider = null;
+            VssTraceActivity traceActivity = VssTraceActivity.Current;
+            lock (m_thisLock)
+            {
+                tokenProvider = m_currentProvider;
+                if (tokenProvider == null || !tokenProvider.IsAuthenticationChallenge(webResponse))
+                {
+                    // Prefer federated authentication over Windows authentication.
+                    if (m_federatedCredential != null && m_federatedCredential.IsAuthenticationChallenge(webResponse))
+                    {
+                        if (tokenProvider != null)
+                        {
+                            VssHttpEventSource.Log.IssuedTokenProviderRemoved(traceActivity, tokenProvider);
+                        }
+
+                        // TODO: This needs to be refactored or renamed to be more generic ...
+                        this.TryGetValidAdalToken(m_federatedCredential.Prompt);
+
+                        tokenProvider = m_federatedCredential.CreateTokenProvider(serverUrl, webResponse, failedToken);
+
+                        if (tokenProvider != null)
+                        {
+                            VssHttpEventSource.Log.IssuedTokenProviderCreated(traceActivity, tokenProvider);
+                        }
+                    }
+
+                    m_currentProvider = tokenProvider;
+                }
+
+                return tokenProvider;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the token provider for the provided server URL if one has been created.
+        /// </summary>
+        /// <param name="serverUrl">The targeted server</param>
+        /// <param name="provider">Stores the active token provider, if one exists</param>
+        /// <returns>True if a token provider was found, false otherwise</returns>
+        public bool TryGetTokenProvider(
+            Uri serverUrl,
+            out IssuedTokenProvider provider)
+        {
+            ArgumentUtility.CheckForNull(serverUrl, "serverUrl");
+
+            lock (m_thisLock)
+            {
+                // Ensure that we attempt to use the most appropriate authentication mechanism by default.
+                if (m_currentProvider == null)
+                {
+                    if (m_federatedCredential != null)
+                    {
+                        m_currentProvider = m_federatedCredential.CreateTokenProvider(serverUrl, null, null);
+                    }
+
+                    if (m_currentProvider != null)
+                    {
+                        VssHttpEventSource.Log.IssuedTokenProviderCreated(VssTraceActivity.Current, m_currentProvider);
+                    }
+                }
+
+                provider = m_currentProvider;
+            }
+
+            return provider != null;
+        }
+
+        /// <summary>
+        /// Determines if the web response is an authentication redirect for issued token providers.
+        /// </summary>
+        /// <param name="webResponse">The web response</param>
+        /// <returns>True if this is an token authentication redirect, false otherwise</returns>
+        internal bool IsAuthenticationChallenge(IHttpResponse webResponse)
+        {
+            if (webResponse == null)
+            {
+                return false;
+            }
+
+            bool isChallenge = false;
+            if (!isChallenge && m_federatedCredential != null)
+            {
+                isChallenge = m_federatedCredential.IsAuthenticationChallenge(webResponse);
+            }
+
+            return isChallenge;
+        }
+
+        internal void SignOut(
+            Uri serverUrl,
+            Uri serviceLocation,
+            string identityProvider)
+        {
+            // Remove the token in the storage and the current token provider. Note that we don't
+            // call InvalidateToken here because we want to remove the whole token not just its value
+            if ((m_currentProvider != null) && (m_currentProvider.CurrentToken != null))
+            {
+                if (m_currentProvider.Credential.Storage != null && m_currentProvider.TokenStorageUrl != null)
+                {
+                    m_currentProvider.Credential.Storage.RemoveToken(m_currentProvider.TokenStorageUrl, m_currentProvider.CurrentToken);
+                }
+                m_currentProvider.CurrentToken = null;
+            }
+
+            // We need to make sure that the current provider actually supports the signout method
+            ISupportSignOut tokenProviderWithSignOut = m_currentProvider as ISupportSignOut;
+            if (tokenProviderWithSignOut == null)
+            {
+                return;
+            }
+
+            // Replace the parameters from the service location
+            if (serviceLocation != null)
+            {
+                string serviceLocationUri = serviceLocation.AbsoluteUri;
+                serviceLocationUri = serviceLocationUri.Replace("{mode}", "SignOut");
+                serviceLocationUri = serviceLocationUri.Replace("{redirectUrl}", serverUrl.AbsoluteUri);
+                serviceLocation = new Uri(serviceLocationUri);
+            }
+
+            // Now actually signout of the token provider
+            tokenProviderWithSignOut.SignOut(serviceLocation, serverUrl, identityProvider);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static void WriteAuthorizationToken(
+            string token,
+            IDictionary<string, string> attributes)
+        {
+            int i = 0;
+            for (int j = 0; j < token.Length; i++, j += 128)
+            {
+                attributes["AuthTokenSegment" + i] = token.Substring(j, Math.Min(128, token.Length - j));
+            }
+
+            attributes["AuthTokenSegmentCount"] = i.ToString(CultureInfo.InvariantCulture);
+        }
+
+        protected static string ReadAuthorizationToken(IDictionary<string, string> attributes)
+        {
+            string authTokenCountValue;
+            if (attributes.TryGetValue("AuthTokenSegmentCount", out authTokenCountValue))
+            {
+                int authTokenCount = int.Parse(authTokenCountValue, CultureInfo.InvariantCulture);
+
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < authTokenCount; i++)
+                {
+                    string segmentName = "AuthTokenSegment" + i;
+
+                    string segmentValue;
+                    if (attributes.TryGetValue(segmentName, out segmentValue))
+                    {
+                        sb.Append(segmentValue);
+                    }
+                }
+
+                return sb.ToString();
+            }
+
+            return string.Empty;
+        }
+
+        protected static bool EnvironmentUserInteractive
+        {
+            get
+            {
+                return Environment.UserInteractive;
+            }
+        }
+
+        private object m_thisLock;
+        private CredentialPromptType m_promptType;
+        private IssuedTokenProvider m_currentProvider;
+        protected FederatedCredential m_federatedCredential;
+        private IVssCredentialStorage m_credentialStorage;
+    }
+}

src/Sdk/Common/Common/ClientStorage/IVssClientStorage.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace GitHub.Services.Common.ClientStorage
+{
+    /// <summary>
+    /// An interface for accessing client data stored locally.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)] // for internal use
+    public interface IVssClientStorage : IVssClientStorageReader, IVssClientStorageWriter
+    {
+        /// <summary>
+        /// Much like the System.IO.Path.Combine method, this method puts together path segments into a path using
+        /// the appropriate path delimiter.
+        /// </summary>
+        /// <param name="paths"></param>
+        /// <returns></returns>
+        string PathKeyCombine(params string[] paths);
+
+        /// <summary>
+        /// The path segment delimiter used by this storage mechanism.
+        /// </summary>
+        char PathSeparator { get; }
+    }
+
+    /// <summary>
+    /// An interface for reading from local data storage
+    /// </summary>
+    public interface IVssClientStorageReader
+    {
+        /// <summary>
+        /// Reads one entry from the storage.
+        /// </summary>
+        /// <typeparam name="T">The type to return.</typeparam>
+        /// <param name="path">This is the path key for the data to retrieve.</param>
+        /// <returns>Returns the value stored at the given path as type T</returns>
+        T ReadEntry<T>(string path);
+
+        /// <summary>
+        /// Reads one entry from the storage.  If the entry does not exist or can not be converted to type T, the default value provided will be returned.
+        /// When T is not a simple type, and there is extra logic to determine the default value, the pattern: ReadEntry&lt;T&gt;(path) && GetDefault(); is
+        /// preferred, so that method to retrieve the default is not evaluated unless the entry does not exist.
+        /// </summary>
+        /// <typeparam name="T">The type to return.</typeparam>
+        /// <param name="path">This is the path key for the data to retrieve.</param>
+        /// <param name="defaultValue">The value to return if the key does not exist or the value can not be converted to type T</param>
+        /// <returns></returns>
+        T ReadEntry<T>(string path, T defaultValue);
+
+        /// <summary>
+        /// Returns all entries under the path provided whose values can be converted to T.  If path = "root\mydata", then this will return all entries where path begins with "root\mydata\".
+        /// </summary>
+        /// <typeparam name="T">The type for the entries to return.</typeparam>
+        /// <param name="path">The path pointing to the branch of entries to return.</param>
+        /// <returns></returns>
+        IDictionary<string, T> ReadEntries<T>(string path);
+    }
+
+    /// <summary>
+    /// An interface for writing to local data storage
+    /// </summary>
+    public interface IVssClientStorageWriter
+    {
+        /// <summary>
+        /// Write one entry into the local data storage.
+        /// </summary>
+        /// <param name="path">This is the key for the data to store.  Providing a path allows data to be accessed hierarchicaly.</param>
+        /// <param name="value">The value to store at the specified path. Setting his to NULL will remove the entry.</param>
+        void WriteEntry(string path, object value);
+
+        /// <summary>
+        /// Writes a set of entries to the writer, which provides efficiency benefits over writing each entry individually.
+        /// It also ensures that the either all of the entries are written or in the case of an error, no entries are written.
+        /// Setting a value to NULL, will remove the entry.
+        /// </summary>
+        /// <param name="entries"></param>
+        void WriteEntries(IEnumerable<KeyValuePair<string, Object>> entries);
+    }
+}

src/Sdk/Common/Common/ClientStorage/VssFileStorage.cs

@@ -0,0 +1,623 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.Services.Common.Internal;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace GitHub.Services.Common.ClientStorage
+{
+    /// <summary>
+    /// Class providing access to local file storage, so data can persist across processes.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)] // for internal use
+    public class VssFileStorage : IVssClientStorage, IDisposable
+    {
+        private readonly string m_filePath;
+        private readonly VssFileStorageReader m_reader;
+        private readonly IVssClientStorageWriter m_writer;
+
+        private const char c_defaultPathSeparator = '\\';
+        private const bool c_defaultIgnoreCaseInPaths = false;
+
+        /// <summary>
+        /// The separator to use between the path segments of the storage keys.
+        /// </summary>
+        public char PathSeparator { get; }
+
+        /// <summary>
+        /// The StringComparer used to compare keys in the dictionary.
+        /// </summary>
+        public StringComparer PathComparer { get; }
+
+        /// <summary>
+        /// This constructor should remain private.  Use the factory method GetVssLocalFileStorage to ensure we only have one instance per file,
+        /// which will reduce contention.
+        /// </summary>
+        /// <param name="filePath">This file path to store the settings.</param>
+        /// <param name="pathSeparatorForKeys">The separator to use between the path segments of the storage keys.</param>
+        /// <param name="ignoreCaseInPaths">If true the dictionary will use the OrdinalIgnoreCase StringComparer to compare keys.</param>
+        private VssFileStorage(string filePath, char pathSeparatorForKeys = c_defaultPathSeparator, bool ignoreCaseInPaths = c_defaultIgnoreCaseInPaths) // This constructor should remain private.
+        {
+            PathSeparator = pathSeparatorForKeys;
+            PathComparer = GetAppropriateStringComparer(ignoreCaseInPaths);
+            m_filePath = filePath;
+            m_reader = new VssFileStorageReader(m_filePath, pathSeparatorForKeys, PathComparer);
+            m_writer = new VssFileStorageWriter(m_filePath, pathSeparatorForKeys, PathComparer);
+        }
+
+        public T ReadEntry<T>(string path)
+        {
+            return m_reader.ReadEntry<T>(path);
+        }
+
+        public T ReadEntry<T>(string path, T defaultValue)
+        {
+            return m_reader.ReadEntry<T>(path, defaultValue);
+        }
+
+        public IDictionary<string, T> ReadEntries<T>(string pathPrefix)
+        {
+            return m_reader.ReadEntries<T>(pathPrefix);
+        }
+
+        public void WriteEntries(IEnumerable<KeyValuePair<string, object>> entries)
+        {
+            m_writer.WriteEntries(entries);
+            m_reader.NotifyChanged();
+        }
+
+        public void WriteEntry(string key, object value)
+        {
+            m_writer.WriteEntry(key, value);
+            m_reader.NotifyChanged();
+        }
+
+        public void Dispose()
+        {
+            m_reader.Dispose();
+        }
+
+        public string PathKeyCombine(params string[] paths)
+        {
+            StringBuilder combinedPath = new StringBuilder();
+            foreach (string segment in paths)
+            {
+                if (segment != null)
+                {
+                    string trimmedSegment = segment.TrimEnd(PathSeparator);
+                    if (trimmedSegment.Length > 0)
+                    {
+                        if (combinedPath.Length > 0)
+                        {
+                            combinedPath.Append(PathSeparator);
+                        }
+                        combinedPath.Append(trimmedSegment);
+                    }
+                }
+            }
+            return combinedPath.ToString();
+        }
+
+        private static ConcurrentDictionary<string, VssFileStorage> s_storages = new ConcurrentDictionary<string, VssFileStorage>(StringComparer.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Factory method to get a VssFileStorage instance ensuring that we don't have two instances for the same file.
+        /// </summary>
+        /// <param name="fullPath">The full path to the storage file.  Ensure that the path used is in an appropriately secure location for the data you are storing.</param>
+        /// <param name="pathSeparatorForKeys">The separator to use between the path segments of the storage keys.</param>
+        /// <param name="ignoreCaseInPaths">If true the dictionary will use the OrdinalIgnoreCase StringComparer to compare keys.</param>
+        /// <returns></returns>
+        public static IVssClientStorage GetVssLocalFileStorage(string fullPath, char pathSeparatorForKeys = c_defaultPathSeparator, bool ignoreCaseInPaths = c_defaultIgnoreCaseInPaths)
+        {
+            string normalizedFullPath = Path.GetFullPath(fullPath);
+            VssFileStorage storage = s_storages.GetOrAdd(normalizedFullPath, (key) => new VssFileStorage(key, pathSeparatorForKeys, ignoreCaseInPaths));
+
+            // we need to throw on mismatch if the cache contains a conflicting instance
+            if (storage.PathSeparator != pathSeparatorForKeys)
+            {
+                throw new ArgumentException(CommonResources.ConflictingPathSeparatorForVssFileStorage(pathSeparatorForKeys, normalizedFullPath, storage.PathSeparator));
+            }
+
+            StringComparer pathComparer = GetAppropriateStringComparer(ignoreCaseInPaths);
+            {
+                if (storage.PathComparer != pathComparer)
+                {
+                    string caseSensitive = "Ordinal";
+                    string caseInsensitive = "OrdinalIgnoreCase";
+                    string requested = ignoreCaseInPaths ? caseInsensitive : caseSensitive;
+                    string previous = ignoreCaseInPaths ? caseSensitive : caseInsensitive;
+                    throw new ArgumentException(CommonResources.ConflictingStringComparerForVssFileStorage(requested, normalizedFullPath, previous));
+                }
+            }
+
+#if DEBUG
+            Debug.Assert(fullPath.Equals(storage.m_filePath), string.Format("The same storage file is being referenced with different casing.  This will cause issues when running in cross patform environments where the file system may be case sensitive.  {0} != {1}", storage.m_filePath, normalizedFullPath));
+#endif
+            return storage;
+        }
+
+        private static StringComparer GetAppropriateStringComparer(bool ignoreCase)
+        {
+            return ignoreCase ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal;
+        }
+
+        /// <summary>
+        /// Gets an instance of a VssLocalFileStorage under the current user directory.
+        /// </summary>
+        /// <param name="pathSuffix">This pathSuffix will be combined at the end of the current user data directory for VSS to make a full path.  Something like: "%localappdata%\GitHub\ActionsService\[pathSuffix]"</param>
+        /// <param name="storeByVssVersion">Adds the current product version as a path segment.  ...\GitHub\ActionsService\v[GeneratedVersionInfo.ProductVersion]\[pathSuffix]"</param>
+        /// <param name="pathSeparatorForKeys">The separator to use between the path segments of the storage keys.</param>
+        /// <param name="ignoreCaseInPaths">If true the dictionary will use the OrdinalIgnoreCase StringComparer to compare keys.</param>
+        /// <returns></returns>
+        public static IVssClientStorage GetCurrentUserVssFileStorage(string pathSuffix, bool storeByVssVersion, char pathSeparatorForKeys = c_defaultPathSeparator, bool ignoreCaseInPaths = c_defaultIgnoreCaseInPaths)
+        {
+            return GetVssLocalFileStorage(Path.Combine(storeByVssVersion ? ClientSettingsDirectoryByVersion : ClientSettingsDirectory, pathSuffix), pathSeparatorForKeys, ignoreCaseInPaths);
+        }
+
+        /// <summary>
+        /// Directory containing the client settings files.
+        ///
+        /// This will look something like this:
+        /// C:\Users\[user]\AppData\Local\GitHub\ActionsService\v[GeneratedVersionInfo.ProductVersion]
+        /// </summary>
+        internal static string ClientSettingsDirectoryByVersion
+        {
+            get
+            {
+                // We purposely do not cache this value. This value needs to change if
+                // Windows Impersonation is being used.
+                return Path.Combine(ClientSettingsDirectory, "v" + GeneratedVersionInfo.ProductVersion);
+            }
+        }
+
+        /// <summary>
+        /// Directory containing the client settings files.
+        ///
+        /// This will look something like this:
+        /// C:\Users\[user]\AppData\Local\GitHub\ActionsService
+        /// </summary>
+        internal static string ClientSettingsDirectory
+        {
+            get
+            {
+                // We purposely do not cache this value. This value needs to change if 
+                // Windows Impersonation is being used.
+
+                // Check to see if we can find the user's local application data directory.
+                string subDir = "GitHub\\ActionsService";
+                string path = Environment.GetEnvironmentVariable("localappdata");
+                SafeGetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+                if (string.IsNullOrEmpty(path))
+                {
+                    // If the user has never logged onto this box they will not have a local application data directory.
+                    // Check to see if they have a roaming network directory that moves with them.
+                    path = SafeGetFolderPath(Environment.SpecialFolder.ApplicationData);
+                    if (string.IsNullOrEmpty(path))
+                    {
+                        // The user does not have a roaming network directory either. Just place the cache in the
+                        // common area.
+                        // If we are using the common dir, we might not have access to create a folder under "GitHub"
+                        // so we just create a top level folder.
+                        path = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
+                        subDir = "GitHubActionsService";
+                    }
+                }
+
+                Debug.Assert(path != null, "folder path cannot be null");
+                return Path.Combine(path, subDir);
+            }
+        }
+
+        /// <summary>
+        /// Gets folder path and returns null in case the special folder in question doesn't exist (useful when the user has never logged on, which makes
+        /// GetFolderPath throw)
+        /// </summary>
+        /// <param name="specialFolder">Folder to retrieve</param>
+        /// <returns>Path if available, null othewise</returns>
+        private static string SafeGetFolderPath(Environment.SpecialFolder specialFolder)
+        {
+            try
+            {
+                return Environment.GetFolderPath(specialFolder);
+            }
+            catch (ArgumentException)
+            {
+                return null;
+            }
+        }
+
+        private class VssFileStorageReader : VssLocalFile, IVssClientStorageReader, IDisposable
+        {
+            private readonly string m_path;
+            private Dictionary<string, JRaw> m_settings;
+
+            private readonly FileSystemWatcher m_watcher;
+            private readonly ReaderWriterLockSlim m_lock;
+            private long m_completedRefreshId;
+            private long m_outstandingRefreshId;
+
+            public VssFileStorageReader(string fullPath, char pathSeparator, StringComparer comparer)
+                : base(fullPath, pathSeparator, comparer)
+            {
+                m_path = fullPath;
+                m_lock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+                m_completedRefreshId = 0;
+                m_outstandingRefreshId = 1;
+
+                // Set up the file system watcher
+                {
+                    string directoryToWatch = Path.GetDirectoryName(m_path);
+
+                    if (!Directory.Exists(directoryToWatch))
+                    {
+                        Directory.CreateDirectory(directoryToWatch);
+                    }
+
+                    m_watcher = new FileSystemWatcher(directoryToWatch, Path.GetFileName(m_path));
+                    m_watcher.IncludeSubdirectories = false;
+                    m_watcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.CreationTime;
+                    m_watcher.Changed += OnCacheFileChanged;
+                    m_watcher.EnableRaisingEvents = true;
+                }
+            }
+
+            public T ReadEntry<T>(string path)
+            {
+                return ReadEntry<T>(path, default(T));
+            }
+
+            public T ReadEntry<T>(string path, T defaultValue)
+            {
+                path = NormalizePath(path);
+                RefreshIfNeeded();
+
+                Dictionary<string, JRaw> settings = m_settings;  // use a pointer to m_settings, incase m_settings gets set to a new instance during the operation
+                JRaw value;
+                if (settings.TryGetValue(path, out value) && value != null)
+                {
+                    return JsonConvert.DeserializeObject<T>(value.ToString());
+                }
+                return defaultValue;
+            }
+
+            public IDictionary<string, T> ReadEntries<T>(string pathPrefix)
+            {
+                string prefix = NormalizePath(pathPrefix, true);
+                RefreshIfNeeded();
+                Dictionary<string, JRaw> settings = m_settings;  // use a pointer to m_settings, incase m_settings gets set to a new instance during the operation
+                Dictionary<string, T> matchingEntries = new Dictionary<string, T>();
+                foreach (KeyValuePair<string, JRaw> kvp in settings.Where(kvp => kvp.Key == prefix || kvp.Key.StartsWith(prefix + PathSeparator)))
+                {
+                    try
+                    {
+                        matchingEntries[kvp.Key] = JsonConvert.DeserializeObject<T>(kvp.Value.ToString());
+                    }
+                    catch (JsonSerializationException) { }
+                    catch (JsonReaderException) { }
+                }
+                return matchingEntries;
+            }
+
+            private void OnCacheFileChanged(object sender, FileSystemEventArgs e)
+            {
+                NotifyChanged();
+            }
+
+            public void Dispose()
+            {
+                m_watcher.Dispose();
+            }
+
+            public void NotifyChanged()
+            {
+                using (new ReadLockScope(m_lock))
+                {
+                    Interlocked.Increment(ref m_outstandingRefreshId);
+                }
+            }
+
+            private void RefreshIfNeeded()
+            {
+                long requestedRefreshId;
+
+                using (new ReadLockScope(m_lock))
+                {
+                    requestedRefreshId = Interlocked.Read(ref m_outstandingRefreshId);
+
+                    if (m_completedRefreshId >= requestedRefreshId)
+                    {
+                        return;
+                    }
+                }
+
+                Dictionary<string, JRaw> newSettings;
+                using (GetNewMutexScope())
+                {
+                    if (m_completedRefreshId >= requestedRefreshId)
+                    {
+                        return;
+                    }
+                    newSettings = LoadFile();
+                }
+
+                using (new ReadLockScope(m_lock))
+                {
+                    if (m_completedRefreshId >= requestedRefreshId)
+                    {
+                        return;
+                    }
+                }
+
+                using (new WriteLockScope(m_lock))
+                {
+                    if (m_completedRefreshId >= requestedRefreshId)
+                    {
+                        return;
+                    }
+
+                    m_completedRefreshId = requestedRefreshId;
+                    m_settings = newSettings;
+                }
+            }
+
+            private struct ReadLockScope : IDisposable
+            {
+                public ReadLockScope(ReaderWriterLockSlim @lock)
+                {
+                    m_lock = @lock;
+
+                    m_lock.EnterReadLock();
+                }
+
+                public void Dispose()
+                {
+                    m_lock.ExitReadLock();
+                }
+
+                private readonly ReaderWriterLockSlim m_lock;
+            }
+
+            private struct WriteLockScope : IDisposable
+            {
+                public WriteLockScope(ReaderWriterLockSlim @lock)
+                {
+                    m_lock = @lock;
+                    m_lock.EnterWriteLock();
+                }
+
+                public void Dispose()
+                {
+                    m_lock.ExitWriteLock();
+                }
+
+                private readonly ReaderWriterLockSlim m_lock;
+            }
+        }
+
+        private class VssFileStorageWriter : VssLocalFile, IVssClientStorageWriter
+        {
+            public VssFileStorageWriter(string fullPath, char pathSeparator, StringComparer comparer)
+                : base(fullPath, pathSeparator, comparer)
+            {
+            }
+
+            public void WriteEntries(IEnumerable<KeyValuePair<string, object>> entries)
+            {
+                if (entries.Any())
+                {
+                    using (GetNewMutexScope())
+                    {
+                        bool changesMade = false;
+                        Dictionary<string, JRaw> originalSettings = LoadFile();
+                        Dictionary<string, JRaw> newSettings = new Dictionary<string, JRaw>(PathComparer);
+                        if (originalSettings.Any())
+                        {
+                            originalSettings.Copy(newSettings);
+                        }
+                        foreach (KeyValuePair<string, object> kvp in entries)
+                        {
+                            string path = NormalizePath(kvp.Key);
+                            if (kvp.Value != null)
+                            {
+                                JRaw jRawValue = new JRaw(JsonConvert.SerializeObject(kvp.Value));
+                                if (!newSettings.ContainsKey(path) || !newSettings[path].Equals(jRawValue))
+                                {
+                                    newSettings[path] = jRawValue;
+                                    changesMade = true;
+                                }
+                            }
+                            else
+                            {
+                                if (newSettings.Remove(path))
+                                {
+                                    changesMade = true;
+                                }
+                            }
+                        }
+                        if (changesMade)
+                        {
+                            SaveFile(originalSettings, newSettings);
+                        }
+                    }
+                }
+            }
+
+            public void WriteEntry(string path, object value)
+            {
+                WriteEntries(new KeyValuePair<string, object>[] { new KeyValuePair<string, object>(path, value) });
+            }
+        }
+
+        private class VssLocalFile
+        {
+            private readonly string m_filePath;
+            private readonly string m_bckUpFilePath;
+            private readonly string m_emptyPathSegment;
+
+            public VssLocalFile(string filePath, char pathSeparator, StringComparer comparer)
+            {
+                m_filePath = filePath;
+                PathComparer = comparer;
+                PathSeparator = pathSeparator;
+                m_emptyPathSegment = new string(pathSeparator, 2);
+                FileInfo fileInfo = new FileInfo(m_filePath);
+                m_bckUpFilePath = Path.Combine(fileInfo.Directory.FullName, "~" + fileInfo.Name);
+            }
+
+            protected char PathSeparator { get; }
+
+            protected string NormalizePath(string path, bool allowRootPath = false)
+            {
+                if (string.IsNullOrEmpty(path) || path[0] != PathSeparator || path.IndexOf(m_emptyPathSegment, StringComparison.Ordinal) >= 0 || (!allowRootPath && path.Length == 1))
+                {
+                    throw new ArgumentException(CommonResources.InvalidClientStoragePath(path, PathSeparator), "path");
+                }
+                if (path[path.Length - 1] == PathSeparator)
+                {
+                    path = path.Substring(0, path.Length - 1);
+                }
+                return path;
+            }
+
+            protected StringComparer PathComparer { get; }
+
+            protected Dictionary<string, JRaw> LoadFile()
+            {
+                Dictionary<string, JRaw> settings = null;
+                if (File.Exists(m_filePath))
+                {
+                    settings = LoadFile(m_filePath);
+                }
+                if ((settings == null || !settings.Any()) && File.Exists(m_bckUpFilePath))
+                {
+                    settings = LoadFile(m_bckUpFilePath);
+                }
+                return settings ?? new Dictionary<string, JRaw>(PathComparer);
+            }
+
+            private Dictionary<string, JRaw> LoadFile(string path)
+            {
+                Dictionary<string, JRaw> settings = new Dictionary<string, JRaw>(PathComparer);
+                try
+                {
+                    string fileContent;
+                    using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete))
+                    {
+                        using (var sr = new StreamReader(fs, Encoding.UTF8))
+                        {
+                            fileContent = sr.ReadToEnd();
+                        }
+                    }
+                    IReadOnlyDictionary<string, JRaw> loadedSettings = JsonConvert.DeserializeObject<IReadOnlyDictionary<string, JRaw>>(fileContent);
+                    if (loadedSettings != null)
+                    {
+                        // Replay the settings into our dictionary one by one so that our uniqueness constraint
+                        // isn't violated based on the StringComparer for this instance.
+                        foreach (KeyValuePair<string, JRaw> setting in loadedSettings)
+                        {
+                            settings[setting.Key] = setting.Value;
+                        }
+                    }
+                }
+                catch (DirectoryNotFoundException) { }
+                catch (FileNotFoundException) { }
+                catch (JsonReaderException) { }
+                catch (JsonSerializationException) { }
+                catch (InvalidCastException) { }
+
+                return settings;
+            }
+
+            protected void SaveFile(IDictionary<string, JRaw> originalSettings, IDictionary<string, JRaw> newSettings)
+            {
+                string newContent = JValue.Parse(JsonConvert.SerializeObject(newSettings)).ToString(Formatting.Indented);
+                if (originalSettings.Any())
+                {
+                    // during testing, creating this backup provided reliability in the event of aborted threads, and
+                    // crashed processes.  With this, I was not able to simulate a case where corruption happens, but there is no
+                    // 100% gaurantee against corruption.
+                    string originalContent = JValue.Parse(JsonConvert.SerializeObject(originalSettings)).ToString(Formatting.Indented);
+                    SaveFile(m_bckUpFilePath, originalContent);
+                }
+                SaveFile(m_filePath, newContent);
+                if (File.Exists(m_bckUpFilePath))
+                {
+                    File.Delete(m_bckUpFilePath);
+                }
+            }
+
+            private void SaveFile(string path, string content)
+            {
+                bool success = false;
+                int tries = 0;
+                int retryDelayMilliseconds = 10;
+                const int maxNumberOfRetries = 6;
+                do
+                {
+                    try
+                    {
+                        using (var fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Delete))
+                        {
+                            using (var sw = new StreamWriter(fs, Encoding.UTF8))
+                            {
+                                sw.Write(content);
+                            }
+                        }
+                        success = true;
+                    }
+                    catch (IOException)
+                    {
+                        if (++tries > maxNumberOfRetries)
+                        {
+                            throw;
+                        }
+                        Task.Delay(retryDelayMilliseconds).Wait();
+                        retryDelayMilliseconds *= 2;
+                    }
+                }
+                while (!success);
+            }
+
+            protected MutexScope GetNewMutexScope()
+            {
+                return new MutexScope(m_filePath.Replace(Path.DirectorySeparatorChar, '_'));
+            }
+
+            protected struct MutexScope : IDisposable
+            {
+                public MutexScope(string name)
+                {
+                    m_mutex = new Mutex(false, name);
+
+                    try
+                    {
+                        if (!m_mutex.WaitOne(s_mutexTimeout))
+                        {
+                            throw new TimeoutException();
+                        }
+                    }
+                    catch (AbandonedMutexException)
+                    {
+                        // If this is thrown, then we hold the mutex.
+                    }
+                }
+
+                public void Dispose()
+                {
+                    m_mutex.ReleaseMutex();
+                }
+
+                private readonly Mutex m_mutex;
+                private static readonly TimeSpan s_mutexTimeout = TimeSpan.FromSeconds(10);
+            }
+        }
+    }
+}

src/Sdk/Common/Common/Diagnostics/HttpRequestMessageExtensions.cs

@@ -0,0 +1,31 @@
+using System;
+using System.ComponentModel;
+using System.Net.Http;
+
+namespace GitHub.Services.Common.Diagnostics
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    internal static class HttpRequestMessageExtensions
+    {
+        public static VssHttpMethod GetHttpMethod(this HttpRequestMessage message)
+        {
+            String methodName = message.Method.Method;
+            VssHttpMethod httpMethod = VssHttpMethod.UNKNOWN;
+            if (!Enum.TryParse<VssHttpMethod>(methodName, true, out httpMethod))
+            {
+                httpMethod = VssHttpMethod.UNKNOWN;
+            }
+            return httpMethod;
+        }
+
+        public static VssTraceActivity GetActivity(this HttpRequestMessage message)
+        {
+            Object traceActivity;
+            if (!message.Properties.TryGetValue(VssTraceActivity.PropertyName, out traceActivity))
+            {
+                return VssTraceActivity.Empty;
+            }
+            return (VssTraceActivity)traceActivity;
+        }
+    }
+}

src/Sdk/Common/Common/Diagnostics/VssHttpMethod.cs

@@ -0,0 +1,15 @@
+
+namespace GitHub.Services.Common.Diagnostics
+{
+    internal enum VssHttpMethod
+    {
+        UNKNOWN,
+        DELETE,
+        HEAD,
+        GET,
+        OPTIONS,
+        PATCH,
+        POST,
+        PUT,
+    }
+}

src/Sdk/Common/Common/Diagnostics/VssTraceActivity.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.Serialization;
+
+namespace GitHub.Services.Common.Diagnostics
+{
+    /// <summary>
+    /// Represents a trace activity for correlating diagnostic traces together. 
+    /// </summary>
+    [DataContract]
+    [Serializable]
+    public sealed class VssTraceActivity
+    {
+        private VssTraceActivity()
+        {
+        }
+
+        private VssTraceActivity(Guid activityId)
+        {
+            this.Id = activityId;
+        }
+
+        /// <summary>
+        /// Gets the unique identifier for the trace activity.
+        /// </summary>
+        [DataMember]
+        public Guid Id
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets the current trace activity if one is set on the current thread; otherwise, null.
+        /// </summary>
+        public static VssTraceActivity Current
+        {
+            get
+            {
+                return null;
+            }
+            set { }
+        }
+
+        /// <summary>
+        /// Gets the empty trace activity.
+        /// </summary>
+        public static VssTraceActivity Empty
+        {
+            get
+            {
+                return s_empty.Value;
+            }
+        }
+
+        /// <summary>
+        /// Creates a disposable trace scope in which the current trace activity is activated for trace correlation. 
+        /// The call context state for <see cref="VssTraceActivity.Current"/> is updated within the scope to reference
+        /// the activated activity.
+        /// </summary>
+        /// <returns>A trace scope for correlating multiple traces together</returns>
+        public IDisposable EnterCorrelationScope()
+        {
+            return new CorrelationScope(this);
+        }
+
+        /// <summary>
+        /// Gets the current activity or, if no activity is active on the current thread, creates a new activity for
+        /// trace correlation.
+        /// </summary>
+        /// <returns>The current trace activity or a new trace activity</returns>
+        public static VssTraceActivity GetOrCreate()
+        {
+            if (VssTraceActivity.Current != null)
+            {
+                return VssTraceActivity.Current;
+            }
+            else if (Trace.CorrelationManager.ActivityId == Guid.Empty)
+            {
+                return new VssTraceActivity(Guid.NewGuid());
+            }
+            else
+            {
+                return new VssTraceActivity(Trace.CorrelationManager.ActivityId);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new trace activity optionally using the provided identifier.
+        /// </summary>
+        /// <param name="activityId">The activity identifier or none to have one generated</param>
+        /// <returns>A new trace activity instance</returns>
+        public static VssTraceActivity New(Guid activityId = default(Guid))
+        {
+            return new VssTraceActivity(activityId == default(Guid) ? Guid.NewGuid() : activityId);
+        }
+
+        /// <summary>
+        /// Gets the property name used to cache this object on extensible objects.
+        /// </summary>
+        public const String PropertyName = "MS.VSS.Diagnostics.TraceActivity";
+        private static Lazy<VssTraceActivity> s_empty = new Lazy<VssTraceActivity>(() => new VssTraceActivity(Guid.Empty));
+
+        private sealed class CorrelationScope : IDisposable
+        {
+            public CorrelationScope(VssTraceActivity activity)
+            {
+                m_previousActivity = VssTraceActivity.Current;
+                if (m_previousActivity == null || m_previousActivity.Id != activity.Id)
+                {
+                    m_swap = true;
+                    VssTraceActivity.Current = activity;
+                }
+            }
+
+            public void Dispose()
+            {
+                if (m_swap)
+                {
+                    try
+                    {
+                        m_swap = false;
+                    }
+                    finally
+                    {
+                        // Perform in a finally block to ensure consistency between the two variables
+                        VssTraceActivity.Current = m_previousActivity;
+                    }
+                }
+            }
+
+            private Boolean m_swap;
+            private VssTraceActivity m_previousActivity;
+        }
+    }
+}