diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 8ac3ac6f5..0acbdf4a0 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -2,7 +2,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
     - release/*
 
 # Trigger builds for PRs to any branch
@@ -11,16 +11,41 @@ pr:
     include:
     - '*'
 
+schedules:
+- cron: 0 9 * * 1
+  displayName: "Run CodeQL3000 weekly, Monday at 2:00 AM PDT"
+  branches:
+    include:
+    - release/2.1
+    - main
+  always: true
+
+parameters:
+# Parameters below are ignored in public builds.
+#
+# Choose whether to run the CodeQL3000 tasks.
+# Manual builds align w/ official builds unless this parameter is true.
+- name: runCodeQL3000
+  default: false
+  displayName: Run CodeQL3000 tasks
+  type: boolean
+
+variables:
+  BuildConfiguration: Release
+
 jobs:
-- template: ../templates/project-ci.yml
+- template: jobs/project-ci.yml
   parameters:
     # Ensures the alignment of branch name and deployment params
     buildArgs: '/warnaserror:BUILD1001'
-    afterBuild:
-    - task: PublishBuildArtifacts@1
-      displayName: Upload KoreBuild artifact
-      condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'), eq(variables['AgentOsName'], 'Windows'), eq(variables['system.pullrequest.isfork'], false))
-      inputs:
-        pathtoPublish: artifacts/korebuild/
-        artifactName: korebuild
-        artifactType: Container
+    ${{ if and(eq(variables['System.TeamProject'], 'internal'), or(eq(variables['Build.Reason'], 'Schedule'), and(eq(variables['Build.Reason'], 'Manual'), eq(parameters.runCodeQL3000, 'true')))) }}:
+      runCodeQL3000: true
+    ${{ else }}:
+      afterBuild:
+      - task: PublishBuildArtifacts@1
+        displayName: Upload KoreBuild artifact
+        condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'), eq(variables['AgentOsName'], 'Windows'), eq(variables['system.pullrequest.isfork'], false))
+        inputs:
+          pathtoPublish: artifacts/korebuild/
+          artifactName: korebuild
+          artifactType: Container
diff --git a/.azure/templates/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
similarity index 87%
rename from .azure/templates/jobs/default-build.yml
rename to .azure/pipelines/jobs/default-build.yml
index 0e5b478f8..058be9661 100644
--- a/.azure/templates/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -48,6 +48,7 @@ parameters:
   afterBuild: []
   codeSign: false
   variables: {}
+  runCodeQL3000: false
   dependsOn: ''
   # buildSteps: [] - don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.buildSteps)"
   # jobName: '' - use agentOs by default.
@@ -68,31 +69,44 @@ jobs:
       maxParallel: 8
       matrix: ${{ parameters.matrix }}
   # Map friendly OS names to the right queue
-  # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md and
+  # See https://github.com/dotnet/arcade/blob/main/Documentation/ChoosingAMachinePool.md and
   # https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#use-a-microsoft-hosted-agent
   pool:
     ${{ if ne(parameters.poolName, '') }}:
       name: ${{ parameters.poolName }}
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'macOS')) }}:
-      vmImage: macOS-10.13
+      vmImage: macOS-10.15
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
-      vmImage: vs2017-win2016
+      vmImage: windows-2019
       ${{ if ne(variables['System.TeamProject'], 'public') }}:
-        name: NetCoreInternal-Pool
-        queue: BuildPool.Windows.10.Amd64.VS2017
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals windows.vs2019.amd64
   variables:
     AgentOsName: ${{ parameters.agentOs }}
     ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
     DOTNET_HOME: $(Agent.BuildDirectory)/.dotnet
     BuildScriptArgs: ${{ parameters.buildArgs }}
     BuildConfiguration: ${{ parameters.configuration }}
+    LC_ALL: 'en_US.UTF-8'
+    LANG: 'en_US.UTF-8'
+    LANGUAGE: 'en_US.UTF-8'
     TeamName: AspNetCore
     ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
       _SignType: real
     ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), eq(variables['Build.Reason'], 'PullRequest')) }}:
       _SignType: ''
+    ${{ if eq(parameters.runCodeQL3000, 'true') }}:
+      # Do not let CodeQL3000 Extension gate scan frequency.
+      Codeql.Cadence: 0
+      # Enable CodeQL3000 unconditionally so it may be run on any branch.
+      Codeql.Enabled: true
+      Codeql.SourceRoot: src
+      # CodeQL3000 needs this plumbed along as a variable to enable TSA.
+      Codeql.TSAEnabled: ${{ eq(variables['Build.Reason'], 'Schedule') }}
+      # Default expects tsaoptions.json under SourceRoot.
+      Codeql.TSAOptionsPath: '$(Build.SourcesDirectory)/.config/tsaoptions.json'
     ${{ insert }}: ${{ parameters.variables }}
   steps:
   - checkout: self
diff --git a/.azure/pipelines/jobs/project-ci.yml b/.azure/pipelines/jobs/project-ci.yml
new file mode 100644
index 000000000..3b738c4c9
--- /dev/null
+++ b/.azure/pipelines/jobs/project-ci.yml
@@ -0,0 +1,71 @@
+# Description: Runs build.cmd/sh on macOS, Linux, and Windows
+# Parameters:
+#   buildArgs: string
+#       Additional arguments to pass to the build.sh/cmd script.
+#       Note: -ci is always passed
+#   beforeBuild: [steps]
+#       Additional steps to run before build.sh/cmd
+#   afterBuild: [steps]
+#       Additional steps to run after build.sh/cmd
+#   variables: {}
+#       Azure DevOps build and environment variables
+#   matrix: {}
+#       The matrix of configurations to run. By default, it runs a Debug and Release build on all platforms
+#   codeSign: boolean
+#       This build definition is enabled for code signing. (Only applies to Windows)
+#   runCodeQL3000: boolean
+#       This build should run CodeQL3000 instead of the regular build
+
+parameters:
+  buildArgs: ''
+  beforeBuild: []
+  afterBuild: []
+  codeSign: false
+  variables: {}
+  runCodeQL3000: false
+
+jobs:
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), eq(parameters.runCodeQL3000, 'true')) }}:
+  - template: default-build.yml
+    parameters:
+      agentOs: Windows
+      matrix: ${{ parameters.matrix }}
+      buildArgs: ${{ parameters.buildArgs }}
+      beforeBuild:
+      - task: CodeQL3000Init@0
+        displayName: CodeQL Initialize
+      - script: "echo ##vso[build.addbuildtag]CodeQL3000"
+        displayName: 'Set CI CodeQL3000 tag'
+        condition: ne(variables.CODEQL_DIST,'')
+      afterBuild:
+      - task: CodeQL3000Finalize@0
+        displayName: CodeQL Finalize
+      codeSign: false
+      variables: ${{ parameters.variables }}
+      runCodeQL3000: true
+- ${{ else }}: # regular build
+  - template: default-build.yml
+    parameters:
+      agentOs: Windows
+      matrix: ${{ parameters.matrix }}
+      buildArgs: ${{ parameters.buildArgs }}
+      beforeBuild: ${{ parameters.beforeBuild }}
+      afterBuild: ${{ parameters.afterBuild }}
+      codeSign: ${{ parameters.codeSign }}
+      variables: ${{ parameters.variables }}
+  - template: default-build.yml
+    parameters:
+      agentOs: macOS
+      matrix: ${{ parameters.matrix }}
+      buildArgs: ${{ parameters.buildArgs }}
+      beforeBuild: ${{ parameters.beforeBuild }}
+      afterBuild: ${{ parameters.afterBuild }}
+      variables: ${{ parameters.variables }}
+  - template: default-build.yml
+    parameters:
+      agentOs: Linux
+      matrix: ${{ parameters.matrix }}
+      buildArgs: ${{ parameters.buildArgs }}
+      beforeBuild: ${{ parameters.beforeBuild }}
+      afterBuild: ${{ parameters.afterBuild }}
+      variables: ${{ parameters.variables }}
diff --git a/.azure/templates/project-ci.yml b/.azure/templates/project-ci.yml
deleted file mode 100644
index 8902e7046..000000000
--- a/.azure/templates/project-ci.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Description: Runs build.cmd/sh on macOS, Linux, and Windows
-# Parameters:
-#   buildArgs: string
-#       Additional arguments to pass to the build.sh/cmd script.
-#       Note: -ci is always passed
-#   beforeBuild: [steps]
-#       Additional steps to run before build.sh/cmd
-#   afterBuild: [steps]
-#       Additional steps to run after build.sh/cmd
-#   variables: {}
-#       Azure DevOps build and environment variables
-#   matrix: {}
-#       The matrix of configurations to run. By default, it runs a Debug and Release build on all platforms
-#   codeSign: boolean
-#       This build definition is enabled for code signing. (Only applies to Windows)
-
-parameters:
-  buildArgs: ''
-  beforeBuild: []
-  afterBuild: []
-  codeSign: false
-  variables: {}
-  matrix:
-    Release:
-      BuildConfiguration: Release
-    Debug:
-      BuildConfiguration: Debug
-
-jobs:
-- template: jobs/default-build.yml
-  parameters:
-    agentOs: Windows
-    matrix: ${{ parameters.matrix }}
-    buildArgs: ${{ parameters.buildArgs }}
-    beforeBuild: ${{ parameters.beforeBuild }}
-    afterBuild: ${{ parameters.afterBuild }}
-    codeSign: ${{ parameters.codeSign }}
-    variables: ${{ parameters.variables }}
-- template: jobs/default-build.yml
-  parameters:
-    agentOs: macOS
-    matrix: ${{ parameters.matrix }}
-    buildArgs: ${{ parameters.buildArgs }}
-    beforeBuild: ${{ parameters.beforeBuild }}
-    afterBuild: ${{ parameters.afterBuild }}
-    variables: ${{ parameters.variables }}
-- template: jobs/default-build.yml
-  parameters:
-    agentOs: Linux
-    matrix: ${{ parameters.matrix }}
-    buildArgs: ${{ parameters.buildArgs }}
-    beforeBuild: ${{ parameters.beforeBuild }}
-    afterBuild: ${{ parameters.afterBuild }}
-    variables: ${{ parameters.variables }}
diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
new file mode 100644
index 000000000..0128aa272
--- /dev/null
+++ b/.config/tsaoptions.json
@@ -0,0 +1,12 @@
+{
+  "areaPath": "DevDiv\\ASP.NET Core",
+  "codebaseName": "Buildtools",
+  "instanceUrl": "https://devdiv.visualstudio.com/",
+  "iterationPath": "DevDiv",
+  "notificationAliases": [
+    "aspnetcore-build@microsoft.com"
+  ],
+  "projectName": "DEVDIV",
+  "repositoryName": "Buildtools",
+  "template": "TFSDEVDIV"
+}
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..0578a0e1f
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @aspnet/build
diff --git a/.gitignore b/.gitignore
index 523876b6f..a03f501b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ node_modules
 .nuget/NuGet.exe
 project.lock.json
 .build
+.idea/
 .vs/
 .vscode/
 global.json
diff --git a/BuildTools.sln b/BuildTools.sln
index 5b92dcc49..7ef78b100 100644
--- a/BuildTools.sln
+++ b/BuildTools.sln
@@ -1,16 +1,15 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27121.1
-MinimumVisualStudioVersion = 15.0.26730.03
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.0.0
+MinimumVisualStudioVersion = 16.0.0.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4F4353B-C3D2-40B0-909A-5B48A748EA76}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{BF3E9C90-F129-4CE6-8F3B-F96831E4429B}"
 	ProjectSection(SolutionItems) = preProject
-		.appveyor.yml = .appveyor.yml
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		.travis.yml = .travis.yml
 		build.cmd = build.cmd
 		build.ps1 = build.ps1
 		build.sh = build.sh
@@ -39,30 +38,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{60A938B2-D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackageVerifier.Console", "modules\NuGetPackageVerifier\console\NuGetPackageVerifier.Console.csproj", "{657AFF5E-164E-493D-8501-8026B7C20808}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheckBaseline.V1", "test\ApiCheckBaseline.V1\ApiCheckBaseline.V1.csproj", "{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheckBaseline.V2", "test\ApiCheckBaseline.V2\ApiCheckBaseline.V2.csproj", "{ECA89839-3332-43F3-B1B1-9C2D91B7285E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheck.Test", "test\ApiCheck.Test\ApiCheck.Test.csproj", "{D61A892B-D214-44AB-9652-334C4338377B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheck.Console", "src\ApiCheck.Console\ApiCheck.Console.csproj", "{AEFC7985-27C8-468E-8EF8-E1D589C9053F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackageVerifier.Task", "modules\NuGetPackageVerifier\msbuild\NuGetPackageVerifier.Task.csproj", "{EF38C1CA-8A2E-4C8E-B478-7072C0140514}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Internal.AspNetCore.Sdk", "src\Internal.AspNetCore.Sdk\Internal.AspNetCore.Sdk.csproj", "{F0E4CF2B-29B9-432B-BF27-195996CA24FD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildTools.Tasks", "modules\BuildTools.Tasks\BuildTools.Tasks.csproj", "{6A631446-BBDD-4743-B576-7F9793B6BE45}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildTools.Tasks.Tests", "test\BuildTools.Tasks.Tests\BuildTools.Tasks.Tests.csproj", "{211858CA-6E82-4EFD-9960-8D023EEB789F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheck.Task", "src\ApiCheck.Task\ApiCheck.Task.csproj", "{9BE633D2-025A-4B29-A8A9-FC8F79C331AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Internal.AspNetCore.BuildTasks", "src\Internal.AspNetCore.BuildTasks\Internal.AspNetCore.BuildTasks.csproj", "{F0E4CF2B-29B9-432B-BF27-195996CA24FD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KoreBuild.FunctionalTests", "test\KoreBuild.FunctionalTests\KoreBuild.FunctionalTests.csproj", "{D5D1BD88-1781-4448-89DD-3E62C95D3A77}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{76ABA507-B453-43BA-BA98-FA3FDDC6DD39}"
 	ProjectSection(SolutionItems) = preProject
 		build\dependencies.props = build\dependencies.props
-		build\repo.beforecommon.props = build\repo.beforecommon.props
 		build\repo.props = build\repo.props
 		build\repo.targets = build\repo.targets
 	EndProjectSection
@@ -82,13 +66,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGetPackageVerifier", "NuG
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KoreBuild.Tasks.Tests", "test\KoreBuild.Tasks.Tests\KoreBuild.Tasks.Tests.csproj", "{A3A81E93-0157-406F-A43C-C163F7F781A9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B16B5072-3A0B-4527-8AB5-1C73A51684F7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KoreBuild.Console", "tools\KoreBuild.Console\KoreBuild.Console.csproj", "{02F548A6-B0E9-4F09-BC03-812FC3C8F0D2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheckForwardDestination", "test\ApiCheckForwardDestination\ApiCheckForwardDestination.csproj", "{605F0478-A9D2-4A8A-BB38-9D5DC132FBB5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackageVerifier.Tests", "test\NuGetPackageVerifier.Tests\NuGetPackageVerifier.Tests.csproj", "{439CC7A3-F6E6-46B8-B6A0-05E22E558FC2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Internal.AspNetCore.SiteExtension.Sdk", "src\Internal.AspNetCore.SiteExtension.Sdk\Internal.AspNetCore.SiteExtension.Sdk.csproj", "{418F99A5-5EC4-4895-B8EB-7F8BBA241DB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTasks.Tests", "test\BuildTasks.Tests\BuildTasks.Tests.csproj", "{917C539F-4A6A-4CA0-B6E5-D50F383718A6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -100,22 +80,6 @@ Global
 		{657AFF5E-164E-493D-8501-8026B7C20808}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{657AFF5E-164E-493D-8501-8026B7C20808}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{657AFF5E-164E-493D-8501-8026B7C20808}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D61A892B-D214-44AB-9652-334C4338377B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D61A892B-D214-44AB-9652-334C4338377B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D61A892B-D214-44AB-9652-334C4338377B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D61A892B-D214-44AB-9652-334C4338377B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -124,18 +88,6 @@ Global
 		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A631446-BBDD-4743-B576-7F9793B6BE45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A631446-BBDD-4743-B576-7F9793B6BE45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A631446-BBDD-4743-B576-7F9793B6BE45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A631446-BBDD-4743-B576-7F9793B6BE45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{211858CA-6E82-4EFD-9960-8D023EEB789F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{211858CA-6E82-4EFD-9960-8D023EEB789F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{211858CA-6E82-4EFD-9960-8D023EEB789F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{211858CA-6E82-4EFD-9960-8D023EEB789F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BE633D2-025A-4B29-A8A9-FC8F79C331AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BE633D2-025A-4B29-A8A9-FC8F79C331AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BE633D2-025A-4B29-A8A9-FC8F79C331AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BE633D2-025A-4B29-A8A9-FC8F79C331AB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5D1BD88-1781-4448-89DD-3E62C95D3A77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5D1BD88-1781-4448-89DD-3E62C95D3A77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D5D1BD88-1781-4448-89DD-3E62C95D3A77}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -148,40 +100,28 @@ Global
 		{A3A81E93-0157-406F-A43C-C163F7F781A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3A81E93-0157-406F-A43C-C163F7F781A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3A81E93-0157-406F-A43C-C163F7F781A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02F548A6-B0E9-4F09-BC03-812FC3C8F0D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02F548A6-B0E9-4F09-BC03-812FC3C8F0D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02F548A6-B0E9-4F09-BC03-812FC3C8F0D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02F548A6-B0E9-4F09-BC03-812FC3C8F0D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{605F0478-A9D2-4A8A-BB38-9D5DC132FBB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{605F0478-A9D2-4A8A-BB38-9D5DC132FBB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{605F0478-A9D2-4A8A-BB38-9D5DC132FBB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{605F0478-A9D2-4A8A-BB38-9D5DC132FBB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{418F99A5-5EC4-4895-B8EB-7F8BBA241DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{418F99A5-5EC4-4895-B8EB-7F8BBA241DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{418F99A5-5EC4-4895-B8EB-7F8BBA241DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{418F99A5-5EC4-4895-B8EB-7F8BBA241DB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{439CC7A3-F6E6-46B8-B6A0-05E22E558FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{439CC7A3-F6E6-46B8-B6A0-05E22E558FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{439CC7A3-F6E6-46B8-B6A0-05E22E558FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{439CC7A3-F6E6-46B8-B6A0-05E22E558FC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{917C539F-4A6A-4CA0-B6E5-D50F383718A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{917C539F-4A6A-4CA0-B6E5-D50F383718A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{917C539F-4A6A-4CA0-B6E5-D50F383718A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{917C539F-4A6A-4CA0-B6E5-D50F383718A6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{657AFF5E-164E-493D-8501-8026B7C20808} = {C0E43505-F8EB-4B7F-B84D-5961F9763945}
-		{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
-		{ECA89839-3332-43F3-B1B1-9C2D91B7285E} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
-		{D61A892B-D214-44AB-9652-334C4338377B} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
-		{AEFC7985-27C8-468E-8EF8-E1D589C9053F} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
 		{EF38C1CA-8A2E-4C8E-B478-7072C0140514} = {C0E43505-F8EB-4B7F-B84D-5961F9763945}
 		{F0E4CF2B-29B9-432B-BF27-195996CA24FD} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
-		{6A631446-BBDD-4743-B576-7F9793B6BE45} = {BD3545FB-5520-43DF-B4F9-83BEA3A38ECA}
-		{211858CA-6E82-4EFD-9960-8D023EEB789F} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
-		{9BE633D2-025A-4B29-A8A9-FC8F79C331AB} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
 		{D5D1BD88-1781-4448-89DD-3E62C95D3A77} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
 		{020ED083-4076-4711-A52B-2F89EA884F9B} = {BD3545FB-5520-43DF-B4F9-83BEA3A38ECA}
 		{C0E43505-F8EB-4B7F-B84D-5961F9763945} = {BD3545FB-5520-43DF-B4F9-83BEA3A38ECA}
 		{A3A81E93-0157-406F-A43C-C163F7F781A9} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
-		{02F548A6-B0E9-4F09-BC03-812FC3C8F0D2} = {B16B5072-3A0B-4527-8AB5-1C73A51684F7}
-		{605F0478-A9D2-4A8A-BB38-9D5DC132FBB5} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
-		{418F99A5-5EC4-4895-B8EB-7F8BBA241DB2} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
+		{439CC7A3-F6E6-46B8-B6A0-05E22E558FC2} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
+		{917C539F-4A6A-4CA0-B6E5-D50F383718A6} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1B8809C8-A6C3-4761-BC91-B12841F49AE1}
diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md
new file mode 100644
index 000000000..775f221c9
--- /dev/null
+++ b/CODE-OF-CONDUCT.md
@@ -0,0 +1,6 @@
+# Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant
+to clarify expected behavior in our community.
+
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ac2d28d2f..3924182cb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
 Contributing
 ======
 
-Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/AspNetCore/blob/master/CONTRIBUTING.md) in the AspNetCore repo.
+Information on contributing to this repo is in the [Contributing Guide](https://github.com/dotnet/aspnetcore/blob/main/CONTRIBUTING.md) in the AspNetCore repo.
diff --git a/Directory.Build.props b/Directory.Build.props
index 5773b98f0..92e5bbed9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,30 +4,21 @@
   <Import Project="build\sources.props" />
 
   <PropertyGroup>
-    <!-- these imports substitute for a package reference to Internal.AspNetCore.Sdk -->
-    <_AspNetToolsSdkPath>$(MSBuildThisFileDirectory)src\Internal.AspNetCore.Sdk</_AspNetToolsSdkPath>
-    <CustomAfterMicrosoftCommonTargets>$(_AspNetToolsSdkPath)\build\Internal.AspNetCore.Sdk.targets</CustomAfterMicrosoftCommonTargets>
-    <CustomAfterMicrosoftCommonCrossTargetingTargets>$(_AspNetToolsSdkPath)\buildMultiTargeting\Internal.AspNetCore.Sdk.targets</CustomAfterMicrosoftCommonCrossTargetingTargets>
-    <GenerateCommitHashAttribute Condition="'$(RepositoryCommit)'==''">false</GenerateCommitHashAttribute>
-    <GenerateSourceLinkFile>false</GenerateSourceLinkFile>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <EnableApiCheck>false</EnableApiCheck>
     <NoWarn>$(NoWarn);NU5105</NoWarn>
     <Serviceable>false</Serviceable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
-  <Import Project="$(_AspNetToolsSdkPath)\build\Internal.AspNetCore.Sdk.props" />
-
   <PropertyGroup>
     <RepositoryUrl>https://github.com/aspnet/BuildTools</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssembliesPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
index e13cd1d29..9b6dfd484 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
-Build Tools
-===========
+Build Tools [Obsolete]
+======================
+
+:warning: **The tools in this repo are obsolete.** You should convert to using Arcade tools.
+See <https://github.com/dotnet/arcade>.
+
 
 Utilities used in the build system for projects that are used with ASP.NET Core and Entity Framework Core.
 
@@ -13,11 +17,13 @@ See [docs/README.md](./docs/README.md).
 
 Channel        | Latest Build
 ---------------|:---------------
-master         | ![badge][master-badge]
+main         | ![badge][main-badge]
+release/2.2    | ![badge][rel-2.2-badge]
 release/2.1    | ![badge][rel-2.1-badge]
 release/2.0    | ![badge][rel-2.0-badge]
 
-[master-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/master/badge.svg
+[main-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/main/badge.svg
+[rel-2.2-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/release/2.2/badge.svg
 [rel-2.1-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/release/2.1/badge.svg
 [rel-2.0-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/release/2.0/badge.svg
 
diff --git a/build/dependencies.props b/build/dependencies.props
index b0683ba4d..c4c3b56d4 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,34 +3,35 @@
     <HtmlAgilityPackPackageVersion>1.5.1</HtmlAgilityPackPackageVersion>
     <MicroBuildCorePackageVersion>0.3.0</MicroBuildCorePackageVersion>
     <MicrosoftDotNetPlatformAbstractionsVersion>2.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
-    <MicrosoftDotNetSignToolPackageVersion>1.0.0-beta.19119.1</MicrosoftDotNetSignToolPackageVersion>
-    <MicrosoftDotNetSignCheckPackageVersion>1.0.0-beta.19119.1</MicrosoftDotNetSignCheckPackageVersion>
+    <MicrosoftDotNetSignToolPackageVersion>1.0.0-beta.19167.10</MicrosoftDotNetSignToolPackageVersion>
+    <MicrosoftDotNetSignCheckPackageVersion>1.0.0-beta.19167.10</MicrosoftDotNetSignCheckPackageVersion>
     <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-preview.1</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
     <MonoCecilPackageVersion>0.10.0-beta6</MonoCecilPackageVersion>
     <MoqPackageVersion>4.7.99</MoqPackageVersion>
     <!-- This one is OK for console tools that bundle their own version of JSON.NET -->
-    <NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
-    <NuGetPackagingPackageVersion>4.3.0</NuGetPackagingPackageVersion>
-    <NuGetProjectModelPackageVersion>4.3.0</NuGetProjectModelPackageVersion>
+    <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
+    <NuGetPackagingPackageVersion>6.0.6</NuGetPackagingPackageVersion>
+    <NuGetProjectModelPackageVersion>6.0.5</NuGetProjectModelPackageVersion>
+    <SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
     <VSWherePackageVersion>2.2.7</VSWherePackageVersion>
-    <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
+    <XunitPackageVersion>2.4.1</XunitPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
 
   <!--
-    Attempt to keep these mostly aligned with https://github.com/dotnet/cli/blob/master/build/DependencyVersions.props
+    Attempt to keep these mostly aligned with https://github.com/dotnet/toolset/blob/master/eng/Versions.props
     and with the version of MSBuild used by KoreBuild.
     MSBuild will prefer the assemblies that ship in the .NET Core SDK and MSbuild. The dependency versions here don't matter
     as long as the version we compile for is binary compatible with what the .NET Core SDK uses.
   -->
   <PropertyGroup>
-    <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>16.0.0-preview.383</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
-    <Tooling_NuGetBuildTasksPackageVersion>4.7.0-netcore.2.1.preview2.5133</Tooling_NuGetBuildTasksPackageVersion>
+    <Tooling_NuGetBuildTasksPackageVersion>5.0.0-preview1.5663</Tooling_NuGetBuildTasksPackageVersion>
   </PropertyGroup>
 
   <!-- These are set to flow into RepoTasks.csproj -->
diff --git a/build/repo.props b/build/repo.props
index 603d5ec41..c428e476d 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -3,13 +3,8 @@
     <DisableSharedSources>true</DisableSharedSources>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ExcludeFromTest Include="$(RepositoryRoot)test\ApiCheckBaseline*\*.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <KoreBuildModule Include="BuildTools.Tasks" />
-    <KoreBuildModule Include="BundledPackages" />
     <KoreBuildModule Include="KoreBuild.Tasks" />
     <KoreBuildModule Include="NuGetPackageVerifier" />
   </ItemGroup>
diff --git a/build/repo.targets b/build/repo.targets
index 4c552b0b7..929eb1653 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,6 +1,7 @@
 <Project>
 
   <PropertyGroup>
+    <_NuGetExeDownloadPath>$(IntermediateDir)nuget.exe</_NuGetExeDownloadPath>
     <_KoreBuildIntermediateDir>$(IntermediateDir)korebuild\</_KoreBuildIntermediateDir>
     <_KoreBuildIntermediateDir>$([MSBuild]::NormalizeDirectory($(_KoreBuildIntermediateDir)))</_KoreBuildIntermediateDir>
     <_KoreBuildOutDir>$(ArtifactsDir)korebuild\artifacts\$(Version)\</_KoreBuildOutDir>
@@ -10,7 +11,7 @@
     <KoreBuildBadgeFile>$(_ChannelOutDir)badge.svg</KoreBuildBadgeFile>
     <KoreBuildLatestTxtFile>$(_ChannelOutDir)latest.txt</KoreBuildLatestTxtFile>
     <KoreBuildChannelTxtFile>$(ArtifactsDir)korebuild\channel.txt</KoreBuildChannelTxtFile>
-    <PrepareDependsOn>$(PrepareDependsOn);SetTeamCityBuildNumberToVersion</PrepareDependsOn>
+    <PrepareDependsOn>$(PrepareDependsOn);DownloadNuGetExe</PrepareDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,58 +32,36 @@
     </ArtifactInfo>
   </ItemGroup>
 
-  <Target Name="ResolveRepositoryCommit" Condition="'$(RepositoryCommit)'==''" BeforeTargets="Prepare">
-
-    <GetGitCommitInfo WorkingDirectory="$(RepositoryRoot)"
-                      Condition="'$(RepositoryCommit)' == ''">
-      <Output TaskParameter="CommitHash" PropertyName="RepositoryCommit" />
-      <Output TaskParameter="Branch" PropertyName="RepositoryBranch" />
-    </GetGitCommitInfo>
-
-    <PropertyGroup>
-      <BuildProperties Condition="'$(RepositoryCommit)' != ''">$(BuildProperties);RepositoryCommit=$(RepositoryCommit)</BuildProperties>
-      <BuildProperties Condition="'$(RepositoryBranch)' != ''">$(BuildProperties);RepositoryBranch=$(RepositoryBranch)</BuildProperties>
-    </PropertyGroup>
+  <Target Name="DownloadNuGetExe">
+      <DownloadFile
+        SourceUrl="https://dist.nuget.org/win-x86-commandline/v4.6.2/nuget.exe"
+        DestinationFolder="$(IntermediateDir)"
+        Condition="!Exists($(_NuGetExeDownloadPath))" />
   </Target>
 
   <Target Name="CleanKoreBuild">
     <RemoveDir Directories="$(_KoreBuildIntermediateDir);$(ArtifactsDir)korebuild\" />
   </Target>
 
-  <Target Name="PackageKoreBuild" DependsOnTargets="ResolveRepositoryCommit;CleanKoreBuild" AfterTargets="Package">
+  <Target Name="PackageKoreBuild" DependsOnTargets="CleanKoreBuild" AfterTargets="Package">
     <Error Text="Missing property: KoreBuildChannel" Condition="'$(KoreBuildChannel)' == ''" />
     <Error Text="Missing property: Version" Condition="'$(Version)' == ''" />
-    <Error Text="Missing property: RepositoryCommit" Condition="'$(RepositoryCommit)' == ''" />
-
-    <!-- passing /warnaserror:BUILD1001 on CI to prevent channel/branch mismatch -->
-    <Warning Text="Current branch '$(RepositoryBranch)' does not match the value of KoreBuildChannel: '$(KoreBuildChannel)'"
-      Condition="'$(RepositoryBranch)' != '$(KoreBuildChannel)' AND '$(CI)' == 'true' AND '$(BUILD_REASON)' != 'PullRequest'"
-      Code="BUILD1001" />
 
     <ItemGroup>
-      <_ToolsProjects Include="$(RepositoryRoot)tools\KoreBuild.Console\KoreBuild.Console.csproj">
-        <AdditionalProperties>PublishDir=$(_KoreBuildIntermediateDir)\tools\%(Identity)\</AdditionalProperties>
-      </_ToolsProjects>
-    </ItemGroup>
-
-    <MSBuild Targets="Publish"
-      Projects="@(_ToolsProjects)"
-      Properties="$(BuildProperties)"
-      BuildInParallel="true" />
-
-    <ItemGroup>
-      <Content Include="$(RepositoryRoot)files\KoreBuild\**\*" />
+      <Content Include="$(RepoRoot)files\KoreBuild\**\*" />
       <VersionFileLines Include="version:$(Version)" />
-      <VersionFileLines Include="commithash:$(RepositoryCommit)" />
+      <VersionFileLines Include="commithash:$(BUILD_SOURCEVERSION)" />
     </ItemGroup>
 
     <MakeDir Directories="$(_ChannelOutDir);$(_KoreBuildOutDir);$(_KoreBuildIntermediateDir)" />
     <Copy SourceFiles="%(Content.Identity)" DestinationFiles="$(_KoreBuildIntermediateDir)\%(RecursiveDir)%(FileName)%(Extension)" />
 
+    <Copy SourceFiles="$(_NuGetExeDownloadPath)" DestinationFolder="$(_KoreBuildIntermediateDir)" />
+
     <WriteLinesToFile File="$(_KoreBuildIntermediateDir).version" Lines="@(VersionFileLines)" Overwrite="true" />
 
     <ItemGroup>
-      <_ModuleProjects Include="$(RepositoryRoot)modules\%(KoreBuildModule.Identity)\%(Identity).*proj">
+      <_ModuleProjects Include="$(RepoRoot)modules\%(KoreBuildModule.Identity)\%(Identity).*proj">
         <AdditionalProperties>Version=$(Version);PublishDir=$(_KoreBuildIntermediateDir)modules\%(Identity)\</AdditionalProperties>
       </_ModuleProjects>
     </ItemGroup>
@@ -96,7 +75,7 @@
       <KoreBuildFiles Include="$(_KoreBuildIntermediateDir)**\*" />
     </ItemGroup>
 
-    <Copy SourceFiles="$(RepositoryRoot)scripts\UploadKoreBuild.ps1" DestinationFiles="$(KoreBuildUploadScriptFile)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(RepoRoot)scripts\UploadKoreBuild.ps1" DestinationFiles="$(KoreBuildUploadScriptFile)" SkipUnchangedFiles="true" />
     <WriteLinesToFile File="$(KoreBuildLatestTxtFile)" Lines="@(VersionFileLines)" Overwrite="true"/>
     <WriteLinesToFile File="$(KoreBuildChannelTxtFile)" Lines="$(KoreBuildChannel)" Overwrite="true"/>
     <GenerateSvgBadge Label="version" Value="$(Version)" OutputPath="$(KoreBuildBadgeFile)" />
diff --git a/build/sdk.props b/build/sdk.props
new file mode 100644
index 000000000..c98a76a23
--- /dev/null
+++ b/build/sdk.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\src\Internal.AspNetCore.Sdk\sdk\Sdk.props" />
+</Project>
diff --git a/build/sdk.targets b/build/sdk.targets
new file mode 100644
index 000000000..3695d4330
--- /dev/null
+++ b/build/sdk.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\src\Internal.AspNetCore.Sdk\sdk\Sdk.targets" />
+</Project>
diff --git a/build/sources.props b/build/sources.props
index c648b2764..34b3e2f43 100644
--- a/build/sources.props
+++ b/build/sources.props
@@ -6,7 +6,8 @@
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
       $(RestoreSources);
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
-      https://api.nuget.org/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
+      https://dnceng.pkgs.visualstudio.com/public/_packaging/nuget-build/nuget/v3/index.json;
     </RestoreSources>
   </PropertyGroup>
 </Project>
diff --git a/modules/BuildTools.Tasks/GenerateSvgBadge.cs b/build/tasks/GenerateSvgBadge.cs
similarity index 92%
rename from modules/BuildTools.Tasks/GenerateSvgBadge.cs
rename to build/tasks/GenerateSvgBadge.cs
index 14a45afbd..a755ed756 100644
--- a/modules/BuildTools.Tasks/GenerateSvgBadge.cs
+++ b/build/tasks/GenerateSvgBadge.cs
@@ -12,15 +12,8 @@ namespace Microsoft.AspNetCore.BuildTools
     /// <summary>
     /// Generates an SVG file badge that can be embedded into a markdown page
     /// </summary>
-#if SDK
-    public class Sdk_GenerateSvgBadge : Microsoft.Build.Utilities.Task
-    {
-#elif BuildTools
     public class GenerateSvgBadge : Microsoft.Build.Utilities.Task
     {
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
 
         private static readonly string Template = @"
 <svg xmlns=`http://www.w3.org/2000/svg` width=`200` height=`20`>
@@ -76,11 +69,8 @@ public override bool Execute()
                 Log.LogError("Color cannot be an empty string");
                 return false;
             }
-#if SDK
-            var generator = new Sdk_GenerateFileFromTemplate()
-#else
+
             var generator = new GenerateFileFromTemplate()
-#endif
             {
                 BuildEngine = BuildEngine,
                 OutputPath = OutputPath,
diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj
index f64666705..d6c2750ea 100644
--- a/build/tasks/RepoTasks.csproj
+++ b/build/tasks/RepoTasks.csproj
@@ -1,25 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoTasksSdkPath)\Sdk.props" Condition="'$(RepoTasksSdkPath)' != '' "/>
+  <Import Project="$(RepoRoot)files\KoreBuild\msbuild\KoreBuild.RepoTasks.Sdk\Sdk\Sdk.props" />
 
   <PropertyGroup>
-    <TargetFramework Condition=" '$(MSBuildRuntimeType)' == 'core' ">netcoreapp2.1</TargetFramework>
+    <TargetFramework Condition=" '$(MSBuildRuntimeType)' == 'core' ">netcoreapp3.1</TargetFramework>
     <TargetFramework Condition=" '$(MSBuildRuntimeType)' != 'core' ">net46</TargetFramework>
     <DefineConstants>$(DefineConstants);BuildTools</DefineConstants>
     <NoWarn>$(NoWarn);NU1603</NoWarn>
+    <ProjectType>RepoTasks</ProjectType>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\Utilities\*.cs" />
-    <Compile Include="..\..\shared\Utilities\MSBuildListSplitter.cs" />
-    <Compile Include="..\..\modules\BuildTools.Tasks\Utilities\**" />
-    <Compile Include="..\..\modules\BuildTools.Tasks\GetGitCommitInfo.cs" />
-    <Compile Include="..\..\modules\BuildTools.Tasks\GenerateFileFromTemplate.cs" />
-    <Compile Include="..\..\modules\BuildTools.Tasks\GenerateSvgBadge.cs" />
-    <Compile Include="..\..\modules\BuildTools.Tasks\RunBase.cs" />
-    <Compile Include="..\..\modules\BuildTools.Tasks\RunDotNet.cs" />
-    <Compile Include="..\..\modules\BuildTools.Tasks\ZipArchive.cs" />
+    <Compile Include="..\..\src\Internal.AspNetCore.BuildTasks\FileHelpers.cs" />
+    <Compile Include="..\..\src\Internal.AspNetCore.BuildTasks\GenerateFileFromTemplate.cs" />
+    <Compile Include="..\..\src\Internal.AspNetCore.BuildTasks\MSBuildListSplitter.cs" />
   </ItemGroup>
 
-  <Import Project="$(RepoTasksSdkPath)\Sdk.targets" Condition="'$(RepoTasksSdkPath)' != '' "/>
-
+  <Import Project="$(RepoRoot)files\KoreBuild\msbuild\KoreBuild.RepoTasks.Sdk\Sdk\Sdk.targets" />
 </Project>
diff --git a/modules/BuildTools.Tasks/ZipArchive.cs b/build/tasks/ZipArchive.cs
similarity index 96%
rename from modules/BuildTools.Tasks/ZipArchive.cs
rename to build/tasks/ZipArchive.cs
index cb25d5c8d..54102f60c 100644
--- a/modules/BuildTools.Tasks/ZipArchive.cs
+++ b/build/tasks/ZipArchive.cs
@@ -12,13 +12,7 @@
 
 namespace Microsoft.AspNetCore.BuildTools
 {
-#if SDK
-    public class Sdk_ZipArchive : Task
-#elif BuildTools
     public class ZipArchive : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
     {
         /// <summary>
         /// The path where the zip file should be created.
@@ -89,7 +83,7 @@ public override bool Execute()
 
                     var entry = zip.CreateEntryFromFile(file.ItemSpec, entryName);
 #if NET46
-#elif NETCOREAPP2_1 || NETSTANDARD2_0
+#elif NETCOREAPP3_1 || NETSTANDARD2_0
                     if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     {
                         // This isn't required when creating a zip on Windows. unzip will check which
diff --git a/docs/KoreBuild.md b/docs/KoreBuild.md
index 9d31e94b0..cf7568ab5 100644
--- a/docs/KoreBuild.md
+++ b/docs/KoreBuild.md
@@ -13,12 +13,8 @@ Previously repositories were runable in only one way, by doing `.\build.cmd`. Bu
 Command               | Purpose                                                          | Example
 ----------------------|------------------------------------------------------------------|----------
 install-tools         | Installs dotnet, CLI and Shared runtimes.                        | .\run.ps1 install-tools
-docker-build          | Runs the build inside docker.                                    | .\run.ps1 docker-build {jessie\|winservercore} /t:SomeTarget /p:Parameters
 default-build         | Runs install-tools followed by msbuild (like build.cmd used to). | .\run.ps1 default-build /t:SomeTarget /p:Parameters
 msbuild               | Runs the build normally.                                         | .\run.ps1 msbuild /t:SomeTarget /p:Parameters
-upgrade deps          | Upgrade the dependencies.props of this project.                  | .\run.ps1 upgrade deps
-generate deps         | Generate a dependencies.props for this project.                  | .\run.ps1 generate deps
-generate api-baseline | Re-generate baselines for all projects.                          | .\run.ps1 generate api-baseline
 
 ### KoreBuild properties
 
@@ -26,10 +22,7 @@ Below is a list of some of the properties that KoreBuild recognizes which you mi
 
 Property          | Purpose
 ------------------|--------
-GenerateBaselines | Toggles the (re-)generation of baselines for all projects (defaults to true).
-ReplaceBaselines  | If 'true' baseline.\*.json and breakingchanges.\*.json files are deleted, and baseline.\*.json files are recreated from the current state.
 VSTestBlame       | Turns on the '--blame' option of vstest, useful for diagnosing test host failures.
-EnableApiCheck    | If 'false' no targets related to ApiCheck are run.
 
 ### KoreBuild config
 
@@ -41,10 +34,10 @@ Example:
 
 {
   // add this for editor auto-completion :)
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/main/tools/korebuild.schema.json",
 
   // specifies the channel used to update KoreBuild to new versions when you attempt to upgrade KoreBuild
-  "channel": "dev",
+  "channel": "main",
 
   "toolsets": {
       // All toolsets listed in this section are treated as required toolsets
diff --git a/docs/Logging.md b/docs/Logging.md
index 580ad35b6..c81d55e14 100644
--- a/docs/Logging.md
+++ b/docs/Logging.md
@@ -1,20 +1,10 @@
 Logging
 -------
 
-KoreBuild produces log files to $(RepositoryRoot)/artifacts/logs. The following log formats can be used:
+KoreBuild produces log files to $(RepoRoot)/artifacts/logs. The following log formats can be used:
 
 ## Binary Logger
 
 Using `build.cmd -Verbose` will produce a binary log file to artifacts/logs/msbuild.binlog.
 
 See <http://msbuildlog.com> for details.
-
-## TeamCity Logger
-
-KoreBuild can produce log messages for TeamCity by using <https://github.com/JetBrains/TeamCity.MSBuild.Logger>.
-
-To configure this,
-
-1. Download the logger from JetBrains. https://github.com/JetBrains/TeamCity.MSBuild.Logger#download
-2. Install this on CI agents.
-3. Set the environment variable `KOREBUILD_TEAMCITY_LOGGER` to the file path of TeamCity.MSBuild.Logger.dll on CI agents.
diff --git a/docs/PackageReferenceManagement.md b/docs/PackageReferenceManagement.md
deleted file mode 100644
index 2c5203df7..000000000
--- a/docs/PackageReferenceManagement.md
+++ /dev/null
@@ -1,87 +0,0 @@
-PackageReference management
----------------------------
-
-## Usage
-
-KoreBuild includes tools to help you automatically update your `dependencies.props` files.
-
-#### Generating a dependencies.props file
-
-On an existing project, you can execute the following command:
-```
-run.ps1 generate deps
-```
-
-This will update csproj files and overwrite your build/dependencies.props file with variables.
-
-#### Updating dependencies.props
-
-KoreBuild can help you automatically update the `build/dependencies.props` file in your repo by using a lineup package.
-
-On command line, you can then execute
-```
-run.ps1 upgrade deps
-```
-
-This command requires you set a few properties so the command can download a remote package and use that as the source
-of version information. Most aspnetcore repos will set this in `build/repo.props`
-
-```xml
-<PropertyGroup>
-  <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-  <!-- Optional, and can float -->
-  <LineupPackageVersion>2.1.0-*</LineupPackageVersion>
-  <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
-</PropertyGroup>
-```
-
-The lineup package itself contains a file that lists all version, and is itself also packaged under `build/dependencies.props`. The `upgrade deps` command will update any matching variables from the lineup package in the local copy of build/dependencies.props.
-
-## Restrictions on PackageReference usage
-
-To manage the complexity of keeping PackageReference versions consistent within a repo and between multiple repos, KoreBuild will enforce the following patterns for using PackageReference.
-
-#### 1. build/dependencies.props
-
-Each repository should have this file, and it should look like this.
-
-```xml
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <PropertyGroup Label="Package Versions: Auto">
-    <NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
-    <MoqPackageVersion>4.7.49</MoqPackageVersion>
-    <XunitPackageVersion>2.3.0</XunitPackageVersion>
-  </PropertyGroup>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-  <PropertyGroup Label="Package Versions: Pinned">
-    <StablePackageVersion>10.0.1</StablePackageVersion>
-  </PropertyGroup>
-</Project>
-```
-
-The `<PropertyGroup Label="Package Versions: Auto">` section is for variables which should be automatically updated.
-
-The `<PropertyGroup Label="Package Versions: Pinned">` section is for variables which upgrade automation should not touch.
-
-### 2. PackageReference's should use variables to set versions
-
-All .csproj files should set the version of a package reference like this:
-
-```xml
-<ItemGroup>
-  <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
-</ItemGroup>
-```
-
-#### Opt-out of restrictions
-
-To opt-out of these restrictions, projects should add this to the `build/repo.props` file in their repository.
-```xml
-<PropertyGroup>
-  <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
-</PropertyGroup>
-```
diff --git a/docs/Signing.md b/docs/Signing.md
index f5e14c4d6..68c9ccfdd 100644
--- a/docs/Signing.md
+++ b/docs/Signing.md
@@ -137,4 +137,4 @@ For example,
 content/*.js;Microsoft.DotNet.Web.Spa.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
 ```
 
-See https://github.com/dotnet/arcade/tree/master/src/SignCheck for more details on SignCheck.
+See https://github.com/dotnet/arcade/tree/main/src/SignCheck for more details on SignCheck.
diff --git a/files/KoreBuild/KoreBuild.Common.props b/files/KoreBuild/KoreBuild.Common.props
index 10729698c..7c3efef4e 100644
--- a/files/KoreBuild/KoreBuild.Common.props
+++ b/files/KoreBuild/KoreBuild.Common.props
@@ -33,17 +33,19 @@ Default layout and configuration.
     <Configuration Condition="'$(CI)' == 'true'">Release</Configuration>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <BuildProperties>$(BuildProperties);Configuration=$(Configuration)</BuildProperties>
-    <RepositoryRoot Condition="'$(RepositoryRoot)' == ''">$(MSBuildStartupDirectory)</RepositoryRoot>
-    <RepositoryRoot>$([MSBuild]::NormalizeDirectory('$(RepositoryRoot)'))</RepositoryRoot>
-    <ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepositoryRoot)'))artifacts\</ArtifactsDir>
+    <RepoRoot Condition="'$(RepoRoot)' == ''">$(MSBuildStartupDirectory)</RepoRoot>
+    <RepoRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)'))</RepoRoot>
+    <!-- Older targets using KoreBuild use RepositoryRoot. Update to use RepoRoot whenever possible as a part of migrating to Arcade. -->
+    <RepositoryRoot>$(RepoRoot)</RepositoryRoot>
+    <ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)'))artifacts\</ArtifactsDir>
     <BuildDir>$(ArtifactsDir)build\</BuildDir>
-    <LogOutputDir>$(ArtifactsDir)logs\</LogOutputDir>
-    <IntermediateDir>$([MSBuild]::NormalizeDirectory('$(RepositoryRoot)'))obj\</IntermediateDir>
+    <LogOutputDir Condition="'$(LogOutputDir)' == ''">$(ArtifactsDir)logs\</LogOutputDir>
+    <IntermediateDir Condition="'$(IntermediateDir)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)'))obj\</IntermediateDir>
 
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(NUGET_PACKAGES)</NuGetPackageRoot>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' AND '$(USERPROFILE)' != '' ">$(USERPROFILE)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' AND '$(HOME)' != '' ">$(HOME)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(RepositoryRoot)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(RepoRoot)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)'))</NuGetPackageRoot>
   </PropertyGroup>
 
@@ -69,10 +71,6 @@ Default layout and configuration.
       This environment variable is automatically set by VSTS.
     -->
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(BUILD_BUILDNUMBER)</BuildNumber>
-    <RepositoryBranch Condition=" '$(RepositoryBranch)' == '' ">$(BUILD_SOURCEBRANCH)</RepositoryBranch>
-    <RepositoryBranch Condition=" '$(RepositoryBranch)' != '' AND $(RepositoryBranch.StartsWith('refs/heads/')) ">$(RepositoryBranch.Substring(11))</RepositoryBranch>
-    <RepositoryBranch Condition=" '$(RepositoryBranch)' != '' AND $(RepositoryBranch.StartsWith('refs/pull/')) ">$(RepositoryBranch.Substring(10))</RepositoryBranch>
-    <RepositoryCommit Condition=" '$(RepositoryCommit)' == '' ">$(BUILD_SOURCEVERSION)</RepositoryCommit>
   </PropertyGroup>
 
   <!-- Create a temporary build number if not assigned by the CI server -->
@@ -93,8 +91,6 @@ Default layout and configuration.
 
   <PropertyGroup>
     <BuildProperties Condition="'$(BuildNumber)' != ''">$(BuildProperties);BuildNumber=$(BuildNumber)</BuildProperties>
-    <BuildProperties Condition="'$(RepositoryCommit)' != ''">$(BuildProperties);RepositoryCommit=$(RepositoryCommit)</BuildProperties>
-    <BuildProperties Condition="'$(RepositoryBranch)' != ''">$(BuildProperties);RepositoryBranch=$(RepositoryBranch)</BuildProperties>
     <!-- Makes CSC error links clickable in the VS Code integrated terminal. -->
     <BuildProperties Condition=" '$(VSCODE_CWD)' != 'true' ">$(BuildProperties);GenerateFullPaths=true</BuildProperties>
   </PropertyGroup>
diff --git a/files/KoreBuild/KoreBuild.Common.targets b/files/KoreBuild/KoreBuild.Common.targets
index 27255d0fe..56ec37890 100644
--- a/files/KoreBuild/KoreBuild.Common.targets
+++ b/files/KoreBuild/KoreBuild.Common.targets
@@ -19,7 +19,7 @@ after all other property imports.
 
     <PackageVersion Condition="'$(PackageVersion)' == '' AND '$(Version)' != '' ">$(Version)</PackageVersion>
     <BuildProperties>$(BuildProperties);RepoVersion=$(Version);RepoPackageVersion=$(PackageVersion)</BuildProperties>
-    <BuildProperties Condition=" ! Exists('$(RepositoryRoot)version.props') ">$(BuildProperties);VerifyVersion=false</BuildProperties>
+    <BuildProperties Condition=" ! Exists('$(RepoRoot)version.props') ">$(BuildProperties);VerifyVersion=false</BuildProperties>
   </PropertyGroup>
 
 <!--
@@ -46,7 +46,7 @@ extending the *DependsOn property
 
   <Target Name="GetRepoInfo" Returns="@(RepoInfo)">
     <ItemGroup>
-      <RepoInfo Include="$(RepositoryRoot)">
+      <RepoInfo Include="$(RepoRoot)">
         <Version>$(Version)</Version>
         <PackageVersion>$(PackageVersion)</PackageVersion>
         <BuildNumber>$(BuildNumber)</BuildNumber>
@@ -93,7 +93,7 @@ extending the *DependsOn property
     <MSBuild Targets="GetArtifactInfo"
              Projects="@(ProjectToBuild)"
              Condition="@(ProjectToBuild->Count()) != 0"
-             Properties="$(BuildProperties);DesignTimeBuild=true;EnableApiCheck=false;NoBuild=true;RepositoryRoot=$(RepositoryRoot);CustomAfterMicrosoftCommonTargets=$(_InspectionTargetsFile);CustomAfterMicrosoftCommonCrossTargetingTargets=$(_InspectionTargetsFile)"
+             Properties="$(BuildProperties);DesignTimeBuild=true;NoBuild=true;RepoRoot=$(RepoRoot);RepositoryRoot=$(RepositoryRoot);CustomAfterMicrosoftCommonTargets=$(_InspectionTargetsFile);CustomAfterMicrosoftCommonCrossTargetingTargets=$(_InspectionTargetsFile)"
              BuildInParallel="$(BuildInParallel)"
              RemoveProperties="$(_BuildPropertiesToRemove)">
 
diff --git a/files/KoreBuild/KoreBuild.proj b/files/KoreBuild/KoreBuild.proj
index 587144321..a44fc65fa 100644
--- a/files/KoreBuild/KoreBuild.proj
+++ b/files/KoreBuild/KoreBuild.proj
@@ -10,20 +10,20 @@
 
   <!-- props -->
   <Import Project="$(CustomBeforeKoreBuildProps)" Condition="'$(CustomBeforeKoreBuildProps)' != '' AND Exists('$(CustomBeforeKoreBuildProps)')" />
-  <Import Project="$(RepositoryRoot)build\repo.beforecommon.props" Condition="Exists('$(RepositoryRoot)build\repo.beforecommon.props')" />
+  <Import Project="$(RepoRoot)build\repo.beforecommon.props" Condition="Exists('$(RepoRoot)build\repo.beforecommon.props')" />
   <Import Project="KoreBuild.Common.props" />
   <Import Project="modules\*\module.props" />
   <Import Project="$(CustomKoreBuildModulesPath)\*\module.props" Condition="Exists('$(CustomKoreBuildModulesPath)')" />
 
-  <Import Project="$(RepositoryRoot)version.props" Condition="Exists('$(RepositoryRoot)version.props')" />
-  <Import Project="$(RepositoryRoot)build\repo.props" Condition="Exists('$(RepositoryRoot)build\repo.props')" />
-  <Import Project="$(RepositoryRoot)build\tasks\*.tasks" Condition="Exists('$(RepositoryRoot)build\tasks\')" />
+  <Import Project="$(RepoRoot)version.props" Condition="Exists('$(RepoRoot)version.props')" />
+  <Import Project="$(RepoRoot)build\repo.props" Condition="Exists('$(RepoRoot)build\repo.props')" />
+  <Import Project="$(RepoRoot)build\tasks\*.tasks" Condition="Exists('$(RepoRoot)build\tasks\')" />
 
   <!-- targets -->
   <Import Project="KoreBuild.Common.targets" />
   <Import Project="modules\*\module.targets" />
   <Import Project="$(CustomKoreBuildModulesPath)\*\module.targets" Condition="Exists('$(CustomKoreBuildModulesPath)')" />
-  <Import Project="$(RepositoryRoot)build\repo.targets" Condition="Exists('$(RepositoryRoot)build\repo.targets')" />
+  <Import Project="$(RepoRoot)build\repo.targets" Condition="Exists('$(RepoRoot)build\repo.targets')" />
   <Import Project="KoreBuild.Overrides.targets" />
   <Import Project="$(CustomAfterKoreBuildTargets)" Condition="'$(CustomAfterKoreBuildTargets)' != '' AND Exists('$(CustomAfterKoreBuildTargets)')" />
   <Import Project="KoreBuild.Verify.targets" />
diff --git a/files/KoreBuild/KoreBuild.sh b/files/KoreBuild/KoreBuild.sh
index ceaefa0c0..b3fbfc8f4 100755
--- a/files/KoreBuild/KoreBuild.sh
+++ b/files/KoreBuild/KoreBuild.sh
@@ -72,15 +72,8 @@ invoke_korebuild_command(){
     elif [ "$command" = "install-tools" ]; then
         __install_tools "$tools_source" "$dot_net_home"
     else
-        __ensure_dotnet
-
-        kore_build_console_dll="$__korebuild_dir/tools/KoreBuild.Console.dll"
-
-        __exec dotnet "$kore_build_console_dll" "$command" \
-            --tools-source "$tools_source" \
-            --dotnet-home "$dot_net_home" \
-            --repo-path "$repo_path" \
-            "$@"
+        __error "Unrecognized command '$command'"
+        exit 1
     fi
 }
 
@@ -129,24 +122,37 @@ __install_tools() {
 
     # Set environment variables
     export PATH="$install_dir:$PATH"
-
-    # This is a workaround for https://github.com/Microsoft/msbuild/issues/2914.
-    # Currently, the only way to configure the NuGetSdkResolver is with NuGet.config, which is not generally used in aspnet org projects.
-    # This project is restored so that it pre-populates the NuGet cache with SDK packages.
-    local restorerfile="$__korebuild_dir/modules/BundledPackages/BundledPackageRestorer.csproj"
-    local restorerfilelock="$NUGET_PACKAGES/internal.aspnetcore.sdk/$(__get_korebuild_version)/korebuild.sentinel"
-    if [[ -e "$restorerfile" ]] && [[ ! -e "$restorerfilelock" ]]; then
-        mkdir -p "$(dirname $restorerfilelock)"
-        touch "$restorerfilelock"
-        __exec dotnet msbuild -t:restore -v:q "$restorerfile"
-    fi
-    # end workaround
 }
 
 __show_version_info() {
     MAGENTA="\033[0;95m"
+    YELLOW="\033[0;33m"
     RESET="\033[0m"
 
+    if [ -z "${TF_BUILD:-}" ]; then
+        echo "##vso[task.logissue type=warning] KoreBuild has been deprecated. You should use Arcade instead now. https://github.com/dotnet/arcade"
+    fi
+
+    echo -e ""
+    echo -e ""
+    echo -e ""
+    echo -e "${YELLOW}*****************************************${RESET}"
+    echo -e "${YELLOW}*****************************************${RESET}"
+    echo -e "${YELLOW}**                                     **${RESET}"
+    echo -e "${YELLOW}**  WARNING!                           **${RESET}"
+    echo -e "${YELLOW}**                                     **${RESET}"
+    echo -e "${YELLOW}**  KoreBuild has been deprecated.     **${RESET}"
+    echo -e "${YELLOW}**  You should use Arcade instead now. **${RESET}"
+    echo -e "${YELLOW}**  https://github.com/dotnet/arcade   **${RESET}"
+    echo -e "${YELLOW}**                                     **${RESET}"
+    echo -e "${YELLOW}**  WARNING!                           **${RESET}"
+    echo -e "${YELLOW}**                                     **${RESET}"
+    echo -e "${YELLOW}*****************************************${RESET}"
+    echo -e "${YELLOW}*****************************************${RESET}"
+    echo -e ""
+    echo -e ""
+    echo -e ""
+
     __korebuild_version="$(__get_korebuild_version)"
     if [[ "$__korebuild_version" != '' ]]; then
         echo -e "${MAGENTA}Using KoreBuild ${__korebuild_version}${RESET}"
diff --git a/files/KoreBuild/Project.Inspection.targets b/files/KoreBuild/Project.Inspection.targets
index 2945b5294..b88c67084 100644
--- a/files/KoreBuild/Project.Inspection.targets
+++ b/files/KoreBuild/Project.Inspection.targets
@@ -11,11 +11,15 @@
       <FullPackageOutputPath>$(PackageOutputPath)$(PackageId).$(NormalizedPackageVersion).nupkg</FullPackageOutputPath>
       <SymbolsPackageOutputPath>$(PackageOutputPath)$(PackageId).$(NormalizedPackageVersion).symbols.nupkg</SymbolsPackageOutputPath>
 
+      <!-- Detect if Internal.AspNetCore.Sdk is referenced -->
+      <_ReferencesInternalAspNetCoreSdk Condition="'$(_ReferencesInternalAspNetCoreSdk)' == ''">@(PackageReference->AnyHaveMetadataValue('Identity', 'Internal.AspNetCore.Sdk'))</_ReferencesInternalAspNetCoreSdk>
+      <!-- If _ReferencesInternalAspNetCoreSdk is still empty, it means there are no package references, so it should be false -->
+      <_ReferencesInternalAspNetCoreSdk Condition="'$(_ReferencesInternalAspNetCoreSdk)' == ''">false</_ReferencesInternalAspNetCoreSdk>
+
       <!--
         Workaround for design time builds on projects using Internal.AspNetCore.Sdk that have not yet been restored.
         IncludeSymbols and IncludeSource are off by default but are enabled in Internal.AspNetCore.Sdk.
       -->
-      <_ReferencesInternalAspNetCoreSdk Condition="'$(_ReferencesInternalAspNetCoreSdk)' == ''">@(PackageReference->AnyHaveMetadataValue('Identity', 'Internal.AspNetCore.Sdk'))</_ReferencesInternalAspNetCoreSdk>
       <IncludeSymbols Condition="'$(IncludeSymbols)' == '' AND $(_ReferencesInternalAspNetCoreSdk)">true</IncludeSymbols>
       <IncludeSource Condition="'$(IncludeSource)' == '' AND $(_ReferencesInternalAspNetCoreSdk)">true</IncludeSource>
     </PropertyGroup>
@@ -37,6 +41,7 @@
         <TargetFrameworks>$([MSBuild]::Escape($(TargetFrameworks)))</TargetFrameworks>
         <PackageType>$(PackageType)</PackageType>
         <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
+        <RepoRoot>$(RepoRoot)</RepoRoot>
         <RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
         <Category>$(PackageArtifactCategory)</Category>
         <Certificate>$(PackageSigningCertName)</Certificate>
@@ -54,14 +59,18 @@
         <SourceIncluded>$(IncludeSource)</SourceIncluded>
         <PackageType>$(PackageType)</PackageType>
         <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
+        <RepoRoot>$(RepoRoot)</RepoRoot>
         <RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
         <Category>$(PackageArtifactCategory)</Category>
         <Certificate>$(PackageSigningCertName)</Certificate>
-        <ShouldBeSigned Condition="'$(PackageSigningCertName)' != '' OR @(_SignedPackageFile->Count()) != 0 ">true</ShouldBeSigned>
+        <ShouldBeSigned Condition="'$(SignSymbolsNupkg)' == 'true' AND ('$(PackageSigningCertName)' != '' OR @(_SignedPackageFile->Count()) != 0) ">true</ShouldBeSigned>
         <ShouldBeSigned Condition=" '$(DisableCodeSigning)' == 'true' ">false</ShouldBeSigned>
         <IsContainer>true</IsContainer>
       </ArtifactInfo>
+    </ItemGroup>
 
+    <!-- Still return metadata about signable package contents when producing a servicing build. -->
+    <ItemGroup Condition="'$(IsPackable)' != 'false' OR '$(IsPackableInNonServicingBuild)' == 'true' ">
       <ArtifactInfo Include="@(_SignedPackageFile)" Condition=" '$(DisableCodeSigning)' != 'true' ">
         <ShouldBeSigned>true</ShouldBeSigned>
         <Container>$(FullPackageOutputPath)</Container>
@@ -72,7 +81,7 @@
         <Container>$(FullPackageOutputPath)</Container>
       </ArtifactInfo>
 
-      <ArtifactInfo Include="@(_SignedPackageFile)" Condition=" '$(DisableCodeSigning)' != 'true' AND '$(IncludeSymbols)' == 'true' ">
+      <ArtifactInfo Include="@(_SignedPackageFile)" Condition=" '$(DisableCodeSigning)' != 'true' AND '$(IncludeSymbols)' == 'true' AND '$(SignSymbolsNupkg)' == 'true' ">
         <ShouldBeSigned>true</ShouldBeSigned>
         <Container>$(SymbolsPackageOutputPath)</Container>
       </ArtifactInfo>
diff --git a/files/KoreBuild/config/sdk.version b/files/KoreBuild/config/sdk.version
index 63673c7e7..6a0741321 100644
--- a/files/KoreBuild/config/sdk.version
+++ b/files/KoreBuild/config/sdk.version
@@ -1 +1 @@
-2.1.506
+3.1.416
diff --git a/files/KoreBuild/modules/benchmarks/module.targets b/files/KoreBuild/modules/benchmarks/module.targets
index 45abe7616..e38a57a2e 100644
--- a/files/KoreBuild/modules/benchmarks/module.targets
+++ b/files/KoreBuild/modules/benchmarks/module.targets
@@ -30,10 +30,10 @@ Runs a quick validation on all benchmark projects.
       Importance="High"
       Condition="'@(BenchmarkAssembly)' != ''" />
 
-    <RunDotNet Condition="'%(BenchmarkAssembly.TargetFrameworkIdentifier)' == '.NETCoreApp'"
-      Arguments="%(BenchmarkAssembly.Identity);*;--validate-fast" />
-    <Run Condition="'%(BenchmarkAssembly.TargetFrameworkIdentifier)' == '.NETFramework'"
-      FileName="%(BenchmarkAssembly.Identity)" Arguments="*;--validate-fast" />
+    <Exec Condition="'%(BenchmarkAssembly.TargetFrameworkIdentifier)' == '.NETCoreApp'"
+         Command="dotnet &quot;%(BenchmarkAssembly.Identity)&quot; * --validate-fast" />
+    <Exec Condition="'%(BenchmarkAssembly.TargetFrameworkIdentifier)' == '.NETFramework'"
+         Command="&quot;%(BenchmarkAssembly.Identity)&quot; * --validate-fast" />
   </Target>
 
 </Project>
diff --git a/files/KoreBuild/modules/projectbuild/module.targets b/files/KoreBuild/modules/projectbuild/module.targets
index c57ac2331..15c23d7e3 100644
--- a/files/KoreBuild/modules/projectbuild/module.targets
+++ b/files/KoreBuild/modules/projectbuild/module.targets
@@ -11,7 +11,7 @@ FYI: targets, properties, and items that begin with an underscore are meant to b
   </ItemDefinitionGroup>
 
   <ItemGroup Condition="'$(DisableDefaultItems)' != 'true' AND '$(BuildSolutions)' == 'false' ">
-    <ProjectToBuild Include="$(RepositoryRoot)**\*.csproj;$(RepositoryRoot)**\*.fsproj;$(RepositoryRoot)**\*.vbproj" Exclude="$(ProjectToExclude)" Condition=" '$(Projects)' == '' " />
+    <ProjectToBuild Include="$(RepoRoot)**\*.csproj;$(RepoRoot)**\*.fsproj;$(RepoRoot)**\*.vbproj" Exclude="$(ProjectToExclude)" Condition=" '$(Projects)' == '' " />
     <ProjectToBuild Include="$(Projects)" Exclude="$(ProjectToExclude)" Condition=" '$(Projects)' != '' " />
   </ItemGroup>
 
@@ -56,7 +56,7 @@ Executes /t:{Target} on all projects
   </Target>
 
   <Target Name="_EnsureProjects">
-    <Error Text="No solutions found to build in '$(RepositoryRoot)'" Condition="@(ProjectToBuild->Count()) == 0" />
+    <Error Text="No solutions found to build in '$(RepoRoot)'" Condition="@(ProjectToBuild->Count()) == 0" />
   </Target>
 
   <Target Name="RestoreProjects" DependsOnTargets="ResolveProjects;_EnsureProjects" Condition="'$(NoRestore)' != 'true'">
@@ -75,6 +75,18 @@ Executes /t:{Target} on all projects
           ItemName="_ProjectToRestoreWithNuGet" />
     </MSBuild>
 
+    <MSBuild Targets="_IsCustomRestoreTargetSupported"
+             Projects="@(ProjectToBuild)"
+             BuildInParallel="true"
+             SkipNonexistentTargets="true"
+             SkipNonexistentProjects="true"
+             RemoveProperties="$(_BuildPropertiesToRemove);Platform"
+             Properties="$(BuildProperties);__BuildTarget=_IsCustomRestoreTargetSupported">
+      <Output
+          TaskParameter="TargetOutputs"
+          ItemName="_ProjectWithCustomRestore" />
+    </MSBuild>
+
     <PropertyGroup>
       <!-- Normalize paths to avoid false warnings by NuGet about missing project references. -->
       <_ProjectToRestoreWithNuGetList>@(_ProjectToRestoreWithNuGet->'%(FullPath)')</_ProjectToRestoreWithNuGetList>
@@ -93,6 +105,15 @@ Executes /t:{Target} on all projects
              Properties="$(BuildProperties);__BuildTarget=Restore"
              RemoveProperties="$(_BuildPropertiesToRemove);Platform"
              BuildInParallel="%(_ProjectToRestoreDirectly.RestoreInParallel)" />
+
+    <!-- Adds support for running a target CustomRestore on projects that require restoring artifacts from other package managers like npm -->
+    <MSBuild Condition="@(_ProjectWithCustomRestore->Count()) != 0 and '%(Targets)' != '' "
+             Projects="@(_ProjectWithCustomRestore)"
+             Targets="%(Targets)"
+             Properties="$(BuildProperties);__BuildTarget=CustomRestore"
+             RemoveProperties="$(_BuildPropertiesToRemove);Platform"
+             BuildInParallel="false" />
+
     <!--
       Invoke NuGet.targets directly. This avoids redundant calls the restore task.
     -->
diff --git a/files/KoreBuild/modules/sharedsources/module.props b/files/KoreBuild/modules/sharedsources/module.props
index a31ab89b3..207c020f7 100644
--- a/files/KoreBuild/modules/sharedsources/module.props
+++ b/files/KoreBuild/modules/sharedsources/module.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <SharedSourcesFolder Condition="'$(SharedSourcesFolder)' == ''">$(RepositoryRoot)shared/</SharedSourcesFolder>
+    <SharedSourcesFolder Condition="'$(SharedSourcesFolder)' == ''">$(RepoRoot)shared/</SharedSourcesFolder>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(DisableSharedSources)' != 'true' ">
diff --git a/files/KoreBuild/modules/sharedsources/module.targets b/files/KoreBuild/modules/sharedsources/module.targets
index a7a679719..61203e8c6 100644
--- a/files/KoreBuild/modules/sharedsources/module.targets
+++ b/files/KoreBuild/modules/sharedsources/module.targets
@@ -3,7 +3,7 @@
 Target: PackSharedSources
 
 Creates a content files package for all each directory in
-that matches "$(RepositoryRoot)/shared/*.Sources".
+that matches "$(RepoRoot)/shared/*.Sources".
 ###################################################################
 -->
 <Project>
@@ -40,6 +40,7 @@ that matches "$(RepositoryRoot)/shared/*.Sources".
     <PropertyGroup>
       <_SharedSourcesPackageProperties>
         RepositoryRoot=$(RepositoryRoot);
+        RepoRoot=$(RepoRoot);
         ImportDirectoryBuildProps=false;
       </_SharedSourcesPackageProperties>
       <_SharedSourcesPackageProperties Condition=" '$(OverridePackageOutputPath)' != 'false' ">
diff --git a/files/KoreBuild/modules/sharedsources/sharedsources.csproj b/files/KoreBuild/modules/sharedsources/sharedsources.csproj
index 04fb6f381..cca4e3e35 100644
--- a/files/KoreBuild/modules/sharedsources/sharedsources.csproj
+++ b/files/KoreBuild/modules/sharedsources/sharedsources.csproj
@@ -13,28 +13,29 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <Target Name="VerifyProperties">
-    <Error Text="Missing property: RepositoryRoot" Condition="'$(RepositoryRoot)'==''"/>
+    <Error Text="Missing property: RepoRoot" Condition="'$(RepoRoot)'==''"/>
     <Error Text="Missing property: PackageId" Condition="'$(PackageId)'==''"/>
     <Error Text="Missing property: NuspecBasePath" Condition="'$(NuspecBasePath)'==''"/>
   </Target>
 
-  <Import Project="$(RepositoryRoot)build\common.props" Condition="Exists('$(RepositoryRoot)build\common.props')" />
+  <Import Project="$(RepoRoot)build\common.props" Condition="Exists('$(RepoRoot)build\common.props')" />
   <Import Project="$(NuspecBasePath)sharedsources.props" Condition="Exists('$(NuspecBasePath)sharedsources.props')" />
 
   <Target Name="WarnIfNoCommonProps" BeforeTargets="Pack">
-    <Warning Text="Expected a props file in '$(RepositoryRoot)build\common.props' or '$(DirBuildPropsInRepo)')'. The package $(PackageId) may be missing the right version number when this is left out."
-             Condition="!Exists('$(RepositoryRoot)build\common.props') And !Exists('$(DirBuildPropsInRepo)')"/>
+    <Warning Text="Expected a props file in '$(RepoRoot)build\common.props' or '$(DirBuildPropsInRepo)')'. The package $(PackageId) may be missing the right version number when this is left out."
+             Condition="!Exists('$(RepoRoot)build\common.props') And !Exists('$(DirBuildPropsInRepo)')"/>
   </Target>
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <NoBuild>true</NoBuild>
-    <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(RepositoryRoot)artifacts\build</PackageOutputPath>
+    <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(RepoRoot)artifacts\build</PackageOutputPath>
     <TargetFramework>netstandard1.0</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
     <PackageId Condition=" '$(PackageId)' == '' ">$(ProjectDirName)</PackageId>
     <Description>$(PackageId)</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
     <ContentTargetFolders>contentFiles</ContentTargetFolders>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <DefaultExcludeItems>$(DefaultExcludeItems);$(BaseOutputPath);$(BaseIntermediateOutputPath);</DefaultExcludeItems>
@@ -77,6 +78,7 @@
         <Version>$(NormalizedPackageVersion)</Version>
         <TargetFramework>$(TargetFramework)</TargetFramework>
         <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
+        <RepoRoot>$(RepoRoot)</RepoRoot>
         <RepositoryUrl>$(RepositoryUrl)</RepositoryUrl>
         <Category>$(PackageArtifactCategory)</Category>
         <IsContainer>true</IsContainer>
diff --git a/files/KoreBuild/modules/solutionbuild/module.targets b/files/KoreBuild/modules/solutionbuild/module.targets
index 1f08e1f3b..1a14e38d5 100644
--- a/files/KoreBuild/modules/solutionbuild/module.targets
+++ b/files/KoreBuild/modules/solutionbuild/module.targets
@@ -9,14 +9,14 @@ FYI: targets, properties, and items that begin with an underscore are meant to b
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DisableDefaultItems)' != 'true' AND '$(BuildSolutions)' == 'true' ">
-    <Solutions Include="$(RepositoryRoot)*.sln" Exclude="@(ExcludeSolutions)" />
-    <ProjectsToPack Include="$(RepositoryRoot)src\*\*.csproj" Exclude="@(ExcludeFromPack)" />
+    <Solutions Include="$(RepoRoot)*.sln" Exclude="@(ExcludeSolutions)" />
+    <ProjectsToPack Include="$(RepoRoot)src\*\*.csproj" Exclude="@(ExcludeFromPack)" />
 
     <!-- put unit test projects ahead of functional tests -->
-    <_FunctionalTests Include="$(RepositoryRoot)test\*\*FunctionalTest*.csproj" Exclude="@(ExcludeFromTest)" />
-    <ProjectsToTest Include="$(RepositoryRoot)test\*\*.csproj" Exclude="@(_FunctionalTests);@(ExcludeFromTest)" />
+    <_FunctionalTests Include="$(RepoRoot)test\*\*FunctionalTest*.csproj" Exclude="@(ExcludeFromTest)" />
+    <ProjectsToTest Include="$(RepoRoot)test\*\*.csproj" Exclude="@(_FunctionalTests);@(ExcludeFromTest)" />
     <ProjectsToTest Include="@(_FunctionalTests)"  />
-    <BenchmarksToValidate Include="$(RepositoryRoot)benchmarks\*\*.csproj" />
+    <BenchmarksToValidate Include="$(RepoRoot)benchmarks\*\*.csproj" />
 
   </ItemGroup>
 
@@ -59,7 +59,7 @@ Executes /t:{Target} on all solutions
   </Target>
 
   <Target Name="_EnsureSolutions">
-    <Error Text="No solutions found to build in '$(RepositoryRoot)'" Condition="@(Solutions->Count()) == 0" />
+    <Error Text="No solutions found to build in '$(RepoRoot)'" Condition="@(Solutions->Count()) == 0" />
   </Target>
 
   <Target Name="RestoreSolutions" DependsOnTargets="ResolveSolutions;_EnsureSolutions" Condition="'$(NoRestore)' != 'true'">
diff --git a/files/KoreBuild/modules/vstest/module.targets b/files/KoreBuild/modules/vstest/module.targets
index 9d76bb0a6..847475372 100644
--- a/files/KoreBuild/modules/vstest/module.targets
+++ b/files/KoreBuild/modules/vstest/module.targets
@@ -75,10 +75,10 @@ Runs the VSTest on all projects in the ProjectToBuild itemgroup.
       </_TestGroups>
 
       <!-- This runs the 'Test' target on projects which do not support VSTest, if that target exists. -->
-      <_TestGroups Include="@(_ProjectToTestDirectly)">
+      <_TestGroups Include="%(_ProjectToTestDirectly.Identity)">
         <Targets>Test</Targets>
         <SkipNonexistentTargets>true</SkipNonexistentTargets>
-        <AdditionalProperties>$(BuildProperties)</AdditionalProperties>
+        <AdditionalProperties>%(_ProjectToTestDirectly.AdditionalProperties);$(BuildProperties)</AdditionalProperties>
       </_TestGroups>
     </ItemGroup>
 
@@ -92,9 +92,14 @@ Runs the VSTest on all projects in the ProjectToBuild itemgroup.
 
   <!-- The 'inner-build' -->
   <PropertyGroup>
-    <TrxFile>$(LogOutputDir)$(TestGroupName)-$(TargetFramework)-$(BuildNumber).trx</TrxFile>
+    <TrxFileWithoutExtension>$(LogOutputDir)$(TestGroupName)-$(TargetFramework)-$(BuildNumber)</TrxFileWithoutExtension>
+    <TrxFile>$(TrxFileWithoutExtension).trx</TrxFile>
+    <TrxFile Condition="'$(RunFlakyTests)' == 'true'">$(TrxFileWithoutExtension).flaky.trx</TrxFile>
+    <TrxFileWildcard>$(TrxFileWithoutExtension)*.trx</TrxFileWildcard>
     <VSTestLogger Condition=" '$(VSTestLogger)' == '' AND '$(CI)' == 'true' ">trx;LogFileName=$(TrxFile)</VSTestLogger>
-    <VSTestDiagFile Condition=" '$(VSTestVerboseOutput)' == 'true'">$(LogOutputDir)$(TestGroupName)-$(TargetFramework)-$(BuildNumber).diag</VSTestDiagFile>
+    <VSTestDiagFileBase>$(LogOutputDir)$(TestGroupName)-$(TargetFramework)-$(BuildNumber)</VSTestDiagFileBase>
+    <VSTestDiagFile Condition=" '$(VSTestVerboseOutput)' == 'true'">$(VSTestDiagFileBase).diag</VSTestDiagFile>
+    <VSTestDiagFile Condition=" '$(VSTestVerboseOutput)' == 'true' And '$(RunFlakyTests)' == 'true'">$(VSTestDiagFileBase).flaky.diag</VSTestDiagFile>
     <!--
       Disable other test reporters if trx logging is enabled.
     -->
@@ -109,6 +114,18 @@ Runs the VSTest on all projects in the ProjectToBuild itemgroup.
 
     <PropertyGroup>
       <TestAdapterPath>%(TestAssemblies.RootDir)%(TestAssemblies.Directory)</TestAdapterPath>
+
+      <_DefaultNonFlakyTestFilterExpression>Flaky:All!=true</_DefaultNonFlakyTestFilterExpression>
+      <_DefaultNonFlakyTestFilterExpression Condition="'$(AGENT_OS)' != ''">$(_DefaultNonFlakyTestFilterExpression)&amp;Flaky:AzP:All!=true&amp;Flaky:AzP:OS:$(AGENT_OS)!=true</_DefaultNonFlakyTestFilterExpression>
+      <_DefaultFlakyTestFilterExpression>Flaky:All=true</_DefaultFlakyTestFilterExpression>
+      <_DefaultFlakyTestFilterExpression Condition="'$(AGENT_OS)' != ''">$(_DefaultFlakyTestFilterExpression)|Flaky:AzP:All=true|Flaky:AzP:OS:$(AGENT_OS)=true</_DefaultFlakyTestFilterExpression>
+
+      <FlakyTestFilterExpression Condition="'$(FlakyTestFilterExpression)' == ''">$(_DefaultFlakyTestFilterExpression)</FlakyTestFilterExpression>
+      <NonFlakyTestFilterExpression Condition="'$(NonFlakyTestFilterExpression)' == ''">$(_DefaultNonFlakyTestFilterExpression)</NonFlakyTestFilterExpression>
+
+      <!-- If $(RunFlakyTests) = 'include' then we will do *neither* of these and we'll include flaky tests in the run -->
+      <TestFilterExpression Condition="'$(TestFilterExpression)' == '' And '$(RunFlakyTests)' != 'true' And '$(RunFlakyTests)' != 'include'">$(NonFlakyTestFilterExpression)</TestFilterExpression>
+      <TestFilterExpression Condition="'$(TestFilterExpression)' == '' And '$(RunFlakyTests)' == 'true'">$(FlakyTestFilterExpression)</TestFilterExpression>
     </PropertyGroup>
 
     <ItemGroup>
@@ -119,20 +136,25 @@ Runs the VSTest on all projects in the ProjectToBuild itemgroup.
       <VSTestArgs Include="--Diag:$([MSBuild]::Escape($(VSTestDiagFile)))" Condition="'$(VSTestDiagFile)' != ''" />
       <VSTestArgs Include="--Framework:$(TargetFrameworkIdentifier),Version=v$(TargetFrameworkVersion)" />
       <VSTestArgs Include="--Logger:$([MSBuild]::Escape($(VSTestLogger)))" Condition="'$(VSTestLogger)' != ''" />
-      <VSTestArgs Include="--TestAdapterPath:$(TestAdapterPath)" Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' " />
+      <VSTestArgs Include="--TestAdapterPath:$(TestAdapterPath.TrimEnd('\'))" Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' " />
+      <VSTestArgs Include="--TestCaseFilter:$(TestFilterExpression)" Condition="'$(TestFilterExpression)' != ''" />
       <VSTestArgs Include="@(TestAssemblies)" />
       <VSTestArgs Include="--;RunConfiguration.NoAutoReporters=true" Condition="'$(VSTestAutoReporters)' != 'true'" />
     </ItemGroup>
 
     <Message Text="%0AStarting test group: $(TestGroupName)/$(TargetFramework)" Importance="High" />
 
-    <RunDotNet Arguments="@(VSTestArgs)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true">
+    <Exec Command="dotnet @(VSTestArgs->'&quot;%(Identity)&quot;',' ')" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true">
       <Output TaskParameter="ExitCode" PropertyName="VsTestExitCode" />
-    </RunDotNet>
+    </Exec>
+
+    <ItemGroup>
+      <_TrxFiles Include="$(TrxFileWildcard)" />
+    </ItemGroup>
 
-    <Message Text="##teamcity[importData type='vstest' path='$(TrxFile)']"
+    <Message Text="##teamcity[importData type='vstest' verbose='false' path='$(TrxFileWildcard)']"
       Importance="High"
-      Condition="'$(TEAMCITY_VERSION)' != '' AND Exists($(TrxFile))" />
+      Condition="'$(TEAMCITY_VERSION)' != '' AND Exists('%(_TrxFiles.FullPath)')" />
     <Error Text="Test group $(TestGroupName)/$(TargetFramework) failed with exit code '$(VsTestExitCode)'." Condition=" $(VsTestExitCode) != 0 " />
   </Target>
 
diff --git a/files/KoreBuild/msbuild/KoreBuild.RepoTasks.Sdk/Sdk/Sdk.props b/files/KoreBuild/msbuild/KoreBuild.RepoTasks.Sdk/Sdk/Sdk.props
index 6f6db6d81..933bc4bff 100644
--- a/files/KoreBuild/msbuild/KoreBuild.RepoTasks.Sdk/Sdk/Sdk.props
+++ b/files/KoreBuild/msbuild/KoreBuild.RepoTasks.Sdk/Sdk/Sdk.props
@@ -5,7 +5,7 @@
     <GenerateFullPaths Condition="'$(VSCODE_CWD)' != ''">true</GenerateFullPaths>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 
-    <!-- Set explicitly to make it clear that this is not a console app, even though it targets netcoreapp2.1 -->
+    <!-- Set explicitly to make it clear that this is not a console app, even though it targets netcoreapp3.1 -->
     <OutputType>library</OutputType>
 
     <!--
diff --git a/files/KoreBuild/scripts/KoreBuild.psm1 b/files/KoreBuild/scripts/KoreBuild.psm1
index 603cfc268..5478f0e39 100644
--- a/files/KoreBuild/scripts/KoreBuild.psm1
+++ b/files/KoreBuild/scripts/KoreBuild.psm1
@@ -89,13 +89,12 @@ function Invoke-RepositoryBuild(
         $koreBuildVersion = Get-KoreBuildVersion
 
         $msBuildArguments = @"
-/nologo
 /m
 /nodeReuse:false
 /verbosity:minimal
 /p:KoreBuildVersion=$koreBuildVersion
 /p:SuppressNETCoreSdkPreviewMessage=true
-/p:RepositoryRoot="$Path\\"
+/p:RepoRoot="$Path\\"
 "$msBuildLogArgument"
 "$makeFileProj"
 "@
@@ -126,7 +125,7 @@ function Invoke-RepositoryBuild(
         }
         else {
             [string[]]$repoTasksArgs = $MSBuildArgs | Where-Object { ($_ -like '-p:*') -or ($_ -like '/p:*') -or ($_ -like '-property:') -or ($_ -like '/property:') }
-            $repoTasksArgs += ,"@$msBuildLogRspFile"
+            $repoTasksArgs += , "@$msBuildLogRspFile"
             __build_task_project $Path $repoTasksArgs
         }
 
@@ -167,7 +166,7 @@ function Install-Tools(
 
     $DotNetHome = Resolve-Path $DotNetHome
     $arch = __get_dotnet_arch
-    $installDir = if ($IS_WINDOWS) { Join-Path $DotNetHome $arch } else { $DotNetHome }
+    $installDir = if ($IS_WINDOWS -and -not $env:KOREBUILD_DISABLE_DOTNET_ARCH) { Join-Path $DotNetHome $arch } else { $DotNetHome }
     Write-Verbose "Installing tools to '$installDir'"
     if ($env:DOTNET_INSTALL_DIR -and $env:DOTNET_INSTALL_DIR -ne $installDir) {
         # DOTNET_INSTALL_DIR is used by dotnet-install.ps1 only, and some repos used it in their automation to isolate dotnet.
@@ -222,18 +221,6 @@ function Install-Tools(
     else {
         Write-Host -ForegroundColor DarkGray ".NET Core SDK $version is already installed. Skipping installation."
     }
-
-    # This is a workaround for https://github.com/Microsoft/msbuild/issues/2914.
-    # Currently, the only way to configure the NuGetSdkResolver is with NuGet.config, which is not generally used in aspnet org projects.
-    # This project is restored so that it pre-populates the NuGet cache with SDK packages.
-    $restorerfile = "$PSScriptRoot/../modules/BundledPackages/BundledPackageRestorer.csproj"
-    $restorerfilelock="$env:NUGET_PACKAGES/internal.aspnetcore.sdk/$(Get-KoreBuildVersion)/korebuild.sentinel"
-    if ((Test-Path $restorerfile) -and -not (Test-Path $restorerfilelock)) {
-        New-Item -ItemType Directory $(Split-Path -Parent $restorerfilelock) -ErrorAction Ignore | Out-Null
-        New-Item -ItemType File $restorerfilelock -ErrorAction Ignore | Out-Null
-        __exec $global:dotnet msbuild '-t:restore' '-v:q' "$restorerfile"
-    }
-    # end workaround
 }
 
 <#
@@ -253,7 +240,12 @@ function Ensure-Dotnet() {
 
 function Get-DotnetMajorVersion() {
     if (Get-Variable "dotnet" -Scope Global -ErrorAction SilentlyContinue) {
-        $infoOutput = dotnet --version
+        $infoOutput = & $global:dotnet --version
+
+        if (-not $infoOutput) {
+            Write-Verbose 'Could not determine the version of dotnet from `dotnet --version`'
+            return 0
+        }
 
         $version = $infoOutput.SubString(0, $infoOutput.IndexOf('.'))
         $versionInt = [convert]::ToInt32($version, 10)
@@ -296,11 +288,19 @@ function Set-KoreBuildSettings(
     if (!$DotNetHome) {
         $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } `
             elseif ($CI) { Join-Path $RepoPath '.dotnet'}
-            elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} `
+        elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} `
             elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}`
             else { Join-Path $RepoPath '.dotnet'}
     }
 
+    # Normalize RepoPath to a native File System path so other tools can use it properly
+    $RepoPath = Convert-Path $RepoPath
+
+    if ($RepoPath.EndsWith("/") -or $RepoPath.EndsWith("\")) {
+        # Remove trailing slash, we add it ourselves
+        $RepoPath = $RepoPath.Substring(0, $RepoPath.Length - 1);
+    }
+
     if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
 
     if ($CI) {
@@ -323,7 +323,7 @@ function Set-KoreBuildSettings(
     $env:NUGET_PACKAGES = $env:NUGET_PACKAGES.TrimEnd('\') + '\'
 
     $arch = __get_dotnet_arch
-    $env:DOTNET_ROOT = if ($IS_WINDOWS) { Join-Path $DotNetHome $arch } else { $DotNetHome }
+    $env:DOTNET_ROOT = if ($IS_WINDOWS -and -not $env:KOREBUILD_DISABLE_DOTNET_ARCH) { Join-Path $DotNetHome $arch } else { $DotNetHome }
 
     $MSBuildType = 'core'
     $toolsets = $Null
@@ -385,8 +385,17 @@ function Invoke-KoreBuildCommand(
 
     $sdkVersion = __get_dotnet_sdk_version
     $korebuildVersion = Get-KoreBuildVersion
-    if ($sdkVersion -ne 'latest') {
-        "{ `"sdk`": { `n`"version`": `"$sdkVersion`" }`n }" | Out-File (Join-Path $global:KoreBuildSettings.RepoPath 'global.json') -Encoding ascii
+    if ($sdkVersion -ne 'latest' -and $env:KOREBUILD_KEEPGLOBALJSON -ne '1') {
+        @"
+{
+  `"sdk`": {
+    `"version`": `"$sdkVersion`"
+  },
+  `"msbuild-sdks`": {
+    `"Internal.AspNetCore.Sdk`": `"$korebuildVersion`"
+  }
+}
+"@ | Out-File (Join-Path $global:KoreBuildSettings.RepoPath 'global.json') -Encoding ascii
     }
     else {
         Write-Verbose "Skipping global.json generation because the `$sdkVersion = $sdkVersion"
@@ -479,8 +488,14 @@ function Get-MSBuildPath() {
     }
 
     Write-Verbose "vswhere = $vswherePath $vswhereArgs"
-
-    $installations = & $vswherePath @vswhereArgs | ConvertFrom-Json
+    $vswhereOut = & $vswherePath @vswhereArgs | Out-String
+    try {
+        $installations = $vswhereOut | ConvertFrom-Json
+    }
+    catch {
+        Write-Host -f Red "vswhere output = $vswhereOut"
+        throw $_
+    }
 
     $latest = $null
     if ($installations) {
@@ -557,6 +572,30 @@ function Get-KoreBuildVersion {
 }
 
 function __show_version_info {
+    if ($env:TF_BUILD) {
+        Write-Host "##vso[task.logissue type=warning] KoreBuild has been deprecated. You should use Arcade instead now. https://github.com/dotnet/arcade"
+    }
+
+    Write-Host -f Yellow ""
+    Write-Host -f Yellow ""
+    Write-Host -f Yellow ""
+    Write-Host -f Yellow "*****************************************"
+    Write-Host -f Yellow "*****************************************"
+    Write-Host -f Yellow "**                                     **"
+    Write-Host -f Yellow "**  WARNING!                           **"
+    Write-Host -f Yellow "**                                     **"
+    Write-Host -f Yellow "**  KoreBuild has been deprecated.     **"
+    Write-Host -f Yellow "**  You should use Arcade instead now. **"
+    Write-Host -f Yellow "**  https://github.com/dotnet/arcade   **"
+    Write-Host -f Yellow "**                                     **"
+    Write-Host -f Yellow "**  WARNING!                           **"
+    Write-Host -f Yellow "**                                     **"
+    Write-Host -f Yellow "*****************************************"
+    Write-Host -f Yellow "*****************************************"
+    Write-Host -f Yellow ""
+    Write-Host -f Yellow ""
+    Write-Host -f Yellow ""
+
     $version = Get-KoreBuildVersion
     if ($version) {
         Write-Host -ForegroundColor Magenta "Using KoreBuild $version"
diff --git a/files/KoreBuild/scripts/dotnet-install.ps1 b/files/KoreBuild/scripts/dotnet-install.ps1
index 14ebe11af..5a1b5ff4d 100644
--- a/files/KoreBuild/scripts/dotnet-install.ps1
+++ b/files/KoreBuild/scripts/dotnet-install.ps1
@@ -12,39 +12,49 @@
 .PARAMETER Channel
     Default: LTS
     Download from the Channel specified. Possible values:
-    - Current - most current release
-    - LTS - most current supported release
+    - STS - the most recent Standard Term Support release
+    - LTS - the most recent Long Term Support release
     - 2-part version in a format A.B - represents a specific release
-          examples: 2.0; 1.0
-    - Branch name
-          examples: release/2.0.0; Master
+          examples: 2.0, 1.0
+    - 3-part version in a format A.B.Cxx - represents a specific SDK release
+          examples: 5.0.1xx, 5.0.2xx
+          Supported since 5.0 release
+    Warning: Value "Current" is deprecated for the Channel parameter. Use "STS" instead.
+    Note: The version parameter overrides the channel parameter when any version other than 'latest' is used.
+.PARAMETER Quality
+    Download the latest build of specified quality in the channel. The possible values are: daily, signed, validated, preview, GA.
+    Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used. 
+    For SDK use channel in A.B.Cxx format: using quality together with channel in A.B format is not supported.
+    Supported since 5.0 release.
+    Note: The version parameter overrides the channel parameter when any version other than 'latest' is used, and therefore overrides the quality.     
 .PARAMETER Version
     Default: latest
     Represents a build version on specific channel. Possible values:
-    - latest - most latest build on specific channel
-    - coherent - most latest coherent build on specific channel
-          coherent applies only to SDK downloads
+    - latest - the latest build on specific channel
     - 3-part version in a format A.B.C - represents specific version of build
-          examples: 2.0.0-preview2-006120; 1.1.0
+          examples: 2.0.0-preview2-006120, 1.1.0
+.PARAMETER Internal
+    Download internal builds. Requires providing credentials via -FeedCredential parameter.
+.PARAMETER FeedCredential
+    Token to access Azure feed. Used as a query string to append to the Azure feed.
+    This parameter typically is not specified.
 .PARAMETER InstallDir
     Default: %LocalAppData%\Microsoft\dotnet
     Path to where to install dotnet. Note that binaries will be placed directly in a given directory.
 .PARAMETER Architecture
     Default: <auto> - this value represents currently running OS architecture
     Architecture of dotnet binaries to be installed.
-    Possible values are: <auto>, x64 and x86
+    Possible values are: <auto>, amd64, x64, x86, arm64, arm
 .PARAMETER SharedRuntime
     This parameter is obsolete and may be removed in a future version of this script.
     The recommended alternative is '-Runtime dotnet'.
-
-    Default: false
     Installs just the shared runtime bits, not the entire SDK.
-    This is equivalent to specifying `-Runtime dotnet`.
 .PARAMETER Runtime
     Installs just a shared runtime, not the entire SDK.
     Possible values:
         - dotnet     - the Microsoft.NETCore.App shared runtime
         - aspnetcore - the Microsoft.AspNetCore.App shared runtime
+        - windowsdesktop - the Microsoft.WindowsDesktop.App shared runtime
 .PARAMETER DryRun
     If set it will not perform installation but instead display what command line to use to consistently install
     currently requested version of dotnet cli. In example if you specify version 'latest' it will display a link
@@ -57,70 +67,101 @@
     Displays diagnostics information.
 .PARAMETER AzureFeed
     Default: https://dotnetcli.azureedge.net/dotnet
-    This parameter typically is not changed by the user.
-    It allows changing the URL for the Azure feed used by this installer.
+    For internal use only.
+    Allows using a different storage to download SDK archives from.
+    This parameter is only used if $NoCdn is false.
 .PARAMETER UncachedFeed
-    This parameter typically is not changed by the user.
-    It allows changing the URL for the Uncached feed used by this installer.
-.PARAMETER FeedCredential
-    Used as a query string to append to the Azure feed.
-    It allows changing the URL to use non-public blob storage accounts.
+    For internal use only.
+    Allows using a different storage to download SDK archives from.
+    This parameter is only used if $NoCdn is true.
 .PARAMETER ProxyAddress
     If set, the installer will use the proxy when making web requests
 .PARAMETER ProxyUseDefaultCredentials
     Default: false
     Use default credentials, when using proxy address.
+.PARAMETER ProxyBypassList
+    If set with ProxyAddress, will provide the list of comma separated urls that will bypass the proxy
 .PARAMETER SkipNonVersionedFiles
     Default: false
     Skips installing non-versioned files if they already exist, such as dotnet.exe.
 .PARAMETER NoCdn
     Disable downloading from the Azure CDN, and use the uncached feed directly.
+.PARAMETER JSonFile
+    Determines the SDK version from a user specified global.json file
+    Note: global.json must have a value for 'SDK:Version'
+.PARAMETER DownloadTimeout
+    Determines timeout duration in seconds for dowloading of the SDK file
+    Default: 1200 seconds (20 minutes)
 #>
 [cmdletbinding()]
 param(
    [string]$Channel="LTS",
+   [string]$Quality,
    [string]$Version="Latest",
-   [string]$InstallDir="<auto>",
+   [switch]$Internal,
+   [string]$JSonFile,
+   [Alias('i')][string]$InstallDir="<auto>",
    [string]$Architecture="<auto>",
-   [ValidateSet("dotnet", "aspnetcore", IgnoreCase = $false)]
    [string]$Runtime,
    [Obsolete("This parameter may be removed in a future version of this script. The recommended alternative is '-Runtime dotnet'.")]
    [switch]$SharedRuntime,
    [switch]$DryRun,
    [switch]$NoPath,
-   [string]$AzureFeed="https://dotnetcli.azureedge.net/dotnet",
-   [string]$UncachedFeed="https://dotnetcli.blob.core.windows.net/dotnet",
+   [string]$AzureFeed,
+   [string]$UncachedFeed,
    [string]$FeedCredential,
    [string]$ProxyAddress,
    [switch]$ProxyUseDefaultCredentials,
+   [string[]]$ProxyBypassList=@(),
    [switch]$SkipNonVersionedFiles,
-   [switch]$NoCdn
+   [switch]$NoCdn,
+   [int]$DownloadTimeout=1200
 )
 
 Set-StrictMode -Version Latest
 $ErrorActionPreference="Stop"
 $ProgressPreference="SilentlyContinue"
 
-if ($NoCdn) {
-    $AzureFeed = $UncachedFeed
+function Say($str) {
+    try {
+        Write-Host "dotnet-install: $str"
+    }
+    catch {
+        # Some platforms cannot utilize Write-Host (Azure Functions, for instance). Fall back to Write-Output
+        Write-Output "dotnet-install: $str"
+    }
 }
 
-$BinFolderRelativePath=""
-
-if ($SharedRuntime -and (-not $Runtime)) {
-    $Runtime = "dotnet"
+function Say-Warning($str) {
+    try {
+        Write-Warning "dotnet-install: $str"
+    }
+    catch {
+        # Some platforms cannot utilize Write-Warning (Azure Functions, for instance). Fall back to Write-Output
+        Write-Output "dotnet-install: Warning: $str"
+    }
 }
 
-# example path with regex: shared/1.0.0-beta-12345/somepath
-$VersionRegEx="/\d+\.\d+[^/]+/"
-$OverrideNonVersionedFiles = !$SkipNonVersionedFiles
-
-function Say($str) {
-    Write-Host "dotnet-install: $str"
+# Writes a line with error style settings.
+# Use this function to show a human-readable comment along with an exception.
+function Say-Error($str) {
+    try {
+        # Write-Error is quite oververbose for the purpose of the function, let's write one line with error style settings.
+        $Host.UI.WriteErrorLine("dotnet-install: $str")
+    }
+    catch {
+        Write-Output "dotnet-install: Error: $str"
+    }
 }
 
 function Say-Verbose($str) {
-    Write-Verbose "dotnet-install: $str"
+    try {
+        Write-Verbose "dotnet-install: $str"
+    }
+    catch {
+        # Some platforms cannot utilize Write-Verbose (Azure Functions, for instance). Fall back to Write-Output
+        Write-Output "dotnet-install: $str"
+    }
 }
 
 function Say-Invocation($Invocation) {
@@ -129,20 +170,25 @@ function Say-Invocation($Invocation) {
     Say-Verbose "$command $args"
 }
 
-function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [int]$MaxAttempts = 3, [int]$SecondsBetweenAttempts = 1) {
+function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [System.Threading.CancellationToken]$cancellationToken = [System.Threading.CancellationToken]::None, [int]$MaxAttempts = 3, [int]$SecondsBetweenAttempts = 1) {
     $Attempts = 0
+    $local:startTime = $(get-date)
 
     while ($true) {
         try {
-            return $ScriptBlock.Invoke()
+            return & $ScriptBlock
         }
         catch {
             $Attempts++
-            if ($Attempts -lt $MaxAttempts) {
+            if (($Attempts -lt $MaxAttempts) -and -not $cancellationToken.IsCancellationRequested) {
                 Start-Sleep $SecondsBetweenAttempts
             }
             else {
-                throw
+                $local:elapsedTime = $(get-date) - $local:startTime
+                if (($local:elapsedTime.TotalSeconds - $DownloadTimeout) -gt 0 -and -not $cancellationToken.IsCancellationRequested) {
+                    throw New-Object System.TimeoutException("Failed to reach the server: connection timeout: default timeout is $DownloadTimeout second(s)");
+                }
+                throw;
             }
         }
     }
@@ -151,30 +197,131 @@ function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [int]$MaxAttempts = 3, [in
 function Get-Machine-Architecture() {
     Say-Invocation $MyInvocation
 
-    # possible values: AMD64, IA64, x86
+    # On PS x86, PROCESSOR_ARCHITECTURE reports x86 even on x64 systems.
+    # To get the correct architecture, we need to use PROCESSOR_ARCHITEW6432.
+    # PS x64 doesn't define this, so we fall back to PROCESSOR_ARCHITECTURE.
+    # Possible values: amd64, x64, x86, arm64, arm
+    if( $ENV:PROCESSOR_ARCHITEW6432 -ne $null ) {
+        return $ENV:PROCESSOR_ARCHITEW6432
+    }
+
+    try {        
+        if( ((Get-CimInstance -ClassName CIM_OperatingSystem).OSArchitecture) -like "ARM*") {
+            if( [Environment]::Is64BitOperatingSystem )
+            {
+                return "arm64"
+            }  
+            return "arm"
+        }
+    }
+    catch {
+        # Machine doesn't support Get-CimInstance
+    }
+
     return $ENV:PROCESSOR_ARCHITECTURE
 }
 
-# TODO: Architecture and CLIArchitecture should be unified
 function Get-CLIArchitecture-From-Architecture([string]$Architecture) {
     Say-Invocation $MyInvocation
 
-    switch ($Architecture.ToLower()) {
-        { $_ -eq "<auto>" } { return Get-CLIArchitecture-From-Architecture $(Get-Machine-Architecture) }
+    if ($Architecture -eq "<auto>") {
+        $Architecture = Get-Machine-Architecture
+    }
+
+    switch ($Architecture.ToLowerInvariant()) {
         { ($_ -eq "amd64") -or ($_ -eq "x64") } { return "x64" }
         { $_ -eq "x86" } { return "x86" }
-        default { throw "Architecture not supported. If you think this is a bug, please report it at https://github.com/dotnet/cli/issues" }
+        { $_ -eq "arm" } { return "arm" }
+        { $_ -eq "arm64" } { return "arm64" }
+        default { throw "Architecture '$Architecture' not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues" }
     }
 }
 
-function Get-Version-Info-From-Version-Text([string]$VersionText) {
+function ValidateFeedCredential([string] $FeedCredential)
+{
+    if ($Internal -and [string]::IsNullOrWhitespace($FeedCredential)) {
+        $message = "Provide credentials via -FeedCredential parameter."
+        if ($DryRun) {
+            Say-Warning "$message"
+        } else {
+            throw "$message"
+        }
+    }
+    
+    #FeedCredential should start with "?", for it to be added to the end of the link.
+    #adding "?" at the beginning of the FeedCredential if needed.
+    if ((![string]::IsNullOrWhitespace($FeedCredential)) -and ($FeedCredential[0] -ne '?')) {
+        $FeedCredential = "?" + $FeedCredential
+    }
+
+    return $FeedCredential
+}
+function Get-NormalizedQuality([string]$Quality) {
     Say-Invocation $MyInvocation
 
-    $Data = @($VersionText.Split([char[]]@(), [StringSplitOptions]::RemoveEmptyEntries));
+    if ([string]::IsNullOrEmpty($Quality)) {
+        return ""
+    }
+
+    switch ($Quality) {
+        { @("daily", "signed", "validated", "preview") -contains $_ } { return $Quality.ToLowerInvariant() }
+        #ga quality is available without specifying quality, so normalizing it to empty
+        { $_ -eq "ga" } { return "" }
+        default { throw "'$Quality' is not a supported value for -Quality option. Supported values are: daily, signed, validated, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues." }
+    }
+}
+
+function Get-NormalizedChannel([string]$Channel) {
+    Say-Invocation $MyInvocation
+
+    if ([string]::IsNullOrEmpty($Channel)) {
+        return ""
+    }
+
+    if ($Channel.Contains("Current")) {
+        Say-Warning 'Value "Current" is deprecated for -Channel option. Use "STS" instead.'
+    }
+
+    if ($Channel.StartsWith('release/')) {
+        Say-Warning 'Using branch name with -Channel option is no longer supported with newer releases. Use -Quality option with a channel in X.Y format instead, such as "-Channel 5.0 -Quality Daily."'
+    }
+
+    switch ($Channel) {
+        { $_ -eq "lts" } { return "LTS" }
+        { $_ -eq "sts" } { return "STS" }
+        { $_ -eq "current" } { return "STS" }
+        default { return $Channel.ToLowerInvariant() }
+    }
+}
+
+function Get-NormalizedProduct([string]$Runtime) {
+    Say-Invocation $MyInvocation
+
+    switch ($Runtime) {
+        { $_ -eq "dotnet" } { return "dotnet-runtime" }
+        { $_ -eq "aspnetcore" } { return "aspnetcore-runtime" }
+        { $_ -eq "windowsdesktop" } { return "windowsdesktop-runtime" }
+        { [string]::IsNullOrEmpty($_) } { return "dotnet-sdk" }
+        default { throw "'$Runtime' is not a supported value for -Runtime option, supported values are: dotnet, aspnetcore, windowsdesktop. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues." }
+    }
+}
 
-    $VersionInfo = @{}
-    $VersionInfo.CommitHash = $Data[0].Trim()
-    $VersionInfo.Version = $Data[1].Trim()
+
+# The version text returned from the feeds is a 1-line or 2-line string:
+# For the SDK and the dotnet runtime (2 lines):
+# Line 1: # commit_hash
+# Line 2: # 4-part version
+# For the aspnetcore runtime (1 line):
+# Line 1: # 4-part version
+function Get-Version-From-LatestVersion-File-Content([string]$VersionText) {
+    Say-Invocation $MyInvocation
+
+    $Data = -split $VersionText
+
+    $VersionInfo = @{
+        CommitHash = $(if ($Data.Count -gt 1) { $Data[0] })
+        Version = $Data[-1] # last line is always the version number.
+    }
     return $VersionInfo
 }
 
@@ -188,10 +335,11 @@ function Load-Assembly([string] $Assembly) {
     }
 }
 
-function GetHTTPResponse([Uri] $Uri)
+function GetHTTPResponse([Uri] $Uri, [bool]$HeaderOnly, [bool]$DisableRedirect, [bool]$DisableFeedCredential)
 {
-    Invoke-With-Retry(
-    {
+    $cts = New-Object System.Threading.CancellationTokenSource
+
+    $downloadScript = {
 
         $HttpClient = $null
 
@@ -204,7 +352,11 @@ function GetHTTPResponse([Uri] $Uri)
                     # Despite no proxy being explicitly specified, we may still be behind a default proxy
                     $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy;
                     if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))) {
-                        $ProxyAddress = $DefaultProxy.GetProxy($Uri).OriginalString
+                        if ($null -ne $DefaultProxy.GetProxy($Uri)) {
+                            $ProxyAddress = $DefaultProxy.GetProxy($Uri).OriginalString
+                        } else {
+                            $ProxyAddress = $null
+                        }
                         $ProxyUseDefaultCredentials = $true
                     }
                 } catch {
@@ -215,63 +367,127 @@ function GetHTTPResponse([Uri] $Uri)
                 }
             }
 
+            $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler
             if($ProxyAddress) {
-                $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler
-                $HttpClientHandler.Proxy =  New-Object System.Net.WebProxy -Property @{Address=$ProxyAddress;UseDefaultCredentials=$ProxyUseDefaultCredentials}
-                $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler
+                $HttpClientHandler.Proxy =  New-Object System.Net.WebProxy -Property @{
+                    Address=$ProxyAddress;
+                    UseDefaultCredentials=$ProxyUseDefaultCredentials;
+                    BypassList = $ProxyBypassList;
+                }
+            }       
+            if ($DisableRedirect)
+            {
+                $HttpClientHandler.AllowAutoRedirect = $false
+            }
+            $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler
+
+            # Default timeout for HttpClient is 100s.  For a 50 MB download this assumes 500 KB/s average, any less will time out
+            # Defaulting to 20 minutes allows it to work over much slower connections.
+            $HttpClient.Timeout = New-TimeSpan -Seconds $DownloadTimeout
+
+            if ($HeaderOnly){
+                $completionOption = [System.Net.Http.HttpCompletionOption]::ResponseHeadersRead
             }
             else {
+                $completionOption = [System.Net.Http.HttpCompletionOption]::ResponseContentRead
+            }
 
-                $HttpClient = New-Object System.Net.Http.HttpClient
+            if ($DisableFeedCredential) {
+                $UriWithCredential = $Uri
             }
-            # Default timeout for HttpClient is 100s.  For a 50 MB download this assumes 500 KB/s average, any less will time out
-            # 10 minutes allows it to work over much slower connections.
-            $HttpClient.Timeout = New-TimeSpan -Minutes 10
-            $Response = $HttpClient.GetAsync("${Uri}${FeedCredential}").Result
-            if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode))) {
-                 # The feed credential is potentially sensitive info. Do not log FeedCredential to console output.
-                $ErrorMsg = "Failed to download $Uri."
-                if ($Response -ne $null) {
-                    $ErrorMsg += "  $Response"
+            else {
+                $UriWithCredential = "${Uri}${FeedCredential}"
+            }
+
+            $Task = $HttpClient.GetAsync("$UriWithCredential", $completionOption).ConfigureAwait("false");
+            $Response = $Task.GetAwaiter().GetResult();
+
+            if (($null -eq $Response) -or ((-not $HeaderOnly) -and (-not ($Response.IsSuccessStatusCode)))) {
+                # The feed credential is potentially sensitive info. Do not log FeedCredential to console output.
+                $DownloadException = [System.Exception] "Unable to download $Uri."
+
+                if ($null -ne $Response) {
+                    $DownloadException.Data["StatusCode"] = [int] $Response.StatusCode
+                    $DownloadException.Data["ErrorMessage"] = "Unable to download $Uri. Returned HTTP status code: " + $DownloadException.Data["StatusCode"]
+
+                    if (404 -eq [int] $Response.StatusCode)
+                    {
+                        $cts.Cancel()
+                    }
                 }
 
-                throw $ErrorMsg
+                throw $DownloadException
+            }
+
+            return $Response
+        }
+        catch [System.Net.Http.HttpRequestException] {
+            $DownloadException = [System.Exception] "Unable to download $Uri."
+
+            # Pick up the exception message and inner exceptions' messages if they exist
+            $CurrentException = $PSItem.Exception
+            $ErrorMsg = $CurrentException.Message + "`r`n"
+            while ($CurrentException.InnerException) {
+              $CurrentException = $CurrentException.InnerException
+              $ErrorMsg += $CurrentException.Message + "`r`n"
+            }
+
+            # Check if there is an issue concerning TLS.
+            if ($ErrorMsg -like "*SSL/TLS*") {
+                $ErrorMsg += "Ensure that TLS 1.2 or higher is enabled to use this script.`r`n"
             }
 
-             return $Response
+            $DownloadException.Data["ErrorMessage"] = $ErrorMsg
+            throw $DownloadException
         }
         finally {
-             if ($HttpClient -ne $null) {
+             if ($null -ne $HttpClient) {
                 $HttpClient.Dispose()
             }
         }
-    })
-}
+    }
 
+    try {
+        return Invoke-With-Retry $downloadScript $cts.Token
+    }
+    finally
+    {
+        if ($null -ne $cts)
+        {
+            $cts.Dispose()
+        }
+    }
+}
 
-function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Coherent) {
+function Get-Version-From-LatestVersion-File([string]$AzureFeed, [string]$Channel) {
     Say-Invocation $MyInvocation
 
     $VersionFileUrl = $null
     if ($Runtime -eq "dotnet") {
-        $VersionFileUrl = "$UncachedFeed/Runtime/$Channel/latest.version"
+        $VersionFileUrl = "$AzureFeed/Runtime/$Channel/latest.version"
     }
     elseif ($Runtime -eq "aspnetcore") {
-        $VersionFileUrl = "$UncachedFeed/aspnetcore/Runtime/$Channel/latest.version"
+        $VersionFileUrl = "$AzureFeed/aspnetcore/Runtime/$Channel/latest.version"
+    }
+    elseif ($Runtime -eq "windowsdesktop") {
+        $VersionFileUrl = "$AzureFeed/WindowsDesktop/$Channel/latest.version"
     }
     elseif (-not $Runtime) {
-        if ($Coherent) {
-            $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.coherent.version"
-        }
-        else {
-            $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.version"
-        }
+        $VersionFileUrl = "$AzureFeed/Sdk/$Channel/latest.version"
     }
     else {
         throw "Invalid value for `$Runtime"
     }
 
-    $Response = GetHTTPResponse -Uri $VersionFileUrl
+    Say-Verbose "Constructed latest.version URL: $VersionFileUrl"
+
+    try {
+        $Response = GetHTTPResponse -Uri $VersionFileUrl
+    }
+    catch {
+        Say-Verbose "Failed to download latest.version file."
+        throw
+    }
     $StringContent = $Response.Content.ReadAsStringAsync().Result
 
     switch ($Response.Content.Headers.ContentType) {
@@ -281,47 +497,99 @@ function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Co
         default { throw "``$Response.Content.Headers.ContentType`` is an unknown .version file content type." }
     }
 
-    $VersionInfo = Get-Version-Info-From-Version-Text $VersionText
+    $VersionInfo = Get-Version-From-LatestVersion-File-Content $VersionText
 
     return $VersionInfo
 }
 
+function Parse-Jsonfile-For-Version([string]$JSonFile) {
+    Say-Invocation $MyInvocation
 
-function Get-Specific-Version-From-Version([string]$AzureFeed, [string]$Channel, [string]$Version) {
+    If (-Not (Test-Path $JSonFile)) {
+        throw "Unable to find '$JSonFile'"
+    }
+    try {
+        $JSonContent = Get-Content($JSonFile) -Raw | ConvertFrom-Json | Select-Object -expand "sdk" -ErrorAction SilentlyContinue
+    }
+    catch {
+        Say-Error "Json file unreadable: '$JSonFile'"
+        throw
+    }
+    if ($JSonContent) {
+        try {
+            $JSonContent.PSObject.Properties | ForEach-Object {
+                $PropertyName = $_.Name
+                if ($PropertyName -eq "version") {
+                    $Version = $_.Value
+                    Say-Verbose "Version = $Version"
+                }
+            }
+        }
+        catch {
+            Say-Error "Unable to parse the SDK node in '$JSonFile'"
+            throw
+        }
+    }
+    else {
+        throw "Unable to find the SDK node in '$JSonFile'"
+    }
+    If ($Version -eq $null) {
+        throw "Unable to find the SDK:version node in '$JSonFile'"
+    }
+    return $Version
+}
+
+function Get-Specific-Version-From-Version([string]$AzureFeed, [string]$Channel, [string]$Version, [string]$JSonFile) {
     Say-Invocation $MyInvocation
 
-    switch ($Version.ToLower()) {
-        { $_ -eq "latest" } {
-            $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $False
+    if (-not $JSonFile) {
+        if ($Version.ToLowerInvariant() -eq "latest") {
+            $LatestVersionInfo = Get-Version-From-LatestVersion-File -AzureFeed $AzureFeed -Channel $Channel
             return $LatestVersionInfo.Version
         }
-        { $_ -eq "coherent" } {
-            $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $True
-            return $LatestVersionInfo.Version
+        else {
+            return $Version 
         }
-        default { return $Version }
+    }
+    else {
+        return Parse-Jsonfile-For-Version $JSonFile
     }
 }
 
 function Get-Download-Link([string]$AzureFeed, [string]$SpecificVersion, [string]$CLIArchitecture) {
     Say-Invocation $MyInvocation
 
+    # If anything fails in this lookup it will default to $SpecificVersion
+    $SpecificProductVersion = Get-Product-Version -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion
+
     if ($Runtime -eq "dotnet") {
-        $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-runtime-$SpecificVersion-win-$CLIArchitecture.zip"
+        $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip"
     }
     elseif ($Runtime -eq "aspnetcore") {
-        $PayloadURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/aspnetcore-runtime-$SpecificVersion-win-$CLIArchitecture.zip"
+        $PayloadURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/aspnetcore-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip"
+    }
+    elseif ($Runtime -eq "windowsdesktop") {
+        # The windows desktop runtime is part of the core runtime layout prior to 5.0
+        $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/windowsdesktop-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip"
+        if ($SpecificVersion -match '^(\d+)\.(.*)$')
+        {
+            $majorVersion = [int]$Matches[1]
+            if ($majorVersion -ge 5)
+            {
+                $PayloadURL = "$AzureFeed/WindowsDesktop/$SpecificVersion/windowsdesktop-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip"
+            }
+        }
     }
     elseif (-not $Runtime) {
-        $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-sdk-$SpecificVersion-win-$CLIArchitecture.zip"
+        $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-sdk-$SpecificProductVersion-win-$CLIArchitecture.zip"
     }
     else {
         throw "Invalid value for `$Runtime"
     }
 
-    Say-Verbose "Constructed primary payload URL: $PayloadURL"
+    Say-Verbose "Constructed primary named payload URL: $PayloadURL"
 
-    return $PayloadURL
+    return $PayloadURL, $SpecificProductVersion
 }
 
 function Get-LegacyDownload-Link([string]$AzureFeed, [string]$SpecificVersion, [string]$CLIArchitecture) {
@@ -337,11 +605,123 @@ function Get-LegacyDownload-Link([string]$AzureFeed, [string]$SpecificVersion, [
         return $null
     }
 
-    Say-Verbose "Constructed legacy payload URL: $PayloadURL"
+    Say-Verbose "Constructed legacy named payload URL: $PayloadURL"
 
     return $PayloadURL
 }
 
+function Get-Product-Version([string]$AzureFeed, [string]$SpecificVersion, [string]$PackageDownloadLink) {
+    Say-Invocation $MyInvocation
+
+    # Try to get the version number, using the productVersion.txt file located next to the installer file.
+    $ProductVersionTxtURLs = (Get-Product-Version-Url $AzureFeed $SpecificVersion $PackageDownloadLink -Flattened $true),
+                             (Get-Product-Version-Url $AzureFeed $SpecificVersion $PackageDownloadLink -Flattened $false)
+    
+    Foreach ($ProductVersionTxtURL in $ProductVersionTxtURLs) {
+        Say-Verbose "Checking for the existence of $ProductVersionTxtURL"
+
+        try {
+            $productVersionResponse = GetHTTPResponse($productVersionTxtUrl)
+
+            if ($productVersionResponse.StatusCode -eq 200) {
+                $productVersion = $productVersionResponse.Content.ReadAsStringAsync().Result.Trim()
+                if ($productVersion -ne $SpecificVersion)
+                {
+                    Say "Using alternate version $productVersion found in $ProductVersionTxtURL"
+                }
+                return $productVersion
+            }
+            else {
+                Say-Verbose "Got StatusCode $($productVersionResponse.StatusCode) when trying to get productVersion.txt at $productVersionTxtUrl."
+            }
+        } 
+        catch {
+            Say-Verbose "Could not read productVersion.txt at $productVersionTxtUrl (Exception: '$($_.Exception.Message)'. )"
+        }
+    }
+
+    # Getting the version number with productVersion.txt has failed. Try parsing the download link for a version number.
+    if ([string]::IsNullOrEmpty($PackageDownloadLink))
+    {
+        Say-Verbose "Using the default value '$SpecificVersion' as the product version."
+        return $SpecificVersion
+    }
+
+    $productVersion = Get-ProductVersionFromDownloadLink $PackageDownloadLink $SpecificVersion
+    return $productVersion
+}
+
+function Get-Product-Version-Url([string]$AzureFeed, [string]$SpecificVersion, [string]$PackageDownloadLink, [bool]$Flattened) {
+    Say-Invocation $MyInvocation
+
+    $majorVersion=$null
+    if ($SpecificVersion -match '^(\d+)\.(.*)') {
+        $majorVersion = $Matches[1] -as[int]
+    }
+
+    $pvFileName='productVersion.txt'
+    if($Flattened) {
+        if(-not $Runtime) {
+            $pvFileName='sdk-productVersion.txt'
+        }
+        elseif($Runtime -eq "dotnet") {
+            $pvFileName='runtime-productVersion.txt'
+        }
+        else {
+            $pvFileName="$Runtime-productVersion.txt"
+        }
+    }
+
+    if ([string]::IsNullOrEmpty($PackageDownloadLink)) {
+        if ($Runtime -eq "dotnet") {
+            $ProductVersionTxtURL = "$AzureFeed/Runtime/$SpecificVersion/$pvFileName"
+        }
+        elseif ($Runtime -eq "aspnetcore") {
+            $ProductVersionTxtURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/$pvFileName"
+        }
+        elseif ($Runtime -eq "windowsdesktop") {
+            # The windows desktop runtime is part of the core runtime layout prior to 5.0
+            $ProductVersionTxtURL = "$AzureFeed/Runtime/$SpecificVersion/$pvFileName"
+            if ($majorVersion -ne $null -and $majorVersion -ge 5) {
+                $ProductVersionTxtURL = "$AzureFeed/WindowsDesktop/$SpecificVersion/$pvFileName"
+            }
+        }
+        elseif (-not $Runtime) {
+            $ProductVersionTxtURL = "$AzureFeed/Sdk/$SpecificVersion/$pvFileName"
+        }
+        else {
+            throw "Invalid value '$Runtime' specified for `$Runtime"
+        }
+    }
+    else {
+        $ProductVersionTxtURL = $PackageDownloadLink.Substring(0, $PackageDownloadLink.LastIndexOf("/"))  + "/$pvFileName"
+    }
+
+    Say-Verbose "Constructed productVersion link: $ProductVersionTxtURL"
+
+    return $ProductVersionTxtURL
+}
+
+function Get-ProductVersionFromDownloadLink([string]$PackageDownloadLink, [string]$SpecificVersion)
+{
+    Say-Invocation $MyInvocation
+
+    #product specific version follows the product name
+    #for filename 'dotnet-sdk-3.1.404-win-x64.zip': the product version is 3.1.400
+    $filename = $PackageDownloadLink.Substring($PackageDownloadLink.LastIndexOf("/") + 1)
+    $filenameParts = $filename.Split('-')
+    if ($filenameParts.Length -gt 2)
+    {
+        $productVersion = $filenameParts[2]
+        Say-Verbose "Extracted product version '$productVersion' from download link '$PackageDownloadLink'."
+    }
+    else {
+        Say-Verbose "Using the default value '$SpecificVersion' as the product version."
+        $productVersion = $SpecificVersion
+    }
+    return $productVersion 
+}
+
 function Get-User-Share-Path() {
     Say-Invocation $MyInvocation
 
@@ -361,28 +741,11 @@ function Resolve-Installation-Path([string]$InstallDir) {
     return $InstallDir
 }
 
-function Get-Version-Info-From-Version-File([string]$InstallRoot, [string]$RelativePathToVersionFile) {
-    Say-Invocation $MyInvocation
-
-    $VersionFile = Join-Path -Path $InstallRoot -ChildPath $RelativePathToVersionFile
-    Say-Verbose "Local version file: $VersionFile"
-
-    if (Test-Path $VersionFile) {
-        $VersionText = cat $VersionFile
-        Say-Verbose "Local version file text: $VersionText"
-        return Get-Version-Info-From-Version-Text $VersionText
-    }
-
-    Say-Verbose "Local version file not found."
-
-    return $null
-}
-
 function Is-Dotnet-Package-Installed([string]$InstallRoot, [string]$RelativePathToPackage, [string]$SpecificVersion) {
     Say-Invocation $MyInvocation
 
     $DotnetPackagePath = Join-Path -Path $InstallRoot -ChildPath $RelativePathToPackage | Join-Path -ChildPath $SpecificVersion
-    Say-Verbose "Is-Dotnet-Package-Installed: Path to a package: $DotnetPackagePath"
+    Say-Verbose "Is-Dotnet-Package-Installed: DotnetPackagePath=$DotnetPackagePath"
     return Test-Path $DotnetPackagePath -PathType Container
 }
 
@@ -394,7 +757,8 @@ function Get-Absolute-Path([string]$RelativeOrAbsolutePath) {
 }
 
 function Get-Path-Prefix-With-Version($path) {
-    $match = [regex]::match($path, $VersionRegEx)
+    # example path with regex: shared/1.0.0-beta-12345/somepath
+    $match = [regex]::match($path, "/\d+\.\d+[^/]+/")
     if ($match.Success) {
         return $entry.FullName.Substring(0, $match.Index + $match.Length)
     }
@@ -408,7 +772,7 @@ function Get-List-Of-Directories-And-Versions-To-Unpack-From-Dotnet-Package([Sys
     $ret = @()
     foreach ($entry in $Zip.Entries) {
         $dir = Get-Path-Prefix-With-Version $entry.FullName
-        if ($dir -ne $null) {
+        if ($null -ne $dir) {
             $path = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $dir)
             if (-Not (Test-Path $path -PathType Container)) {
                 $ret += $dir
@@ -449,7 +813,7 @@ function Extract-Dotnet-Package([string]$ZipPath, [string]$OutPath) {
 
         foreach ($entry in $Zip.Entries) {
             $PathWithVersion = Get-Path-Prefix-With-Version $entry.FullName
-            if (($PathWithVersion -eq $null) -Or ($DirectoriesToUnpack -contains $PathWithVersion)) {
+            if (($null -eq $PathWithVersion) -Or ($DirectoriesToUnpack -contains $PathWithVersion)) {
                 $DestinationPath = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $entry.FullName)
                 $DestinationDir = Split-Path -Parent $DestinationPath
                 $OverrideFiles=$OverrideNonVersionedFiles -Or (-Not (Test-Path $DestinationPath))
@@ -460,130 +824,678 @@ function Extract-Dotnet-Package([string]$ZipPath, [string]$OutPath) {
             }
         }
     }
+    catch
+    {
+        Say-Error "Failed to extract package. Exception: $_"
+        throw;
+    }
     finally {
-        if ($Zip -ne $null) {
+        if ($null -ne $Zip) {
             $Zip.Dispose()
         }
     }
 }
 
-function DownloadFile([Uri]$Uri, [string]$OutPath) {
-    if ($Uri -notlike "http*") {
-        Say-Verbose "Copying file from $Uri to $OutPath"
-        Copy-Item $Uri.AbsolutePath $OutPath
+function DownloadFile($Source, [string]$OutPath) {
+    if ($Source -notlike "http*") {
+        #  Using System.IO.Path.GetFullPath to get the current directory
+        #    does not work in this context - $pwd gives the current directory
+        if (![System.IO.Path]::IsPathRooted($Source)) {
+            $Source = $(Join-Path -Path $pwd -ChildPath $Source)
+        }
+        $Source = Get-Absolute-Path $Source
+        Say "Copying file from $Source to $OutPath"
+        Copy-Item $Source $OutPath
         return
     }
 
     $Stream = $null
 
     try {
-        $Response = GetHTTPResponse -Uri $Uri
+        $Response = GetHTTPResponse -Uri $Source
         $Stream = $Response.Content.ReadAsStreamAsync().Result
         $File = [System.IO.File]::Create($OutPath)
         $Stream.CopyTo($File)
         $File.Close()
     }
     finally {
-        if ($Stream -ne $null) {
+        if ($null -ne $Stream) {
             $Stream.Dispose()
         }
     }
 }
 
-function Prepend-Sdk-InstallRoot-To-Path([string]$InstallRoot, [string]$BinFolderRelativePath) {
-    $BinPath = Get-Absolute-Path $(Join-Path -Path $InstallRoot -ChildPath $BinFolderRelativePath)
+function SafeRemoveFile($Path) {
+    try {
+        if (Test-Path $Path) {
+            Remove-Item $Path
+            Say-Verbose "The temporary file `"$Path`" was removed."
+        }
+        else
+        {
+            Say-Verbose "The temporary file `"$Path`" does not exist, therefore is not removed."
+        }
+    }
+    catch
+    {
+        Say-Warning "Failed to remove the temporary file: `"$Path`", remove it manually."
+    }
+}
+
+function Prepend-Sdk-InstallRoot-To-Path([string]$InstallRoot) {
+    $BinPath = Get-Absolute-Path $(Join-Path -Path $InstallRoot -ChildPath "")
     if (-Not $NoPath) {
-        Say "Adding to current process PATH: `"$BinPath`". Note: This change will not be visible if PowerShell was run as a child process."
-        $env:path = "$BinPath;" + $env:path
+        $SuffixedBinPath = "$BinPath;"
+        if (-Not $env:path.Contains($SuffixedBinPath)) {
+            Say "Adding to current process PATH: `"$BinPath`". Note: This change will not be visible if PowerShell was run as a child process."
+            $env:path = $SuffixedBinPath + $env:path
+        } else {
+            Say-Verbose "Current process PATH already contains `"$BinPath`""
+        }
     }
     else {
         Say "Binaries of dotnet can be found in $BinPath"
     }
 }
 
-$CLIArchitecture = Get-CLIArchitecture-From-Architecture $Architecture
-$SpecificVersion = Get-Specific-Version-From-Version -AzureFeed $AzureFeed -Channel $Channel -Version $Version
-$DownloadLink = Get-Download-Link -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
-$LegacyDownloadLink = Get-LegacyDownload-Link -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
-
-if ($DryRun) {
+function PrintDryRunOutput($Invocation, $DownloadLinks)
+{
     Say "Payload URLs:"
-    Say "Primary - $DownloadLink"
-    if ($LegacyDownloadLink) {
-        Say "Legacy - $LegacyDownloadLink"
+    
+    for ($linkIndex=0; $linkIndex -lt $DownloadLinks.count; $linkIndex++) {
+        Say "URL #$linkIndex - $($DownloadLinks[$linkIndex].type): $($DownloadLinks[$linkIndex].downloadLink)"
+    }
+    $RepeatableCommand = ".\$ScriptName -Version `"$SpecificVersion`" -InstallDir `"$InstallRoot`" -Architecture `"$CLIArchitecture`""
+    if ($Runtime -eq "dotnet") {
+       $RepeatableCommand+=" -Runtime `"dotnet`""
+    }
+    elseif ($Runtime -eq "aspnetcore") {
+       $RepeatableCommand+=" -Runtime `"aspnetcore`""
+    }
+
+    foreach ($key in $Invocation.BoundParameters.Keys) {
+        if (-not (@("Architecture","Channel","DryRun","InstallDir","Runtime","SharedRuntime","Version","Quality","FeedCredential") -contains $key)) {
+            $RepeatableCommand+=" -$key `"$($Invocation.BoundParameters[$key])`""
+        }
+    }
+    if ($Invocation.BoundParameters.Keys -contains "FeedCredential") {
+        $RepeatableCommand+=" -FeedCredential `"<feedCredential>`""
+    }
+    Say "Repeatable invocation: $RepeatableCommand"
+    if ($SpecificVersion -ne $EffectiveVersion)
+    {
+        Say "NOTE: Due to finding a version manifest with this runtime, it would actually install with version '$EffectiveVersion'"
     }
-    Say "Repeatable invocation: .\$($MyInvocation.Line)"
-    exit 0
 }
 
-$InstallRoot = Resolve-Installation-Path $InstallDir
-Say-Verbose "InstallRoot: $InstallRoot"
+function Get-AkaMSDownloadLink([string]$Channel, [string]$Quality, [bool]$Internal, [string]$Product, [string]$Architecture) {
+    Say-Invocation $MyInvocation 
+
+    #quality is not supported for LTS or STS channel
+    if (![string]::IsNullOrEmpty($Quality) -and (@("LTS", "STS") -contains $Channel)) {
+        $Quality = ""
+        Say-Warning "Specifying quality for STS or LTS channel is not supported, the quality will be ignored."
+    }
+    Say-Verbose "Retrieving primary payload URL from aka.ms link for channel: '$Channel', quality: '$Quality' product: '$Product', os: 'win', architecture: '$Architecture'." 
+   
+    #construct aka.ms link
+    $akaMsLink = "https://aka.ms/dotnet"
+    if ($Internal) {
+        $akaMsLink += "/internal"
+    }
+    $akaMsLink += "/$Channel"
+    if (-not [string]::IsNullOrEmpty($Quality)) {
+        $akaMsLink +="/$Quality"
+    }
+    $akaMsLink +="/$Product-win-$Architecture.zip"
+    Say-Verbose  "Constructed aka.ms link: '$akaMsLink'."
+    $akaMsDownloadLink=$null
+
+    for ($maxRedirections = 9; $maxRedirections -ge 0; $maxRedirections--)
+    {
+        #get HTTP response
+        #do not pass credentials as a part of the $akaMsLink and do not apply credentials in the GetHTTPResponse function
+        #otherwise the redirect link would have credentials as well
+        #it would result in applying credentials twice to the resulting link and thus breaking it, and in echoing credentials to the output as a part of redirect link
+        $Response= GetHTTPResponse -Uri $akaMsLink -HeaderOnly $true -DisableRedirect $true -DisableFeedCredential $true
+        Say-Verbose "Received response:`n$Response"
+
+        if ([string]::IsNullOrEmpty($Response)) {
+            Say-Verbose "The link '$akaMsLink' is not valid: failed to get redirect location. The resource is not available."
+            return $null
+        }
+
+        #if HTTP code is 301 (Moved Permanently), the redirect link exists
+        if  ($Response.StatusCode -eq 301)
+        {
+            try {
+                $akaMsDownloadLink = $Response.Headers.GetValues("Location")[0]
+
+                if ([string]::IsNullOrEmpty($akaMsDownloadLink)) {
+                    Say-Verbose "The link '$akaMsLink' is not valid: server returned 301 (Moved Permanently), but the headers do not contain the redirect location."
+                    return $null
+                }
+
+                Say-Verbose "The redirect location retrieved: '$akaMsDownloadLink'."
+                # This may yet be a link to another redirection. Attempt to retrieve the page again.
+                $akaMsLink = $akaMsDownloadLink
+                continue
+            }
+            catch {
+                Say-Verbose "The link '$akaMsLink' is not valid: failed to get redirect location."
+                return $null
+            }
+        }
+        elseif ((($Response.StatusCode -lt 300) -or ($Response.StatusCode -ge 400)) -and (-not [string]::IsNullOrEmpty($akaMsDownloadLink)))
+        {
+            # Redirections have ended.
+            return $akaMsDownloadLink
+        }
+
+        Say-Verbose "The link '$akaMsLink' is not valid: failed to retrieve the redirection location."
+        return $null
+    }
+
+    Say-Verbose "Aka.ms links have redirected more than the maximum allowed redirections. This may be caused by a cyclic redirection of aka.ms links."
+    return $null
+
+}
+
+function Get-AkaMsLink-And-Version([string] $NormalizedChannel, [string] $NormalizedQuality, [bool] $Internal, [string] $ProductName, [string] $Architecture) {
+    $AkaMsDownloadLink = Get-AkaMSDownloadLink -Channel $NormalizedChannel -Quality $NormalizedQuality -Internal $Internal -Product $ProductName -Architecture $Architecture
+   
+    if ([string]::IsNullOrEmpty($AkaMsDownloadLink)){
+        if (-not [string]::IsNullOrEmpty($NormalizedQuality)) {
+            # if quality is specified - exit with error - there is no fallback approach
+            Say-Error "Failed to locate the latest version in the channel '$NormalizedChannel' with '$NormalizedQuality' quality for '$ProductName', os: 'win', architecture: '$Architecture'."
+            Say-Error "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support."
+            throw "aka.ms link resolution failure"
+        }
+        Say-Verbose "Falling back to latest.version file approach."
+        return ($null, $null, $null)
+    }
+    else {
+        Say-Verbose "Retrieved primary named payload URL from aka.ms link: '$AkaMsDownloadLink'."
+        Say-Verbose  "Downloading using legacy url will not be attempted."
+
+        #get version from the path
+        $pathParts = $AkaMsDownloadLink.Split('/')
+        if ($pathParts.Length -ge 2) { 
+            $SpecificVersion = $pathParts[$pathParts.Length - 2]
+            Say-Verbose "Version: '$SpecificVersion'."
+        }
+        else {
+            Say-Error "Failed to extract the version from download link '$AkaMsDownloadLink'."
+            return ($null, $null, $null)
+        }
+
+        #retrieve effective (product) version
+        $EffectiveVersion = Get-Product-Version -SpecificVersion $SpecificVersion -PackageDownloadLink $AkaMsDownloadLink
+        Say-Verbose "Product version: '$EffectiveVersion'."
 
-if ($Runtime -eq "dotnet") {
-    $assetName = ".NET Core Runtime"
-    $dotnetPackageRelativePath = "shared\Microsoft.NETCore.App"
+        return ($AkaMsDownloadLink, $SpecificVersion, $EffectiveVersion);
+    }
 }
-elseif ($Runtime -eq "aspnetcore") {
-    $assetName = "ASP.NET Core Runtime"
-    $dotnetPackageRelativePath = "shared\Microsoft.AspNetCore.App"
+
+function Get-Feeds-To-Use()
+{
+    $feeds = @(
+    "https://dotnetcli.azureedge.net/dotnet",
+    "https://dotnetbuilds.azureedge.net/public"
+    )
+
+    if (-not [string]::IsNullOrEmpty($AzureFeed)) {
+        $feeds = @($AzureFeed)
+    }
+
+    if ($NoCdn) {
+        $feeds = @(
+        "https://dotnetcli.blob.core.windows.net/dotnet",
+        "https://dotnetbuilds.blob.core.windows.net/public"
+        )
+
+        if (-not [string]::IsNullOrEmpty($UncachedFeed)) {
+            $feeds = @($UncachedFeed)
+        }
+    }
+
+    return $feeds
 }
-elseif (-not $Runtime) {
-    $assetName = ".NET Core SDK"
-    $dotnetPackageRelativePath = "sdk"
+
+function Resolve-AssetName-And-RelativePath([string] $Runtime) {
+    
+    if ($Runtime -eq "dotnet") {
+        $assetName = ".NET Core Runtime"
+        $dotnetPackageRelativePath = "shared\Microsoft.NETCore.App"
+    }
+    elseif ($Runtime -eq "aspnetcore") {
+        $assetName = "ASP.NET Core Runtime"
+        $dotnetPackageRelativePath = "shared\Microsoft.AspNetCore.App"
+    }
+    elseif ($Runtime -eq "windowsdesktop") {
+        $assetName = ".NET Core Windows Desktop Runtime"
+        $dotnetPackageRelativePath = "shared\Microsoft.WindowsDesktop.App"
+    }
+    elseif (-not $Runtime) {
+        $assetName = ".NET Core SDK"
+        $dotnetPackageRelativePath = "sdk"
+    }
+    else {
+        throw "Invalid value for `$Runtime"
+    }
+
+    return ($assetName, $dotnetPackageRelativePath)
 }
-else {
-    throw "Invalid value for `$Runtime"
+
+function Prepare-Install-Directory {
+    New-Item -ItemType Directory -Force -Path $InstallRoot | Out-Null
+
+    $installDrive = $((Get-Item $InstallRoot -Force).PSDrive.Name);
+    $diskInfo = $null
+    try{
+        $diskInfo = Get-PSDrive -Name $installDrive
+    }
+    catch{
+        Say-Warning "Failed to check the disk space. Installation will continue, but it may fail if you do not have enough disk space."
+    }
+    
+    if ( ($null -ne $diskInfo) -and ($diskInfo.Free / 1MB -le 100)) {
+        throw "There is not enough disk space on drive ${installDrive}:"
+    }
 }
 
-#  Check if the SDK version is already installed.
-$isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion
-if ($isAssetInstalled) {
-    Say "$assetName version $SpecificVersion is already installed."
-    Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath
-    exit 0
+Say "Note that the intended use of this script is for Continuous Integration (CI) scenarios, where:"
+Say "- The SDK needs to be installed without user interaction and without admin rights."
+Say "- The SDK installation doesn't need to persist across multiple CI runs."
+Say "To set up a development environment or to run apps, use installers rather than this script. Visit https://dotnet.microsoft.com/download to get the installer.`r`n"
+
+if ($SharedRuntime -and (-not $Runtime)) {
+    $Runtime = "dotnet"
 }
 
-New-Item -ItemType Directory -Force -Path $InstallRoot | Out-Null
+$OverrideNonVersionedFiles = !$SkipNonVersionedFiles
+
+$CLIArchitecture = Get-CLIArchitecture-From-Architecture $Architecture
+$NormalizedQuality = Get-NormalizedQuality $Quality
+Say-Verbose "Normalized quality: '$NormalizedQuality'"
+$NormalizedChannel = Get-NormalizedChannel $Channel
+Say-Verbose "Normalized channel: '$NormalizedChannel'"
+$NormalizedProduct = Get-NormalizedProduct $Runtime
+Say-Verbose "Normalized product: '$NormalizedProduct'"
+$FeedCredential = ValidateFeedCredential $FeedCredential
+
+$InstallRoot = Resolve-Installation-Path $InstallDir
+Say-Verbose "InstallRoot: $InstallRoot"
+$ScriptName = $MyInvocation.MyCommand.Name
+($assetName, $dotnetPackageRelativePath) = Resolve-AssetName-And-RelativePath -Runtime $Runtime
+
+$feeds = Get-Feeds-To-Use
+$DownloadLinks = @()
 
-$installDrive = $((Get-Item $InstallRoot).PSDrive.Name);
-$free = Get-CimInstance -Class win32_logicaldisk | where Deviceid -eq "${installDrive}:"
-if ($free.Freespace / 1MB -le 100 ) {
-    Say "There is not enough disk space on drive ${installDrive}:"
-    exit 0
+if ($Version.ToLowerInvariant() -ne "latest" -and -not [string]::IsNullOrEmpty($Quality)) {
+    throw "Quality and Version options are not allowed to be specified simultaneously. See https:// learn.microsoft.com/dotnet/core/tools/dotnet-install-script#options for details."
 }
 
+# aka.ms links can only be used if the user did not request a specific version via the command line or a global.json file.
+if ([string]::IsNullOrEmpty($JSonFile) -and ($Version -eq "latest")) {
+    ($DownloadLink, $SpecificVersion, $EffectiveVersion) = Get-AkaMsLink-And-Version $NormalizedChannel $NormalizedQuality $Internal $NormalizedProduct $CLIArchitecture
+    
+    if ($null -ne $DownloadLink) {
+        $DownloadLinks += New-Object PSObject -Property @{downloadLink="$DownloadLink";specificVersion="$SpecificVersion";effectiveVersion="$EffectiveVersion";type='aka.ms'}
+        Say-Verbose "Generated aka.ms link $DownloadLink with version $EffectiveVersion"
+        
+        if (-Not $DryRun) {
+            Say-Verbose "Checking if the version $EffectiveVersion is already installed"
+            if (Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $EffectiveVersion)
+            {
+                Say "$assetName with version '$EffectiveVersion' is already installed."
+                Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
+                return
+            }
+        }
+    }
+}
+
+# Primary and legacy links cannot be used if a quality was specified.
+# If we already have an aka.ms link, no need to search the blob feeds.
+if ([string]::IsNullOrEmpty($NormalizedQuality) -and 0 -eq $DownloadLinks.count)
+{
+    foreach ($feed in $feeds) {
+        try {
+            $SpecificVersion = Get-Specific-Version-From-Version -AzureFeed $feed -Channel $Channel -Version $Version -JSonFile $JSonFile
+            $DownloadLink, $EffectiveVersion = Get-Download-Link -AzureFeed $feed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
+            $LegacyDownloadLink = Get-LegacyDownload-Link -AzureFeed $feed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
+            
+            $DownloadLinks += New-Object PSObject -Property @{downloadLink="$DownloadLink";specificVersion="$SpecificVersion";effectiveVersion="$EffectiveVersion";type='primary'}
+            Say-Verbose "Generated primary link $DownloadLink with version $EffectiveVersion"
+    
+            if (-not [string]::IsNullOrEmpty($LegacyDownloadLink)) {
+                $DownloadLinks += New-Object PSObject -Property @{downloadLink="$LegacyDownloadLink";specificVersion="$SpecificVersion";effectiveVersion="$EffectiveVersion";type='legacy'}
+                Say-Verbose "Generated legacy link $LegacyDownloadLink with version $EffectiveVersion"
+            }
+    
+            if (-Not $DryRun) {
+                Say-Verbose "Checking if the version $EffectiveVersion is already installed"
+                if (Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $EffectiveVersion)
+                {
+                    Say "$assetName with version '$EffectiveVersion' is already installed."
+                    Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
+                    return
+                }
+            }
+        }
+        catch
+        {
+            Say-Verbose "Failed to acquire download links from feed $feed. Exception: $_"
+        }
+    }
+}
+
+if ($DownloadLinks.count -eq 0) {
+    throw "Failed to resolve the exact version number."
+}
+
+if ($DryRun) {
+    PrintDryRunOutput $MyInvocation $DownloadLinks
+    return
+}
+
+Prepare-Install-Directory
+
 $ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName())
 Say-Verbose "Zip path: $ZipPath"
-Say "Downloading link: $DownloadLink"
-try {
-    DownloadFile -Uri $DownloadLink -OutPath $ZipPath
-}
-catch {
-    Say "Cannot download: $DownloadLink"
-    if ($LegacyDownloadLink) {
-        $DownloadLink = $LegacyDownloadLink
-        $ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName())
-        Say-Verbose "Legacy zip path: $ZipPath"
-        Say "Downloading legacy link: $DownloadLink"
-        DownloadFile -Uri $DownloadLink -OutPath $ZipPath
+
+$DownloadSucceeded = $false
+$DownloadedLink = $null
+$ErrorMessages = @()
+
+foreach ($link in $DownloadLinks)
+{
+    Say-Verbose "Downloading `"$($link.type)`" link $($link.downloadLink)"
+
+    try {
+        DownloadFile -Source $link.downloadLink -OutPath $ZipPath
+        Say-Verbose "Download succeeded."
+        $DownloadSucceeded = $true
+        $DownloadedLink = $link
+        break
     }
-    else {
-        throw "Could not download $assetName version $SpecificVersion"
+    catch {
+        $StatusCode = $null
+        $ErrorMessage = $null
+
+        if ($PSItem.Exception.Data.Contains("StatusCode")) {
+            $StatusCode = $PSItem.Exception.Data["StatusCode"]
+        }
+    
+        if ($PSItem.Exception.Data.Contains("ErrorMessage")) {
+            $ErrorMessage = $PSItem.Exception.Data["ErrorMessage"]
+        } else {
+            $ErrorMessage = $PSItem.Exception.Message
+        }
+
+        Say-Verbose "Download failed with status code $StatusCode. Error message: $ErrorMessage"
+        $ErrorMessages += "Downloading from `"$($link.type)`" link has failed with error:`nUri: $($link.downloadLink)`nStatusCode: $StatusCode`nError: $ErrorMessage"
+    }
+
+    # This link failed. Clean up before trying the next one.
+    SafeRemoveFile -Path $ZipPath
+}
+
+if (-not $DownloadSucceeded) {
+    foreach ($ErrorMessage in $ErrorMessages) {
+        Say-Error $ErrorMessages
     }
+
+    throw "Could not find `"$assetName`" with version = $($DownloadLinks[0].effectiveVersion)`nRefer to: https://aka.ms/dotnet-os-lifecycle for information on .NET support"
 }
 
-Say "Extracting zip from $DownloadLink"
+Say "Extracting the archive."
 Extract-Dotnet-Package -ZipPath $ZipPath -OutPath $InstallRoot
 
-#  Check if the SDK version is now installed; if not, fail the installation.
-$isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion
+#  Check if the SDK version is installed; if not, fail the installation.
+$isAssetInstalled = $false
+
+# if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed.
+if ($DownloadedLink.effectiveVersion -Match "rtm" -or $DownloadedLink.effectiveVersion -Match "servicing") {
+    $ReleaseVersion = $DownloadedLink.effectiveVersion.Split("-")[0]
+    Say-Verbose "Checking installation: version = $ReleaseVersion"
+    $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $ReleaseVersion
+}
+
+#  Check if the SDK version is installed.
 if (!$isAssetInstalled) {
-    throw "$assetName version $SpecificVersion failed to install with an unknown error."
+    Say-Verbose "Checking installation: version = $($DownloadedLink.effectiveVersion)"
+    $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $DownloadedLink.effectiveVersion
 }
 
-Remove-Item $ZipPath
+# Version verification failed. More likely something is wrong either with the downloaded content or with the verification algorithm.
+if (!$isAssetInstalled) {
+    Say-Error "Failed to verify the version of installed `"$assetName`".`nInstallation source: $($DownloadedLink.downloadLink).`nInstallation location: $InstallRoot.`nReport the bug at https://github.com/dotnet/install-scripts/issues."
+    throw "`"$assetName`" with version = $($DownloadedLink.effectiveVersion) failed to install with an unknown error."
+}
 
-Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath
+SafeRemoveFile -Path $ZipPath
 
+Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
+
+Say "Note that the script does not resolve dependencies during installation."
+Say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install/windows#dependencies"
+Say "Installed version is $($DownloadedLink.effectiveVersion)"
 Say "Installation finished"
-exit 0
+
+# SIG # Begin signature block
+# MIInzgYJKoZIhvcNAQcCoIInvzCCJ7sCAQExDzANBglghkgBZQMEAgEFADB5Bgor
+# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCB7pzZ0nuEMd30h
+# n1EcAYUQN+1clltqaLf9611TDrw/laCCDYUwggYDMIID66ADAgECAhMzAAACzfNk
+# v/jUTF1RAAAAAALNMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD
+# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy
+# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p
+# bmcgUENBIDIwMTEwHhcNMjIwNTEyMjA0NjAyWhcNMjMwNTExMjA0NjAyWjB0MQsw
+# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u
+# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy
+# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+# AQDrIzsY62MmKrzergm7Ucnu+DuSHdgzRZVCIGi9CalFrhwtiK+3FIDzlOYbs/zz
+# HwuLC3hir55wVgHoaC4liQwQ60wVyR17EZPa4BQ28C5ARlxqftdp3H8RrXWbVyvQ
+# aUnBQVZM73XDyGV1oUPZGHGWtgdqtBUd60VjnFPICSf8pnFiit6hvSxH5IVWI0iO
+# nfqdXYoPWUtVUMmVqW1yBX0NtbQlSHIU6hlPvo9/uqKvkjFUFA2LbC9AWQbJmH+1
+# uM0l4nDSKfCqccvdI5l3zjEk9yUSUmh1IQhDFn+5SL2JmnCF0jZEZ4f5HE7ykDP+
+# oiA3Q+fhKCseg+0aEHi+DRPZAgMBAAGjggGCMIIBfjAfBgNVHSUEGDAWBgorBgEE
+# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQU0WymH4CP7s1+yQktEwbcLQuR9Zww
+# VAYDVR0RBE0wS6RJMEcxLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh
+# dGlvbnMgTGltaXRlZDEWMBQGA1UEBRMNMjMwMDEyKzQ3MDUzMDAfBgNVHSMEGDAW
+# gBRIbmTlUAXTgqoXNzcitW2oynUClTBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8v
+# d3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NybC9NaWNDb2RTaWdQQ0EyMDExXzIw
+# MTEtMDctMDguY3JsMGEGCCsGAQUFBwEBBFUwUzBRBggrBgEFBQcwAoZFaHR0cDov
+# L3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNDb2RTaWdQQ0EyMDEx
+# XzIwMTEtMDctMDguY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIB
+# AE7LSuuNObCBWYuttxJAgilXJ92GpyV/fTiyXHZ/9LbzXs/MfKnPwRydlmA2ak0r
+# GWLDFh89zAWHFI8t9JLwpd/VRoVE3+WyzTIskdbBnHbf1yjo/+0tpHlnroFJdcDS
+# MIsH+T7z3ClY+6WnjSTetpg1Y/pLOLXZpZjYeXQiFwo9G5lzUcSd8YVQNPQAGICl
+# 2JRSaCNlzAdIFCF5PNKoXbJtEqDcPZ8oDrM9KdO7TqUE5VqeBe6DggY1sZYnQD+/
+# LWlz5D0wCriNgGQ/TWWexMwwnEqlIwfkIcNFxo0QND/6Ya9DTAUykk2SKGSPt0kL
+# tHxNEn2GJvcNtfohVY/b0tuyF05eXE3cdtYZbeGoU1xQixPZAlTdtLmeFNly82uB
+# VbybAZ4Ut18F//UrugVQ9UUdK1uYmc+2SdRQQCccKwXGOuYgZ1ULW2u5PyfWxzo4
+# BR++53OB/tZXQpz4OkgBZeqs9YaYLFfKRlQHVtmQghFHzB5v/WFonxDVlvPxy2go
+# a0u9Z+ZlIpvooZRvm6OtXxdAjMBcWBAsnBRr/Oj5s356EDdf2l/sLwLFYE61t+ME
+# iNYdy0pXL6gN3DxTVf2qjJxXFkFfjjTisndudHsguEMk8mEtnvwo9fOSKT6oRHhM
+# 9sZ4HTg/TTMjUljmN3mBYWAWI5ExdC1inuog0xrKmOWVMIIHejCCBWKgAwIBAgIK
+# YQ6Q0gAAAAAAAzANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNV
+# BAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jv
+# c29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlm
+# aWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwNzA4MjA1OTA5WhcNMjYwNzA4MjEw
+# OTA5WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UE
+# BxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYD
+# VQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMIICIjANBgkqhkiG
+# 9w0BAQEFAAOCAg8AMIICCgKCAgEAq/D6chAcLq3YbqqCEE00uvK2WCGfQhsqa+la
+# UKq4BjgaBEm6f8MMHt03a8YS2AvwOMKZBrDIOdUBFDFC04kNeWSHfpRgJGyvnkmc
+# 6Whe0t+bU7IKLMOv2akrrnoJr9eWWcpgGgXpZnboMlImEi/nqwhQz7NEt13YxC4D
+# dato88tt8zpcoRb0RrrgOGSsbmQ1eKagYw8t00CT+OPeBw3VXHmlSSnnDb6gE3e+
+# lD3v++MrWhAfTVYoonpy4BI6t0le2O3tQ5GD2Xuye4Yb2T6xjF3oiU+EGvKhL1nk
+# kDstrjNYxbc+/jLTswM9sbKvkjh+0p2ALPVOVpEhNSXDOW5kf1O6nA+tGSOEy/S6
+# A4aN91/w0FK/jJSHvMAhdCVfGCi2zCcoOCWYOUo2z3yxkq4cI6epZuxhH2rhKEmd
+# X4jiJV3TIUs+UsS1Vz8kA/DRelsv1SPjcF0PUUZ3s/gA4bysAoJf28AVs70b1FVL
+# 5zmhD+kjSbwYuER8ReTBw3J64HLnJN+/RpnF78IcV9uDjexNSTCnq47f7Fufr/zd
+# sGbiwZeBe+3W7UvnSSmnEyimp31ngOaKYnhfsi+E11ecXL93KCjx7W3DKI8sj0A3
+# T8HhhUSJxAlMxdSlQy90lfdu+HggWCwTXWCVmj5PM4TasIgX3p5O9JawvEagbJjS
+# 4NaIjAsCAwEAAaOCAe0wggHpMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBRI
+# bmTlUAXTgqoXNzcitW2oynUClTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTAL
+# BgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRyLToCMZBD
+# uRQFTuHqp8cx0SOJNDBaBgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLm1pY3Jv
+# c29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFf
+# MDNfMjIuY3JsMF4GCCsGAQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL3d3
+# dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFf
+# MDNfMjIuY3J0MIGfBgNVHSAEgZcwgZQwgZEGCSsGAQQBgjcuAzCBgzA/BggrBgEF
+# BQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9kb2NzL3ByaW1h
+# cnljcHMuaHRtMEAGCCsGAQUFBwICMDQeMiAdAEwAZQBnAGEAbABfAHAAbwBsAGkA
+# YwB5AF8AcwB0AGEAdABlAG0AZQBuAHQALiAdMA0GCSqGSIb3DQEBCwUAA4ICAQBn
+# 8oalmOBUeRou09h0ZyKbC5YR4WOSmUKWfdJ5DJDBZV8uLD74w3LRbYP+vj/oCso7
+# v0epo/Np22O/IjWll11lhJB9i0ZQVdgMknzSGksc8zxCi1LQsP1r4z4HLimb5j0b
+# pdS1HXeUOeLpZMlEPXh6I/MTfaaQdION9MsmAkYqwooQu6SpBQyb7Wj6aC6VoCo/
+# KmtYSWMfCWluWpiW5IP0wI/zRive/DvQvTXvbiWu5a8n7dDd8w6vmSiXmE0OPQvy
+# CInWH8MyGOLwxS3OW560STkKxgrCxq2u5bLZ2xWIUUVYODJxJxp/sfQn+N4sOiBp
+# mLJZiWhub6e3dMNABQamASooPoI/E01mC8CzTfXhj38cbxV9Rad25UAqZaPDXVJi
+# hsMdYzaXht/a8/jyFqGaJ+HNpZfQ7l1jQeNbB5yHPgZ3BtEGsXUfFL5hYbXw3MYb
+# BL7fQccOKO7eZS/sl/ahXJbYANahRr1Z85elCUtIEJmAH9AAKcWxm6U/RXceNcbS
+# oqKfenoi+kiVH6v7RyOA9Z74v2u3S5fi63V4GuzqN5l5GEv/1rMjaHXmr/r8i+sL
+# gOppO6/8MO0ETI7f33VtY5E90Z1WTk+/gFcioXgRMiF670EKsT/7qMykXcGhiJtX
+# cVZOSEXAQsmbdlsKgEhr/Xmfwb1tbWrJUnMTDXpQzTGCGZ8wghmbAgEBMIGVMH4x
+# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt
+# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01p
+# Y3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTECEzMAAALN82S/+NRMXVEAAAAA
+# As0wDQYJYIZIAWUDBAIBBQCgga4wGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQw
+# HAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkEMSIEINK7
+# cJe0KVfbcXchjID30U/cUg7pWAQUa3+n8JuhjLCLMEIGCisGAQQBgjcCAQwxNDAy
+# oBSAEgBNAGkAYwByAG8AcwBvAGYAdKEagBhodHRwOi8vd3d3Lm1pY3Jvc29mdC5j
+# b20wDQYJKoZIhvcNAQEBBQAEggEAODLxcflOtjpIXXIhbYyQ0wFeBx0NrmoMU/Ri
+# e7CRrAieAbG4iLJzs4DhUov5iuMHY6AAbLWAH54QlSkd4XNp6POsE7lSzN9yjlVw
+# V/e0XCaYeXIbtd75hGd5P7wAhM4m2ViDI4IRHyQtjysW0U0F6YiqNlFm7Fzo5Si6
+# l2XxvuEDSdyJcEN70wHQajx6bKfnI/oMY59iGjDXvDP/6cQV9NI0gPHFTwPKA7vg
+# PySyVFEG7dQMoEwAWy9GHbcS//RulgUwBhWcrtUP411XLSO6is2VTknwbdglc9HZ
+# zViuS4C1ujHlPrlMzm8Y5iGVIQCna5w2NU/kGsSK5+dMkovomKGCFykwghclBgor
+# BgEEAYI3AwMBMYIXFTCCFxEGCSqGSIb3DQEHAqCCFwIwghb+AgEDMQ8wDQYJYIZI
+# AWUDBAIBBQAwggFZBgsqhkiG9w0BCRABBKCCAUgEggFEMIIBQAIBAQYKKwYBBAGE
+# WQoDATAxMA0GCWCGSAFlAwQCAQUABCDRz6ce9oWlH6+o0BtjmAjtvEMN1hfhIA5v
+# +wTZHvB4XgIGY2PeyIloGBMyMDIyMTExMDE1MDUxNi43MzRaMASAAgH0oIHYpIHV
+# MIHSMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH
+# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQL
+# EyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsT
+# HVRoYWxlcyBUU1MgRVNOOkEyNDAtNEI4Mi0xMzBFMSUwIwYDVQQDExxNaWNyb3Nv
+# ZnQgVGltZS1TdGFtcCBTZXJ2aWNloIIReDCCBycwggUPoAMCAQICEzMAAAG4CNTB
+# uHngUUkAAQAAAbgwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNV
+# BAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jv
+# c29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAg
+# UENBIDIwMTAwHhcNMjIwOTIwMjAyMjE2WhcNMjMxMjE0MjAyMjE2WjCB0jELMAkG
+# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx
+# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9z
+# b2Z0IElyZWxhbmQgT3BlcmF0aW9ucyBMaW1pdGVkMSYwJAYDVQQLEx1UaGFsZXMg
+# VFNTIEVTTjpBMjQwLTRCODItMTMwRTElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUt
+# U3RhbXAgU2VydmljZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJwb
+# sfwRHERn5C95QPGn37tJ5vOiY9aWjeIDxpgaXaYGiqsw0G0cvCK3YulrqemEf2Ck
+# GSdcOJAF++EqhOSqrO13nGcjqw6hFNnsGwKANyzddwnOO0jz1lfBIIu77TbfNvna
+# WbwSRu0DTGHA7n7PR0MYJ9bC/HopStpbFf606LKcTWnwaUuEdAhx6FAqg1rkgugi
+# uuaaxKyxRkdjFZLKFXEXL9p01PtwS0fG6vZiRVnEKgeal2TeLvdAIqapBwltPYif
+# gqnp7Z4VJMcPo0TWmRNVFOcHRNwWHehN9xg6ugIGXPo7hMpWrPgg4moHO2epc0T3
+# 6rgm9hlDrl28bG5TakmV7NJ98kbF5lgtlrowT6ecwEVtuLd4a0gzYqhanW7zaFZn
+# Dft5yMexy59ifETdzpwArj2nJAyIsiq1PY3XPm2mUMLlACksqelHKfWihK/Fehw/
+# mziovBVwkkr/G0F19OWgR+MBUKifwpOyQiLAxrqvVnfCY4QjJCZiHIuS15HCQ/TI
+# t/Qj4x1WvRa1UqjnmpLu4/yBYWZsdvZoq8SXI7iOs7muecAJeEkYlM6iOkMighzE
+# hjQK9ThPpoAtluXbL7qIHGrfFlHmX/4soc7jj1j8uB31U34gJlB2XphjMaT+E+O9
+# SImk/6GRV9Sm8C88Fnmm2VdwMluCNAUzPFjfvHx3AgMBAAGjggFJMIIBRTAdBgNV
+# HQ4EFgQUxP1HJTeFwzNYo1njfucXuUfQaW4wHwYDVR0jBBgwFoAUn6cVXQBeYl2D
+# 9OXSZacbUzUZ6XIwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3Nv
+# ZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUy
+# MDIwMTAoMSkuY3JsMGwGCCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDov
+# L3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1l
+# LVN0YW1wJTIwUENBJTIwMjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUB
+# Af8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQAD
+# ggIBAJ9uk8miwpMoKw3D996piEzbegAGxkABHYn2vP2hbqnkS9U97s/6QlyZOhGF
+# sVudaiLeRZZTsaG5hR0oCuBINZ/lelo5xzHc+mBOpBXpxSaW1hqoxaCLsVH1EBtz
+# 7in25Hjy+ejuBcilH6EZ0ZtNxmWGIQz8R0AuS0Tj4VgJXHIlXP9dVOiyGo9Velrk
+# +FGx/BC+iEuCaKd/IsypHPiCUCh52DGc91s2S7ldQx1H4CljOAtanDfbvSejASWL
+# o/s3w0XMAbDurWNns0XidAF2RnL1PaxoOyz9VYakNGK4F3/uJRZnVgbsCYuwNX1B
+# mSwM1ZbPSnggNSGTZx/FQ20Jj/ulrK0ryAbvNbNb4kkaS4a767ifCqvUOFLlUT8P
+# N43hhldxI6yHPMOWItJpEHIZBiTNKblBsYbIrghb1Ym9tfSsLa5ZJDzVZNndRfhU
+# qJOyXF+CVm9OtVmFDG9kIwM6QAX8Q0if721z4VOzZNvD8ktg1lI+XjXgXDJVs3h4
+# 7sMu9GXSYzky+7dtgmc3iRPkda3YVRdmPJtNFN0NLybcssE7vhFCij75eDGQBFq0
+# A4KVG6uBdr6UTWwE0VKHxBz2BpGvn7BCs+5yxnF+HV6CUickDqqPi/II7Zssd9Eb
+# P9uzj4luldXDAPrWGtdGq+wK0odlGNVuCMxsL3hn8+KiO9UiMIIHcTCCBVmgAwIB
+# AgITMwAAABXF52ueAptJmQAAAAAAFTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UE
+# BhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAc
+# BgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0
+# IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEwOTMwMTgyMjI1
+# WhcNMzAwOTMwMTgzMjI1WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGlu
+# Z3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBv
+# cmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDCC
+# AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOThpkzntHIhC3miy9ckeb0O
+# 1YLT/e6cBwfSqWxOdcjKNVf2AX9sSuDivbk+F2Az/1xPx2b3lVNxWuJ+Slr+uDZn
+# hUYjDLWNE893MsAQGOhgfWpSg0S3po5GawcU88V29YZQ3MFEyHFcUTE3oAo4bo3t
+# 1w/YJlN8OWECesSq/XJprx2rrPY2vjUmZNqYO7oaezOtgFt+jBAcnVL+tuhiJdxq
+# D89d9P6OU8/W7IVWTe/dvI2k45GPsjksUZzpcGkNyjYtcI4xyDUoveO0hyTD4MmP
+# frVUj9z6BVWYbWg7mka97aSueik3rMvrg0XnRm7KMtXAhjBcTyziYrLNueKNiOSW
+# rAFKu75xqRdbZ2De+JKRHh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9fvzZnkXftnIv
+# 231fgLrbqn427DZM9ituqBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdHGO2n6Jl8P0zb
+# r17C89XYcz1DTsEzOUyOArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7XKHYC4jMYcten
+# IPDC+hIK12NvDMk2ZItboKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiER9vcG9H9stQc
+# xWv2XFJRXRLbJbqvUAV6bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/eKtFtvUeh17a
+# j54WcmnGrnu3tz5q4i6tAgMBAAGjggHdMIIB2TASBgkrBgEEAYI3FQEEBQIDAQAB
+# MCMGCSsGAQQBgjcVAgQWBBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAdBgNVHQ4EFgQU
+# n6cVXQBeYl2D9OXSZacbUzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEEAYI3TIN9AQEw
+# QTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9E
+# b2NzL1JlcG9zaXRvcnkuaHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMIMBkGCSsGAQQB
+# gjcUAgQMHgoAUwB1AGIAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/
+# MB8GA1UdIwQYMBaAFNX2VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1UdHwRPME0wS6BJ
+# oEeGRWh0dHA6Ly9jcmwubWljcm9zb2Z0LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01p
+# Y1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNybDBaBggrBgEFBQcBAQROMEwwSgYIKwYB
+# BQUHMAKGPmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvY2VydHMvTWljUm9v
+# Q2VyQXV0XzIwMTAtMDYtMjMuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQCdVX38Kq3h
+# LB9nATEkW+Geckv8qW/qXBS2Pk5HZHixBpOXPTEztTnXwnE2P9pkbHzQdTltuw8x
+# 5MKP+2zRoZQYIu7pZmc6U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gngugnue99qb74p
+# y27YP0h1AdkY3m2CDPVtI1TkeFN1JFe53Z/zjj3G82jfZfakVqr3lbYoVSfQJL1A
+# oL8ZthISEV09J+BAljis9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHCgRlCGVJ1ijbC
+# HcNhcy4sa3tuPywJeBTpkbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6MhrZlvSP9pEB
+# 9s7GdP32THJvEKt1MMU0sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEUBHG/ZPkkvnNt
+# yo4JvbMBV0lUZNlz138eW0QBjloZkWsNn6Qo3GcZKCS6OEuabvshVGtqRRFHqfG3
+# rsjoiV5PndLQTHa1V1QJsWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+fpO+y/g75LcV
+# v7TOPqUxUYS8vwLBgqJ7Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrpNPgkNWcr4A24
+# 5oyZ1uEi6vAnQj0llOZ0dFtq0Z4+7X6gMTN9vMvpe784cETRkPHIqzqKOghif9lw
+# Y1NNje6CbaUFEMFxBmoQtB1VM1izoXBm8qGCAtQwggI9AgEBMIIBAKGB2KSB1TCB
+# 0jELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1Jl
+# ZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMk
+# TWljcm9zb2Z0IElyZWxhbmQgT3BlcmF0aW9ucyBMaW1pdGVkMSYwJAYDVQQLEx1U
+# aGFsZXMgVFNTIEVTTjpBMjQwLTRCODItMTMwRTElMCMGA1UEAxMcTWljcm9zb2Z0
+# IFRpbWUtU3RhbXAgU2VydmljZaIjCgEBMAcGBSsOAwIaAxUAcGteVqFx/IbTKXHL
+# euXCPRPMD7uggYMwgYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGlu
+# Z3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBv
+# cmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAN
+# BgkqhkiG9w0BAQUFAAIFAOcW7qowIhgPMjAyMjExMTAxMTI5NDZaGA8yMDIyMTEx
+# MTExMjk0NlowdDA6BgorBgEEAYRZCgQBMSwwKjAKAgUA5xbuqgIBADAHAgEAAgIE
+# qTAHAgEAAgIRVjAKAgUA5xhAKgIBADA2BgorBgEEAYRZCgQCMSgwJjAMBgorBgEE
+# AYRZCgMCoAowCAIBAAIDB6EgoQowCAIBAAIDAYagMA0GCSqGSIb3DQEBBQUAA4GB
+# AGsU2HTQg158bHX+QngoY7NVfCbGRaLjQOi8geKi26qQWAxll9QLFg4+epiG2nZB
+# eQvhxeNmIzounhWfJ+gfhFMi8aBT5z4dLK9iBtmpG1Y14RmSS4andiUlS6bVNVNe
+# WGObqHijMVeMOphiTaAfzR6zSASDaG0CfVm9bNBOnZZsMYIEDTCCBAkCAQEwgZMw
+# fDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1Jl
+# ZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMd
+# TWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAG4CNTBuHngUUkAAQAA
+# AbgwDQYJYIZIAWUDBAIBBQCgggFKMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRAB
+# BDAvBgkqhkiG9w0BCQQxIgQg578XwPrBwneU95xu1sHFncHeCC0UPQ7QK7PvSSby
+# VpwwgfoGCyqGSIb3DQEJEAIvMYHqMIHnMIHkMIG9BCAo69Y4oHA7Q4pS+Y1NsBfr
+# pIYTeWsPeGTami0X0PD7HzCBmDCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv
+# ZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBD
+# QSAyMDEwAhMzAAABuAjUwbh54FFJAAEAAAG4MCIEIJVlMK4mQfdJaAZx7Unfka/I
+# D4Wbw5edh/SR7TTptzRqMA0GCSqGSIb3DQEBCwUABIICAA1QlR3ywR7e+jqZ++NC
+# xsIwREiwVS70CEkbH8XpPRS0mFS0SHcCfpwymGfdep3D0CWk0PIfMhXq0SD97iBI
+# rOLdHglVBkMYTjGEBHyBzv/LevAZUuzoc5aqyIF4Ywa5KS4PGbMSuRK5CKAojOzH
+# A/vp2/KYuADmf9kOOgOfDVicyfoqZ+3W+QaUI/k0KKV4dPLF55+y18C+Td6sR60Y
+# AkcvGZObuj/OkREhdTJ1qJ2E/4RKG8gtGY1DfluLon7+UvS/ciWDWrJnHMmkxM11
+# cYuRIvLArIdq/YS2bcSnY6AVO2zYjj7gCqDN9GuCurstUKC5uxVl3VNxntC0u3Le
+# BoI/R5uMYlTXodW8ukLNL6zHrQ4wI4udgW77KJref+3E1PEpZBRMxwose7Vt8lDc
+# sW1vdM+eZzUXRLhDR8a0Nai7+PaNoukoGf4pvwsu8Mkeji5a0hWtU9lUVRv6nzue
+# 3L2olhsbiHhAET7N6Rj0kzEhbUgfVUJrGvNlWOfN7MDr+OpArGXMPLtovbKTLtXF
+# v/GrJo9wQuyqUmY6KQSRDZgOw1CcoZpJcy40HG/aOlJwk03N13OZD5H3KfHwEphR
+# YnbGwGq9zUId5druSr5s40Yyl3idAkqmI5SXAm9v/gRq2X9vMU0a7KqXet9wO62F
+# TqxV+7Qp48Vw6hW1g+Q7oWoc
+# SIG # End signature block
diff --git a/files/KoreBuild/scripts/dotnet-install.sh b/files/KoreBuild/scripts/dotnet-install.sh
index 6dda76038..ecb2b6cf1 100755
--- a/files/KoreBuild/scripts/dotnet-install.sh
+++ b/files/KoreBuild/scripts/dotnet-install.sh
@@ -24,7 +24,7 @@ exec 3>&1
 # See if stdout is a terminal
 if [ -t 1 ] && command -v tput > /dev/null; then
     # see if it supports colors
-    ncolors=$(tput colors)
+    ncolors=$(tput colors || echo 0)
     if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then
         bold="$(tput bold       || echo)"
         normal="$(tput sgr0     || echo)"
@@ -40,7 +40,7 @@ if [ -t 1 ] && command -v tput > /dev/null; then
 fi
 
 say_warning() {
-    printf "%b\n" "${yellow:-}dotnet_install: Warning: $1${normal:-}"
+    printf "%b\n" "${yellow:-}dotnet_install: Warning: $1${normal:-}" >&3
 }
 
 say_err() {
@@ -75,16 +75,24 @@ get_legacy_os_name_from_platform() {
             echo "debian"
             return 0
             ;;
+        "debian.9")
+            echo "debian.9"
+            return 0
+            ;;
         "fedora.23")
             echo "fedora.23"
             return 0
             ;;
+        "fedora.24")
+            echo "fedora.24"
+            return 0
+            ;;
         "fedora.27")
             echo "fedora.27"
             return 0
             ;;
-        "fedora.24")
-            echo "fedora.24"
+        "fedora.28")
+            echo "fedora.28"
             return 0
             ;;
         "opensuse.13.2")
@@ -127,6 +135,31 @@ get_legacy_os_name_from_platform() {
     return 1
 }
 
+get_legacy_os_name() {
+    eval $invocation
+
+    local uname=$(uname)
+    if [ "$uname" = "Darwin" ]; then
+        echo "osx"
+        return 0
+    elif [ -n "$runtime_id" ]; then
+        echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
+        return 0
+    else
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+            os=$(get_legacy_os_name_from_platform "$ID${VERSION_ID:+.${VERSION_ID}}" || echo "")
+            if [ -n "$os" ]; then
+                echo "$os"
+                return 0
+            fi
+        fi
+    fi
+
+    say_verbose "Distribution specific OS name and version could not be detected: UName = $uname"
+    return 1
+}
+
 get_linux_platform_name() {
     eval $invocation
 
@@ -136,11 +169,11 @@ get_linux_platform_name() {
     else
         if [ -e /etc/os-release ]; then
             . /etc/os-release
-            echo "$ID.$VERSION_ID"
+            echo "$ID${VERSION_ID:+.${VERSION_ID}}"
             return 0
         elif [ -e /etc/redhat-release ]; then
             local redhatRelease=$(</etc/redhat-release)
-            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
+            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux "*" release 6."* ]]; then
                 echo "rhel.6"
                 return 0
             fi
@@ -151,6 +184,10 @@ get_linux_platform_name() {
     return 1
 }
 
+is_musl_based_distro() {
+    (ldd --version 2>&1 || true) | grep -q musl
+}
+
 get_current_os_name() {
     eval $invocation
 
@@ -158,14 +195,20 @@ get_current_os_name() {
     if [ "$uname" = "Darwin" ]; then
         echo "osx"
         return 0
+    elif [ "$uname" = "FreeBSD" ]; then
+        echo "freebsd"
+        return 0
     elif [ "$uname" = "Linux" ]; then
-        local linux_platform_name
-        linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; }
+        local linux_platform_name=""
+        linux_platform_name="$(get_linux_platform_name)" || true
 
-        if [[ $linux_platform_name == "rhel.6" ]]; then
+        if [ "$linux_platform_name" = "rhel.6" ]; then
             echo $linux_platform_name
             return 0
-        elif [[ $linux_platform_name == alpine* ]]; then
+        elif is_musl_based_distro; then
+            echo "linux-musl"
+            return 0
+        elif [ "$linux_platform_name" = "linux-musl" ]; then
             echo "linux-musl"
             return 0
         else
@@ -178,39 +221,13 @@ get_current_os_name() {
     return 1
 }
 
-get_legacy_os_name() {
-    eval $invocation
-
-    local uname=$(uname)
-    if [ "$uname" = "Darwin" ]; then
-        echo "osx"
-        return 0
-    elif [ -n "$runtime_id" ]; then
-        echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
-        return 0
-    else
-        if [ -e /etc/os-release ]; then
-            . /etc/os-release
-            os=$(get_legacy_os_name_from_platform "$ID.$VERSION_ID" || echo "")
-            if [ -n "$os" ]; then
-                echo "$os"
-                return 0
-            fi
-        fi
-    fi
-
-    say_verbose "Distribution specific OS name and version could not be detected: UName = $uname"
-    return 1
-}
-
 machine_has() {
     eval $invocation
 
-    hash "$1" > /dev/null 2>&1
+    command -v "$1" > /dev/null 2>&1
     return $?
 }
 
-
 check_min_reqs() {
     local hasMinimum=false
     if machine_has "curl"; then
@@ -226,33 +243,6 @@ check_min_reqs() {
     return 0
 }
 
-check_pre_reqs() {
-    eval $invocation
-
-    if [ "${DOTNET_INSTALL_SKIP_PREREQS:-}" = "1" ]; then
-        return 0
-    fi
-
-    if [ "$(uname)" = "Linux" ]; then
-        if [ ! -x "$(command -v ldconfig)" ]; then
-            echo "ldconfig is not in PATH, trying /sbin/ldconfig."
-            LDCONFIG_COMMAND="/sbin/ldconfig"
-        else
-            LDCONFIG_COMMAND="ldconfig"
-        fi
-
-        local librarypath=${LD_LIBRARY_PATH:-}
-        LDCONFIG_COMMAND="$LDCONFIG_COMMAND -NXv ${librarypath//:/ }"
-
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libunwind)" ] && say_warning "Unable to locate libunwind. Probable prerequisite missing; please install libunwind."
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libssl)" ] && say_warning "Unable to locate libssl. Probable prerequisite missing; please install libssl."
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libicu)" ] && say_warning "Unable to locate libicu. Probable prerequisite missing; please install libicu."
-        [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep -F libcurl.so)" ] && say_warning "Unable to locate libcurl. Probable prerequisite missing; please install libcurl."
-    fi
-
-    return 0
-}
-
 # args:
 # input - $1
 to_lowercase() {
@@ -308,14 +298,18 @@ get_machine_architecture() {
     if command -v uname > /dev/null; then
         CPUName=$(uname -m)
         case $CPUName in
-        armv7l)
+        armv*l)
             echo "arm"
             return 0
             ;;
-        aarch64)
+        aarch64|arm64)
             echo "arm64"
             return 0
             ;;
+        s390x)
+            echo "s390x"
+            return 0
+            ;;
         esac
     fi
 
@@ -330,11 +324,13 @@ get_normalized_architecture_from_architecture() {
     eval $invocation
 
     local architecture="$(to_lowercase "$1")"
+
+    if [[ $architecture == \<auto\> ]]; then
+        echo "$(get_machine_architecture)"
+        return 0
+    fi
+
     case "$architecture" in
-        \<auto\>)
-            echo "$(get_normalized_architecture_from_architecture "$(get_machine_architecture)")"
-            return 0
-            ;;
         amd64|x64)
             echo "x64"
             return 0
@@ -347,32 +343,177 @@ get_normalized_architecture_from_architecture() {
             echo "arm64"
             return 0
             ;;
+        s390x)
+            echo "s390x"
+            return 0
+            ;;
     esac
 
-    say_err "Architecture \`$architecture\` not supported. If you think this is a bug, please report it at https://github.com/dotnet/cli/issues"
+    say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
     return 1
 }
 
-# version_info is a conceptual two line string representing commit hash and 4-part version
-# format:
-# Line 1: # commit_hash
-# Line 2: # 4-part version
+# args:
+# version - $1
+# channel - $2
+# architecture - $3
+get_normalized_architecture_for_specific_sdk_version() {
+    eval $invocation
+
+    local is_version_support_arm64="$(is_arm64_supported "$1")"
+    local is_channel_support_arm64="$(is_arm64_supported "$2")"
+    local architecture="$3";
+    local osname="$(get_current_os_name)"
+
+    if [ "$osname" == "osx" ] && [ "$architecture" == "arm64" ] && { [ "$is_version_support_arm64" = false ] || [ "$is_channel_support_arm64" = false ]; }; then
+        #check if rosetta is installed
+        if [ "$(/usr/bin/pgrep oahd >/dev/null 2>&1;echo $?)" -eq 0 ]; then 
+            say_verbose "Changing user architecture from '$architecture' to 'x64' because .NET SDKs prior to version 6.0 do not support arm64." 
+            echo "x64"
+            return 0;
+        else
+            say_err "Architecture \`$architecture\` is not supported for .NET SDK version \`$version\`. Please install Rosetta to allow emulation of the \`$architecture\` .NET SDK on this platform"
+            return 1
+        fi
+    fi
+
+    echo "$architecture"
+    return 0
+}
 
 # args:
-# version_text - stdin
-get_version_from_version_info() {
+# version or channel - $1
+is_arm64_supported() {
+    #any channel or version that starts with the specified versions
+    case "$1" in
+        ( "1"* | "2"* | "3"*  | "4"* | "5"*) 
+            echo false
+            return 0
+    esac
+
+    echo true
+    return 0
+}
+
+# args:
+# user_defined_os - $1
+get_normalized_os() {
     eval $invocation
 
-    cat | tail -n 1 | sed 's/\r$//'
+    local osname="$(to_lowercase "$1")"
+    if [ ! -z "$osname" ]; then
+        case "$osname" in
+            osx | freebsd | rhel.6 | linux-musl | linux)
+                echo "$osname"
+                return 0
+                ;;
+            *)
+                say_err "'$user_defined_os' is not a supported value for --os option, supported values are: osx, linux, linux-musl, freebsd, rhel.6. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                return 1
+                ;;
+        esac
+    else
+        osname="$(get_current_os_name)" || return 1
+    fi
+    echo "$osname"
+    return 0
+}
+
+# args:
+# quality - $1
+get_normalized_quality() {
+    eval $invocation
+
+    local quality="$(to_lowercase "$1")"
+    if [ ! -z "$quality" ]; then
+        case "$quality" in
+            daily | signed | validated | preview)
+                echo "$quality"
+                return 0
+                ;;
+            ga)
+                #ga quality is available without specifying quality, so normalizing it to empty
+                return 0
+                ;;
+            *)
+                say_err "'$quality' is not a supported value for --quality option. Supported values are: daily, signed, validated, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                return 1
+                ;;
+        esac
+    fi
+    return 0
+}
+
+# args:
+# channel - $1
+get_normalized_channel() {
+    eval $invocation
+
+    local channel="$(to_lowercase "$1")"
+
+    if [[ $channel == current ]]; then
+        say_warning 'Value "Current" is deprecated for -Channel option. Use "STS" instead.'
+    fi
+
+    if [[ $channel == release/* ]]; then
+        say_warning 'Using branch name with -Channel option is no longer supported with newer releases. Use -Quality option with a channel in X.Y format instead.';
+    fi
+
+    if [ ! -z "$channel" ]; then
+        case "$channel" in
+            lts)
+                echo "LTS"
+                return 0
+                ;;
+            sts)
+                echo "STS"
+                return 0
+                ;;
+            current)
+                echo "STS"
+                return 0
+                ;;
+            *)
+                echo "$channel"
+                return 0
+                ;;
+        esac
+    fi
+
+    return 0
+}
+
+# args:
+# runtime - $1
+get_normalized_product() {
+    eval $invocation
+
+    local product=""
+    local runtime="$(to_lowercase "$1")"
+    if [[ "$runtime" == "dotnet" ]]; then
+        product="dotnet-runtime"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        product="aspnetcore-runtime"
+    elif [ -z "$runtime" ]; then
+        product="dotnet-sdk"
+    fi
+    echo "$product"
     return 0
 }
 
+# The version text returned from the feeds is a 1-line or 2-line string:
+# For the SDK and the dotnet runtime (2 lines):
+# Line 1: # commit_hash
+# Line 2: # 4-part version
+# For the aspnetcore runtime (1 line):
+# Line 1: # 4-part version
+
 # args:
 # version_text - stdin
-get_commit_hash_from_version_info() {
+get_version_from_latestversion_file_content() {
     eval $invocation
 
-    cat | head -n 1 | sed 's/\r$//'
+    cat | tail -n 1 | sed 's/\r$//'
     return 0
 }
 
@@ -401,34 +542,68 @@ is_dotnet_package_installed() {
 # azure_feed - $1
 # channel - $2
 # normalized_architecture - $3
-# coherent - $4
-get_latest_version_info() {
+get_version_from_latestversion_file() {
     eval $invocation
 
     local azure_feed="$1"
     local channel="$2"
     local normalized_architecture="$3"
-    local coherent="$4"
 
     local version_file_url=null
     if [[ "$runtime" == "dotnet" ]]; then
-        version_file_url="$uncached_feed/Runtime/$channel/latest.version"
+        version_file_url="$azure_feed/Runtime/$channel/latest.version"
     elif [[ "$runtime" == "aspnetcore" ]]; then
-        version_file_url="$uncached_feed/aspnetcore/Runtime/$channel/latest.version"
+        version_file_url="$azure_feed/aspnetcore/Runtime/$channel/latest.version"
     elif [ -z "$runtime" ]; then
-        if [ "$coherent" = true ]; then
-            version_file_url="$uncached_feed/Sdk/$channel/latest.coherent.version"
-        else
-            version_file_url="$uncached_feed/Sdk/$channel/latest.version"
-        fi
+         version_file_url="$azure_feed/Sdk/$channel/latest.version"
     else
         say_err "Invalid value for \$runtime"
         return 1
     fi
-    say_verbose "get_latest_version_info: latest url: $version_file_url"
+    say_verbose "get_version_from_latestversion_file: latest url: $version_file_url"
 
-    download "$version_file_url"
-    return $?
+    download "$version_file_url" || return $?
+    return 0
+}
+
+# args:
+# json_file - $1
+parse_globaljson_file_for_version() {
+    eval $invocation
+
+    local json_file="$1"
+    if [ ! -f "$json_file" ]; then
+        say_err "Unable to find \`$json_file\`"
+        return 1
+    fi
+
+    sdk_section=$(cat $json_file | tr -d "\r" | awk '/"sdk"/,/}/')
+    if [ -z "$sdk_section" ]; then
+        say_err "Unable to parse the SDK node in \`$json_file\`"
+        return 1
+    fi
+
+    sdk_list=$(echo $sdk_section | awk -F"[{}]" '{print $2}')
+    sdk_list=${sdk_list//[\" ]/}
+    sdk_list=${sdk_list//,/$'\n'}
+
+    local version_info=""
+    while read -r line; do
+      IFS=:
+      while read -r key value; do
+        if [[ "$key" == "version" ]]; then
+          version_info=$value
+        fi
+      done <<< "$line"
+    done <<< "$sdk_list"
+    if [ -z "$version_info" ]; then
+        say_err "Unable to find the SDK:version node in \`$json_file\`"
+        return 1
+    fi
+
+    unset IFS;
+    echo "$version_info"
+    return 0
 }
 
 # args:
@@ -436,6 +611,7 @@ get_latest_version_info() {
 # channel - $2
 # normalized_architecture - $3
 # version - $4
+# json_file - $5
 get_specific_version_from_version() {
     eval $invocation
 
@@ -443,27 +619,25 @@ get_specific_version_from_version() {
     local channel="$2"
     local normalized_architecture="$3"
     local version="$(to_lowercase "$4")"
+    local json_file="$5"
 
-    case "$version" in
-        latest)
-            local version_info
-            version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1
-            say_verbose "get_specific_version_from_version: version_info=$version_info"
-            echo "$version_info" | get_version_from_version_info
-            return 0
-            ;;
-        coherent)
+    if [ -z "$json_file" ]; then
+        if [[ "$version" == "latest" ]]; then
             local version_info
-            version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" true)" || return 1
+            version_info="$(get_version_from_latestversion_file "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1
             say_verbose "get_specific_version_from_version: version_info=$version_info"
-            echo "$version_info" | get_version_from_version_info
+            echo "$version_info" | get_version_from_latestversion_file_content
             return 0
-            ;;
-        *)
+        else
             echo "$version"
             return 0
-            ;;
-    esac
+        fi
+    else
+        local version_info
+        version_info="$(parse_globaljson_file_for_version "$json_file")" || return 1
+        echo "$version_info"
+        return 0
+    fi
 }
 
 # args:
@@ -471,6 +645,7 @@ get_specific_version_from_version() {
 # channel - $2
 # normalized_architecture - $3
 # specific_version - $4
+# normalized_os - $5
 construct_download_link() {
     eval $invocation
 
@@ -478,17 +653,16 @@ construct_download_link() {
     local channel="$2"
     local normalized_architecture="$3"
     local specific_version="${4//[$'\t\r\n']}"
-
-    local osname
-    osname="$(get_current_os_name)" || return 1
+    local specific_product_version="$(get_specific_product_version "$1" "$4")"
+    local osname="$5"
 
     local download_link=null
     if [[ "$runtime" == "dotnet" ]]; then
-        download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_version-$osname-$normalized_architecture.tar.gz"
+        download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz"
     elif [[ "$runtime" == "aspnetcore" ]]; then
-        download_link="$azure_feed/aspnetcore/Runtime/$specific_version/aspnetcore-runtime-$specific_version-$osname-$normalized_architecture.tar.gz"
+        download_link="$azure_feed/aspnetcore/Runtime/$specific_version/aspnetcore-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz"
     elif [ -z "$runtime" ]; then
-        download_link="$azure_feed/Sdk/$specific_version/dotnet-sdk-$specific_version-$osname-$normalized_architecture.tar.gz"
+        download_link="$azure_feed/Sdk/$specific_version/dotnet-sdk-$specific_product_version-$osname-$normalized_architecture.tar.gz"
     else
         return 1
     fi
@@ -497,6 +671,140 @@ construct_download_link() {
     return 0
 }
 
+# args:
+# azure_feed - $1
+# specific_version - $2
+# download link - $3 (optional)
+get_specific_product_version() {
+    # If we find a 'productVersion.txt' at the root of any folder, we'll use its contents
+    # to resolve the version of what's in the folder, superseding the specified version.
+    # if 'productVersion.txt' is missing but download link is already available, product version will be taken from download link
+    eval $invocation
+
+    local azure_feed="$1"
+    local specific_version="${2//[$'\t\r\n']}"
+    local package_download_link=""
+    if [ $# -gt 2  ]; then
+        local package_download_link="$3"
+    fi
+    local specific_product_version=null
+
+    # Try to get the version number, using the productVersion.txt file located next to the installer file.
+    local download_links=($(get_specific_product_version_url "$azure_feed" "$specific_version" true "$package_download_link")
+        $(get_specific_product_version_url "$azure_feed" "$specific_version" false "$package_download_link"))
+
+    for download_link in "${download_links[@]}"
+    do
+        say_verbose "Checking for the existence of $download_link"
+
+        if machine_has "curl"
+        then
+            if ! specific_product_version=$(curl -s --fail "${download_link}${feed_credential}" 2>&1); then
+                continue
+            else
+                echo "${specific_product_version//[$'\t\r\n']}"
+                return 0
+            fi
+
+        elif machine_has "wget"
+        then
+            specific_product_version=$(wget -qO- "${download_link}${feed_credential}" 2>&1)
+            if [ $? = 0 ]; then
+                echo "${specific_product_version//[$'\t\r\n']}"
+                return 0
+            fi
+        fi
+    done
+    
+    # Getting the version number with productVersion.txt has failed. Try parsing the download link for a version number.
+    say_verbose "Failed to get the version using productVersion.txt file. Download link will be parsed instead."
+    specific_product_version="$(get_product_specific_version_from_download_link "$package_download_link" "$specific_version")"
+    echo "${specific_product_version//[$'\t\r\n']}"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# specific_version - $2
+# is_flattened - $3
+# download link - $4 (optional)
+get_specific_product_version_url() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local specific_version="$2"
+    local is_flattened="$3"
+    local package_download_link=""
+    if [ $# -gt 3  ]; then
+        local package_download_link="$4"
+    fi
+
+    local pvFileName="productVersion.txt"
+    if [ "$is_flattened" = true ]; then
+        if [ -z "$runtime" ]; then
+            pvFileName="sdk-productVersion.txt"
+        elif [[ "$runtime" == "dotnet" ]]; then
+            pvFileName="runtime-productVersion.txt"
+        else
+            pvFileName="$runtime-productVersion.txt"
+        fi
+    fi
+
+    local download_link=null
+
+    if [ -z "$package_download_link" ]; then
+        if [[ "$runtime" == "dotnet" ]]; then
+            download_link="$azure_feed/Runtime/$specific_version/${pvFileName}"
+        elif [[ "$runtime" == "aspnetcore" ]]; then
+            download_link="$azure_feed/aspnetcore/Runtime/$specific_version/${pvFileName}"
+        elif [ -z "$runtime" ]; then
+            download_link="$azure_feed/Sdk/$specific_version/${pvFileName}"
+        else
+            return 1
+        fi
+    else
+        download_link="${package_download_link%/*}/${pvFileName}"
+    fi
+
+    say_verbose "Constructed productVersion link: $download_link"
+    echo "$download_link"
+    return 0
+}
+
+# args:
+# download link - $1
+# specific version - $2
+get_product_specific_version_from_download_link()
+{
+    eval $invocation
+
+    local download_link="$1"
+    local specific_version="$2"
+    local specific_product_version="" 
+
+    if [ -z "$download_link" ]; then
+        echo "$specific_version"
+        return 0
+    fi
+
+    #get filename
+    filename="${download_link##*/}"
+
+    #product specific version follows the product name
+    #for filename 'dotnet-sdk-3.1.404-linux-x64.tar.gz': the product version is 3.1.404
+    IFS='-'
+    read -ra filename_elems <<< "$filename"
+    count=${#filename_elems[@]}
+    if [[ "$count" -gt 2 ]]; then
+        specific_product_version="${filename_elems[2]}"
+    else
+        specific_product_version=$specific_version
+    fi
+    unset IFS;
+    echo "$specific_product_version"
+    return 0
+}
+
 # args:
 # azure_feed - $1
 # channel - $2
@@ -554,24 +862,6 @@ resolve_installation_path() {
     return 0
 }
 
-# args:
-# install_root - $1
-get_installed_version_info() {
-    eval $invocation
-
-    local install_root="$1"
-    local version_file="$(combine_paths "$install_root" "$local_version_file_relative_path")"
-    say_verbose "Local version file: $version_file"
-    if [ ! -z "$version_file" ] | [ -r "$version_file" ]; then
-        local version_info="$(cat "$version_file")"
-        echo "$version_info"
-        return 0
-    fi
-
-    say_verbose "Local version file not found."
-    return 0
-}
-
 # args:
 # relative_or_absolute_path - $1
 get_absolute_path() {
@@ -596,7 +886,7 @@ copy_files_or_dirs_from_list() {
     local osname="$(get_current_os_name)"
     local override_switch=$(
         if [ "$override" = false ]; then
-            if [[ "$osname" == "linux-musl" ]]; then
+            if [ "$osname" = "linux-musl" ]; then
                 printf -- "-u";
             else
                 printf -- "-n";
@@ -608,6 +898,9 @@ copy_files_or_dirs_from_list() {
         local target="$out_path/$path"
         if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then
             mkdir -p "$out_path/$(dirname "$path")"
+            if [ -d "$target" ]; then
+                rm -rf "$target"
+            fi
             cp -R $override_switch "$root_path/$path" "$target"
         fi
     done
@@ -632,11 +925,84 @@ extract_dotnet_package() {
     find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
 
     rm -rf "$temp_out_path"
+    rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
 
     if [ "$failed" = true ]; then
         say_err "Extraction failed"
         return 1
     fi
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header()
+{
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+
+    local failed=false
+    local response
+    if machine_has "curl"; then
+        get_http_header_curl $remote_path $disable_feed_credential || failed=true
+    elif machine_has "wget"; then
+        get_http_header_wget $remote_path $disable_feed_credential || failed=true
+    else
+        failed=true
+    fi
+    if [ "$failed" = true ]; then
+        say_verbose "Failed to get HTTP header: '$remote_path'."
+        return 1
+    fi
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header_curl() {
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+
+    remote_path_with_credential="$remote_path"
+    if [ "$disable_feed_credential" = false ]; then
+        remote_path_with_credential+="$feed_credential"
+    fi
+
+    curl_options="-I -sSL --retry 5 --retry-delay 2 --connect-timeout 15 "
+    curl $curl_options "$remote_path_with_credential" 2>&1 || return 1
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header_wget() {
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+    local wget_options="-q -S --spider --tries 5 "
+
+    local wget_options_extra=''
+
+    # Test for options that aren't supported on all wget implementations.
+    if [[ $(wget -h 2>&1 | grep -E 'waitretry|connect-timeout') ]]; then
+        wget_options_extra="--waitretry 2 --connect-timeout 15 "
+    else
+        say "wget extra options are unavailable for this environment"
+    fi
+
+    remote_path_with_credential="$remote_path"
+    if [ "$disable_feed_credential" = false ]; then
+        remote_path_with_credential+="$feed_credential"
+    fi
+
+    wget $wget_options $wget_options_extra "$remote_path_with_credential" 2>&1
+
+    return $?
 }
 
 # args:
@@ -654,13 +1020,28 @@ download() {
     fi
 
     local failed=false
-    if machine_has "curl"; then
-        downloadcurl "$remote_path" "$out_path" || failed=true
-    elif machine_has "wget"; then
-        downloadwget "$remote_path" "$out_path" || failed=true
-    else
-        failed=true
-    fi
+    local attempts=0
+    while [ $attempts -lt 3 ]; do
+        attempts=$((attempts+1))
+        failed=false
+        if machine_has "curl"; then
+            downloadcurl "$remote_path" "$out_path" || failed=true
+        elif machine_has "wget"; then
+            downloadwget "$remote_path" "$out_path" || failed=true
+        else
+            say_err "Missing dependency: neither curl nor wget was found."
+            exit 1
+        fi
+
+        if [ "$failed" = false ] || [ $attempts -ge 3 ] || { [ ! -z $http_code ] && [ $http_code = "404" ]; }; then
+            break
+        fi
+
+        say "Download attempt #$attempts has failed: $http_code $download_error_msg"
+        say "Attempt #$((attempts+1)) will start in $((attempts*10)) seconds."
+        sleep $((attempts*10))
+    done
+
     if [ "$failed" = true ]; then
         say_verbose "Download failed: $remote_path"
         return 1
@@ -668,82 +1049,357 @@ download() {
     return 0
 }
 
+# Updates global variables $http_code and $download_error_msg
 downloadcurl() {
     eval $invocation
+    unset http_code
+    unset download_error_msg
     local remote_path="$1"
     local out_path="${2:-}"
-
     # Append feed_credential as late as possible before calling curl to avoid logging feed_credential
-    remote_path="${remote_path}${feed_credential}"
-
-    local failed=false
+    # Avoid passing URI with credentials to functions: note, most of them echoing parameters of invocation in verbose output.
+    local remote_path_with_credential="${remote_path}${feed_credential}"
+    local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs "
+    local curl_exit_code=0;
     if [ -z "$out_path" ]; then
-        curl --retry 10 -sSL -f --create-dirs "$remote_path" || failed=true
+        curl $curl_options "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
     else
-        curl --retry 10 -sSL -f --create-dirs -o "$out_path" "$remote_path" || failed=true
+        curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
     fi
-    if [ "$failed" = true ]; then
-        say_verbose "Curl download failed"
+    
+    if [ $curl_exit_code -gt 0 ]; then
+        download_error_msg="Unable to download $remote_path."
+        # Check for curl timeout codes
+        if [[ $curl_exit_code == 7 || $curl_exit_code == 28 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
+        else
+            local disable_feed_credential=false
+            local response=$(get_http_header_curl $remote_path $disable_feed_credential)
+            http_code=$( echo "$response" | awk '/^HTTP/{print $2}' | tail -1 )
+            if  [[ ! -z $http_code && $http_code != 2* ]]; then
+                download_error_msg+=" Returned HTTP status code: $http_code."
+            fi
+        fi
+        say_verbose "$download_error_msg"
         return 1
     fi
     return 0
 }
 
+
+# Updates global variables $http_code and $download_error_msg
 downloadwget() {
     eval $invocation
+    unset http_code
+    unset download_error_msg
     local remote_path="$1"
     local out_path="${2:-}"
-
     # Append feed_credential as late as possible before calling wget to avoid logging feed_credential
-    remote_path="${remote_path}${feed_credential}"
+    local remote_path_with_credential="${remote_path}${feed_credential}"
+    local wget_options="--tries 20 "
+
+    local wget_options_extra=''
+    local wget_result=''
+
+    # Test for options that aren't supported on all wget implementations.
+    if [[ $(wget -h 2>&1 | grep -E 'waitretry|connect-timeout') ]]; then
+        wget_options_extra="--waitretry 2 --connect-timeout 15 "
+    else
+        say "wget extra options are unavailable for this environment"
+    fi
 
-    local failed=false
     if [ -z "$out_path" ]; then
-        wget -q --tries 10 -O - "$remote_path" || failed=true
+        wget -q $wget_options $wget_options_extra -O - "$remote_path_with_credential" 2>&1
+        wget_result=$?
     else
-        wget --tries 10 -O "$out_path" "$remote_path" || failed=true
+        wget $wget_options $wget_options_extra -O "$out_path" "$remote_path_with_credential" 2>&1
+        wget_result=$?
     fi
-    if [ "$failed" = true ]; then
-        say_verbose "Wget download failed"
+
+    if [[ $wget_result != 0 ]]; then
+        local disable_feed_credential=false
+        local response=$(get_http_header_wget $remote_path $disable_feed_credential)
+        http_code=$( echo "$response" | awk '/^  HTTP/{print $2}' | tail -1 )
+        download_error_msg="Unable to download $remote_path."
+        if  [[ ! -z $http_code && $http_code != 2* ]]; then
+            download_error_msg+=" Returned HTTP status code: $http_code."
+        # wget exit code 4 stands for network-issue
+        elif [[ $wget_result == 4 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
+        fi
+        say_verbose "$download_error_msg"
         return 1
     fi
+
     return 0
 }
 
-calculate_vars() {
+get_download_link_from_aka_ms() {
     eval $invocation
-    valid_legacy_download_link=true
 
-    normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")"
-    say_verbose "normalized_architecture=$normalized_architecture"
+    #quality is not supported for LTS or STS channel
+    #STS maps to current
+    if [[ ! -z "$normalized_quality"  && ("$normalized_channel" == "LTS" || "$normalized_channel" == "STS") ]]; then
+        normalized_quality=""
+        say_warning "Specifying quality for STS or LTS channel is not supported, the quality will be ignored."
+    fi
 
-    specific_version="$(get_specific_version_from_version "$azure_feed" "$channel" "$normalized_architecture" "$version")"
-    say_verbose "specific_version=$specific_version"
-    if [ -z "$specific_version" ]; then
-        say_err "Could not get version information."
+    say_verbose "Retrieving primary payload URL from aka.ms for channel: '$normalized_channel', quality: '$normalized_quality', product: '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'." 
+
+    #construct aka.ms link
+    aka_ms_link="https://aka.ms/dotnet"
+    if  [ "$internal" = true ]; then
+        aka_ms_link="$aka_ms_link/internal"
+    fi
+    aka_ms_link="$aka_ms_link/$normalized_channel"
+    if [[ ! -z "$normalized_quality" ]]; then
+        aka_ms_link="$aka_ms_link/$normalized_quality"
+    fi
+    aka_ms_link="$aka_ms_link/$normalized_product-$normalized_os-$normalized_architecture.tar.gz"
+    say_verbose "Constructed aka.ms link: '$aka_ms_link'."
+
+    #get HTTP response
+    #do not pass credentials as a part of the $aka_ms_link and do not apply credentials in the get_http_header function
+    #otherwise the redirect link would have credentials as well
+    #it would result in applying credentials twice to the resulting link and thus breaking it, and in echoing credentials to the output as a part of redirect link
+    disable_feed_credential=true
+    response="$(get_http_header $aka_ms_link $disable_feed_credential)"
+
+    say_verbose "Received response: $response"
+    # Get results of all the redirects.
+    http_codes=$( echo "$response" | awk '$1 ~ /^HTTP/ {print $2}' )
+    # They all need to be 301, otherwise some links are broken (except for the last, which is not a redirect but 200 or 404).
+    broken_redirects=$( echo "$http_codes" | sed '$d' | grep -v '301' )
+
+    # All HTTP codes are 301 (Moved Permanently), the redirect link exists.
+    if [[ -z "$broken_redirects" ]]; then
+        aka_ms_download_link=$( echo "$response" | awk '$1 ~ /^Location/{print $2}' | tail -1 | tr -d '\r')
+
+        if [[ -z "$aka_ms_download_link" ]]; then
+            say_verbose "The aka.ms link '$aka_ms_link' is not valid: failed to get redirect location."
+            return 1
+        fi
+
+        say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
+        return 0
+    else
+        say_verbose "The aka.ms link '$aka_ms_link' is not valid: received HTTP code: $(echo "$broken_redirects" | paste -sd "," -)."
         return 1
     fi
+}
+
+get_feeds_to_use()
+{
+    feeds=(
+    "https://dotnetcli.azureedge.net/dotnet"
+    "https://dotnetbuilds.azureedge.net/public"
+    )
+
+    if [[ -n "$azure_feed" ]]; then
+        feeds=("$azure_feed")
+    fi
 
-    download_link="$(construct_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")"
-    say_verbose "download_link=$download_link"
+    if [[ "$no_cdn" == "true" ]]; then
+        feeds=(
+        "https://dotnetcli.blob.core.windows.net/dotnet"
+        "https://dotnetbuilds.blob.core.windows.net/public"
+        )
+
+        if [[ -n "$uncached_feed" ]]; then
+            feeds=("$uncached_feed")
+        fi
+    fi
+}
 
-    legacy_download_link="$(construct_legacy_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false
+# THIS FUNCTION MAY EXIT (if the determined version is already installed).
+generate_download_links() {
+
+    download_links=()
+    specific_versions=()
+    effective_versions=()
+    link_types=()
+
+    # If generate_akams_links returns false, no fallback to old links. Just terminate.
+    # This function may also 'exit' (if the determined version is already installed).
+    generate_akams_links || return
+
+    # Check other feeds only if we haven't been able to find an aka.ms link.
+    if [[ "${#download_links[@]}" -lt 1 ]]; then
+        for feed in ${feeds[@]}
+        do
+            # generate_regular_links may also 'exit' (if the determined version is already installed).
+            generate_regular_links $feed || return
+        done
+    fi
+
+    if [[ "${#download_links[@]}" -eq 0 ]]; then
+        say_err "Failed to resolve the exact version number."
+        return 1
+    fi
+
+    say_verbose "Generated ${#download_links[@]} links."
+    for link_index in ${!download_links[@]}
+    do
+        say_verbose "Link $link_index: ${link_types[$link_index]}, ${effective_versions[$link_index]}, ${download_links[$link_index]}"
+    done
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed).
+generate_akams_links() {
+    local valid_aka_ms_link=true;
+
+    normalized_version="$(to_lowercase "$version")"
+    if [[ "$normalized_version" != "latest" ]] && [ -n "$normalized_quality" ]; then
+        say_err "Quality and Version options are not allowed to be specified simultaneously. See https://learn.microsoft.com/dotnet/core/tools/dotnet-install-script#options for details."
+        return 1
+    fi
+
+    if [[ -n "$json_file" || "$normalized_version" != "latest" ]]; then
+        # aka.ms links are not needed when exact version is specified via command or json file
+        return
+    fi
+
+    get_download_link_from_aka_ms || valid_aka_ms_link=false
+
+    if [[ "$valid_aka_ms_link" == true ]]; then
+        say_verbose "Retrieved primary payload URL from aka.ms link: '$aka_ms_download_link'."
+        say_verbose "Downloading using legacy url will not be attempted."
+
+        download_link=$aka_ms_download_link
+
+        #get version from the path
+        IFS='/'
+        read -ra pathElems <<< "$download_link"
+        count=${#pathElems[@]}
+        specific_version="${pathElems[count-2]}"
+        unset IFS;
+        say_verbose "Version: '$specific_version'."
+
+        #Retrieve effective version
+        effective_version="$(get_specific_product_version "$azure_feed" "$specific_version" "$download_link")"
+
+        # Add link info to arrays
+        download_links+=($download_link)
+        specific_versions+=($specific_version)
+        effective_versions+=($effective_version)
+        link_types+=("aka.ms")
+
+        #  Check if the SDK version is already installed.
+        if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+            say "$asset_name with version '$effective_version' is already installed."
+            exit 0
+        fi
+
+        return 0
+    fi
+
+    # if quality is specified - exit with error - there is no fallback approach
+    if [ ! -z "$normalized_quality" ]; then
+        say_err "Failed to locate the latest version in the channel '$normalized_channel' with '$normalized_quality' quality for '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'."
+        say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support."
+        return 1
+    fi
+    say_verbose "Falling back to latest.version file approach."
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed)
+# args:
+# feed - $1
+generate_regular_links() {
+    local feed="$1"
+    local valid_legacy_download_link=true
+
+    specific_version=$(get_specific_version_from_version "$feed" "$channel" "$normalized_architecture" "$version" "$json_file") || specific_version='0'
+
+    if [[ "$specific_version" == '0' ]]; then
+        say_verbose "Failed to resolve the specific version number using feed '$feed'"
+        return
+    fi
+
+    effective_version="$(get_specific_product_version "$feed" "$specific_version")"
+    say_verbose "specific_version=$specific_version"
+
+    download_link="$(construct_download_link "$feed" "$channel" "$normalized_architecture" "$specific_version" "$normalized_os")"
+    say_verbose "Constructed primary named payload URL: $download_link"
+
+    # Add link info to arrays
+    download_links+=($download_link)
+    specific_versions+=($specific_version)
+    effective_versions+=($effective_version)
+    link_types+=("primary")
+
+    legacy_download_link="$(construct_legacy_download_link "$feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false
 
     if [ "$valid_legacy_download_link" = true ]; then
-        say_verbose "legacy_download_link=$legacy_download_link"
+        say_verbose "Constructed legacy named payload URL: $legacy_download_link"
+    
+        download_links+=($legacy_download_link)
+        specific_versions+=($specific_version)
+        effective_versions+=($effective_version)
+        link_types+=("legacy")
     else
+        legacy_download_link=""
         say_verbose "Cound not construct a legacy_download_link; omitting..."
     fi
 
-    install_root="$(resolve_installation_path "$install_dir")"
-    say_verbose "install_root=$install_root"
+    #  Check if the SDK version is already installed.
+    if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+        say "$asset_name with version '$effective_version' is already installed."
+        exit 0
+    fi
 }
 
-install_dotnet() {
+print_dry_run() {
+
+    say "Payload URLs:"
+
+    for link_index in "${!download_links[@]}"
+        do
+            say "URL #$link_index - ${link_types[$link_index]}: ${download_links[$link_index]}"
+    done
+
+    resolved_version=${specific_versions[0]}
+    repeatable_command="./$script_name --version "\""$resolved_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\"" --os "\""$normalized_os"\"""
+    
+    if [ ! -z "$normalized_quality" ]; then
+        repeatable_command+=" --quality "\""$normalized_quality"\"""
+    fi
+
+    if [[ "$runtime" == "dotnet" ]]; then
+        repeatable_command+=" --runtime "\""dotnet"\"""
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        repeatable_command+=" --runtime "\""aspnetcore"\"""
+    fi
+
+    repeatable_command+="$non_dynamic_parameters"
+
+    if [ -n "$feed_credential" ]; then
+        repeatable_command+=" --feed-credential "\""<feed_credential>"\"""
+    fi
+
+    say "Repeatable invocation: $repeatable_command"
+}
+
+calculate_vars() {
     eval $invocation
-    local download_failed=false
-    local asset_name=''
-    local asset_relative_path=''
+
+    script_name=$(basename "$0")
+    normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")"
+    say_verbose "Normalized architecture: '$normalized_architecture'."
+    normalized_os="$(get_normalized_os "$user_defined_os")"
+    say_verbose "Normalized OS: '$normalized_os'."
+    normalized_quality="$(get_normalized_quality "$quality")"
+    say_verbose "Normalized quality: '$normalized_quality'."
+    normalized_channel="$(get_normalized_channel "$channel")"
+    say_verbose "Normalized channel: '$normalized_channel'."
+    normalized_product="$(get_normalized_product "$runtime")"
+    say_verbose "Normalized product: '$normalized_product'."
+    install_root="$(resolve_installation_path "$install_dir")"
+    say_verbose "InstallRoot: '$install_root'."
+
+    normalized_architecture="$(get_normalized_architecture_for_specific_sdk_version "$version" "$normalized_channel" "$normalized_architecture")"
 
     if [[ "$runtime" == "dotnet" ]]; then
         asset_relative_path="shared/Microsoft.NETCore.App"
@@ -754,76 +1410,110 @@ install_dotnet() {
     elif [ -z "$runtime" ]; then
         asset_relative_path="sdk"
         asset_name=".NET Core SDK"
-    else
-        say_err "Invalid value for \$runtime"
-        return 1
     fi
 
-    #  Check if the SDK version is already installed.
-    if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_version"; then
-        say "$asset_name version $specific_version is already installed."
-        return 0
-    fi
+    get_feeds_to_use
+}
+
+install_dotnet() {
+    eval $invocation
+    local download_failed=false
+    local download_completed=false
 
     mkdir -p "$install_root"
     zip_path="$(mktemp "$temporary_file_template")"
     say_verbose "Zip path: $zip_path"
 
-    say "Downloading link: $download_link"
-
-    # Failures are normal in the non-legacy case for ultimately legacy downloads.
-    # Do not output to stderr, since output to stderr is considered an error.
-    download "$download_link" "$zip_path" 2>&1 || download_failed=true
-
-    #  if the download fails, download the legacy_download_link
-    if [ "$download_failed" = true ]; then
-        say "Cannot download: $download_link"
-
-        if [ "$valid_legacy_download_link" = true ]; then
-            download_failed=false
-            download_link="$legacy_download_link"
-            zip_path="$(mktemp "$temporary_file_template")"
-            say_verbose "Legacy zip path: $zip_path"
-            say "Downloading legacy link: $download_link"
-            download "$download_link" "$zip_path" 2>&1 || download_failed=true
+    for link_index in "${!download_links[@]}"
+    do
+        download_link="${download_links[$link_index]}"
+        specific_version="${specific_versions[$link_index]}"
+        effective_version="${effective_versions[$link_index]}"
+        link_type="${link_types[$link_index]}"
+
+        say "Attempting to download using $link_type link $download_link"
+
+        # The download function will set variables $http_code and $download_error_msg in case of failure.
+        download_failed=false
+        download "$download_link" "$zip_path" 2>&1 || download_failed=true
+
+        if [ "$download_failed" = true ]; then
+            case $http_code in
+            404)
+                say "The resource at $link_type link '$download_link' is not available."
+                ;;
+            *)
+                say "Failed to download $link_type link '$download_link': $download_error_msg"
+                ;;
+            esac
+            rm -f "$zip_path" 2>&1 && say_verbose "Temporary zip file $zip_path was removed"
+        else
+            download_completed=true
+            break
         fi
-    fi
+    done
 
-    if [ "$download_failed" = true ]; then
-        say_err "Could not download $asset_name version $specific_version"
+    if [[ "$download_completed" == false ]]; then
+        say_err "Could not find \`$asset_name\` with version = $specific_version"
+        say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support"
         return 1
     fi
 
     say "Extracting zip from $download_link"
-    extract_dotnet_package "$zip_path" "$install_root"
+    extract_dotnet_package "$zip_path" "$install_root" || return 1
+
+    #  Check if the SDK version is installed; if not, fail the installation.
+    # if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed.
+    if [[ $specific_version == *"rtm"* || $specific_version == *"servicing"* ]]; then
+        IFS='-'
+        read -ra verArr <<< "$specific_version"
+        release_version="${verArr[0]}"
+        unset IFS;
+        say_verbose "Checking installation: version = $release_version"
+        if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$release_version"; then
+            say "Installed version is $effective_version"
+            return 0
+        fi
+    fi
 
-    #  Check if the SDK version is now installed; if not, fail the installation.
-    if ! is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_version"; then
-        say_err "$asset_name version $specific_version failed to install with an unknown error."
-        return 1
+    #  Check if the standard SDK version is installed.
+    say_verbose "Checking installation: version = $effective_version"
+    if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+        say "Installed version is $effective_version"
+        return 0
     fi
 
-    return 0
+    # Version verification failed. More likely something is wrong either with the downloaded content or with the verification algorithm.
+    say_err "Failed to verify the version of installed \`$asset_name\`.\nInstallation source: $download_link.\nInstallation location: $install_root.\nReport the bug at https://github.com/dotnet/install-scripts/issues."
+    say_err "\`$asset_name\` with version = $effective_version failed to install with an error."
+    return 1
 }
 
+args=("$@")
+
 local_version_file_relative_path="/.version"
 bin_folder_relative_path=""
 temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX"
 
 channel="LTS"
 version="Latest"
+json_file=""
 install_dir="<auto>"
 architecture="<auto>"
 dry_run=false
 no_path=false
 no_cdn=false
-azure_feed="https://dotnetcli.azureedge.net/dotnet"
-uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet"
+azure_feed=""
+uncached_feed=""
 feed_credential=""
 verbose=false
 runtime=""
 runtime_id=""
+quality=""
+internal=false
 override_non_versioned_files=true
+non_dynamic_parameters=""
+user_defined_os=""
 
 while [ $# -ne 0 ]
 do
@@ -837,6 +1527,14 @@ do
             shift
             version="$1"
             ;;
+        -q|--quality|-[Qq]uality)
+            shift
+            quality="$1"
+            ;;
+        --internal|-[Ii]nternal)
+            internal=true
+            non_dynamic_parameters+=" $name"
+            ;;
         -i|--install-dir|-[Ii]nstall[Dd]ir)
             shift
             install_dir="$1"
@@ -845,6 +1543,10 @@ do
             shift
             architecture="$1"
             ;;
+        --os|-[Oo][SS])
+            shift
+            user_defined_os="$1"
+            ;;
         --shared-runtime|-[Ss]hared[Rr]untime)
             say_warning "The --shared-runtime flag is obsolete and may be removed in a future version of this script. The recommended usage is to specify '--runtime dotnet'."
             if [ -z "$runtime" ]; then
@@ -856,6 +1558,9 @@ do
             runtime="$1"
             if [[ "$runtime" != "dotnet" ]] && [[ "$runtime" != "aspnetcore" ]]; then
                 say_err "Unsupported value for --runtime: '$1'. Valid values are 'dotnet' and 'aspnetcore'."
+                if [[ "$runtime" == "windowsdesktop" ]]; then
+                    say_err "WindowsDesktop archives are manufactured for Windows platforms only."
+                fi
                 exit 1
             fi
             ;;
@@ -864,31 +1569,46 @@ do
             ;;
         --no-path|-[Nn]o[Pp]ath)
             no_path=true
+            non_dynamic_parameters+=" $name"
             ;;
         --verbose|-[Vv]erbose)
             verbose=true
+            non_dynamic_parameters+=" $name"
             ;;
         --no-cdn|-[Nn]o[Cc]dn)
             no_cdn=true
+            non_dynamic_parameters+=" $name"
             ;;
         --azure-feed|-[Aa]zure[Ff]eed)
             shift
             azure_feed="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
             ;;
         --uncached-feed|-[Uu]ncached[Ff]eed)
             shift
             uncached_feed="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
             ;;
         --feed-credential|-[Ff]eed[Cc]redential)
             shift
             feed_credential="$1"
+            #feed_credential should start with "?", for it to be added to the end of the link.
+            #adding "?" at the beginning of the feed_credential if needed.
+            [[ -z "$(echo $feed_credential)" ]] || [[ $feed_credential == \?* ]] || feed_credential="?$feed_credential"
             ;;
         --runtime-id|-[Rr]untime[Ii]d)
             shift
             runtime_id="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
+            say_warning "Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead."
+            ;;
+        --jsonfile|-[Jj][Ss]on[Ff]ile)
+            shift
+            json_file="$1"
             ;;
         --skip-non-versioned-files|-[Ss]kip[Nn]on[Vv]ersioned[Ff]iles)
             override_non_versioned_files=false
+            non_dynamic_parameters+=" $name"
             ;;
         -?|--?|-h|--help|-[Hh]elp)
             script_name="$(basename "$0")"
@@ -902,47 +1622,62 @@ do
             echo "  -c,--channel <CHANNEL>         Download from the channel specified, Defaults to \`$channel\`."
             echo "      -Channel"
             echo "          Possible values:"
-            echo "          - Current - most current release"
-            echo "          - LTS - most current supported release"
+            echo "          - STS - the most recent Standard Term Support release"
+            echo "          - LTS - the most recent Long Term Support release"
             echo "          - 2-part version in a format A.B - represents a specific release"
             echo "              examples: 2.0; 1.0"
-            echo "          - Branch name"
-            echo "              examples: release/2.0.0; Master"
+            echo "          - 3-part version in a format A.B.Cxx - represents a specific SDK release"
+            echo "              examples: 5.0.1xx, 5.0.2xx."
+            echo "              Supported since 5.0 release"
+            echo "          Warning: Value 'Current' is deprecated for the Channel parameter. Use 'STS' instead."
+            echo "          Note: The version parameter overrides the channel parameter when any version other than 'latest' is used."
             echo "  -v,--version <VERSION>         Use specific VERSION, Defaults to \`$version\`."
             echo "      -Version"
             echo "          Possible values:"
-            echo "          - latest - most latest build on specific channel"
-            echo "          - coherent - most latest coherent build on specific channel"
-            echo "              coherent applies only to SDK downloads"
+            echo "          - latest - the latest build on specific channel"
             echo "          - 3-part version in a format A.B.C - represents specific version of build"
             echo "              examples: 2.0.0-preview2-006120; 1.1.0"
+            echo "  -q,--quality <quality>         Download the latest build of specified quality in the channel."
+            echo "      -Quality"
+            echo "          The possible values are: daily, signed, validated, preview, GA."
+            echo "          Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used." 
+            echo "          For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported." 
+            echo "          Supported since 5.0 release." 
+            echo "          Note: The version parameter overrides the channel parameter when any version other than 'latest' is used, and therefore overrides the quality."
+            echo "  --internal,-Internal               Download internal builds. Requires providing credentials via --feed-credential parameter."
+            echo "  --feed-credential <FEEDCREDENTIAL> Token to access Azure feed. Used as a query string to append to the Azure feed."
+            echo "      -FeedCredential                This parameter typically is not specified."
             echo "  -i,--install-dir <DIR>             Install under specified location (see Install Location below)"
             echo "      -InstallDir"
             echo "  --architecture <ARCHITECTURE>      Architecture of dotnet binaries to be installed, Defaults to \`$architecture\`."
             echo "      --arch,-Architecture,-Arch"
-            echo "          Possible values: x64, arm, and arm64"
+            echo "          Possible values: x64, arm, arm64 and s390x"
+            echo "  --os <system>                    Specifies operating system to be used when selecting the installer."
+            echo "          Overrides the OS determination approach used by the script. Supported values: osx, linux, linux-musl, freebsd, rhel.6."
+            echo "          In case any other value is provided, the platform will be determined by the script based on machine configuration."
+            echo "          Not supported for legacy links. Use --runtime-id to specify platform for legacy links."
+            echo "          Refer to: https://aka.ms/dotnet-os-lifecycle for more information."
             echo "  --runtime <RUNTIME>                Installs a shared runtime only, without the SDK."
             echo "      -Runtime"
             echo "          Possible values:"
             echo "          - dotnet     - the Microsoft.NETCore.App shared runtime"
             echo "          - aspnetcore - the Microsoft.AspNetCore.App shared runtime"
-            echo "  --skip-non-versioned-files         Skips non-versioned files if they already exist, such as the dotnet executable."
-            echo "      -SkipNonVersionedFiles"
             echo "  --dry-run,-DryRun                  Do not perform installation. Display download link."
             echo "  --no-path, -NoPath                 Do not set PATH for the current process."
             echo "  --verbose,-Verbose                 Display diagnostics information."
-            echo "  --azure-feed,-AzureFeed            Azure feed location. Defaults to $azure_feed, This parameter typically is not changed by the user."
-            echo "  --uncached-feed,-UncachedFeed      Uncached feed location. This parameter typically is not changed by the user."
+            echo "  --azure-feed,-AzureFeed            For internal use only."
+            echo "                                     Allows using a different storage to download SDK archives from."
+            echo "                                     This parameter is only used if --no-cdn is false."
+            echo "  --uncached-feed,-UncachedFeed      For internal use only."
+            echo "                                     Allows using a different storage to download SDK archives from."
+            echo "                                     This parameter is only used if --no-cdn is true."
+            echo "  --skip-non-versioned-files         Skips non-versioned files if they already exist, such as the dotnet executable."
+            echo "      -SkipNonVersionedFiles"
             echo "  --no-cdn,-NoCdn                    Disable downloading from the Azure CDN, and use the uncached feed directly."
-            echo "  --feed-credential,-FeedCredential  Azure feed shared access token. This parameter typically is not specified."
-            echo "  --runtime-id                       Installs the .NET Tools for the given platform (use linux-x64 for portable linux)."
-            echo "      -RuntimeId"
+            echo "  --jsonfile <JSONFILE>              Determines the SDK version from a user specified global.json file."
+            echo "                                     Note: global.json must have a value for 'SDK:Version'"
             echo "  -?,--?,-h,--help,-Help             Shows this help message"
             echo ""
-            echo "Obsolete parameters:"
-            echo "  --shared-runtime                   The recommended alternative is '--runtime dotnet'."
-            echo "      -SharedRuntime                 Installs just the shared runtime bits, not the entire SDK."
-            echo ""
             echo "Install Location:"
             echo "  Location is chosen in following order:"
             echo "    - --install-dir option"
@@ -959,23 +1694,31 @@ do
     shift
 done
 
-if [ "$no_cdn" = true ]; then
-    azure_feed="$uncached_feed"
+say "Note that the intended use of this script is for Continuous Integration (CI) scenarios, where:"
+say "- The SDK needs to be installed without user interaction and without admin rights."
+say "- The SDK installation doesn't need to persist across multiple CI runs."
+say "To set up a development environment or to run apps, use installers rather than this script. Visit https://dotnet.microsoft.com/download to get the installer.\n"
+
+if [ "$internal" = true ] && [ -z "$(echo $feed_credential)" ]; then
+    message="Provide credentials via --feed-credential parameter."
+    if [ "$dry_run" = true ]; then
+        say_warning "$message"
+    else
+        say_err "$message"
+        exit 1
+    fi
 fi
 
 check_min_reqs
 calculate_vars
+# generate_regular_links call below will 'exit' if the determined version is already installed.
+generate_download_links
 
-if [ "$dry_run" = true ]; then
-    say "Payload URL: $download_link"
-    if [ "$valid_legacy_download_link" = true ]; then
-        say "Legacy payload URL: $legacy_download_link"
-    fi
-    say "Repeatable invocation: ./$(basename "$0") --version $specific_version --channel $channel --install-dir $install_dir"
+if [[ "$dry_run" = true ]]; then
+    print_dry_run
     exit 0
 fi
 
-check_pre_reqs
 install_dotnet
 
 bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")"
@@ -986,4 +1729,6 @@ else
     say "Binaries of dotnet can be found in $bin_path"
 fi
 
+say "Note that the script does not resolve dependencies during installation."
+say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
 say "Installation finished successfully."
diff --git a/files/KoreBuild/scripts/invoke-repository-build.sh b/files/KoreBuild/scripts/invoke-repository-build.sh
index e5f335926..739fed80f 100755
--- a/files/KoreBuild/scripts/invoke-repository-build.sh
+++ b/files/KoreBuild/scripts/invoke-repository-build.sh
@@ -60,11 +60,14 @@ __verbose "Building $repo_path"
 
 sdk_version="$(__get_dotnet_sdk_version)"
 korebuild_version="$(__get_korebuild_version)"
-if [ "$sdk_version" != 'latest' ]; then
+if [ "$sdk_version" != 'latest' ] && [ "${KOREBUILD_KEEPGLOBALJSON:-}" != '1' ]; then
     echo "{
-    \"sdk\": {
-        \"version\": \"${sdk_version}\"
-    }
+  \"sdk\": {
+    \"version\": \"${sdk_version}\"
+  },
+  \"msbuild-sdks\": {
+    \"Internal.AspNetCore.Sdk\": \"${korebuild_version}\"
+  }
 }" > "$repo_path/global.json"
 else
     __verbose "Skipping global.json generation because the \$sdk_version = $sdk_version"
@@ -87,12 +90,11 @@ if [ ! -f "$msbuild_artifacts_dir" ]; then
 fi
 
 cat > "$msbuild_response_file" <<ENDMSBUILDARGS
-/nologo
 /m
 /nodeReuse:false
 /p:KoreBuildVersion=$korebuild_version
 /p:SuppressNETCoreSdkPreviewMessage=true
-/p:RepositoryRoot="$repo_path/"
+/p:RepoRoot="$repo_path/"
 "$msbuild_log_argument"
 "$korebuild_proj"
 ENDMSBUILDARGS
diff --git a/korebuild.json b/korebuild.json
index c402b586b..625567b87 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,4 +1,4 @@
 {
   "$schema": "./tools/korebuild.schema.json",
-  "channel": "release/2.1"
+  "channel": "main"
 }
diff --git a/modules/BuildTools.Tasks/BuildTools.Tasks.csproj b/modules/BuildTools.Tasks/BuildTools.Tasks.csproj
deleted file mode 100644
index 8b3066158..000000000
--- a/modules/BuildTools.Tasks/BuildTools.Tasks.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);BuildTools</DefineConstants>
-    <Description>MSBuild tasks. This package is intended for Microsoft use only</Description>
-    <TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
-    <RootNamespace>Microsoft.AspNetCore.BuildTools</RootNamespace>
-    <AssemblyName>Internal.AspNetCore.BuildTools.Tasks</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\shared\Utilities\MSBuildListSplitter.cs" />
-    <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\Utilities\*.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="Publish.targets" Condition=" '$(TargetFramework)' == '' " />
-</Project>
diff --git a/modules/BuildTools.Tasks/BuildTools.Tasks.props b/modules/BuildTools.Tasks/BuildTools.Tasks.props
deleted file mode 100644
index e32478c8d..000000000
--- a/modules/BuildTools.Tasks/BuildTools.Tasks.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project>
-
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)GenerateResxDesignerFiles" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)GenerateFileFromTemplate" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)GetAssemblyFileVersion" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)GetGitBranch" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)GetGitCommitHash" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)GetGitCommitInfo" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)GenerateSvgBadge" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)SetEnvironmentVariable" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)UpdatePackageSource" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)WaitForDebugger" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)ZipArchive" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)UnzipArchive" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)CreateSourceLink" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)Run" AssemblyFile="$(_BuildToolsAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.$(_BuildTasksPrefix)RunDotNet" AssemblyFile="$(_BuildToolsAssembly)" />
-
-</Project>
diff --git a/modules/BuildTools.Tasks/CreateSourceLink.cs b/modules/BuildTools.Tasks/CreateSourceLink.cs
deleted file mode 100644
index d3b329625..000000000
--- a/modules/BuildTools.Tasks/CreateSourceLink.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    /// <summary>
-    /// Generates a source link JSON file.
-    /// <para>
-    /// <seealso href="https://github.com/dotnet/core/blob/aa68ce453ad63152bf321c86eb83f9420114d087/Documentation/diagnostics/source_link.md" />
-    /// </para>
-    /// </summary>
-#if SDK
-    public class Sdk_CreateSourceLink : Task
-#elif BuildTools
-    public class CreateSourceLink : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        [Required]
-        public string SourceLinkRoot { get; set; }
-
-        [Required]
-        public string OriginUrl { get; set; }
-
-        [Required]
-        public string DestinationFile { get; set; }
-
-        [Required]
-        public string Commit { get; set; }
-
-        [Output]
-        public string SourceLinkFile { get; set; }
-
-        public override bool Execute()
-        {
-            var lastCh = SourceLinkRoot[SourceLinkRoot.Length - 1];
-            if (lastCh != '/' && lastCh != '\\')
-            {
-                Log.LogError("SourceLinkRoot must end with a slash.");
-                return false;
-            }
-
-            SourceLinkRoot += '*';
-
-            var codeSource = ConvertUrl();
-
-            var mappings = new List<Mapping>
-            {
-                new Mapping { LocalPath = SourceLinkRoot, Url = codeSource },
-            };
-
-            GenerateSourceLink(DestinationFile, mappings);
-            SourceLinkFile = DestinationFile;
-            return true;
-        }
-
-        private static void GenerateSourceLink(string filePath, List<Mapping> mappings)
-        {
-            var data = new StringBuilder();
-            data.Append("{\"documents\":{");
-
-            // not bullet-proof, but should be good enough for escaping paths
-            string JsonEscape(string str)
-                => str.Replace(@"\", @"\\").Replace("\"", "\\\"");
-
-            var first = true;
-            foreach (var mapping in mappings)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    data.Append(",");
-                }
-
-                data
-                    .Append('"')
-                    .Append(JsonEscape(mapping.LocalPath))
-                    .Append("\":\"")
-                    .Append(JsonEscape(mapping.Url))
-                    .Append('"');
-            }
-
-            data.Append("}}");
-
-            File.WriteAllText(filePath, data.ToString());
-        }
-
-        private string ConvertUrl()
-        {
-            if (!OriginUrl.Contains("github.com"))
-            {
-                throw new ArgumentException("OriginUrl must be for github.com", "OriginUrl");
-            }
-
-            var prefix = OriginUrl.StartsWith("git@github.com:")
-                ? "git@github.com:"
-                : "https://github.com/";
-
-            var repoName = OriginUrl.Replace(prefix, "");
-
-            repoName = repoName.Replace(".git", "");
-
-            return $"https://raw.githubusercontent.com/{repoName}/{Commit}/*";
-        }
-
-        private struct Mapping
-        {
-            public string LocalPath;
-            public string Url;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/GenerateResxDesignerFiles.cs b/modules/BuildTools.Tasks/GenerateResxDesignerFiles.cs
deleted file mode 100644
index 327af76a3..000000000
--- a/modules/BuildTools.Tasks/GenerateResxDesignerFiles.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Xml.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    /// <summary>
-    /// Generates C# for resx files. It is expected to run on all EmbeddedResource items named *.resx and after
-    /// the 'PrepareResourceNames' target.
-    /// <seealso cref="Microsoft.Build.Tasks.CreateManifestResourceName"/>.
-    /// </summary>
-#if SDK
-    public class Sdk_GenerateResxDesignerFiles : Task
-#elif BuildTools
-    public class GenerateResxDesignerFiles : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        /// <summary>
-        /// Expected metadata items on <see cref="ResourceFiles"/>.
-        /// </summary>
-        private static class Metadata
-        {
-            public const string GeneratedFileName = "GeneratedFileName";
-            public const string ManifestResourceName = "ManifestResourceName";
-            public const string Type = "Type";
-            public const string FullPath = "FullPath";
-            public const string WithCulture = "WithCulture";
-        }
-
-        private static readonly Regex _namedParameterMatcher = new Regex(@"\{([a-z]\w+)\}", RegexOptions.IgnoreCase);
-        private static readonly Regex _numberParameterMatcher = new Regex(@"\{(\d+)\}");
-        private readonly List<ITaskItem> _createdFiles = new List<ITaskItem>();
-
-        /// <summary>
-        /// <para>
-        /// The resx files to be generated.
-        /// </para>
-        /// <para>
-        /// Metadata: 'GeneratedFileName' can be used to set where the C# is written. Defaults to creating a file in the same folder.
-        /// Metadata: 'ManifestResourceName' created by the CreateManifestResourceNames target.
-        /// </para>
-        /// </summary>
-        [Required]
-        public ITaskItem[] ResourceFiles { get; set; }
-
-        /// <summary>
-        /// An item for each generated file.
-        /// </summary>
-        [Output]
-        public ITaskItem[] FileWrites { get; set; }
-
-        public override bool Execute()
-        {
-            foreach (var item in ResourceFiles)
-            {
-                var resourceName = item.GetMetadata(Metadata.ManifestResourceName);
-                if (string.IsNullOrEmpty(resourceName))
-                {
-                    Log.LogWarning("'{0}' was not set on {1}.", Metadata.ManifestResourceName, item.ItemSpec);
-                    continue;
-                }
-
-                if (!"Resx".Equals(item.GetMetadata(Metadata.Type), StringComparison.OrdinalIgnoreCase))
-                {
-                    Log.LogMessage(MessageImportance.High, "Skipping resource '{0}' with type '{1}", item.ItemSpec, item.GetMetadata(Metadata.Type));
-                    continue;
-                }
-
-                if ("true".Equals(item.GetMetadata(Metadata.WithCulture), StringComparison.OrdinalIgnoreCase))
-                {
-                    Log.LogMessage(MessageImportance.High, "Skipping culture-specific resource '{0}'", item.ItemSpec);
-                    continue;
-                }
-
-                try
-                {
-                    var resxFile = item.GetMetadata(Metadata.FullPath) ?? item.ItemSpec;
-                    GenerateCsharp(
-                        resxFile,
-                        item.GetMetadata(Metadata.GeneratedFileName),
-                        resourceName);
-                }
-                catch (IOException ex)
-                {
-                    Log.LogError("Failed to generated C# for {0}:\n{1}", item.ItemSpec, ex.ToString());
-                    return false;
-                }
-            }
-
-            FileWrites = _createdFiles.ToArray();
-
-            return true;
-        }
-
-        private void GenerateCsharp(string resxFile, string outputFileName, string manifestName)
-        {
-            if (string.IsNullOrEmpty(outputFileName))
-            {
-                outputFileName = Path.GetFileNameWithoutExtension(resxFile) + ".Designer.cs";
-            }
-
-            var outputFullPath = !Path.IsPathRooted(outputFileName)
-                ? Path.Combine(Path.GetDirectoryName(resxFile), outputFileName)
-                : outputFileName;
-
-            // normalize separator
-            outputFullPath = Path.DirectorySeparatorChar == '\\'
-                ? outputFullPath.Replace('/', Path.DirectorySeparatorChar)
-                : outputFullPath.Replace('\\', Path.DirectorySeparatorChar);
-
-            var resourceStrings = new List<ResourceData>();
-            if (!File.Exists(resxFile))
-            {
-                Log.LogError("'{0}' does not exist", resxFile);
-                return;
-            }
-
-            var xml = XDocument.Load(resxFile);
-
-            Log.LogMessage(MessageImportance.Low, "Used '{0}' to generate '{1}'", resxFile, outputFileName);
-            Log.LogMessage(MessageImportance.High, "Generated {0}", outputFullPath);
-
-            foreach (var entry in xml.Descendants("data"))
-            {
-                var name = entry.Attribute("name").Value;
-                var value = entry.Element("value").Value;
-
-                var usingNamedArgs = true;
-                var match = _namedParameterMatcher.Matches(value);
-                if (match.Count == 0)
-                {
-                    usingNamedArgs = false;
-                    match = _numberParameterMatcher.Matches(value);
-                }
-
-                var arguments = match.Cast<Match>()
-                                     .Select(m => m.Groups[1].Value)
-                                     .Distinct();
-                if (!usingNamedArgs)
-                {
-                    arguments = arguments.OrderBy(Convert.ToInt32);
-                }
-
-                resourceStrings.Add(
-                    new ResourceData
-                    {
-                        Name = name,
-                        Value = value,
-                        Arguments = arguments.ToList(),
-                        UsingNamedArgs = usingNamedArgs
-                    });
-            }
-
-            var resourceNamespace = manifestName.Substring(0, manifestName.LastIndexOf('.'));
-            var resourceTypeName = manifestName.Substring(manifestName.LastIndexOf('.') + 1);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(outputFullPath));
-
-            using (var stream = new FileStream(outputFullPath, FileMode.Create))
-            using (var writer = new StreamWriter(stream))
-            {
-                _createdFiles.Add(new TaskItem(outputFullPath));
-
-                writer.WriteLine(
-        $@"// <auto-generated />
-namespace {resourceNamespace}
-{{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class {resourceTypeName}
-    {{
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager(""{manifestName}"", typeof({resourceTypeName}).GetTypeInfo().Assembly);");
-
-                using (var indent = writer.Indent(8))
-                {
-                    foreach (var resourceString in resourceStrings)
-                    {
-                        writer.WriteLine();
-                        RenderHeader(indent, resourceString);
-                        RenderProperty(indent, resourceString);
-
-                        writer.WriteLine();
-                        RenderHeader(indent, resourceString);
-                        RenderFormatMethod(indent, resourceString);
-                    }
-                }
-
-                writer.WriteLine(@"
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace(""{"" + formatterNames[i] + ""}"", ""{"" + i + ""}"");
-                }
-            }
-
-            return value;
-        }
-    }
-}");
-
-            }
-        }
-
-        private static void RenderHeader(TextWriter writer, ResourceData resourceString)
-        {
-            writer.WriteLine("/// <summary>");
-            foreach (var line in resourceString.Value.Split(new[] { '\n' }, StringSplitOptions.None))
-            {
-                writer.WriteLine($"/// {new XText(line)}");
-            }
-            writer.WriteLine("/// </summary>");
-        }
-
-        private static void RenderProperty(TextWriter writer, ResourceData resourceString)
-        {
-            writer.WriteLine("internal static string {0}", resourceString.Name);
-            writer.WriteLine("{");
-            using (var indent = writer.Indent())
-            {
-                indent.WriteLine($@"get => GetString(""{resourceString.Name}"");");
-            }
-            writer.WriteLine("}");
-        }
-
-        private static void RenderFormatMethod(TextWriter writer, ResourceData resourceString)
-        {
-            writer.WriteLine($"internal static string Format{resourceString.Name}({resourceString.Parameters})");
-
-            using (var indent = writer.Indent())
-            {
-                if (resourceString.Arguments.Count > 0)
-                {
-                    indent.WriteLine(@"=> string.Format(CultureInfo.CurrentCulture, GetString(""{0}""{1}), {2});",
-                                resourceString.Name,
-                                resourceString.UsingNamedArgs ? ", " + resourceString.FormatArguments : null,
-                                resourceString.ArgumentNames);
-                }
-                else
-                {
-                    indent.WriteLine($@"=> GetString(""{resourceString.Name}"");");
-                }
-            }
-        }
-
-        private class ResourceData
-        {
-            public string Name { get; set; }
-            public string Value { get; set; }
-            public List<string> Arguments { get; set; }
-
-            public bool UsingNamedArgs { get; set; }
-
-            public string FormatArguments => string.Join(", ", Arguments.Select(a => "\"" + a + "\""));
-
-            public string ArgumentNames => string.Join(", ", Arguments.Select(GetArgName));
-
-            public string Parameters => string.Join(", ", Arguments.Select(a => "object " + GetArgName(a)));
-
-            private string GetArgName(string name) => UsingNamedArgs ? name : 'p' + name;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/GetAssemblyFileVersion.cs b/modules/BuildTools.Tasks/GetAssemblyFileVersion.cs
deleted file mode 100644
index 296ba6a49..000000000
--- a/modules/BuildTools.Tasks/GetAssemblyFileVersion.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-#if SDK
-    public class Sdk_GetAssemblyFileVersion : Task
-#elif BuildTools
-    public class GetAssemblyFileVersion : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        [Required]
-        public string AssemblyVersion { get; set; }
-
-        [Required]
-        public int AssemblyRevision { get; set; }
-
-        [Output]
-        public string AssemblyFileVersion { get; set; }
-
-        public override bool Execute()
-        {
-            if (!Version.TryParse(AssemblyVersion, out var assemblyVersionValue))
-            {
-                Log.LogError("Invalid value '{0}' for {1}.", AssemblyVersion, nameof(AssemblyVersion));
-                return false;
-            }
-
-            var assemblyFileVersionValue = assemblyVersionValue;
-            if (assemblyFileVersionValue.Revision <= 0)
-            {
-                assemblyFileVersionValue = new Version(
-                    assemblyFileVersionValue.Major,
-                    assemblyFileVersionValue.Minor,
-                    assemblyFileVersionValue.Build,
-                    AssemblyRevision);
-            }
-
-            AssemblyFileVersion = assemblyFileVersionValue.ToString();
-            return true;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/GetGitBranch.cs b/modules/BuildTools.Tasks/GetGitBranch.cs
deleted file mode 100644
index d58b22181..000000000
--- a/modules/BuildTools.Tasks/GetGitBranch.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.BuildTools.Utilities;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-#if SDK
-    public class Sdk_GetGitBranch : Task
-#elif BuildTools
-    public class GetGitBranch : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        /// <summary>
-        /// A folder inside the git project. Does not need to be the top folder.
-        /// This task will search upwards for the .git folder.
-        /// </summary>
-        [Required]
-        public string WorkingDirectory { get; set; }
-
-        /// <summary>
-        /// The name of the branch HEAD is pointed to. Can be null or empty
-        /// for repositories in detached HEAD mode.
-        /// </summary>
-        [Output]
-        public string Branch { get; set; }
-
-        public override bool Execute()
-        {
-            try
-            {
-                var repoInfo = GitRepoInfo.Load(WorkingDirectory);
-                Log.LogMessage(MessageImportance.Low, "Resolved git repo info to: RootPath = {0}, GitDir = {1}, HEAD = {2}, Branch = {3}, Hash = {4}",
-                    repoInfo.RepositoryRootPath,
-                    repoInfo.GitDir,
-                    repoInfo.HeadFile,
-                    repoInfo.Branch,
-                    repoInfo.CommitHash);
-
-                if (repoInfo.DetachedHeadMode)
-                {
-                    Log.LogError("The current git repo is in detached HEAD mode. It is not possible to determine the branch name.");
-                    return false;
-                }
-
-                if (string.IsNullOrEmpty(repoInfo.Branch))
-                {
-                    Log.LogError("Could not determine the branch name of the current git repo in '{0}'.", repoInfo.RepositoryRootPath);
-                    return false;
-                }
-
-                Branch = repoInfo.Branch;
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Log.LogError(ex.Message);
-                return false;
-            }
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/GetGitCommitHash.cs b/modules/BuildTools.Tasks/GetGitCommitHash.cs
deleted file mode 100644
index 720cb3cb7..000000000
--- a/modules/BuildTools.Tasks/GetGitCommitHash.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.BuildTools.Utilities;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-#if SDK
-    public class Sdk_GetGitCommitHash : Task
-#elif BuildTools
-    public class GetGitCommitHash : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        /// <summary>
-        /// A folder inside the git project. Does not need to be the top folder.
-        /// This task will search upwards for the .git folder.
-        /// </summary>
-        [Required]
-        public string WorkingDirectory { get; set; }
-
-        /// <summary>
-        /// The full commit SHA of the current commit referenced by HEAD.
-        /// </summary>
-        [Output]
-        public string CommitHash { get; set; }
-
-        public override bool Execute()
-        {
-            try
-            {
-                var repoInfo = GitRepoInfo.Load(WorkingDirectory);
-                Log.LogMessage(MessageImportance.Low, "Resolved git repo info to: RootPath = {0}, GitDir = {1}, HEAD = {2}, Branch = {3}, Hash = {4}",
-                    repoInfo.RepositoryRootPath,
-                    repoInfo.GitDir,
-                    repoInfo.HeadFile,
-                    repoInfo.Branch,
-                    repoInfo.CommitHash);
-
-                if (string.IsNullOrEmpty(repoInfo.CommitHash))
-                {
-                    Log.LogError("Could not determine the commit hash of the current git repo in '{0}'.", repoInfo.RepositoryRootPath);
-                    return false;
-                }
-
-                CommitHash = repoInfo.CommitHash;
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Log.LogError(ex.Message);
-                return false;
-            }
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/GetGitCommitInfo.cs b/modules/BuildTools.Tasks/GetGitCommitInfo.cs
deleted file mode 100644
index 6cd305083..000000000
--- a/modules/BuildTools.Tasks/GetGitCommitInfo.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.BuildTools.Utilities;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-#if SDK
-    public class Sdk_GetGitCommitInfo : Task
-#elif BuildTools
-    public class GetGitCommitInfo : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        /// <summary>
-        /// A folder inside the git project. Does not need to be the top folder.
-        /// This task will search upwards for the .git folder.
-        /// </summary>
-        [Required]
-        public string WorkingDirectory { get; set; }
-
-        /// <summary>
-        /// The name of the branch HEAD is pointed to. Can be null or empty
-        /// for repositories in detached HEAD mode.
-        /// </summary>
-        [Output]
-        public string Branch { get; set; }
-
-        /// <summary>
-        /// The full commit SHA of the current commit referenced by HEAD.
-        /// </summary>
-        [Output]
-        public string CommitHash { get; set; }
-
-        /// <summary>
-        /// The folder containing the '.git', not the .git folder itself.
-        /// </summary>
-        [Output]
-        public string RepositoryRootPath { get; set; }
-
-        public override bool Execute()
-        {
-            try
-            {
-                var repoInfo = GitRepoInfo.Load(WorkingDirectory);
-                Log.LogMessage(MessageImportance.Low, "Resolved git repo info to: RootPath = {0}, GitDir = {1}, HEAD = {2}, Branch = {3}, Hash = {4}",
-                    repoInfo.RepositoryRootPath,
-                    repoInfo.GitDir,
-                    repoInfo.HeadFile,
-                    repoInfo.Branch,
-                    repoInfo.CommitHash);
-
-                if (repoInfo.DetachedHeadMode)
-                {
-                    Log.LogWarning("The repo in '{0}' appears to be in detached HEAD mode. Unable to determine current git branch.", repoInfo.RepositoryRootPath);
-                }
-
-                if (string.IsNullOrEmpty(repoInfo.CommitHash))
-                {
-                    Log.LogError("Could not determine the commit hash of the current git repo in '{0}'.", repoInfo.RepositoryRootPath);
-                    return false;
-                }
-
-                Branch = repoInfo.Branch;
-                CommitHash = repoInfo.CommitHash;
-                RepositoryRootPath = repoInfo.RepositoryRootPath;
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Log.LogError(ex.Message);
-                return false;
-            }
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/Project.CSharp.Resx.targets b/modules/BuildTools.Tasks/Project.CSharp.Resx.targets
deleted file mode 100644
index 5c80b1764..000000000
--- a/modules/BuildTools.Tasks/Project.CSharp.Resx.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  This file should be imported into C# projects. It is not imported into the "KoreBuild" project.
-
-  KoreBuild does this by calling MSBuild on the solution with the property 'CustomAfterMicrosoftCommonTargets' set to
-  the location of this file. Microsoft.Common.targets then imports this file into the csproj.
-
-  This layer of indirection is required because calling the 'GenerateCSharpForResx' target directly on a solution
-  would fail for any project that does not reference Internal.AspNetCore.Sdk. This indirection allows KoreBuild
-  to "inject" itself into the project to run the resx generation targets.
--->
-<Project>
-  <PropertyGroup>
-    <ResxDependsOn Condition="'$(InternalAspNetCoreSdkImported)' == 'true'">Resx</ResxDependsOn>
-  </PropertyGroup>
-
-  <Target Name="_GenerateResx" DependsOnTargets="$(ResxDependsOn)">
-    <Warning
-      Text="Could not generate resx files. This project does not reference Internal.AspNetCore.Sdk."
-      Condition="'$(ResxDependsOn)' == ''" />
-  </Target>
-</Project>
diff --git a/modules/BuildTools.Tasks/Properties/InternalsVisibleTo.cs b/modules/BuildTools.Tasks/Properties/InternalsVisibleTo.cs
deleted file mode 100644
index b11b4fa2c..000000000
--- a/modules/BuildTools.Tasks/Properties/InternalsVisibleTo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("BuildTools.Tasks.Tests")]
diff --git a/modules/BuildTools.Tasks/Publish.targets b/modules/BuildTools.Tasks/Publish.targets
deleted file mode 100644
index cd76193e6..000000000
--- a/modules/BuildTools.Tasks/Publish.targets
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project>
-  <Target Name="Publish">
-    <ItemGroup>
-      <ContentFiles Include="module.props" />
-      <ContentFiles Include="module.targets" />
-      <ContentFiles Include="BuildTools.Tasks.props" />
-      <ContentFiles Include="Project.CSharp.Resx.targets" />
-
-      <_TargetFramework Remove="@(_TargetFramework)" />
-      <_TargetFramework Include="$(TargetFrameworks)" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(ContentFiles)" DestinationFolder="$(PublishDir)" />
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="Publish"
-             Properties="PublishDir=$(PublishDir)%(_TargetFramework.Identity)\;TargetFramework=%(_TargetFramework.Identity)" />
-  </Target>
-</Project>
diff --git a/modules/BuildTools.Tasks/Run.cs b/modules/BuildTools.Tasks/Run.cs
deleted file mode 100644
index 1b6b3da75..000000000
--- a/modules/BuildTools.Tasks/Run.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    /// <summary>
-    /// A task that runs a process without piping output into the logger.
-    /// See <seealso cref="RunBase" /> for more arguments.
-    /// </summary>
-#if SDK
-    public class Sdk_Run
-#elif BuildTools
-    public class Run
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-        : RunBase
-    {
-        /// <summary>
-        /// The executable to run. Can be a file path or a command for an executable on the system PATH.
-        /// </summary>
-        [Required]
-        public string FileName { get; set; }
-
-        protected override string ToolName => FileName;
-
-        protected override string GenerateFullPathToTool()
-        {
-            return FileName;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/RunBase.cs b/modules/BuildTools.Tasks/RunBase.cs
deleted file mode 100644
index ab6baeee6..000000000
--- a/modules/BuildTools.Tasks/RunBase.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Utilities;
-using Microsoft.Build.Framework;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    /// <summary>
-    /// A task that runs a process without piping output into the logger.
-    /// </summary>
-    public abstract class RunBase : ToolTask
-    {
-        protected RunBase()
-        {
-            // only use exit code to determine error by default.
-            LogStandardErrorAsError = false;
-        }
-
-        private static readonly char[] EqualsArray = new[] { '=' };
-
-        private const int OK = 0;
-
-        /// <summary>
-        /// A list of arguments to be passed to the executable. The task will escape them for spaces and quotes.
-        /// Cannot be used with <see cref="Command"/>
-        /// </summary>
-        public ITaskItem[] Arguments { get; set; }
-
-        /// <summary>
-        /// The command to pass to the executable as string.
-        /// Cannot be used with <see cref="Arguments"/>
-        /// </summary>
-        public string Command { get; set; }
-
-        // Additional options
-        /// <summary>
-        /// The current working directory
-        /// </summary>
-        public string WorkingDirectory { get; set; }
-
-        /// <summary>
-        /// Don't fail the task if the command exits with a non-zero code
-        /// </summary>
-        public bool IgnoreExitCode { get; set; }
-
-        /// <summary>
-        /// Repeat the command up to this many times if the exit code is non-zero. Defaults to 0.
-        /// </summary>
-        public int MaxRetries { get; set; }
-
-        /// <summary>
-        /// Ignore standard error and warning formatting
-        /// </summary>
-        public bool IgnoreStandardErrorWarningFormat { get; set; }
-
-        // increase the default output importance from Low to High
-        /// <inheritdoc />
-        protected override MessageImportance StandardErrorLoggingImportance => MessageImportance.High;
-
-        /// <inheritdoc />
-        protected override MessageImportance StandardOutputLoggingImportance => MessageImportance.High;
-
-        protected override bool HandleTaskExecutionErrors()
-        {
-            return IgnoreExitCode || base.HandleTaskExecutionErrors();
-        }
-
-        protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance)
-        {
-            if (IgnoreStandardErrorWarningFormat)
-            {
-                Log.LogMessage(messageImportance, singleLine);
-            }
-            else
-            {
-                base.LogEventsFromTextOutput(singleLine, messageImportance);
-            }
-        }
-
-        protected override string GetWorkingDirectory() => WorkingDirectory;
-
-        protected override bool ValidateParameters()
-        {
-            var exe = GenerateFullPathToTool();
-
-            if (string.IsNullOrEmpty(exe))
-            {
-                Log.LogError("FileName must be specified.");
-                return false;
-            }
-
-            if (MaxRetries < 0)
-            {
-                Log.LogError("MaxRetries must be a non-negative number.");
-                return false;
-            }
-
-            if (!string.IsNullOrEmpty(WorkingDirectory) && !Directory.Exists(WorkingDirectory))
-            {
-                Log.LogError("WorkingDirectory does not exist: '{0}'", WorkingDirectory);
-                return false;
-            }
-
-            // if path is not rooted, it may be a command on the system PATH
-            if (Path.IsPathRooted(exe) && !File.Exists(exe))
-            {
-                Log.LogError("FileName does not exist: '{0}'", WorkingDirectory);
-                return false;
-            }
-
-            return base.ValidateParameters();
-        }
-
-        public override bool Execute()
-        {
-            var retries = Math.Max(1, MaxRetries);
-            for (int i = 0; i < retries; i++)
-            {
-                if (base.Execute())
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        protected override string GenerateCommandLineCommands()
-        {
-            var cmd = 0;
-            var arguments = string.Empty;
-
-            if (Arguments != null)
-            {
-                arguments = ArgumentEscaper.EscapeAndConcatenate(Arguments.Select(i => i.ItemSpec));
-                cmd++;
-            }
-
-            if (!string.IsNullOrEmpty(Command))
-            {
-                arguments = Command;
-                cmd++;
-            }
-
-            if (cmd > 1)
-            {
-                Log.LogError("Arguments and Command cannot both be used.");
-                return null;
-            }
-
-            return arguments;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/RunDotNet.cs b/modules/BuildTools.Tasks/RunDotNet.cs
deleted file mode 100644
index 7c939e2f5..000000000
--- a/modules/BuildTools.Tasks/RunDotNet.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    /// <summary>
-    /// A task that runs a dotnet command without piping output into the logger.
-    /// See <seealso cref="RunBase" /> for more arguments.
-    /// </summary>
-#if SDK
-    public class Sdk_RunDotNet
-#elif BuildTools
-    public class RunDotNet
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-        : RunBase
-    {
-        protected override string ToolName => "dotnet";
-
-        protected override string GenerateFullPathToTool()
-#if NET46
-            => "dotnet";
-#else
-            => DotNetMuxer.MuxerPathOrDefault();
-#endif
-    }
-}
diff --git a/modules/BuildTools.Tasks/SetEnvironmentVariable.cs b/modules/BuildTools.Tasks/SetEnvironmentVariable.cs
deleted file mode 100644
index 62ca1cc79..000000000
--- a/modules/BuildTools.Tasks/SetEnvironmentVariable.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-#if SDK
-    public class Sdk_SetEnvironmentVariable : Task
-#elif BuildTools
-    public class SetEnvironmentVariable : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        [Required]
-        public string Variable { get; set; }
-
-        [Required]
-        public string Value { get; set; }
-
-        public override bool Execute()
-        {
-            if (string.IsNullOrEmpty(Variable))
-            {
-                Log.LogError($"{nameof(Variable)} cannot be null or an empty string");
-                return false;
-            }
-
-            var expandedValue = Environment.ExpandEnvironmentVariables(Value);
-
-            Log.LogMessage("Setting environment variable '{0}' to '{1}'", Variable, expandedValue);
-
-            Environment.SetEnvironmentVariable(Variable, expandedValue);
-
-            return true;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/UnzipArchive.cs b/modules/BuildTools.Tasks/UnzipArchive.cs
deleted file mode 100644
index 5a4f37861..000000000
--- a/modules/BuildTools.Tasks/UnzipArchive.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using ZipArchiveStream = System.IO.Compression.ZipArchive;
-using IOFile = System.IO.File;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    /// <summary>
-    /// Unzips an archive file.
-    /// </summary>
-#if SDK
-    public class Sdk_UnzipArchive : Task
-#elif BuildTools
-    public class UnzipArchive : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        /// <summary>
-        /// The file to unzip.
-        /// </summary>
-        [Required]
-        public string File { get; set; }
-
-        /// <summary>
-        /// The directory where files will be unzipped.
-        /// </summary>
-        /// <returns></returns>
-        [Required]
-        public string Destination { get; set; }
-
-        /// <summary>
-        /// Overwrite <see cref="File"/> if it exists. Defaults to false.
-        /// </summary>
-        public bool Overwrite { get; set; } = false;
-
-        /// <summary>
-        /// Disables normalizing zip entry paths while extracting.
-        /// </summary>
-        public bool DisablePathNormalization { get; set; } = false;
-
-        /// <summary>
-        /// The files that were unzipped.
-        /// </summary>
-        [Output]
-        public ITaskItem[] OutputFiles { get; set; }
-
-        public override bool Execute()
-        {
-            if (!IOFile.Exists(File))
-            {
-                Log.LogError("'{0}' does not exist", File);
-                return false;
-            }
-
-            Directory.CreateDirectory(Destination);
-
-            var output = new List<ITaskItem>();
-            using (var stream = IOFile.OpenRead(File))
-            using (var zip = new ZipArchiveStream(stream, ZipArchiveMode.Read))
-            {
-                foreach (var entry in zip.Entries)
-                {
-                    var entryPath = entry.FullName;
-                    if (!DisablePathNormalization)
-                    {
-                        if (entry.FullName.IndexOf('\\') >= 0)
-                        {
-                            Log.LogMessage(null, null, null, File, 0, 0, 0, 0, MessageImportance.Low,
-                                message: $"Zip entry '{entry.FullName}' has been normalized because it contains a backslash. Set DisablePathNormalization=true to disable this.");
-                            entryPath = entry.FullName.Replace('\\', '/');
-                        }
-                    }
-
-                    var fileDest = Path.Combine(Destination, entryPath);
-                    var dirName = Path.GetDirectoryName(fileDest);
-                    Directory.CreateDirectory(dirName);
-
-                    // Do not try to extract directories
-                    if (Path.GetFileName(fileDest) != string.Empty)
-                    {
-                        entry.ExtractToFile(fileDest, Overwrite);
-                        Log.LogMessage(MessageImportance.Low, "Extracted '{0}'", fileDest);
-                        output.Add(new TaskItem(fileDest));
-                    }
-                }
-            }
-
-            Log.LogMessage(MessageImportance.High, "Extracted {0} file(s) to '{1}'", output.Count, Destination);
-            OutputFiles = output.ToArray();
-
-            return true;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/UpdatePackageSource.cs b/modules/BuildTools.Tasks/UpdatePackageSource.cs
deleted file mode 100644
index 07321a095..000000000
--- a/modules/BuildTools.Tasks/UpdatePackageSource.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    /// <summary>
-    /// Update or adds a NuGet feed to a NuGet.config file. It reads <see cref="NuGetConfigPath"/>
-    /// and replaces or adds the feed named <see cref="SourceName"/> with <see cref="SourceUri"/>.
-    /// </summary>
-#if SDK
-    public class Sdk_UpdatePackageSource : Task
-#elif BuildTools
-    public class UpdatePackageSource : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        [Required]
-        public string NuGetConfigPath { get; set; }
-
-        [Required]
-        public string SourceName { get; set; }
-
-        [Required]
-        public string SourceUri { get; set; }
-
-        public override bool Execute()
-        {
-            if (string.IsNullOrEmpty(SourceName))
-            {
-                Log.LogError("FeedName must not be empty");
-                return false;
-            }
-
-            if (string.IsNullOrEmpty(SourceUri))
-            {
-                Log.LogError("PackageSource must not be empty");
-                return false;
-            }
-
-            var nugetConfig = XDocument.Load(NuGetConfigPath);
-            var packageSources = nugetConfig.Element("configuration")?.Element("packageSources");
-            var addElements = packageSources?.Elements("add").ToList();
-
-            var valueToUpdate = addElements.FirstOrDefault(f => string.Equals(f.Attribute("key")?.Value, SourceName, StringComparison.OrdinalIgnoreCase));
-            if (valueToUpdate == null)
-            {
-                Log.LogMessage("Adding feed '{0}' to '{1}'", SourceName, SourceUri);
-                packageSources.Add(new XElement("add",
-                    new XAttribute("key", SourceName),
-                    new XAttribute("value", SourceUri)));
-            }
-            else
-            {
-                Log.LogMessage("Updating feed '{0}' to '{1}'", SourceName, SourceUri);
-                valueToUpdate.SetAttributeValue("value", SourceUri);
-            }
-
-            using (var file = new FileStream(NuGetConfigPath, FileMode.Create))
-            {
-                nugetConfig.Save(file);
-            }
-
-            Log.LogMessage("Saved changes to '{0}'", NuGetConfigPath);
-
-            return true;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/Utilities/GitRepoInfo.cs b/modules/BuildTools.Tasks/Utilities/GitRepoInfo.cs
deleted file mode 100644
index 77d1edf35..000000000
--- a/modules/BuildTools.Tasks/Utilities/GitRepoInfo.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.BuildTools.Utilities
-{
-    internal class GitRepoInfo
-    {
-        private const string HeadContentStart = "ref: refs/heads/";
-        private const string GitDirRefContentStart = "gitdir:";
-
-        private const int CommitShaLength = 40;
-
-        /// <summary>
-        /// The name of the branch HEAD is pointed to. Can be null or empty
-        /// for repositories in detached HEAD mode.
-        /// </summary>
-        public string Branch { get; set; }
-
-        /// <summary>
-        /// The full commit SHA of the current commit referenced by HEAD.
-        /// </summary>
-        public string CommitHash { get; private set; }
-
-        /// <summary>
-        /// The root folder of the working directory. Not the .git folder itself.
-        /// </summary>
-        public string RepositoryRootPath { get; private set; }
-
-        /// <summary>
-        /// The folder containing the .git folder
-        /// </summary>
-        public string GitDir { get; private set; }
-
-        /// <summary>
-        /// The repo is in detached head mode.
-        /// </summary>
-        public bool DetachedHeadMode { get; private set; }
-
-        /// <summary>
-        /// Full path to the HEAD file.
-        /// </summary>
-        public string HeadFile { get; set; }
-
-        /// <summary>
-        /// Find give info for a folder inside the git project. Does not need to be the top folder.
-        /// This task will search upwards for the .git folder.
-        /// </summary>
-        public static GitRepoInfo Load(string workingDirectory)
-        {
-            var repoRoot = GetRepositoryRoot(workingDirectory);
-            if (repoRoot == null)
-            {
-                throw new DirectoryNotFoundException($"Could not find the git directory for '{workingDirectory}'");
-            }
-
-            var info = new GitRepoInfo
-            {
-                RepositoryRootPath = FileHelpers.EnsureTrailingSlash(repoRoot.FullName)
-            };
-
-            switch (repoRoot.GetFileSystemInfos(".git").FirstOrDefault())
-            {
-                case DirectoryInfo d:
-                    // regular git working directories
-                    info.GitDir = d.FullName;
-                    info.HeadFile = Path.Combine(info.GitDir, "HEAD");
-                    break;
-                case FileInfo f:
-                    // submodules and worktrees
-                    var contents = File.ReadAllText(f.FullName);
-                    if (contents.StartsWith(GitDirRefContentStart, StringComparison.OrdinalIgnoreCase))
-                    {
-                        var gitdirRef = contents.Substring(GitDirRefContentStart.Length).Trim();
-                        var gitDirRoot = Path.IsPathRooted(gitdirRef)
-                            ? new DirectoryInfo(gitdirRef)
-                            : new DirectoryInfo(Path.Combine(f.Directory.FullName, gitdirRef));
-
-                        info.HeadFile = Path.Combine(gitDirRoot.FullName, "HEAD");
-
-                        var commonDir = gitDirRoot.GetFiles("commondir").FirstOrDefault();
-                        if (commonDir != null)
-                        {
-                            // happens in worktrees
-                            var commonDirRef = File.ReadAllText(commonDir.FullName).Trim();
-                            info.GitDir = Path.IsPathRooted(commonDirRef)
-                            ? commonDirRef
-                            : Path.Combine(gitDirRoot.FullName, commonDirRef);
-                        }
-                        else
-                        {
-                            // happens with submodules
-                            info.GitDir = gitDirRoot.FullName;
-                        }
-                    }
-                    else
-                    {
-                        throw new DirectoryNotFoundException($"Unable to determine the location of the .git directory. Unrecognized file format: {f.FullName}");
-                    }
-                    break;
-                case null:
-                default:
-                    throw new ArgumentOutOfRangeException("Unrecognized implementation of FileSystemInfo");
-            }
-
-            if (!File.Exists(info.HeadFile))
-            {
-                throw new FileNotFoundException("Unable to determine the status of the git repo. No HEAD file found.");
-            }
-
-            var content = File.ReadAllText(info.HeadFile).Trim();
-            if (content.StartsWith(HeadContentStart, StringComparison.OrdinalIgnoreCase))
-            {
-                info.Branch = content.Substring(HeadContentStart.Length);
-                info.CommitHash = ResolveHashFromBranch(info.GitDir, info.Branch);
-            }
-            else if (content.Length == CommitShaLength)
-            {
-                info.DetachedHeadMode = true;
-                info.CommitHash = content;
-            }
-            else
-            {
-                throw new InvalidOperationException($"Unable to determine the status of the git repo. THe HEAD file has an unexpected format: '{content}'");
-            }
-
-            return info;
-        }
-
-        private static string ResolveHashFromBranch(string gitDir, string branch)
-        {
-            if (string.IsNullOrEmpty(branch))
-            {
-                throw new InvalidOperationException("Current branch appears to be empty. Failed to retrieve current branch.");
-            }
-
-            var branchFile = Path.Combine(gitDir, "refs", "heads", branch);
-            if (File.Exists(branchFile))
-            {
-                return File.ReadAllText(branchFile).Trim();
-            }
-
-            var packedRefs = Path.Combine(gitDir, "packed-refs");
-            if (File.Exists(packedRefs))
-            {
-                var lines = File.ReadAllLines(packedRefs);
-                foreach (var line in lines)
-                {
-                    if (line.Length == 0)
-                    {
-                        continue;
-                    }
-
-                    if (line[0] == '#' || line[0] == '^')
-                    {
-                        continue;
-                    }
-
-                    var split = line.Split(new[] { ' ' }, 2);
-                    if (split.Length < 2)
-                    {
-                        continue;
-                    }
-
-                    if (string.Equals("refs/heads/" + branch, split[1], StringComparison.Ordinal))
-                    {
-                        return split[0];
-                    }
-                }
-            }
-
-            throw new FileNotFoundException("Unable to determine current git commit hash");
-        }
-
-        private static DirectoryInfo GetRepositoryRoot(string start)
-        {
-            var dir = new DirectoryInfo(start);
-            while (dir != null)
-            {
-                var dotGit = dir.GetFileSystemInfos(".git").FirstOrDefault();
-                if (dotGit != null)
-                {
-                    return dir;
-                }
-                dir = dir.Parent;
-            }
-            return null;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/Utilities/IndentedTextWriter.cs b/modules/BuildTools.Tasks/Utilities/IndentedTextWriter.cs
deleted file mode 100644
index 064152069..000000000
--- a/modules/BuildTools.Tasks/Utilities/IndentedTextWriter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Text;
-
-namespace Microsoft.AspNetCore.BuildTools.Utilities
-{
-    internal class IndentedTextWriter : TextWriter
-    {
-        private readonly TextWriter _wrapped;
-        private readonly string _spaces;
-
-        public IndentedTextWriter(TextWriter wrapped, int indentSpaces)
-        {
-            _wrapped = wrapped;
-            _spaces = new String(' ', indentSpaces);
-        }
-
-        public override Encoding Encoding => _wrapped.Encoding;
-
-        public override void Write(char value)
-            => _wrapped.Write(value);
-
-        public override void WriteLine(string line)
-        {
-            _wrapped.Write(_spaces);
-            _wrapped.WriteLine(line);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/Utilities/TextWriterExtensions.cs b/modules/BuildTools.Tasks/Utilities/TextWriterExtensions.cs
deleted file mode 100644
index ba195085e..000000000
--- a/modules/BuildTools.Tasks/Utilities/TextWriterExtensions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.BuildTools.Utilities;
-
-namespace System.IO
-{
-    internal static class TextWriterExtensions
-    {
-        public static IndentedTextWriter Indent(this TextWriter writer, int spaces = 4)
-            => new IndentedTextWriter(writer, spaces);
-    }
-}
diff --git a/modules/BuildTools.Tasks/WaitForDebugger.cs b/modules/BuildTools.Tasks/WaitForDebugger.cs
deleted file mode 100644
index 43478090a..000000000
--- a/modules/BuildTools.Tasks/WaitForDebugger.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Diagnostics;
-using System.Threading;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-#if SDK
-    public class Sdk_WaitForDebugger : Task, ICancelableTask
-#elif BuildTools
-    public class WaitForDebugger : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
-    {
-        private bool _canceled;
-
-        public void Cancel()
-        {
-            _canceled = true;
-        }
-
-        public override bool Execute()
-        {
-            Log.LogMessage(MessageImportance.High, $"Waiting for debugger. Process ID: {Process.GetCurrentProcess().Id}");
-
-            // 30 seconds
-            var maxTimeout = 30 * 1000;
-            var step = 150;
-
-            while (!Debugger.IsAttached && maxTimeout > 0 && !_canceled)
-            {
-                Thread.Sleep(step);
-                maxTimeout -= step;
-            }
-
-            if (!Debugger.IsAttached && !_canceled)
-            {
-                Log.LogMessage(MessageImportance.High, "Waiting for debugger timed out. Continuing execution.");
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/_._ b/modules/BuildTools.Tasks/_._
deleted file mode 100644
index e69de29bb..000000000
diff --git a/modules/BuildTools.Tasks/module.props b/modules/BuildTools.Tasks/module.props
deleted file mode 100644
index 0f1724a8a..000000000
--- a/modules/BuildTools.Tasks/module.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <_BuildToolsAssembly Condition="'$(MSBuildRuntimeType)' == 'core' ">$(MSBuildThisFileDirectory)netcoreapp2.1\Internal.AspNetCore.BuildTools.Tasks.dll</_BuildToolsAssembly>
-    <_BuildToolsAssembly Condition="'$(MSBuildRuntimeType)' != 'core' ">$(MSBuildThisFileDirectory)net46\Internal.AspNetCore.BuildTools.Tasks.dll</_BuildToolsAssembly>
-    <_BuildTasksPrefix></_BuildTasksPrefix>
-  </PropertyGroup>
-
-  <Import Project="BuildTools.Tasks.props" />
-
-</Project>
diff --git a/modules/BuildTools.Tasks/module.targets b/modules/BuildTools.Tasks/module.targets
deleted file mode 100644
index b22749fea..000000000
--- a/modules/BuildTools.Tasks/module.targets
+++ /dev/null
@@ -1,84 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <PrepareDependsOn>$(PrepareDependsOn);_UseVolatileFeed;ResolveCommitHash</PrepareDependsOn>
-  </PropertyGroup>
-
-  <!-- This target is optional. You can manually chain it into a repo build if you need branch name. -->
-  <Target Name="ResolveRepositoryBranch" Condition="'$(RepositoryBranch)' == ''">
-    <GetGitCommitHash WorkingDirectory="$(RepositoryRoot)"
-                      ContinueOnError="WarnAndContinue">
-      <Output TaskParameter="Branch" PropertyName="RepositoryBranch" />
-    </GetGitCommitHash>
-  </Target>
-
-  <Target Name="ResolveCommitHash" Condition="'$(RepositoryCommit)' == ''">
-    <PropertyGroup>
-      <RepositoryCommit Condition="'$(APPVEYOR_REPO_COMMIT)' != ''">$(APPVEYOR_REPO_COMMIT)</RepositoryCommit>
-      <RepositoryCommit Condition="'$(TRAVIS_COMMIT)' != ''">$(TRAVIS_COMMIT)</RepositoryCommit>
-      <RepositoryCommit Condition="'$(CommitHash)' != ''">$(CommitHash)</RepositoryCommit>
-    </PropertyGroup>
-
-    <GetGitCommitHash WorkingDirectory="$(RepositoryRoot)"
-                      Condition="'$(RepositoryCommit)' == ''"
-                      ContinueOnError="WarnAndContinue">
-      <Output TaskParameter="CommitHash" PropertyName="RepositoryCommit" />
-    </GetGitCommitHash>
-
-    <PropertyGroup>
-      <!--
-        RepositoryCommit should be the same as CommitHash.
-        We use CommitHash for backwards compatibility with build scripts.
-        Setting RepositoryCommit enables NuGet features added in NuGet/NuGet.Client#2036.
-      -->
-      <CommitHash>$(RepositoryCommit)</CommitHash>
-      <BuildProperties Condition="'$(RepositoryCommit)' != ''">$(BuildProperties);CommitHash=$(RepositoryCommit)</BuildProperties>
-      <BuildProperties Condition="'$(RepositoryCommit)' != ''">$(BuildProperties);RepositoryCommit=$(RepositoryCommit)</BuildProperties>
-    </PropertyGroup>
-  </Target>
-
-<!--
-###################################################################
-Targets: Resx
-
-Generates resource files
-###################################################################
--->
-  <Target Name="Resx" DependsOnTargets="ResolveSolutions">
-    <Warning Text="No solutions found to build in '$(RepositoryRoot)'" Condition="'@(Solutions)' == ''" />
-
-    <PropertyGroup>
-      <_ResxTargets>$(MSBuildThisFileDirectory)Project.CSharp.Resx.targets</_ResxTargets>
-      <_ResxSlnProps>$(BuildProperties)</_ResxSlnProps>
-      <!-- See comments in Project.CSharp.Resx.targets for what this does-->
-      <_ResxSlnProps>$(_ResxSlnProps);CustomAfterMicrosoftCommonTargets=$(_ResxTargets)</_ResxSlnProps>
-      <_ResxSlnProps>$(_ResxSlnProps);CustomAfterMicrosoftCommonCrossTargetingTargets=$(_ResxTargets)</_ResxSlnProps>
-    </PropertyGroup>
-
-    <MSBuild Targets="_GenerateResx"
-      Projects="@(Solutions)"
-      Properties="$(_ResxSlnProps)"
-      BuildInParallel="$(BuildInParallel)"
-      Condition="'@(Solutions)' != ''" />
-  </Target>
-
-<!--
-###################################################################
-Targets: _UseVolatileFeed
-
-Replaces $(RepositoryRoot)\NuGet.config feeds.
-###################################################################
--->
-  <ItemGroup>
-    <_UpdateFeeds Include="ARTIFACTS" Value="$(NUGET_VOLATILE_FEED_ARTIFACTS)" Condition="'$(NUGET_VOLATILE_FEED_ARTIFACTS)' != ''" />
-    <_UpdateFeeds Include="AspNetCore" Value="$(NUGET_VOLATILE_FEED_AspNetCore)" Condition="'$(NUGET_VOLATILE_FEED_AspNetCore)' != ''" />
-  </ItemGroup>
-
-  <Target Name="_UseVolatileFeed" Condition="'@(_UpdateFeeds)' != ''">
-    <UpdatePackageSource NuGetConfigPath="$(RepositoryRoot)NuGet.config"
-      SourceName="%(_UpdateFeeds.Identity)"
-      SourceUri="%(_UpdateFeeds.Value)"
-      Condition="'%(_UpdateFeeds.Value)' != ''" />
-  </Target>
-
-</Project>
diff --git a/modules/BundledPackages/BundledPackages.proj b/modules/BundledPackages/BundledPackages.proj
deleted file mode 100644
index 04da269d2..000000000
--- a/modules/BundledPackages/BundledPackages.proj
+++ /dev/null
@@ -1,55 +0,0 @@
-<Project>
-  <Import Project="..\..\build\dependencies.props" />
-
-  <Target Name="Publish">
-
-    <ItemGroup>
-      <Projects Include="$(MSBuildThisFileDirectory)..\..\src\Internal.AspNetCore.Sdk\Internal.AspNetCore.Sdk.csproj" />
-      <Projects Include="$(MSBuildThisFileDirectory)..\..\src\ApiCheck.Console\ApiCheck.Console.csproj" />
-    </ItemGroup>
-
-    <MSBuild Projects="@(Projects)"
-      Targets="Pack"
-      Properties="PackageOutputPath=$(PublishDir);Configuration=$(Configuration);BuildNumber=$(BuildNumber)"
-      BuildInParallel="true"
-      RemoveProperties="PublishDir" />
-
-    <PropertyGroup>
-      <!--
-        This is a workaround for https://github.com/Microsoft/msbuild/issues/2914.
-        Currently, the only way to configure the NuGetSdkResolver is with NuGet.config, which is not generally used in aspnet org projects.
-        This project is restored so that it pre-populates the NuGet cache with SDK packages.
-      -->
-      <BundledPackageRestorerContent>
-<![CDATA[
-<Project>
-  <PropertyGroup>
-    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
-    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
-  </PropertyGroup>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCorePackageVersion)" />
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(Version)" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-</Project>
-]]>
-      </BundledPackageRestorerContent>
-    </PropertyGroup>
-
-    <WriteLinesToFile File="$(PublishDir)BundledPackageRestorer.csproj" Lines="$(BundledPackageRestorerContent)" Overwrite="true" />
-    <Copy SourceFiles="NuGet.config" DestinationFolder="$(PublishDir)" />
-    <DownloadFile SourceUrl="https://www.nuget.org/api/v2/package/MicroBuild.Core/$(MicroBuildCorePackageVersion)" DestinationFolder="$(PublishDir)" DestinationFileName="MicroBuild.Core.$(MicroBuildCorePackageVersion).nupkg" />
-  </Target>
-
-</Project>
diff --git a/modules/BundledPackages/NuGet.config b/modules/BundledPackages/NuGet.config
deleted file mode 100644
index b34426546..000000000
--- a/modules/BundledPackages/NuGet.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="LocalFolder" value="./" />
-  </packageSources>
-</configuration>
diff --git a/modules/KoreBuild.Tasks/CheckPackageReferences.cs b/modules/KoreBuild.Tasks/CheckPackageReferences.cs
deleted file mode 100644
index c99d5dd26..000000000
--- a/modules/KoreBuild.Tasks/CheckPackageReferences.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using KoreBuild.Tasks.ProjectModel;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.AspNetCore.BuildTools;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Exceptions;
-using Microsoft.Build.Framework;
-using NuGet.Versioning;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Ensures MSBuild files use PackageReference responsibly.
-    /// </summary>
-    public class CheckPackageReferences : Microsoft.Build.Utilities.Task
-    {
-        /// <summary>
-        /// The solutions of csproj files to check.
-        /// </summary>
-        [Required]
-        public ITaskItem[] Projects { get; set; }
-
-        /// <summary>
-        /// The file that contains the PropertyGroup of versions
-        /// </summary>
-        [Required]
-        public string DependenciesFile { get; set; }
-
-        public string[] Properties { get; set; }
-
-        public override bool Execute()
-        {
-            if (Projects == null || Projects.Length == 0)
-            {
-                Log.LogMessage(MessageImportance.Low, "No projects or solutions were found. Skipping PackageReference validation.");
-                return true;
-            }
-
-            if (!File.Exists(DependenciesFile))
-            {
-                Log.LogKoreBuildError(KoreBuildErrors.DependenciesFileDoesNotExist, $"Expected the dependencies file to exist at {DependenciesFile}");
-                return false;
-            }
-
-            if (!DependencyVersionsFile.TryLoad(DependenciesFile, out var depsFile))
-            {
-                Log.LogError($"Could not load the dependencies file from {DependenciesFile}");
-                return false;
-            }
-
-            if (!depsFile.HasVersionsPropertyGroup)
-            {
-                Log.LogKoreBuildWarning(KoreBuildErrors.PackageRefPropertyGroupNotFound, $"No PropertyGroup with Label=\"{DependencyVersionsFile.PackageVersionsLabel}\" or Label=\"{DependencyVersionsFile.AutoPackageVersionsLabel}\" could be found in {DependenciesFile}");
-            }
-
-            foreach (var proj in Projects)
-            {
-                var ext = Path.GetExtension(proj.ItemSpec);
-                if (ext == ".sln")
-                {
-                    var solutionProps = MSBuildListSplitter.GetNamedProperties(Properties);
-                    var projectFiles = Projects.SelectMany(p => SolutionInfoFactory.GetProjects(p, solutionProps)).Distinct();
-                    foreach (var project in projectFiles)
-                    {
-                        VerifyPackageReferences(project, depsFile.VersionVariables);
-                    }
-                }
-                else
-                {
-                    VerifyPackageReferences(proj.ItemSpec, depsFile.VersionVariables);
-                }
-            }
-
-            return !Log.HasLoggedErrors;
-        }
-
-        private void VerifyPackageReferences(string filePath, IReadOnlyDictionary<string, PackageVersionVariable> versionVariables)
-        {
-            ProjectRootElement doc;
-            try
-            {
-                doc = ProjectRootElement.Open(filePath);
-            }
-            catch (InvalidProjectFileException ex)
-            {
-                Log.LogError(null, null, null, filePath, 0, 0, 0, 0, message: "Invalid project file: " + ex.Message);
-                return;
-            }
-
-            var packageReferences = doc.Items.Where(i => i.ItemType == "PackageReference");
-            foreach (var pkgRef in packageReferences)
-            {
-                var id = pkgRef.Include;
-
-                if (string.IsNullOrEmpty(id))
-                {
-                    // this node is an Update or Remove node
-                    continue;
-                }
-
-                var versionMetadata = pkgRef.Metadata.LastOrDefault(m => m.Name == "Version");
-                var versionRaw = versionMetadata?.Value;
-                if (versionMetadata == null || string.IsNullOrEmpty(versionRaw))
-                {
-                    Log.LogKoreBuildError(pkgRef.Location.File, pkgRef.Location.Line, KoreBuildErrors.PackageReferenceDoesNotHaveVersion, $"PackageReference to {id} does not define a Version");
-                    continue;
-                }
-
-                var versionIsVariable =
-                    versionRaw != null
-                    && versionRaw.Length > 3
-                    && versionRaw[0] == '$'
-                    && versionRaw[1] == '('
-                    && versionRaw[versionRaw.Length - 1] == ')'
-                    && versionRaw.IndexOf(')') == versionRaw.Length - 1;
-
-                if (!versionIsVariable)
-                {
-                    Log.LogKoreBuildError(pkgRef.Location.File, pkgRef.Location.Line, KoreBuildErrors.PackageRefHasLiteralVersion, "PackageReference must use an MSBuild variable to set the version.");
-                    continue;
-                }
-
-                var versionVarName = versionRaw.Substring(2, versionRaw.Length - 3);
-
-                if (!versionVariables.TryGetValue(versionVarName, out var variable))
-                {
-                    Log.LogKoreBuildError(pkgRef.Location.File, pkgRef.Location.Line, KoreBuildErrors.VariableNotFoundInDependenciesPropsFile, $"The variable {versionRaw} could not be found in {DependenciesFile}");
-                    continue;
-                }
-
-                var versionValue = variable.Version;
-                if (!VersionRange.TryParse(versionValue, out var nugetVersion))
-                {
-                    Log.LogKoreBuildError(pkgRef.Location.File, pkgRef.Location.Line, KoreBuildErrors.InvalidPackageVersion, $"PackageReference to {id} has an invalid version identifier: '{versionValue}'");
-                    continue;
-                }
-
-                if (nugetVersion.IsFloating)
-                {
-                    Log.LogKoreBuildError(pkgRef.Location.File, pkgRef.Location.Line, KoreBuildErrors.PackageRefHasFloatingVersion, $"PackageReference to {id} uses a floating version: '{versionValue}'");
-                }
-            }
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/CodeSign.props b/modules/KoreBuild.Tasks/CodeSign.props
new file mode 100644
index 000000000..382a7aee1
--- /dev/null
+++ b/modules/KoreBuild.Tasks/CodeSign.props
@@ -0,0 +1,29 @@
+<Project>
+  <Import Project="SignTool/build/Microsoft.DotNet.SignTool.props" />
+
+  <PropertyGroup>
+    <DisableCodeSigning Condition=" '$(OS)' != 'Windows_NT' ">true</DisableCodeSigning>
+
+    <!-- This file can be used to exclude something files from signcheck. -->
+    <SignCheckExclusionsFile Condition=" '$(SignCheckExclusionsFile)' == '' ">$(RepoRoot)build\signcheck.exclusions.txt</SignCheckExclusionsFile>
+
+    <SignCheckWorkingDir Condition=" '$(SignCheckWorkingDir)' == '' ">$(ArtifactsDir)</SignCheckWorkingDir>
+
+    <!-- Relative paths in SignToolData.json are relative to this path -->
+    <SignToolDataWorkingDir Condition=" '$(SignToolDataWorkingDir)' == '' ">$(RepoRoot)</SignToolDataWorkingDir>
+
+    <!-- Dry run checks signing config without applying authenticode signatures to files. -->
+    <SignToolDryRun Condition=" '$(SignType)' != 'real' AND '$(SignType)' != 'test' ">true</SignToolDryRun>
+    <SignToolDryRun Condition=" '$(SignToolDryRun)' == '' ">false</SignToolDryRun>
+
+    <!-- Test signing uses test certificates which, when used, requires different validation behavior by SignTool. -->
+    <SignToolTestSign>false</SignToolTestSign>
+    <SignToolTestSign Condition=" '$(SignType)' == 'test' ">true</SignToolTestSign>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(DisableDefaultItems)' != 'true' ">
+    <!-- Multiple directories can be specified.-->
+    <SignCheckDirectory Include="$(SignCheckWorkingDir)" />
+  </ItemGroup>
+
+</Project>
diff --git a/modules/KoreBuild.Tasks/CodeSign.targets b/modules/KoreBuild.Tasks/CodeSign.targets
index 28edbbc5c..2ea2a8399 100644
--- a/modules/KoreBuild.Tasks/CodeSign.targets
+++ b/modules/KoreBuild.Tasks/CodeSign.targets
@@ -1,26 +1,4 @@
 <Project>
-  <Import Project="SignTool/build/Microsoft.DotNet.SignTool.props" />
-
-  <PropertyGroup>
-    <DisableCodeSigning Condition=" '$(OS)' != 'Windows_NT' ">true</DisableCodeSigning>
-
-    <!-- This file can be used to exclude something files from signcheck. -->
-    <SignCheckExclusionsFile Condition=" '$(SignCheckExclusionsFile)' == '' ">$(RepositoryRoot)build\signcheck.exclusions.txt</SignCheckExclusionsFile>
-
-    <SignCheckWorkingDir Condition=" '$(SignCheckWorkingDir)' == '' ">$(ArtifactsDir)</SignCheckWorkingDir>
-
-    <!-- Relative paths in SignToolData.json are relative to this path -->
-    <SignToolDataWorkingDir Condition=" '$(SignToolDataWorkingDir)' == '' ">$(RepositoryRoot)</SignToolDataWorkingDir>
-
-    <!-- Dry run checks signing config without code signing. -->
-    <SignToolDryRun Condition=" '$(SignType)' != 'real' AND '$(SignType)' != 'test' ">true</SignToolDryRun>
-    <SignToolDryRun Condition=" '$(SignToolDryRun)' == '' ">false</SignToolDryRun>
-
-    <!-- Test signing (not commonly used) -->
-    <SignToolTestSign>false</SignToolTestSign>
-    <SignToolTestSign Condition=" '$(SignType)' == 'test' ">true</SignToolTestSign>
-  </PropertyGroup>
-
   <Target Name="CodeSign" Condition=" '$(DisableCodeSigning)' != 'true' "
           AfterTargets="Package"
           DependsOnTargets="$(CodeSignDependsOn)">
@@ -52,7 +30,9 @@
       DryRun="$(SignToolDryRun)"
       TestSign="$(SignToolTestSign)"
       ItemsToSign="@(_ItemsToSign)"
-      FileSignInfo="@(_FileSignInfo)"
+      FileSignInfo="@(_FileSignInfo);@(FileNamesToSign)"
+      StrongNameSignInfo="@(AssemblyToSign)"
+      FileExtensionSignInfo="@(FileExtensionsToSign)"
       TempDir="$(IntermediateDir)"
       LogDir="$(LogOutputDir)"
       MSBuildPath="$(MSBuildx86Path)"
@@ -69,18 +49,18 @@
 
     <ItemGroup>
       <SignCheckArgs Remove="@(SignCheckArgs)" />
+      <SignCheckArgs Include="$(SignCheckToolPath)" />
       <SignCheckArgs Include="--error-log-file;$(LogOutputDir)signcheck.errors.log" />
       <SignCheckArgs Include="--generate-exclusions-file;$(LogOutputDir)signcheck.exclusions.g.txt" />
-      <SignCheckArgs Include="--input-files;$(SignCheckWorkingDir)" />
       <SignCheckArgs Include="--recursive" />
       <SignCheckArgs Include="--verify-jar" />
       <SignCheckArgs Include="--verify-strongname" Condition=" '$(DisableSignCheckStrongName)' != 'true' " />
       <SignCheckArgs Include="--exclusions-file;$(SignCheckExclusionsFile)" Condition="Exists('$(SignCheckExclusionsFile)')" />
     </ItemGroup>
 
-    <Message Text="Running signcheck on $(SignCheckWorkingDir)" Importance="high" />
+    <Message Text="Running signcheck on @(SignCheckDirectory, ', ')" Importance="high" />
 
-    <Run FileName="$(SignCheckToolPath)" Arguments="@(SignCheckArgs)" />
+    <Exec Command="@(SignCheckArgs->'&quot;%(Identity)&quot;',' ') --input-files &quot;$([System.String]::new('%(SignCheckDirectory.Identity)').TrimEnd('\'))&quot;" />
   </Target>
 
 </Project>
diff --git a/modules/KoreBuild.Tasks/ComputeChecksum.cs b/modules/KoreBuild.Tasks/ComputeChecksum.cs
deleted file mode 100644
index 45f37f4bb..000000000
--- a/modules/KoreBuild.Tasks/ComputeChecksum.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.Build.Framework;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Computes the checksum for a single file.
-    /// </summary>
-    public class ComputeChecksum : Microsoft.Build.Utilities.Task
-    {
-        /// <summary>
-        /// The file path.
-        /// </summary>
-        [Required]
-        public string File { get; set; }
-
-        /// <summary>
-        /// The algorithm. Allowed values: SHA256, SHA384, SHA512.
-        /// </summary>
-        public string Algorithm { get; set; } = "SHA256";
-
-        /// <summary>
-        /// The hash.
-        /// </summary>
-        [Output]
-        public string Hash { get; set; }
-
-        public override bool Execute()
-        {
-            Hash = HashHelper.GetFileHash(Algorithm, File);
-
-            return true;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/DisableSkipStrongName.cs b/modules/KoreBuild.Tasks/DisableSkipStrongName.cs
deleted file mode 100644
index acb0d2345..000000000
--- a/modules/KoreBuild.Tasks/DisableSkipStrongName.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using KoreBuild.Tasks.SkipStrongNames;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Win32;
-
-namespace KoreBuild.Tasks
-{
-    public class DisableSkipStrongName : Task
-    {
-        [Required]
-        public string XmlFile { get; set; }
-
-        public override bool Execute()
-        {
-            var configuration = new StrongNameConfiguration(AssembliesFile.Read(XmlFile));
-
-            return SkipDisable(configuration);
-        }
-
-        private bool SkipDisable(StrongNameConfiguration configuration)
-        {
-            bool printedHeader = false;
-
-            foreach (RegistrySection section in WindowsRegistry.Sections)
-            {
-                using (RegistryKey registryKey = WindowsRegistry.CreateWritableVerificationRegistryKey(section))
-                {
-                    if (registryKey == null)
-                    {
-                        Log.LogError($"Unable to open writable verification registry key for {section}.");
-                        return false;
-                    }
-
-                    foreach (var assembly in configuration.FilteredAssemblySpecifications[section])
-                    {
-                        RegistryKey subKey = registryKey.OpenSubKey(assembly);
-
-                        if (subKey != null)
-                        {
-                            if (!printedHeader)
-                            {
-                                printedHeader = true;
-                                Log.LogMessage("Deleting registry entries:");
-                            }
-
-                            Log.LogMessage($"  {registryKey}\\{assembly}");
-                            subKey.Dispose();
-                            registryKey.DeleteSubKeyTree(assembly);
-                        }
-                    }
-                }
-            }
-
-            if (!printedHeader)
-            {
-                Log.LogMessage("Skip Strong Names is already disabled.");
-            }
-            else
-            {
-                Log.LogMessage("");
-                Log.LogMessage("Skip Strong Names was successfully disabled.");
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/DownloadFile.cs b/modules/KoreBuild.Tasks/DownloadFile.cs
deleted file mode 100644
index cf0be8e50..000000000
--- a/modules/KoreBuild.Tasks/DownloadFile.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Build.Framework;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Downloads a file.
-    /// </summary>
-    public class DownloadFile : Microsoft.Build.Utilities.Task, ICancelableTask
-    {
-        private readonly CancellationTokenSource _cts = new CancellationTokenSource();
-
-        /// <summary>
-        /// The file to download. Can be prefixed with <c>file://</c> for local file paths.
-        /// </summary>
-        [Required]
-        public string Uri { get; set; }
-
-        /// <summary>
-        /// Destination for the downloaded file. If the file already exists, it is not re-downloaded unless <see cref="Overwrite"/> is true.
-        /// </summary>
-        [Required]
-        public string DestinationPath { get; set; }
-
-        /// <summary>
-        /// Should <see cref="DestinationPath"/> be overwritten. When <c>true</c>, the file is always re-downloaded.
-        /// </summary>
-        public bool Overwrite { get; set; }
-
-        /// <summary>
-        /// The maximum amount of time to allow for downloading the file. Defaults to 15 minutes.
-        /// </summary>
-        public int TimeoutSeconds { get; set; } = 60 * 15;
-
-        public void Cancel() => _cts.Cancel();
-
-        public override bool Execute() => ExecuteAsync().Result;
-
-        public async Task<bool> ExecuteAsync()
-        {
-            if (File.Exists(DestinationPath) && !Overwrite)
-            {
-                return true;
-            }
-
-            const string FileUriProtocol = "file://";
-
-            if (Uri.StartsWith(FileUriProtocol, StringComparison.OrdinalIgnoreCase))
-            {
-                var filePath = Uri.Substring(FileUriProtocol.Length);
-                Log.LogMessage($"Copying '{filePath}' to '{DestinationPath}'");
-                File.Copy(filePath, DestinationPath);
-            }
-            else
-            {
-                Log.LogMessage($"Downloading '{Uri}' to '{DestinationPath}'");
-
-                using (var httpClient = new HttpClient
-                {
-                    // Timeout if no response starts in 2 minutes
-                    Timeout = TimeSpan.FromMinutes(2),
-                })
-                {
-                    try
-                    {
-                        var response = await httpClient.GetAsync(Uri, _cts.Token);
-                        response.EnsureSuccessStatusCode();
-                        _cts.Token.ThrowIfCancellationRequested();
-
-                        Directory.CreateDirectory(Path.GetDirectoryName(DestinationPath));
-
-                        using (var outStream = File.Create(DestinationPath))
-                        {
-                            var responseStream = response.Content.ReadAsStreamAsync();
-                            var finished = await Task.WhenAny(responseStream, Task.Delay(TimeSpan.FromSeconds(TimeoutSeconds)));
-
-                            if (!ReferenceEquals(responseStream, finished))
-                            {
-                                throw new TimeoutException($"Download failed to complete in {TimeoutSeconds} seconds.");
-                            }
-
-                            responseStream.Result.CopyTo(outStream);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.LogError($"Downloading '{Uri}' failed.");
-                        Log.LogErrorFromException(ex, showStackTrace: true);
-
-                        File.Delete(DestinationPath);
-                        return false;
-                    }
-                }
-            }
-
-            return !Log.HasLoggedErrors;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/DownloadNuGetPackages.cs b/modules/KoreBuild.Tasks/DownloadNuGetPackages.cs
deleted file mode 100644
index e69cb71f1..000000000
--- a/modules/KoreBuild.Tasks/DownloadNuGetPackages.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NuGet.Build;
-using NuGet.Packaging.Core;
-using NuGet.Versioning;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Downloads NuGet packages in parallel.
-    /// </summary>
-    public class DownloadNuGetPackages : Microsoft.Build.Utilities.Task, ICancelableTask
-    {
-        private readonly CancellationTokenSource _cts = new CancellationTokenSource();
-
-        /// <summary>
-        /// The NuGet packages to download. Expected form:
-        ///
-        /// ItemSpec = PackageID
-        ///
-        /// Metadata:
-        ///   Version = the exact package version to download
-        ///   Source = the NuGet feed (remote or folder)
-        /// </summary>
-        [Required]
-        public ITaskItem[] Packages { get; set; }
-
-        /// <summary>
-        /// The directory for download NuGet files. The task will write files to $(DestinationFolder)/$(PackageId.ToLower()).$(Version).nupkg
-        /// </summary>
-        [Required]
-        public string DestinationFolder { get; set; }
-
-        /// <summary>
-        /// The package files that were downloaded.
-        /// </summary>
-        [Output]
-        public ITaskItem[] Files { get; set; }
-
-        /// <summary>
-        /// The maximum amount of time to allow for downloading packages.
-        /// </summary>
-        public int TimeoutSeconds { get; set; } = 60 * 5;
-
-        public void Cancel() => _cts.Cancel();
-
-        public override bool Execute()
-        {
-            return ExecuteAsync().Result;
-        }
-
-        public async Task<bool> ExecuteAsync()
-        {
-            DestinationFolder = DestinationFolder.Replace('\\', '/');
-
-            var requests = new List<PackageDownloadRequest>();
-            var files = new List<ITaskItem>();
-            var downloadCount = 0;
-            foreach (var item in Packages)
-            {
-                var id = item.ItemSpec;
-                var rawVersion = item.GetMetadata("Version");
-                if (!NuGetVersion.TryParse(rawVersion, out var version))
-                {
-                    Log.LogError($"Package '{id}' has an invalid 'Version' metadata value: '{rawVersion}'.");
-                    return false;
-                }
-
-                var source = item.GetMetadata("Source");
-                if (string.IsNullOrEmpty(source))
-                {
-                    Log.LogError($"Package '{id}' is missing the 'Source' metadata value.");
-                    return false;
-                }
-
-                var outputPath = Path.Combine(DestinationFolder, $"{id.ToLowerInvariant()}.{version.ToNormalizedString()}.nupkg");
-
-                files.Add(new TaskItem(outputPath));
-                if (File.Exists(outputPath))
-                {
-                    Log.LogMessage($"Skipping {id} {version}. Already exists in '{outputPath}'");
-                    continue;
-                }
-                else
-                {
-                    downloadCount++;
-
-                    var request = new PackageDownloadRequest
-                    {
-                        Identity = new PackageIdentity(id, version),
-                        OutputPath = outputPath,
-                        Sources = source.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries),
-                    };
-
-                    requests.Add(request);
-                }
-            }
-
-            Files = files.ToArray();
-
-            if (downloadCount == 0)
-            {
-                Log.LogMessage("All packages are downloaded.");
-                return true;
-            }
-
-            Directory.CreateDirectory(DestinationFolder);
-            var logger = new MSBuildLogger(Log);
-            var timeout = TimeSpan.FromSeconds(TimeoutSeconds);
-            var downloader = new PackageDownloader(logger);
-            var timer = Stopwatch.StartNew();
-
-            var result = await downloader.DownloadPackagesAsync(requests, timeout, _cts.Token);
-
-            timer.Stop();
-            logger.LogMinimal($"Finished downloading {requests.Count} package(s) in {timer.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/EnableSkipStrongName.cs b/modules/KoreBuild.Tasks/EnableSkipStrongName.cs
deleted file mode 100644
index 53ffd31ce..000000000
--- a/modules/KoreBuild.Tasks/EnableSkipStrongName.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using System.Runtime.InteropServices;
-using KoreBuild.Tasks.SkipStrongNames;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Win32;
-
-namespace KoreBuild.Tasks
-{
-    public class EnableSkipStrongName : Task
-    {
-        [Required]
-        public string XmlFile { get; set; }
-
-        public override bool Execute()
-        {
-            var configuration = new StrongNameConfiguration(AssembliesFile.Read(XmlFile));
-
-            return SkipEnable(configuration);
-        }
-
-        private bool SkipEnable(StrongNameConfiguration configuration)
-        {
-            if (!File.Exists(XmlFile))
-            {
-                Log.LogError("The XmlFile given must exist.");
-                return false;
-            }
-
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                Log.LogError("Strongname tasks should only be run on Windows.");
-                return false;
-            }
-
-            bool printedHeader = false;
-
-            foreach (RegistrySection section in WindowsRegistry.Sections)
-            {
-                using (RegistryKey registryKey = WindowsRegistry.CreateWritableVerificationRegistryKey(section))
-                {
-                    if (registryKey == null)
-                    {
-                        Log.LogError($"Unable to open writable verification registry key for {section}.");
-                        return false;
-                    }
-
-                    foreach (var assembly in configuration.FilteredAssemblySpecifications[section])
-                    {
-                        using (RegistryKey subKey = registryKey.OpenSubKey(assembly))
-                        {
-                            if (subKey == null)
-                            {
-                                if (!printedHeader)
-                                {
-                                    printedHeader = true;
-                                    Log.LogMessage("Adding registry entries:");
-                                }
-
-                                Log.LogMessage($"  {registryKey}\\{assembly}");
-                                registryKey.CreateSubKey(assembly);
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (!printedHeader)
-            {
-                Log.LogMessage("Skip Strong Names is already enabled.");
-            }
-            else
-            {
-                Log.LogMessage("");
-                Log.LogMessage("Skip Strong Names was successfully enabled.");
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/GenerateDependenciesPropsFile.cs b/modules/KoreBuild.Tasks/GenerateDependenciesPropsFile.cs
deleted file mode 100644
index 149fc5b8d..000000000
--- a/modules/KoreBuild.Tasks/GenerateDependenciesPropsFile.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using KoreBuild.Tasks.ProjectModel;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Evaluation;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Generates the build/dependencies.props file base on your current project,
-    /// and updates all PackageReferences in <see cref="Projects"/>  and <see cref="OtherImports"/> to use MSBuild variables.
-    /// </summary>
-    public class GenerateDependenciesPropsFile : Microsoft.Build.Utilities.Task, ICancelableTask
-    {
-        private readonly CancellationTokenSource _cts = new CancellationTokenSource();
-
-        /// <summary>
-        /// The projects to update
-        /// </summary>
-        [Required]
-        public ITaskItem[] Projects { get; set; }
-
-        /// <summary>
-        /// other files to update that may have PackageReferences in them
-        /// </summary>
-        public ITaskItem[] OtherImports { get; set; }
-
-        /// <summary>
-        /// Location of the dependenices.props file
-        /// </summary>
-        [Required]
-        public string DependenciesFile { get; set; }
-
-        /// <summary>
-        /// Additional properties to use when evaluating the projects
-        /// </summary>
-        public string[] Properties { get; set; }
-
-        public void Cancel()
-        {
-            _cts.Cancel();
-        }
-
-        public override bool Execute()
-        {
-            var unifiedPackageList = new Dictionary<string, PackageReferenceInfo>(StringComparer.OrdinalIgnoreCase);
-
-            var projects = new ProjectInfoFactory(Log).CreateMany(Projects, Properties, false, _cts.Token);
-            var packageRefs = projects.SelectMany(p => p.Frameworks).SelectMany(f => f.Dependencies);
-
-            foreach (var packageRef in packageRefs)
-            {
-                if (packageRef.Value.IsImplicitlyDefined)
-                {
-                    // skip PackageReferences added by the SDK
-                    continue;
-                }
-
-                if (packageRef.Value.NoWarn.Contains(KoreBuildErrors.Prefix + KoreBuildErrors.ConflictingPackageReferenceVersions))
-                {
-                    // Make it possible to suppress version conflicts while generating this file.
-                    continue;
-                }
-
-                if (unifiedPackageList.TryGetValue(packageRef.Value.Id, out var other))
-                {
-                    if (other.Version != packageRef.Value.Version)
-                    {
-                        Log.LogKoreBuildError(KoreBuildErrors.ConflictingPackageReferenceVersions, $"Conflicting dependency versions for {packageRef.Value.Id}: {other.Project.FileName} references '{other.Version}' but {packageRef.Value.Project.FileName} references '{packageRef.Value.Version}'");
-                    }
-                }
-                else
-                {
-                    unifiedPackageList.Add(packageRef.Value.Id, packageRef.Value);
-                    Log.LogMessage(MessageImportance.Low, $"Found {packageRef.Value.Id} = {packageRef.Value.Version}");
-                }
-            }
-
-            if (Log.HasLoggedErrors)
-            {
-                return false;
-            }
-
-            var items = unifiedPackageList.Values.Select(p => new TaskItem(p.Id, new Hashtable { ["Version"] = p.Version })).ToArray();
-
-            var task = new GeneratePackageVersionPropsFile
-            {
-                AddOverrideImport = true,
-                SuppressVariableLabels = true,
-                Packages = items,
-                BuildEngine = BuildEngine,
-                HostObject = HostObject,
-                OutputPath = DependenciesFile,
-            };
-
-            if (!task.Execute())
-            {
-                return false;
-            }
-
-            var otherImports = OtherImports != null
-                ? OtherImports.Select(p => p.ItemSpec)
-                : Array.Empty<string>();
-
-            foreach (var proj in projects.Select(p => p.FullPath).Concat(otherImports))
-            {
-                var project = ProjectRootElement.Open(proj, ProjectCollection.GlobalProjectCollection, preserveFormatting: true);
-                var changed = false;
-                foreach (var item in project.Items.Where(i => i.ItemType == "PackageReference"))
-                {
-                    var noWarn = item.Metadata.FirstOrDefault(m => m.Name == "NoWarn");
-                    if (noWarn != null && noWarn.Value.Contains(KoreBuildErrors.Prefix + KoreBuildErrors.ConflictingPackageReferenceVersions))
-                    {
-                        continue;
-                    }
-
-                    var versionMetadata = item.Metadata.LastOrDefault(p => p.Name == "Version");
-                    if (versionMetadata != null && versionMetadata.Value.StartsWith("$("))
-                    {
-                        continue;
-                    }
-                    changed = true;
-
-                    var varName = $"$({DependencyVersionsFile.GetVariableName(item.Include)})";
-                    if (versionMetadata == null)
-                    {
-                        item.AddMetadata("Version", varName, expressAsAttribute: true);
-                    }
-                    else
-                    {
-                        versionMetadata.Value = varName;
-                    }
-                }
-
-                if (changed)
-                {
-                    Log.LogMessage(MessageImportance.High, $"Updated {proj}");
-                    project.Save(proj);
-                }
-                else
-                {
-                    Log.LogMessage(MessageImportance.Normal, $"Skipping {proj}. Already up to date.");
-                }
-            }
-
-            return !Log.HasLoggedErrors;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/GeneratePackageVersionPropsFile.cs b/modules/KoreBuild.Tasks/GeneratePackageVersionPropsFile.cs
deleted file mode 100644
index 38c34cf15..000000000
--- a/modules/KoreBuild.Tasks/GeneratePackageVersionPropsFile.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace KoreBuild.Tasks
-{
-    public class GeneratePackageVersionPropsFile : Task
-    {
-        [Required]
-        public ITaskItem[] Packages { get; set; }
-
-        [Required]
-        public string OutputPath { get; set; }
-
-        public bool AddOverrideImport { get; set; }
-
-        public string[] AdditionalImports { get; set; }
-
-        public bool SuppressVariableLabels { get; set; }
-
-        public override bool Execute()
-        {
-            OutputPath = OutputPath.Replace('\\', '/');
-            Directory.CreateDirectory(Path.GetDirectoryName(OutputPath));
-
-            DependencyVersionsFile depsFile;
-            if (File.Exists(OutputPath))
-            {
-                if (!DependencyVersionsFile.TryLoad(OutputPath, out depsFile))
-                {
-                    depsFile = DependencyVersionsFile.Create(AddOverrideImport, AdditionalImports);
-                    Log.LogWarning($"Could not load the existing deps file from {OutputPath}. This file will be overwritten.");
-                }
-            }
-            else
-            {
-                depsFile = DependencyVersionsFile.Create(AddOverrideImport, AdditionalImports);
-            }
-
-            var varNames = new HashSet<string>();
-            foreach (var pkg in Packages)
-            {
-                var packageVersion = pkg.GetMetadata("Version");
-
-                if (string.IsNullOrEmpty(packageVersion))
-                {
-                    Log.LogError("Package {0} is missing the Version metadata", pkg.ItemSpec);
-                    continue;
-                }
-
-                string packageVarName;
-                if (!string.IsNullOrEmpty(pkg.GetMetadata("VariableName")))
-                {
-                    packageVarName = pkg.GetMetadata("VariableName");
-                    if (!packageVarName.EndsWith("Version", StringComparison.Ordinal))
-                    {
-                        Log.LogError("VariableName for {0} must end in 'Version'", pkg.ItemSpec);
-                        continue;
-                    }
-                }
-                else
-                {
-                    packageVarName = DependencyVersionsFile.GetVariableName(pkg.ItemSpec);
-                }
-
-                if (varNames.Contains(packageVarName))
-                {
-                    Log.LogError("Multiple packages would produce {0} in the generated dependencies.props file. Set VariableName to differentiate the packages manually", packageVarName);
-                    continue;
-                }
-
-                var item = depsFile.Update(packageVarName, packageVersion);
-                if (!SuppressVariableLabels)
-                {
-                    item.SetLabel(pkg.ItemSpec);
-                }
-            }
-
-            depsFile.Save(OutputPath);
-            Log.LogMessage(MessageImportance.Normal, $"Generated {OutputPath}");
-            return !Log.HasLoggedErrors;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/GetToolsets.cs b/modules/KoreBuild.Tasks/GetToolsets.cs
index 2f4edec2c..f2de1a253 100644
--- a/modules/KoreBuild.Tasks/GetToolsets.cs
+++ b/modules/KoreBuild.Tasks/GetToolsets.cs
@@ -98,7 +98,8 @@ private void GetVisualStudio(KoreBuildSettings.VisualStudioToolset vsToolset)
                 if (vsToolset.Required != KoreBuildSettings.RequiredPlatforms.None)
                 {
                     Log.LogError($"Could not find an installation of Visual Studio that satisifies the specified requirements in '{ConfigFile}'. " +
-                        "Execute `./run.ps1 install vs` to update or install the current VS installation.");
+                        "Execute `./run.ps1 install vs` to update or install the current VS installation. " +
+                        "See https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community for more details on workloads.");
                 }
                 return;
             }
diff --git a/modules/KoreBuild.Tasks/InstallDotNet.cs b/modules/KoreBuild.Tasks/InstallDotNet.cs
index 4f82a83f3..3c055c5ac 100644
--- a/modules/KoreBuild.Tasks/InstallDotNet.cs
+++ b/modules/KoreBuild.Tasks/InstallDotNet.cs
@@ -19,6 +19,7 @@ namespace KoreBuild.Tasks
     /// </summary>
     public class InstallDotNet : Microsoft.Build.Utilities.Task, ICancelableTask
     {
+        private const string DefaultArch = "x64";
         public readonly CancellationTokenSource _cts = new CancellationTokenSource();
 
         /// <summary>
@@ -86,7 +87,7 @@ private async Task<bool> ExecuteAsync()
                 arguments.AddRange(defaultArgs);
 
                 var arch = string.IsNullOrEmpty(request.Arch)
-                    ? "x64"
+                    ? DefaultArch
                     : request.Arch;
                 arguments.Add("-Architecture");
                 arguments.Add(arch);
@@ -233,19 +234,25 @@ private async Task<bool> ExecuteAsync()
 
         private string GetInstallDir(string arch)
         {
-            if (string.IsNullOrEmpty(DotNetHome))
-            {
-                var dotnetPath = Path.GetDirectoryName(DotNetMuxer.MuxerPath);
-                return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                    ? Path.Combine(Path.GetDirectoryName(dotnetPath), arch)
-                    : dotnetPath;
-            }
-            else
-            {
-                return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                    ? Path.Combine(DotNetHome, arch)
-                    : DotNetHome;
-            }
+            var shouldInstallToSubfolder = IsDotNetArchEnabled(arch);
+            var muxerDir = Path.GetDirectoryName(DotNetMuxer.MuxerPath);
+            var dotnetRootPath = !string.IsNullOrEmpty(DotNetHome)
+                ? DotNetHome
+                : shouldInstallToSubfolder
+                    ? Path.GetDirectoryName(muxerDir)
+                    : muxerDir;
+
+            return shouldInstallToSubfolder
+                ? Path.Combine(dotnetRootPath, arch)
+                : dotnetRootPath;
+        }
+
+        private bool IsDotNetArchEnabled(string arch)
+        {
+            // Only install to $DOTNET_HOME/x64/ on Windows
+            // if KOREBUILD_DISABLE_DOTNET_ARCH is undefined or arch != x64
+            return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                && (Environment.GetEnvironmentVariable("KOREBUILD_DISABLE_DOTNET_ARCH") == null || !string.Equals(DefaultArch, arch, StringComparison.OrdinalIgnoreCase));
         }
 
         private IEnumerable<DotNetAssetRequest> CreateAssetRequests()
diff --git a/modules/KoreBuild.Tasks/Internal/HashHelper.cs b/modules/KoreBuild.Tasks/Internal/HashHelper.cs
deleted file mode 100644
index 0973cf812..000000000
--- a/modules/KoreBuild.Tasks/Internal/HashHelper.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace KoreBuild.Tasks
-{
-    internal class HashHelper
-    {
-        public static string GetFileHash(string algorithmName, string filePath)
-        {
-            byte[] hash;
-            using (var stream = File.OpenRead(filePath))
-            {
-                HashAlgorithm algorithm;
-                switch (algorithmName.ToUpperInvariant())
-                {
-                    case "SHA256":
-                        algorithm = new SHA256Managed();
-                        break;
-                    case "SHA384":
-                        algorithm = new SHA384Managed();
-                        break;
-                    case "SHA512":
-                        algorithm = new SHA512Managed();
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException($"Unsupported hash algoritm {algorithmName}", nameof(algorithm));
-                }
-                hash = algorithm.ComputeHash(stream);
-            }
-
-            var sb = new StringBuilder();
-            foreach (var b in hash)
-            {
-                sb.AppendFormat("{0:X2}", b);
-            }
-
-            return sb.ToString();
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/MSBuildLogger.cs b/modules/KoreBuild.Tasks/Internal/MSBuildLogger.cs
deleted file mode 100644
index 458bd698d..000000000
--- a/modules/KoreBuild.Tasks/Internal/MSBuildLogger.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NuGet.Common;
-
-namespace NuGet.Build
-{
-    /// <summary>
-    /// TaskLoggingHelper -> ILogger
-    /// </summary>
-    internal class MSBuildLogger : LoggerBase, Common.ILogger
-    {
-        private readonly TaskLoggingHelper _taskLogging;
-
-        private delegate void LogMessageWithDetails(string subcategory,
-            string code,
-            string helpKeyword,
-            string file,
-            int lineNumber,
-            int columnNumber,
-            int endLineNumber,
-            int endColumnNumber,
-            MessageImportance importance,
-            string message,
-            params object[] messageArgs);
-
-        private delegate void LogErrorWithDetails(string subcategory,
-            string code,
-            string helpKeyword,
-            string file,
-            int lineNumber,
-            int columnNumber,
-            int endLineNumber,
-            int endColumnNumber,
-            string message,
-            params object[] messageArgs);
-
-        private delegate void LogMessageAsString(MessageImportance importance,
-            string message,
-            params object[] messageArgs);
-
-        private delegate void LogErrorAsString(string message,
-            params object[] messageArgs);
-
-        public MSBuildLogger(TaskLoggingHelper taskLogging)
-        {
-            _taskLogging = taskLogging ?? throw new ArgumentNullException(nameof(taskLogging));
-        }
-
-        public override void Log(ILogMessage message)
-        {
-            if (DisplayMessage(message.Level))
-            {
-                if (RuntimeEnvironmentHelper.IsMono)
-                {
-                    LogForMono(message);
-                    return;
-                }
-                else
-                {
-                    var logMessage = message as IRestoreLogMessage;
-
-                    if (logMessage == null)
-                    {
-                        logMessage = new RestoreLogMessage(message.Level, message.Message)
-                        {
-                            Code = message.Code,
-                            FilePath = message.ProjectPath
-                        };
-                    }
-                    LogForNonMono(logMessage);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Log using with metadata for non mono platforms.
-        /// </summary>
-        private void LogForNonMono(IRestoreLogMessage message)
-        {
-            switch (message.Level)
-            {
-                case LogLevel.Error:
-                    LogError(message, _taskLogging.LogError, _taskLogging.LogError);
-                    break;
-
-                case LogLevel.Warning:
-                    LogError(message, _taskLogging.LogWarning, _taskLogging.LogWarning);
-                    break;
-
-                case LogLevel.Minimal:
-                    LogMessage(message, MessageImportance.High, _taskLogging.LogMessage, _taskLogging.LogMessage);
-                    break;
-
-                case LogLevel.Information:
-                    LogMessage(message, MessageImportance.Normal, _taskLogging.LogMessage, _taskLogging.LogMessage);
-                    break;
-
-                case LogLevel.Debug:
-                case LogLevel.Verbose:
-                default:
-                    // Default to LogLevel.Debug and low importance
-                    LogMessage(message, MessageImportance.Low, _taskLogging.LogMessage, _taskLogging.LogMessage);
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Log using basic methods to avoid missing methods on mono.
-        /// </summary>
-        private void LogForMono(ILogMessage message)
-        {
-            switch (message.Level)
-            {
-                case LogLevel.Error:
-                    _taskLogging.LogError(message.Message);
-                    break;
-
-                case LogLevel.Warning:
-                    _taskLogging.LogWarning(message.Message);
-                    break;
-
-                case LogLevel.Minimal:
-                    _taskLogging.LogMessage(MessageImportance.High, message.Message);
-                    break;
-
-                case LogLevel.Information:
-                    _taskLogging.LogMessage(MessageImportance.Normal, message.Message);
-                    break;
-
-                case LogLevel.Debug:
-                case LogLevel.Verbose:
-                default:
-                    // Default to LogLevel.Debug and low importance
-                    _taskLogging.LogMessage(MessageImportance.Low, message.Message);
-                    break;
-            }
-
-            return;
-        }
-
-        private void LogMessage(IRestoreLogMessage logMessage,
-            MessageImportance importance,
-            LogMessageWithDetails logWithDetails,
-            LogMessageAsString logAsString)
-        {
-            if (logMessage.Code > NuGetLogCode.Undefined)
-            {
-                // NuGet does not currently have a subcategory while throwing logs, hence string.Empty
-                logWithDetails(string.Empty,
-                    Enum.GetName(typeof(NuGetLogCode), logMessage.Code),
-                    Enum.GetName(typeof(NuGetLogCode), logMessage.Code),
-                    logMessage.FilePath,
-                    logMessage.StartLineNumber,
-                    logMessage.StartColumnNumber,
-                    logMessage.EndLineNumber,
-                    logMessage.EndColumnNumber,
-                    importance,
-                    logMessage.Message);
-            }
-            else
-            {
-                logAsString(importance, logMessage.Message);
-            }
-        }
-
-        private void LogError(IRestoreLogMessage logMessage,
-            LogErrorWithDetails logWithDetails,
-            LogErrorAsString logAsString)
-        {
-            if (logMessage.Code > NuGetLogCode.Undefined)
-            {
-                // NuGet does not currently have a subcategory while throwing logs, hence string.Empty
-                logWithDetails(string.Empty,
-                    Enum.GetName(typeof(NuGetLogCode), logMessage.Code),
-                    Enum.GetName(typeof(NuGetLogCode), logMessage.Code),
-                    logMessage.FilePath,
-                    logMessage.StartLineNumber,
-                    logMessage.StartColumnNumber,
-                    logMessage.EndLineNumber,
-                    logMessage.EndColumnNumber,
-                    logMessage.Message);
-            }
-            else
-            {
-                logAsString(logMessage.Message);
-            }
-        }
-
-        public override System.Threading.Tasks.Task LogAsync(ILogMessage message)
-        {
-            Log(message);
-
-            return System.Threading.Tasks.Task.FromResult(0);
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/PackageInfo.cs b/modules/KoreBuild.Tasks/Internal/PackageInfo.cs
deleted file mode 100644
index b976aabfa..000000000
--- a/modules/KoreBuild.Tasks/Internal/PackageInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using NuGet.Packaging.Core;
-
-namespace KoreBuild.Tasks.Internal
-{
-    public class PackageInfo
-    {
-        public PackageIdentity Identity { get; set; }
-
-        public string PackagePath { get; set; }
-
-        public override string ToString()
-        {
-            return Identity.ToString();
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/ProjectModel/DotNetCliReferenceInfo.cs b/modules/KoreBuild.Tasks/Internal/ProjectModel/DotNetCliReferenceInfo.cs
deleted file mode 100644
index d4a9712fd..000000000
--- a/modules/KoreBuild.Tasks/Internal/ProjectModel/DotNetCliReferenceInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace KoreBuild.Tasks.ProjectModel
-{
-    internal class DotNetCliReferenceInfo
-    {
-        public DotNetCliReferenceInfo(string id, string version)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentException(nameof(id));
-            }
-
-            Id = id;
-            Version = version;
-        }
-
-        public string Id { get; }
-        public string Version { get; }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/ProjectModel/PackageReferenceInfo.cs b/modules/KoreBuild.Tasks/Internal/ProjectModel/PackageReferenceInfo.cs
deleted file mode 100644
index 63a9edde8..000000000
--- a/modules/KoreBuild.Tasks/Internal/ProjectModel/PackageReferenceInfo.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-
-namespace KoreBuild.Tasks.ProjectModel
-{
-    internal class PackageReferenceInfo
-    {
-        public PackageReferenceInfo(string id, string version, bool isImplicitlyDefined, IReadOnlyList<string> noWarn)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentException(nameof(id));
-            }
-
-            Id = id;
-            Version = version;
-            IsImplicitlyDefined = isImplicitlyDefined;
-            NoWarn = noWarn;
-        }
-
-        public string Id { get; }
-        public string Version { get; }
-        public bool IsImplicitlyDefined { get; }
-        public IReadOnlyList<string> NoWarn { get; }
-        public ProjectInfo Project { get; internal set; }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectFrameworkInfo.cs b/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectFrameworkInfo.cs
deleted file mode 100644
index ee0f9d3db..000000000
--- a/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectFrameworkInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NuGet.Frameworks;
-
-namespace KoreBuild.Tasks.ProjectModel
-{
-    internal class ProjectFrameworkInfo
-    {
-        public ProjectFrameworkInfo(NuGetFramework targetFramework, IReadOnlyDictionary<string, PackageReferenceInfo> dependencies)
-        {
-            TargetFramework = targetFramework ?? throw new ArgumentNullException(nameof(targetFramework));
-            Dependencies = dependencies ?? throw new ArgumentNullException(nameof(dependencies));
-        }
-
-        public NuGetFramework TargetFramework { get; }
-        public IReadOnlyDictionary<string, PackageReferenceInfo> Dependencies { get; }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectInfo.cs b/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectInfo.cs
deleted file mode 100644
index 95dc0780f..000000000
--- a/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectInfo.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace KoreBuild.Tasks.ProjectModel
-{
-    internal class ProjectInfo
-    {
-        public ProjectInfo(string fullPath,
-            string projectExtensionsPath,
-            IReadOnlyList<ProjectFrameworkInfo> frameworks,
-            IReadOnlyList<DotNetCliReferenceInfo> tools)
-        {
-            if (!Path.IsPathRooted(fullPath))
-            {
-                throw new ArgumentException("Path must be absolute", nameof(fullPath));
-            }
-
-            Frameworks = frameworks ?? throw new ArgumentNullException(nameof(frameworks));
-            Tools = tools ?? throw new ArgumentNullException(nameof(tools));
-
-            FullPath = fullPath;
-            FileName = Path.GetFileName(fullPath);
-            Directory = Path.GetDirectoryName(FullPath);
-            ProjectExtensionsPath = projectExtensionsPath ?? Path.Combine(Directory, "obj");
-
-            foreach (var dep in frameworks.SelectMany(f => f.Dependencies))
-            {
-                dep.Value.Project = this;
-            }
-        }
-
-        public string FullPath { get; }
-        public string FileName { get; }
-        public string ProjectExtensionsPath { get; }
-        public string Directory { get; }
-
-        public IReadOnlyList<ProjectFrameworkInfo> Frameworks { get; }
-        public IReadOnlyList<DotNetCliReferenceInfo> Tools { get; }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectInfoFactory.cs b/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectInfoFactory.cs
deleted file mode 100644
index 65e5879dc..000000000
--- a/modules/KoreBuild.Tasks/Internal/ProjectModel/ProjectInfoFactory.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.BuildTools;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Evaluation;
-using Microsoft.Build.Execution;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NuGet.Frameworks;
-
-namespace KoreBuild.Tasks.ProjectModel
-{
-    internal class ProjectInfoFactory
-    {
-        private readonly TaskLoggingHelper _logger;
-
-        public ProjectInfoFactory(TaskLoggingHelper logger)
-        {
-           _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        public IReadOnlyList<ProjectInfo> CreateMany(ITaskItem[] projectItems, string[] properties, bool policyDesignBuild, CancellationToken token)
-        {
-            if (projectItems == null)
-            {
-                return Array.Empty<ProjectInfo>();
-            }
-
-            var cts = new CancellationTokenSource();
-            token.Register(() => cts.Cancel());
-            var solutionProps = MSBuildListSplitter.GetNamedProperties(properties);
-            var projectFiles = projectItems.SelectMany(p => SolutionInfoFactory.GetProjects(p, solutionProps)).Distinct();
-            var projects = new ConcurrentBag<ProjectInfo>();
-            var stop = Stopwatch.StartNew();
-
-            Parallel.ForEach(projectFiles, projectFile =>
-            {
-                if (cts.Token.IsCancellationRequested)
-                {
-                    return;
-                }
-
-                try
-                {
-                    projects.Add(Create(projectFile, policyDesignBuild));
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogErrorFromException(ex);
-                    cts.Cancel();
-                }
-            });
-
-            stop.Stop();
-            _logger.LogMessage(MessageImportance.Low, $"Finished design-time build in {stop.ElapsedMilliseconds}ms");
-            return projects.ToArray();
-        }
-
-        public ProjectInfo Create(string path, bool policyDesignBuild)
-        {
-            var project = GetProject(path, ProjectCollection.GlobalProjectCollection, policyDesignBuild);
-            var instance = project.CreateProjectInstance(ProjectInstanceSettings.ImmutableWithFastItemLookup);
-            var projExtPath = instance.GetPropertyValue("MSBuildProjectExtensionsPath");
-
-            var targetFrameworks = instance.GetPropertyValue("TargetFrameworks");
-            var targetFramework = instance.GetPropertyValue("TargetFramework");
-
-            var frameworks = new List<ProjectFrameworkInfo>();
-            if (!string.IsNullOrEmpty(targetFrameworks) && string.IsNullOrEmpty(targetFramework))
-            {
-                // multi targeting
-                foreach (var tfm in targetFrameworks.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
-                {
-                    project.SetGlobalProperty("TargetFramework", tfm);
-                    var innerBuild = project.CreateProjectInstance(ProjectInstanceSettings.ImmutableWithFastItemLookup);
-
-                    var tfmInfo = new ProjectFrameworkInfo(NuGetFramework.Parse(tfm), GetDependencies(innerBuild));
-
-                    frameworks.Add(tfmInfo);
-                }
-
-                project.RemoveGlobalProperty("TargetFramework");
-            }
-            else if (!string.IsNullOrEmpty(targetFramework))
-            {
-                var tfmInfo = new ProjectFrameworkInfo(NuGetFramework.Parse(targetFramework), GetDependencies(instance));
-
-                frameworks.Add(tfmInfo);
-            }
-
-            var projectDir = Path.GetDirectoryName(path);
-
-            var tools = GetTools(instance).ToArray();
-
-            return new ProjectInfo(path, projExtPath, frameworks, tools);
-        }
-
-        private static Project GetProject(string path, ProjectCollection projectCollection, bool policyDesignBuild)
-        {
-            var projects = projectCollection.GetLoadedProjects(path);
-            foreach (var proj in projects)
-            {
-                if (proj.GetPropertyValue("DesignTimeBuild") == "true")
-                {
-                    return proj;
-                }
-            }
-            var xml = ProjectRootElement.Open(path, projectCollection);
-            var globalProps = new Dictionary<string, string>()
-            {
-                ["DesignTimeBuild"] = "true",
-            };
-            if (policyDesignBuild)
-            {
-                globalProps["PolicyDesignTimeBuild"] = "true";
-            }
-            var project = new Project(xml,
-                globalProps,
-                toolsVersion: "15.0",
-                projectCollection: projectCollection)
-            {
-                IsBuildEnabled = false
-            };
-            return project;
-        }
-
-        private IReadOnlyDictionary<string, PackageReferenceInfo> GetDependencies(ProjectInstance project)
-        {
-            var references = new Dictionary<string, PackageReferenceInfo>(StringComparer.OrdinalIgnoreCase);
-            foreach (var item in  project.GetItems("PackageReference"))
-            {
-                bool.TryParse(item.GetMetadataValue("IsImplicitlyDefined"), out var isImplicit);
-                var noWarn = item.GetMetadataValue("NoWarn");
-                IReadOnlyList<string> noWarnItems = string.IsNullOrEmpty(noWarn)
-                    ? Array.Empty<string>()
-                    : noWarn.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-
-                var info = new PackageReferenceInfo(item.EvaluatedInclude, item.GetMetadataValue("Version"), isImplicit, noWarnItems);
-
-                if (references.ContainsKey(info.Id))
-                {
-                    _logger.LogKoreBuildWarning(project.ProjectFileLocation.File, KoreBuildErrors.DuplicatePackageReference, $"Found a duplicate PackageReference for {info.Id}. Restore results may be unpredictable.");
-                }
-
-                references[info.Id] = info;
-            }
-
-            return references;
-        }
-
-        private static IEnumerable<DotNetCliReferenceInfo> GetTools(ProjectInstance project)
-        {
-            return project.GetItems("DotNetCliToolReference").Select(item =>
-                new DotNetCliReferenceInfo(item.EvaluatedInclude, item.GetMetadataValue("Version")));
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/ProjectModel/SolutionInfo.cs b/modules/KoreBuild.Tasks/Internal/ProjectModel/SolutionInfo.cs
deleted file mode 100644
index d968438cb..000000000
--- a/modules/KoreBuild.Tasks/Internal/ProjectModel/SolutionInfo.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-
-namespace KoreBuild.Tasks.ProjectModel
-{
-    internal class SolutionInfo
-    {
-        public SolutionInfo(string fullPath, IReadOnlyList<string> projects)
-        {
-            if (string.IsNullOrEmpty(fullPath))
-            {
-                throw new ArgumentException(nameof(fullPath));
-            }
-
-            FullPath = fullPath;
-            Projects = projects ?? throw new ArgumentNullException(nameof(projects));
-        }
-
-        public string FullPath { get; }
-
-        public IReadOnlyList<string> Projects { get; }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/ProjectModel/SolutionInfoFactory.cs b/modules/KoreBuild.Tasks/Internal/ProjectModel/SolutionInfoFactory.cs
deleted file mode 100644
index 18d2a2550..000000000
--- a/modules/KoreBuild.Tasks/Internal/ProjectModel/SolutionInfoFactory.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.AspNetCore.BuildTools;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Framework;
-
-namespace KoreBuild.Tasks.ProjectModel
-{
-    internal class SolutionInfoFactory
-    {
-        public static SolutionInfo Create(string filePath, string configName)
-        {
-            var sln = SolutionFile.Parse(filePath);
-
-            if (string.IsNullOrEmpty(configName))
-            {
-                configName = sln.GetDefaultConfigurationName();
-            }
-
-            var projects = new List<string>();
-
-            var config = sln.SolutionConfigurations.FirstOrDefault(c => c.ConfigurationName == configName);
-            if (config == null)
-            {
-                throw new InvalidOperationException($"A solution configuration by the name of '{configName}' was not found in '{filePath}'");
-            }
-
-            foreach (var project in sln.ProjectsInOrder
-                .Where(p =>
-                    p.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat // skips solution folders
-                    && p.ProjectConfigurations.TryGetValue(config.FullName, out var projectConfig)
-                    && projectConfig.IncludeInBuild))
-            {
-                projects.Add(project.AbsolutePath.Replace('\\', '/'));
-            }
-
-            return new SolutionInfo(filePath, projects.ToArray());
-        }
-
-        public static IEnumerable<string> GetProjects(ITaskItem projectOrSolution, IDictionary<string, string> solutionProperties)
-        {
-            var projectFilePath = projectOrSolution.ItemSpec.Replace('\\', '/');
-
-            if (Path.GetExtension(projectFilePath).Equals(".sln", StringComparison.OrdinalIgnoreCase))
-            {
-                // prefer the AdditionalProperties metadata as this is what the MSBuild task will use when building solutions
-                var props = MSBuildListSplitter.GetNamedProperties(projectOrSolution.GetMetadata("AdditionalProperties"));
-                props.TryGetValue("Configuration", out var config);
-
-                if (config == null)
-                {
-                    solutionProperties.TryGetValue("Configuration", out config);
-                }
-
-                var sln = Create(projectFilePath, config);
-
-                foreach (var project in sln.Projects)
-                {
-                    yield return project;
-                }
-            }
-            else
-            {
-                yield return Path.GetFullPath(projectFilePath);
-            }
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs b/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs
deleted file mode 100644
index c9011c606..000000000
--- a/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using NuGet.Commands;
-using NuGet.Common;
-using NuGet.DependencyResolver;
-using NuGet.LibraryModel;
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
-using NuGet.Packaging.Signing;
-using NuGet.Protocol.Core.Types;
-
-namespace KoreBuild.Tasks.Utilities
-{
-    internal class SimplePackageInstaller
-    {
-        private readonly string _packagesDirectory;
-        private readonly ILogger _logger;
-        private readonly SourceCacheContext _cacheContext;
-        private readonly int _maxDegreeOfConcurrency;
-
-        public SimplePackageInstaller(string packageDir, SourceCacheContext cacheContext, bool disableParallel, ILogger logger)
-        {
-            _packagesDirectory = packageDir;
-            _cacheContext = cacheContext;
-            _logger = logger;
-            _maxDegreeOfConcurrency = disableParallel ? 1 : 16;
-        }
-
-        public async Task InstallPackagesAsync(IEnumerable<RestoreTargetGraph> graphs,
-            HashSet<LibraryIdentity> allInstalledPackages,
-            CancellationToken token)
-        {
-            var packagesToInstall = graphs.SelectMany(g => g.Install.Where(match => allInstalledPackages.Add(match.Library)));
-            if (_maxDegreeOfConcurrency <= 1)
-            {
-                foreach (var match in packagesToInstall)
-                {
-                    await InstallPackageAsync(match, token);
-                }
-            }
-            else
-            {
-                var bag = new ConcurrentBag<RemoteMatch>(packagesToInstall);
-                var tasks = Enumerable.Range(0, _maxDegreeOfConcurrency)
-                    .Select(async _ =>
-                    {
-                        while (bag.TryTake(out RemoteMatch match))
-                        {
-                            await InstallPackageAsync(match, token);
-                        }
-                    });
-                await Task.WhenAll(tasks);
-            }
-        }
-
-        private async Task InstallPackageAsync(RemoteMatch installItem, CancellationToken token)
-        {
-            var packageIdentity = new PackageIdentity(installItem.Library.Name, installItem.Library.Version);
-
-            var verificationProviders = SignatureVerificationProviderFactory.GetSignatureVerificationProviders();
-            var signedPackageVerifier = new PackageSignatureVerifier(verificationProviders, SignedPackageVerifierSettings.VerifyCommandDefaultPolicy);
-
-            var versionFolderPathResolver = new VersionFolderPathResolver(_packagesDirectory);
-            var packageExtractionContext = new PackageExtractionContext(
-                PackageSaveMode.Defaultv3,
-                XmlDocFileSaveMode.None,
-                _logger,
-                signedPackageVerifier);
-
-            using (var packageDependency = await installItem.Provider.GetPackageDownloaderAsync(
-                packageIdentity,
-                _cacheContext,
-                _logger,
-                token))
-            {
-                await PackageExtractor.InstallFromSourceAsync(
-                    packageIdentity,
-                    packageDependency,
-                    versionFolderPathResolver,
-                    packageExtractionContext,
-                    token);
-            }
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj b/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj
index 6147092aa..d1346531e 100644
--- a/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj
+++ b/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -9,22 +9,19 @@
     <Content Include="*.props" CopyToPublishDirectory="PreserveNewest" />
     <Content Include="*.targets" CopyToPublishDirectory="PreserveNewest" />
     <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\Utilities\*.cs" />
-    <Compile Include="..\..\shared\Utilities\MSBuildListSplitter.cs" />
-    <Compile Include="..\..\tools\KoreBuildSettings.cs" />
+    <Compile Include="..\..\src\Internal.AspNetCore.BuildTasks\FileHelpers.cs" Link="Utilities\FileHelpers.cs" />
+    <Compile Include="..\..\src\Internal.AspNetCore.BuildTasks\MSBuildListSplitter.cs" Link="Utilities\MSBuildListSplitter.cs" />
     <Content Include="$(VSWhereDir)vswhere.exe" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
     <Content Include="$(PkgMicrosoft_DotNet_SignCheck)\tools\**\*" Link="SignCheck\tools\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
     <Content Include="$(PkgMicrosoft_DotNet_SignTool)\tools\**\*" Link="SignTool\tools\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
     <Content Include="$(PkgMicrosoft_DotNet_SignTool)\build\**\*" Link="SignTool\build\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
-    <Content Include="$(MSBuildThisFileDirectory)SkipStrongNames.xml" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
- </ItemGroup>
+  </ItemGroup>
 
   <ItemGroup>
     <!-- set as private assets all so these assemblies get resolved from the version bundled in the .NET Core SDK -->
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
-    <PackageReference Include="NuGet.Build.Tasks" Version="$(Tooling_NuGetBuildTasksPackageVersion)" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
     <PackageReference Include="vswhere" Version="$(VSWherePackageVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolPackageVersion)" ExcludeAssets="All" PrivateAssets="All" />
diff --git a/tools/KoreBuildSettings.cs b/modules/KoreBuild.Tasks/KoreBuildSettings.cs
similarity index 100%
rename from tools/KoreBuildSettings.cs
rename to modules/KoreBuild.Tasks/KoreBuildSettings.cs
diff --git a/modules/KoreBuild.Tasks/PackNuSpec.cs b/modules/KoreBuild.Tasks/PackNuSpec.cs
deleted file mode 100644
index f711a4fbb..000000000
--- a/modules/KoreBuild.Tasks/PackNuSpec.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using System.Linq;
-using Microsoft.AspNetCore.BuildTools;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NuGet.Frameworks;
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
-using NuGet.Versioning;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Generates a nupkg from a nuspec file
-    /// </summary>
-    public class PackNuSpec : Microsoft.Build.Utilities.Task
-    {
-        /// <summary>
-        /// The path the nuspec file.
-        /// </summary>
-        [Required]
-        public string NuspecPath { get; set; }
-
-        /// <summary>
-        /// Output nupkg is placed in folder + '$(id).$(version).nupkg'.
-        /// Either this or <see cref="OutputPath" /> must be specified.
-        /// </summary>
-        public string DestinationFolder { get; set; }
-
-        /// <summary>
-        /// The output path for the nupkg.
-        /// Either this or <see cref="DestinationFolder" /> must be specified.
-        /// </summary>
-        public string OutputPath { get; set; }
-
-        /// <summary>
-        /// The base path to use for any relative paths in the &lt;files%gt; section of nuspec.
-        /// Defaults to the nuspec folder.
-        /// </summary>
-        public string BasePath { get; set; }
-
-        /// <summary>
-        /// Dependencies to add to the metadata>dependencies section of the spec.
-        /// Metadata 'TargetFramework' can be specified to further put dependencies into >group[targetFramework]
-        /// </summary>
-        public ITaskItem[] Dependencies { get; set; }
-
-        /// <summary>
-        /// Files to add to the package. Must specify the PackagePath metadata.
-        /// </summary>
-        public ITaskItem[] PackageFiles { get; set; }
-
-        /// <summary>
-        /// Subsitution in the nuspec via $key$.
-        /// </summary>
-        public string[] Properties { get; set; }
-
-        /// <summary>
-        /// Pack empty directories.
-        /// </summary>
-        public bool IncludeEmptyDirectories { get; set; } = false;
-
-        /// <summary>
-        /// Overwrite the destination file if it exists.
-        /// </summary>
-        public bool Overwrite { get; set; } = false;
-
-        /// <summary>
-        /// The nupkg files created
-        /// </summary>
-        [Output]
-        public ITaskItem[] Packages { get; set; }
-
-        public override bool Execute()
-        {
-            if (!File.Exists(NuspecPath))
-            {
-                Log.LogError("Nuspec does not exist: " + NuspecPath);
-                return false;
-            }
-
-            var packageBasePath = string.IsNullOrEmpty(BasePath)
-                ? Path.GetDirectoryName(NuspecPath)
-                : BasePath;
-
-            if (!Directory.Exists(packageBasePath))
-            {
-                Log.LogError("Base path does not exist: " + packageBasePath);
-                return false;
-            }
-
-            if (!(string.IsNullOrEmpty(DestinationFolder) ^ string.IsNullOrEmpty(OutputPath)))
-            {
-                Log.LogError("Either DestinationFolder and OutputPath must be specified, but only not both.");
-                return false;
-            }
-
-            var properties = MSBuildListSplitter.GetNamedProperties(Properties);
-
-            string PropertyProvider(string name)
-            {
-                if (properties.TryGetValue(name, out var value))
-                {
-                    return value;
-                }
-                Log.LogError("Undefined property: " + name);
-                return null;
-            }
-
-            PackageBuilder packageBuilder;
-            try
-            {
-                Log.LogMessage($"Loading nuspec {NuspecPath}");
-
-                using (var file = File.OpenRead(NuspecPath))
-                {
-                    var manifest = Manifest.ReadFrom(file, PropertyProvider, validateSchema: false);
-                    if (!manifest.HasFilesNode)
-                    {
-                        // Warn about this overly permissive default in nuspec.
-                        Log.LogKoreBuildWarning(KoreBuildErrors.NuspecMissingFilesNode,
-                            "The nuspec file is missing the <files> nodes. This causes all files in NuspecBase to be included in the package. " +
-                            @"Add an empty `<files />` node to prevent this behavior. Add `<files> <file src=""**\*\"" target=""\"" /> </files>` to the nuspec to suppress this warning.");
-                    }
-                }
-
-                packageBuilder = new PackageBuilder(NuspecPath, packageBasePath, PropertyProvider, IncludeEmptyDirectories);
-            }
-            catch (InvalidDataException ex)
-            {
-                Log.LogKoreBuildError(NuspecPath, KoreBuildErrors.InvalidNuspecFile, ex.Message);
-                return false;
-            }
-
-            if (Dependencies != null)
-            {
-                AddDependencies(packageBuilder);
-            }
-
-            if (PackageFiles != null)
-            {
-                AddFiles(packageBuilder);
-            }
-
-            if (Log.HasLoggedErrors)
-            {
-                return false;
-            }
-
-            var dest = !string.IsNullOrEmpty(OutputPath)
-                ? OutputPath
-                : Path.Combine(DestinationFolder, $"{packageBuilder.Id}.{packageBuilder.Version}.nupkg");
-
-            // normalize path
-            dest = Path.GetFullPath(dest);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(dest));
-
-            if (!Overwrite && File.Exists(dest))
-            {
-                Log.LogError($"File path '{dest}' already exists. Set Overwrite=true to overwrite the destination nupkg file.");
-                return false;
-            }
-
-            if (packageBuilder.Files != null)
-            {
-                foreach (var file in packageBuilder.Files)
-                {
-                    if (file is PhysicalPackageFile p)
-                    {
-                        Log.LogMessage($"Packing {p.SourcePath} => {p.Path}");
-                    }
-                    else
-                    {
-                        Log.LogMessage($"Packing {file.Path}");
-                    }
-                }
-            }
-
-            using (var stream = File.Create(dest))
-            {
-                packageBuilder.Save(stream);
-            }
-
-            Log.LogMessage(MessageImportance.High, $"Created package {dest}");
-            Packages = new[] { new TaskItem(dest) };
-
-            return true;
-        }
-
-        private void AddFiles(PackageBuilder builder)
-        {
-            foreach (var file in PackageFiles)
-            {
-                var packagePath = file.GetMetadata("PackagePath");
-                var fileName = Path.GetFileName(packagePath);
-                if (string.IsNullOrEmpty(fileName))
-                {
-                    Log.LogKoreBuildError(KoreBuildErrors.InvalidPackagePathMetadata,
-                        "The PackagePath metadata value on {0} is invalid. PackagePath must be set to the exact file path within the nuget package.");
-                    continue;
-                }
-
-                builder.Files.Add(new PhysicalPackageFile
-                {
-                    SourcePath = file.ItemSpec,
-                    TargetPath = packagePath,
-                });
-            }
-        }
-
-        private void AddDependencies(PackageBuilder builder)
-        {
-            var packageRequest = Dependencies.Select(d =>
-            {
-                NuGetFramework tfm = NuGetFramework.AnyFramework;
-                if (!string.IsNullOrEmpty(d.GetMetadata("TargetFramework")))
-                {
-                    tfm = NuGetFramework.Parse(d.GetMetadata("TargetFramework"));
-                }
-
-                if (string.IsNullOrEmpty(d.GetMetadata("Version")))
-                {
-                    Log.LogError($"Dependency {d.ItemSpec} is missing expected metdata: Version");
-                }
-
-                return new
-                {
-                    tfm,
-                    dependency = new PackageDependency(d.ItemSpec,
-                        VersionRange.Parse(d.GetMetadata("Version")),
-                        d.GetMetadata("IncludeAssets").Split(';').Select(s => s.Trim()).ToArray(),
-                        d.GetMetadata("ExcludeAssets").Split(';').Select(s => s.Trim()).ToArray())
-                };
-            });
-
-            foreach (var group in packageRequest.GroupBy(g => g.tfm))
-            {
-                var existingPackages = builder.DependencyGroups.FirstOrDefault(g => g.TargetFramework == group.Key)?.Packages
-                    ?? Enumerable.Empty<PackageDependency>();
-
-                var depGroup = new PackageDependencyGroup(group.Key, existingPackages.Concat(group.Select(d => d.dependency)));
-                builder.DependencyGroups.Add(depGroup);
-            }
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/PushNuGetPackages.cs b/modules/KoreBuild.Tasks/PushNuGetPackages.cs
deleted file mode 100644
index ae564dc98..000000000
--- a/modules/KoreBuild.Tasks/PushNuGetPackages.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Concurrent;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Build.Framework;
-using NuGet.Common;
-using NuGet.Packaging;
-using NuGet.Protocol;
-using NuGet.Protocol.Core.Types;
-using KoreBuild.Tasks.Internal;
-
-namespace KoreBuild.Tasks
-{
-    public class PushNuGetPackages : Microsoft.Build.Utilities.Task, ICancelableTask
-    {
-        private const int _maxRetryCount = 5;
-        private const int _maxParallelPackagePushes = 4;
-
-        private ConcurrentBag<PackageInfo> _packages;
-        private readonly CancellationTokenSource _packagePushCancellationTokenSource = new CancellationTokenSource();
-
-        [Required]
-        public ITaskItem[] Packages { get; set; }
-
-        [Required]
-        public string Feed { get; set; }
-
-        // not be required if pushing to the filesystem
-        public string ApiKey { get; set; }
-
-        public int TimeoutSeconds { get; set; } = 300;
-
-        public void Cancel()
-        {
-            _packagePushCancellationTokenSource.Cancel();
-        }
-
-        public override bool Execute()
-        {
-            if (Packages.Length == 0)
-            {
-                Log.LogWarning("No package files were found to be published.");
-                return true;
-            }
-
-            if (string.IsNullOrEmpty(Feed))
-            {
-                Log.LogError("Feed must not be null or empty.");
-                return false;
-            }
-
-            var packages = Packages
-                .Select(fileInfo =>
-                {
-                    using (var fileStream = File.OpenRead(fileInfo.ItemSpec))
-                    using (var reader = new PackageArchiveReader(fileStream))
-                    {
-                        return new PackageInfo
-                        {
-                            Identity = reader.GetIdentity(),
-                            PackagePath = fileInfo.ItemSpec
-                        };
-                    }
-                });
-
-            _packages = new ConcurrentBag<PackageInfo>(packages);
-
-            Log.LogMessage(MessageImportance.High, "Attempting to push {0} package(s) to {1}", Packages.Length, Feed);
-            try
-            {
-                PublishToFeedAsync().GetAwaiter().GetResult();
-                Log.LogMessage(MessageImportance.High, "Successfully pushed {0} package(s) to {1}", Packages.Length, Feed);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Log.LogErrorFromException(ex, showStackTrace: true);
-                return false;
-            }
-        }
-
-        private async Task PublishToFeedAsync()
-        {
-            Log.LogMessage("Publishing packages to feed: {0}", Feed);
-
-            var sourceRepository = Repository.Factory.GetCoreV3(Feed, FeedType.HttpV3);
-            var packageUpdateResource = await sourceRepository.GetResourceAsync<PackageUpdateResource>();
-
-            var tasks = new Task[_maxParallelPackagePushes];
-            for (var i = 0; i < tasks.Length; i++)
-            {
-                tasks[i] = PushPackagesAsync(packageUpdateResource);
-            }
-
-            await Task.WhenAll(tasks);
-        }
-
-        private async Task PushPackagesAsync(PackageUpdateResource packageUpdateResource)
-        {
-            while (_packages.TryTake(out var package))
-            {
-                await PushPackageAsync(packageUpdateResource, package);
-            }
-        }
-
-        private async Task PushPackageAsync(PackageUpdateResource packageUpdateResource, PackageInfo package)
-        {
-            for (var attempt = 1; attempt <= _maxRetryCount; attempt++)
-            {
-                // Fail fast if a parallel push operation has already failed
-                _packagePushCancellationTokenSource.Token.ThrowIfCancellationRequested();
-
-                Log.LogMessage($"Attempting to publish package {package.Identity} (Attempt: {attempt})");
-
-                try
-                {
-                    await packageUpdateResource.Push(
-                        package.PackagePath,
-                        symbolSource: null,
-                        timeoutInSecond: TimeoutSeconds,
-                        disableBuffering: false,
-                        getApiKey: _ => ApiKey,
-                        getSymbolApiKey: _ => null,
-                        noServiceEndpoint: false,
-                        log: NullLogger.Instance);
-
-                    Log.LogMessage(MessageImportance.High, $"Published package {package.Identity}");
-
-                    return;
-                }
-                catch (Exception ex) when (attempt < _maxRetryCount) // allow exception to be thrown at the last attempt
-                {
-                    Log.LogMessage(
-                        MessageImportance.High,
-                        $"Attempt {attempt} failed to publish package {package.Identity}." +
-                        Environment.NewLine +
-                        ex +
-                        Environment.NewLine +
-                        "Retrying...");
-                }
-                catch
-                {
-                    _packagePushCancellationTokenSource.Cancel();
-                    throw;
-                }
-            }
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/SkipStrongName/AssembliesFile.cs b/modules/KoreBuild.Tasks/SkipStrongName/AssembliesFile.cs
deleted file mode 100644
index 9fb2343be..000000000
--- a/modules/KoreBuild.Tasks/SkipStrongName/AssembliesFile.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-
-namespace KoreBuild.Tasks.SkipStrongNames
-{
-    internal static class AssembliesFile
-    {
-        public static AssemblySpecification[] Read(string path)
-        {
-            XElement assembliesElement = XElement.Load(path);
-
-            if (assembliesElement.Name != "assemblies")
-            {
-                throw new InvalidOperationException("The name of the root element must be assemblies.");
-            }
-
-            XAttribute defaultPublicKeyTokenAttribute = assembliesElement.Attribute("defaultPublicKeyToken");
-
-            string defaultPublicKeyToken;
-
-            if (defaultPublicKeyTokenAttribute != null)
-            {
-                defaultPublicKeyToken = defaultPublicKeyTokenAttribute.Value;
-            }
-            else
-            {
-                defaultPublicKeyToken = null;
-            }
-
-            List<AssemblySpecification> specifications = new List<AssemblySpecification>();
-
-            foreach (XElement assembly in assembliesElement.Elements("assembly"))
-            {
-                XAttribute nameAttribute = assembly.Attribute("name");
-
-                if (nameAttribute == null)
-                {
-                    throw new InvalidOperationException("An assembly element must have a name attribute.");
-                }
-
-                XAttribute publicKeyTokenAttribute = assembly.Attribute("publicKeyToken");
-                string publicKeyToken;
-
-                if (publicKeyTokenAttribute != null)
-                {
-                    publicKeyToken = publicKeyTokenAttribute.Value;
-                }
-                else
-                {
-                    publicKeyToken = defaultPublicKeyToken;
-                }
-
-                if (publicKeyToken == null)
-                {
-                    throw new InvalidOperationException("An assembly element must have a publicKeyToken attribute, " +
-                        "or the assemblies element must have a defaultPublicKeyToken attribute.");
-                }
-
-                specifications.Add(new AssemblySpecification
-                {
-                    Name = nameAttribute.Value,
-                    PublicKeyToken = publicKeyToken
-                });
-            }
-
-            if (specifications.Count == 0)
-            {
-                throw new InvalidOperationException(
-                    "The assemblies element must contain at least one assembly element.");
-            }
-
-            return specifications.ToArray();
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/SkipStrongName/AssemblySpecification.cs b/modules/KoreBuild.Tasks/SkipStrongName/AssemblySpecification.cs
deleted file mode 100644
index 5f6798254..000000000
--- a/modules/KoreBuild.Tasks/SkipStrongName/AssemblySpecification.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-
-namespace KoreBuild.Tasks.SkipStrongNames
-{
-    internal class AssemblySpecification
-    {
-        public string Name { get; set; }
-
-        public string PublicKeyToken { get; set; }
-
-        public override string ToString()
-        {
-            return Name + "," + PublicKeyToken;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/SkipStrongName/RegistrySection.cs b/modules/KoreBuild.Tasks/SkipStrongName/RegistrySection.cs
deleted file mode 100644
index 2999ae1d0..000000000
--- a/modules/KoreBuild.Tasks/SkipStrongName/RegistrySection.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-
-namespace KoreBuild.Tasks.SkipStrongNames
-{
-    public enum RegistrySection
-    {
-        Native,
-        Windows32OnWindows64
-    }
-}
diff --git a/modules/KoreBuild.Tasks/SkipStrongName/Status.cs b/modules/KoreBuild.Tasks/SkipStrongName/Status.cs
deleted file mode 100644
index 2f37811fe..000000000
--- a/modules/KoreBuild.Tasks/SkipStrongName/Status.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-
-namespace KoreBuild.Tasks.SkipStrongNames
-{
-    public enum Status
-    {
-        Disabled,
-        Enabled,
-        PartiallyEnabled,
-    }
-}
diff --git a/modules/KoreBuild.Tasks/SkipStrongName/StrongNameConfiguration.cs b/modules/KoreBuild.Tasks/SkipStrongName/StrongNameConfiguration.cs
deleted file mode 100644
index 80dedffc5..000000000
--- a/modules/KoreBuild.Tasks/SkipStrongName/StrongNameConfiguration.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace KoreBuild.Tasks.SkipStrongNames
-{
-    internal class StrongNameConfiguration
-    {
-        private readonly Dictionary<RegistrySection, HashSet<string>> _strongNameExclusions;
-        private readonly AssemblySpecification[] _assemblies;
-
-        public StrongNameConfiguration(AssemblySpecification[] specifications)
-        {
-            if (specifications != null)
-            {
-                _assemblies = specifications.OrderBy(s => s.Name).ToArray();
-            }
-            else
-            {
-                _assemblies = null;
-            }
-
-            FilteredAssemblySpecifications = new Dictionary<RegistrySection, string[]>();
-            _strongNameExclusions = new Dictionary<RegistrySection, HashSet<string>>();
-
-            foreach (RegistrySection section in WindowsRegistry.Sections)
-            {
-                HashSet<string> sectionExclusions = WindowsRegistry.LoadStrongNameExclusions(section);
-                string[] sectionFilteredAssemblies = FilterAssemblySpecifications(_assemblies, sectionExclusions);
-
-                FilteredAssemblySpecifications.Add(section, sectionFilteredAssemblies);
-                _strongNameExclusions.Add(section, sectionExclusions);
-            }
-        }
-
-        public Dictionary<RegistrySection, string[]> FilteredAssemblySpecifications { get; private set; }
-
-        public Status Status
-        {
-            get
-            {
-                bool allFound = true;
-                bool anyFound = false;
-
-                foreach (RegistrySection section in WindowsRegistry.Sections)
-                {
-                    string[] sectionFilteredAssemblies = FilteredAssemblySpecifications[section];
-                    HashSet<string> sectionExclusions = _strongNameExclusions[section];
-
-                    foreach (string assemblySpecification in sectionFilteredAssemblies)
-                    {
-                        bool found = sectionExclusions.Contains(assemblySpecification);
-                        allFound = allFound && found;
-                        anyFound = anyFound || found;
-
-                        if (!allFound && anyFound)
-                        {
-                            break;
-                        }
-                    }
-                }
-
-                if (allFound)
-                {
-                    return Status.Enabled;
-                }
-                else if (anyFound)
-                {
-                    return Status.PartiallyEnabled;
-                }
-                else
-                {
-                    return Status.Disabled;
-                }
-            }
-        }
-
-        private string[] FilterAssemblySpecifications(AssemblySpecification[] assemblies, HashSet<string> exclusions)
-        {
-            if (assemblies == null || assemblies.Length == 0)
-            {
-                return new string[0];
-            }
-
-            // Determine whether strong name verification is disabled globally (with a "*,*" entry).
-            if (exclusions.Contains("*,*"))
-            {
-                return new string[0];
-            }
-
-            // Get a list of the public key tokens that are globally excluded (with a "*,PublicKeyToken" entry)
-            HashSet<string> globallyExcludedPublicKeyTokens = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
-
-            foreach (var publicKeyToken in assemblies.Select(a => a.PublicKeyToken.ToUpperInvariant()).Distinct())
-            {
-                if (exclusions.Contains("*," + publicKeyToken))
-                {
-                    globallyExcludedPublicKeyTokens.Add(publicKeyToken);
-                }
-            }
-
-            // Create specifications for the list of the assemblies not covered by a global exclusion
-            return (from element in assemblies
-                    where !globallyExcludedPublicKeyTokens.Contains(element.PublicKeyToken)
-                    select element.ToString()).ToArray();
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/SkipStrongName/WindowsRegistry.cs b/modules/KoreBuild.Tasks/SkipStrongName/WindowsRegistry.cs
deleted file mode 100644
index 6e7a5aae8..000000000
--- a/modules/KoreBuild.Tasks/SkipStrongName/WindowsRegistry.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.Win32;
-
-namespace KoreBuild.Tasks.SkipStrongNames
-{
-    internal static class WindowsRegistry
-    {
-        private const string SoftwareNativeKeyName = "SOFTWARE";
-        private const string SoftwareWowKeyName = @"SOFTWARE\Wow6432Node";
-        private const string VerificationSubKeyName = @"Microsoft\StrongName\Verification";
-
-        private static readonly Lazy<bool> softwareWowExists = new Lazy<bool>(() => CheckRegistryKeyExists(SoftwareWowKeyName));
-
-        public static IEnumerable<RegistrySection> Sections
-        {
-            get
-            {
-                yield return RegistrySection.Native;
-
-                if (softwareWowExists.Value)
-                {
-                    yield return RegistrySection.Windows32OnWindows64;
-                }
-            }
-        }
-
-        public static RegistryKey CreateWritableVerificationRegistryKey(RegistrySection section)
-        {
-            return CreateWriteableRegistryKey(GetBaseKeyName(section), VerificationSubKeyName);
-        }
-
-        public static HashSet<string> LoadStrongNameExclusions(RegistrySection section)
-        {
-            HashSet<string> results = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-            using (RegistryKey key = OpenReadOnlyVerificationRegistryKey(section))
-            {
-                if (key != null)
-                {
-                    foreach (var subKey in key.GetSubKeyNames())
-                    {
-                        results.Add(subKey);
-                    }
-                }
-            }
-
-            return results;
-        }
-
-        private static bool CheckRegistryKeyExists(string name)
-        {
-            using (RegistryKey key = OpenReadOnlyRegistryKey(name))
-            {
-                return key != null;
-            }
-        }
-
-        private static RegistryKey CreateWriteableRegistryKey(string baseKeyName, string subKeyName)
-        {
-            List<RegistryKey> keysToDispose = new List<RegistryKey>();
-
-            try
-            {
-                RegistryKey currentKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(baseKeyName, writable: true);
-
-                if (currentKey == null)
-                {
-                    return null;
-                }
-
-                string[] subKeyParts = subKeyName.Split('\\');
-
-                foreach (string subKeyPart in subKeyParts)
-                {
-                    keysToDispose.Add(currentKey);
-                    currentKey = currentKey.CreateSubKey(subKeyPart);
-                }
-
-                return currentKey;
-            }
-            finally
-            {
-                foreach (RegistryKey key in keysToDispose)
-                {
-                    key.Dispose();
-                }
-            }
-        }
-
-        private static string GetBaseKeyName(RegistrySection section)
-        {
-            switch (section)
-            {
-                case RegistrySection.Windows32OnWindows64:
-                    return SoftwareWowKeyName;
-                case RegistrySection.Native:
-                default:
-                    return SoftwareNativeKeyName;
-            }
-        }
-
-        private static RegistryKey OpenReadOnlyRegistryKey(string name)
-        {
-            return Microsoft.Win32.Registry.LocalMachine.OpenSubKey(name);
-        }
-
-        private static RegistryKey OpenReadOnlyVerificationRegistryKey(RegistrySection section)
-        {
-            string keyName = GetBaseKeyName(section) + '\\' + VerificationSubKeyName;
-            return OpenReadOnlyRegistryKey(keyName);
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/SkipStrongNames.xml b/modules/KoreBuild.Tasks/SkipStrongNames.xml
deleted file mode 100644
index 3457d438e..000000000
--- a/modules/KoreBuild.Tasks/SkipStrongNames.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assemblies defaultPublicKeyToken="31bf3856ad364e35">
-  <assembly name="Microsoft.Win32.Registry" />
-  <assembly name="System.Buffers" />
-  <assembly name="System.Diagnostics.DiagnosticSource" />
-  <assembly name="System.Memory" />
-  <assembly name="System.Runtime.CompilerServices.Unsafe" />
-  <assembly name="System.Text.Encodings.Web" />
-</assemblies>
diff --git a/modules/KoreBuild.Tasks/UpgradeDependencies.cs b/modules/KoreBuild.Tasks/UpgradeDependencies.cs
deleted file mode 100644
index 4e5ca9006..000000000
--- a/modules/KoreBuild.Tasks/UpgradeDependencies.cs
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Evaluation;
-using Microsoft.Build.Framework;
-using NuGet.Build;
-using NuGet.Configuration;
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
-using NuGet.Protocol;
-using NuGet.Protocol.Core.Types;
-using NuGet.Versioning;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Uses a remote package to update the version variables in the local dependencies.props file
-    /// </summary>
-    public class UpgradeDependencies : Microsoft.Build.Utilities.Task, ICancelableTask
-    {
-        private CancellationTokenSource _cts = new CancellationTokenSource();
-
-        /// <summary>
-        /// The lineup package ID of the nupkg that contains the master dependencies.props files that will be used to upgrade versions
-        /// </summary>
-        [Required]
-        public string LineupPackageId { get; set; }
-
-        /// <summary>
-        /// The version of the lineup package. If empty, this will attempt to pull the latest
-        /// </summary>
-        public string LineupPackageVersion { get; set; }
-
-        /// <summary>
-        /// The dependencies.props file to use versions from
-        /// </summary>
-        public string LineupDependenciesFile { get; set; }
-
-        /// <summary>
-        /// The NuGet feed containing the lineup package
-        /// </summary>
-        [Required]
-        public string LineupPackageRestoreSource { get; set; }
-
-        /// <summary>
-        /// The dependencies.props file to update
-        /// </summary>
-        [Required]
-        public string DependenciesFile { get; set; }
-
-        public void Cancel()
-        {
-            _cts.Cancel();
-        }
-
-        public override bool Execute()
-        {
-            return ExecuteAsync().GetAwaiter().GetResult();
-        }
-
-        public async Task<bool> ExecuteAsync()
-        {
-            if (!DependencyVersionsFile.TryLoad(DependenciesFile, out var localVersionsFile))
-            {
-                Log.LogError($"Could not load file from {DependenciesFile}");
-                return false;
-            }
-
-            if (!localVersionsFile.HasVersionsPropertyGroup)
-            {
-                Log.LogKoreBuildWarning(KoreBuildErrors.PackageRefPropertyGroupNotFound, $"No PropertyGroup with Label=\"{DependencyVersionsFile.PackageVersionsLabel}\" could be found in {DependenciesFile}");
-            }
-
-            if (localVersionsFile.VersionVariables.Count == 0)
-            {
-                Log.LogMessage(MessageImportance.High, $"No version variables could be found in {DependenciesFile}");
-                return true;
-            }
-
-
-            var tmpNupkgPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            var logger = new MSBuildLogger(Log);
-
-            try
-            {
-                var remoteDepsVersionFile = await TryDownloadLineupDepsFile() ?? await TryDownloadLineupPackage(logger, tmpNupkgPath);
-
-                if (remoteDepsVersionFile == null)
-                {
-                    return false;
-                }
-
-                var updateCount = UpdateDependencies(localVersionsFile, remoteDepsVersionFile);
-
-                if (updateCount > 0)
-                {
-                    Log.LogMessage($"Finished updating {updateCount} version variables in {DependenciesFile}");
-                    localVersionsFile.Save(DependenciesFile);
-                }
-                else
-                {
-                    Log.LogMessage($"Versions in {DependenciesFile} are already up to date");
-                }
-
-                return !Log.HasLoggedErrors;
-            }
-            finally
-            {
-                if (File.Exists(tmpNupkgPath))
-                {
-                    File.Delete(tmpNupkgPath);
-                }
-            }
-        }
-
-        private async Task<DependencyVersionsFile> TryDownloadLineupDepsFile()
-        {
-            if (string.IsNullOrEmpty(LineupDependenciesFile))
-            {
-                return null;
-            }
-
-            var path = LineupDependenciesFile;
-            string text;
-            if (path.StartsWith("http"))
-            {
-                using (var client = new HttpClient())
-                {
-                    text = await client.GetStringAsync(path);
-                }
-            }
-            else
-            {
-                text = File.ReadAllText(path);
-            }
-
-
-            using (var stringReader = new StringReader(text))
-            using (var reader = new XmlTextReader(stringReader))
-            {
-                var project = new Project(ProjectRootElement.Create(reader));
-                return DependencyVersionsFile.LoadFromProject(project);
-            }
-        }
-
-        private async Task<DependencyVersionsFile> TryDownloadLineupPackage(MSBuildLogger logger, string tmpNupkgPath)
-        {
-            VersionRange versionRange;
-
-            if (string.IsNullOrEmpty(LineupPackageVersion))
-            {
-                versionRange = VersionRange.AllFloating;
-            }
-            else if (!VersionRange.TryParse(LineupPackageVersion, out versionRange))
-            {
-                Log.LogError($"{LineupPackageVersion} is not a valid NuGet package version");
-                return null;
-            }
-
-            var packageVersion = await GetPackageVersion(versionRange);
-            if (packageVersion == null)
-            {
-                Log.LogError($"Could not find a version of {LineupPackageId} in the version range {versionRange}.");
-                return null;
-            }
-
-            var packageId = new PackageIdentity(LineupPackageId, packageVersion);
-
-            var request = new PackageDownloadRequest
-            {
-                Identity = packageId,
-                OutputPath = tmpNupkgPath,
-                Sources = new[] { LineupPackageRestoreSource },
-            };
-
-            var result = await new PackageDownloader(logger).DownloadPackagesAsync(new[] { request }, TimeSpan.FromSeconds(60), _cts.Token);
-
-            if (!result)
-            {
-                Log.LogError("Could not download the lineup package");
-                return null;
-            }
-
-            using (var nupkgReader = new PackageArchiveReader(tmpNupkgPath))
-            using (var stream = nupkgReader.GetStream("build/dependencies.props"))
-            using (var reader = new XmlTextReader(stream))
-            {
-                var projectRoot = ProjectRootElement.Create(reader);
-                return DependencyVersionsFile.Load(projectRoot);
-            }
-        }
-
-        private int UpdateDependencies(DependencyVersionsFile localVersionsFile, DependencyVersionsFile remoteDepsVersionFile)
-        {
-            var updateCount = 0;
-            foreach (var localVariable in localVersionsFile.VersionVariables.Values.Where(v => !v.IsReadOnly))
-            {
-                string remoteVariableVersion;
-                // special case any package bundled in KoreBuild
-                if (!string.IsNullOrEmpty(KoreBuildVersion.Current) && localVariable.Name == "InternalAspNetCoreSdkPackageVersion")
-                {
-                    remoteVariableVersion = KoreBuildVersion.Current;
-                    Log.LogMessage(MessageImportance.Low, "Setting InternalAspNetCoreSdkPackageVersion to the current version of KoreBuild");
-                }
-                else
-                {
-                    if (remoteDepsVersionFile.VersionVariables.TryGetValue(localVariable.Name, out var remoteVariable))
-                    {
-                        remoteVariableVersion = remoteVariable.Version;
-                    }
-                    else
-                    {
-                        Log.LogKoreBuildWarning(
-                            DependenciesFile, KoreBuildErrors.PackageVersionNotFoundInLineup,
-                            $"A new version variable for {localVariable.Name} could not be found in {LineupPackageId}. This might be an unsupported external dependency.");
-                        continue;
-                    }
-                }
-
-
-                if (remoteVariableVersion != localVariable.Version)
-                {
-                    updateCount++;
-                    localVersionsFile.Update(localVariable.Name, remoteVariableVersion);
-                }
-            }
-
-            return updateCount;
-        }
-
-        private async Task<NuGetVersion> GetPackageVersion(VersionRange range)
-        {
-            if (!range.IsFloating)
-            {
-                return range.MinVersion;
-            }
-
-            using (var cacheContext = new SourceCacheContext())
-            {
-                var log = new MSBuildLogger(Log);
-                var defaultSettings = Settings.LoadDefaultSettings(root: null, configFileName: null, machineWideSettings: null);
-                var sourceProvider = new CachingSourceProvider(new PackageSourceProvider(defaultSettings));
-
-                var repo = sourceProvider.CreateRepository(new PackageSource(LineupPackageRestoreSource));
-
-                var metadata = await repo.GetResourceAsync<MetadataResource>();
-                if (!await metadata.Exists(LineupPackageId, cacheContext, log, _cts.Token))
-                {
-                    Log.LogError($"Package {LineupPackageId} is not available on '{repo}'");
-                    return null;
-                }
-
-                try
-                {
-                    var versions = await metadata.GetVersions(LineupPackageId, includePrerelease: true, includeUnlisted: false, sourceCacheContext: cacheContext, log: log, token: _cts.Token);
-
-                    return range.FindBestMatch(versions);
-                }
-                catch (Exception ex)
-                {
-                    Log.LogError($"Unexpected error while fetching versions from {repo.PackageSource.Source}: " + ex.Message);
-                    return null;
-                }
-            }
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Utilities/DependencyVersionsFile.cs b/modules/KoreBuild.Tasks/Utilities/DependencyVersionsFile.cs
deleted file mode 100644
index 2b50a02b1..000000000
--- a/modules/KoreBuild.Tasks/Utilities/DependencyVersionsFile.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Evaluation;
-
-namespace KoreBuild.Tasks.Utilities
-{
-    public class DependencyVersionsFile
-    {
-        public const string PackageVersionsLabel = "Package Versions";
-
-        public const string AutoPackageVersionsLabel = "Package Versions: Auto";
-        public const string PinnedPackageVersionsLabel = "Package Versions: Pinned";
-
-        private readonly Dictionary<string, PackageVersionVariable> _versionVariables
-            = new Dictionary<string, PackageVersionVariable>(StringComparer.OrdinalIgnoreCase);
-
-        //private readonly SortedDictionary<string, ProjectPropertyElement> _versionElements
-        //    = new SortedDictionary<string, ProjectPropertyElement>(StringComparer.OrdinalIgnoreCase);
-
-        private readonly ProjectRootElement _document;
-        private ProjectPropertyGroupElement _autoPackageVersions;
-        private ProjectPropertyGroupElement _pinnedPackageVersions;
-
-        private DependencyVersionsFile(ProjectRootElement xDocument)
-        {
-            _document = xDocument;
-        }
-
-        public static string GetVariableName(string packageId)
-        {
-            var sb = new StringBuilder();
-            var first = true;
-            foreach (var ch in packageId)
-            {
-                if (!char.IsLetterOrDigit(ch))
-                {
-                    first = true;
-                    continue;
-                }
-
-                if (first)
-                {
-                    first = false;
-                    sb.Append(char.ToUpperInvariant(ch));
-                }
-                else
-                {
-                    sb.Append(ch);
-                }
-            }
-            sb.Append("PackageVersion");
-            return sb.ToString();
-        }
-
-
-        public static DependencyVersionsFile Create(bool addOverrideImport, string[] additionalImports = null)
-        {
-            var projectRoot = ProjectRootElement.Create(NewProjectFileOptions.None);
-
-            projectRoot.AddPropertyGroup().AddProperty("MSBuildAllProjects", "$(MSBuildAllProjects);$(MSBuildThisFileFullPath)");
-
-            var autoPackageVersions = projectRoot.AddPropertyGroup();
-            autoPackageVersions.Label = AutoPackageVersionsLabel;
-
-            if (additionalImports != null)
-            {
-                foreach (var item in additionalImports)
-                {
-                    var import = projectRoot.AddImport(item);
-                    import.Condition = $"Exists('{item}')";
-                }
-            }
-
-            if (addOverrideImport)
-            {
-                var import = projectRoot.AddImport("$(DotNetPackageVersionPropsPath)");
-                import.Condition = " '$(DotNetPackageVersionPropsPath)' != '' ";
-            }
-
-            var pinnedPackageVersions = projectRoot.AddPropertyGroup();
-            pinnedPackageVersions.Label = PinnedPackageVersionsLabel;
-
-            return new DependencyVersionsFile(projectRoot)
-            {
-                _autoPackageVersions = autoPackageVersions,
-                _pinnedPackageVersions = pinnedPackageVersions,
-            };
-        }
-
-        public static bool TryLoad(string sourceFile, out DependencyVersionsFile file)
-        {
-            try
-            {
-                file = Load(sourceFile);
-                return true;
-            }
-            catch
-            {
-                file = null;
-                return false;
-            }
-        }
-
-        public static DependencyVersionsFile Load(string sourceFile)
-        {
-            var project = ProjectRootElement.Open(sourceFile, ProjectCollection.GlobalProjectCollection, preserveFormatting: true);
-            return Load(project);
-        }
-
-        public static DependencyVersionsFile Load(ProjectRootElement document)
-        {
-            var file = new DependencyVersionsFile(document);
-
-            var propGroups = file._document.PropertyGroups;
-
-            var listPropertyGroups = new List<ProjectPropertyGroupElement>();
-
-            foreach (var propGroup in propGroups)
-            {
-                var attr = propGroup.Label;
-                if (attr != null && attr.StartsWith(PackageVersionsLabel, StringComparison.OrdinalIgnoreCase))
-                {
-                    file.HasVersionsPropertyGroup = true;
-                    listPropertyGroups.Add(propGroup);
-                }
-            }
-
-            foreach (var group in listPropertyGroups)
-            {
-                var isReadOnly = string.Equals(group.Label, PinnedPackageVersionsLabel, StringComparison.OrdinalIgnoreCase);
-                if (isReadOnly)
-                {
-                    file._pinnedPackageVersions = group;
-                }
-                else
-                {
-                    file._autoPackageVersions = group;
-                }
-
-                foreach (var child in group.Properties)
-                {
-                    var variable = new PackageVersionVariable(child, isReadOnly);
-                    file._versionVariables[variable.Name] = variable;
-                }
-            }
-
-            file.EnsureGroupsCreated();
-            return file;
-        }
-
-        private void EnsureGroupsCreated()
-        {
-            if (_autoPackageVersions == null)
-            {
-                _autoPackageVersions = _document.AddPropertyGroup();
-                _autoPackageVersions.Label = AutoPackageVersionsLabel;
-            }
-
-            if (_pinnedPackageVersions == null)
-            {
-                _pinnedPackageVersions = _document.AddPropertyGroup();
-                _pinnedPackageVersions.Label = PinnedPackageVersionsLabel;
-            }
-        }
-
-        public static DependencyVersionsFile LoadFromProject(Project project)
-        {
-            var file = new DependencyVersionsFile(ProjectRootElement.Create(NewProjectFileOptions.None));
-
-            foreach (var property in project.AllEvaluatedProperties.Where(p => p.Xml != null))
-            {
-                var group = (ProjectPropertyGroupElement)property.Xml.Parent;
-                var isReadOnly = string.Equals(group.Label, PinnedPackageVersionsLabel, StringComparison.OrdinalIgnoreCase);
-
-                var variable = new PackageVersionVariable(property.Xml, property.EvaluatedValue?.Trim(), isReadOnly);
-                file._versionVariables[property.Name] = variable;
-            }
-
-            file.EnsureGroupsCreated();
-
-            return file;
-        }
-
-        public bool HasVersionsPropertyGroup { get; private set; }
-
-        // copying is required so calling .Set while iterating on this doesn't raise an InvalidOperationException
-        public IReadOnlyDictionary<string, PackageVersionVariable> VersionVariables
-            => new Dictionary<string, PackageVersionVariable>(_versionVariables, StringComparer.OrdinalIgnoreCase);
-
-        public PackageVersionVariable Update(string variableName, string version)
-        {
-            if (!_versionVariables.TryGetValue(variableName, out var variable))
-            {
-                var element = _document.CreatePropertyElement(variableName);
-                variable = new PackageVersionVariable(element, version, isReadOnly: false);
-                _versionVariables[variableName] = variable;
-                variable.AddToGroup(_autoPackageVersions);
-            }
-
-            variable.UpdateVersion(version);
-            return variable;
-        }
-
-        public PackageVersionVariable AddPinnedVariable(string variableName, string version)
-        {
-            if (_versionVariables.ContainsKey(variableName))
-            {
-                throw new InvalidOperationException("Key already exists: " + variableName);
-            }
-
-            var element = _document.CreatePropertyElement(variableName);
-            var variable = new PackageVersionVariable(element, version, isReadOnly: true);
-            _versionVariables.Add(variableName, variable);
-            variable.AddToGroup(_pinnedPackageVersions);
-            return variable;
-        }
-
-        public void Save(string filePath)
-        {
-            _autoPackageVersions.RemoveAllChildren();
-            foreach (var item in _versionVariables.Values.Where(v => !v.IsReadOnly).OrderBy(v => v.Name))
-            {
-                item.AddToGroup(_autoPackageVersions);
-            }
-
-            _document.Save(filePath, Encoding.UTF8);
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Utilities/DownloadFileHelper.cs b/modules/KoreBuild.Tasks/Utilities/DownloadFileHelper.cs
new file mode 100644
index 000000000..3d1bebae5
--- /dev/null
+++ b/modules/KoreBuild.Tasks/Utilities/DownloadFileHelper.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Build.Utilities;
+using Task = System.Threading.Tasks.Task;
+
+namespace KoreBuild.Tasks.Utilities
+{
+    public class DownloadFileHelper
+    {
+        public static async Task<bool> DownloadFileAsync(string uri, string destinationPath, bool overwrite, CancellationToken cancellationToken, int timeoutSeconds, TaskLoggingHelper log)
+        {
+            if (File.Exists(destinationPath) && !overwrite)
+            {
+                return true;
+            }
+
+            const string FileuriProtocol = "file://";
+
+            if (uri.StartsWith(FileuriProtocol, StringComparison.OrdinalIgnoreCase))
+            {
+                var filePath = uri.Substring(FileuriProtocol.Length);
+                log.LogMessage($"Copying '{filePath}' to '{destinationPath}'");
+                File.Copy(filePath, destinationPath);
+            }
+            else
+            {
+                log.LogMessage($"Downloading '{uri}' to '{destinationPath}'");
+
+                using (var httpClient = new HttpClient
+                {
+                    // Timeout if no response starts in 2 minutes
+                    Timeout = TimeSpan.FromMinutes(2),
+                })
+                {
+                    try
+                    {
+                        var response = await httpClient.GetAsync(uri, cancellationToken);
+                        response.EnsureSuccessStatusCode();
+                        cancellationToken.ThrowIfCancellationRequested();
+
+                        Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));
+
+                        using (var outStream = File.Create(destinationPath))
+                        {
+                            var responseStream = response.Content.ReadAsStreamAsync();
+                            var finished = await Task.WhenAny(responseStream, Task.Delay(TimeSpan.FromSeconds(timeoutSeconds)));
+
+                            if (!ReferenceEquals(responseStream, finished))
+                            {
+                                throw new TimeoutException($"Download failed to complete in {timeoutSeconds} seconds.");
+                            }
+
+                            responseStream.Result.CopyTo(outStream);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        log.LogError($"Downloading '{uri}' failed.");
+                        log.LogErrorFromException(ex, showStackTrace: true);
+
+                        File.Delete(destinationPath);
+                        return false;
+                    }
+                }
+            }
+
+            return !log.HasLoggedErrors;
+        }
+    }
+}
diff --git a/modules/KoreBuild.Tasks/Utilities/PackageDownloadRequest.cs b/modules/KoreBuild.Tasks/Utilities/PackageDownloadRequest.cs
deleted file mode 100644
index 40aeef381..000000000
--- a/modules/KoreBuild.Tasks/Utilities/PackageDownloadRequest.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using NuGet.Packaging.Core;
-
-namespace KoreBuild.Tasks.Utilities
-{
-    public class PackageDownloadRequest
-    {
-        public PackageIdentity Identity { get; set; }
-        public string OutputPath { get; set; }
-        public IReadOnlyList<string> Sources { get; set; }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Utilities/PackageDownloader.cs b/modules/KoreBuild.Tasks/Utilities/PackageDownloader.cs
deleted file mode 100644
index 9d5a9ac32..000000000
--- a/modules/KoreBuild.Tasks/Utilities/PackageDownloader.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using NuGet.Commands;
-using NuGet.Configuration;
-using NuGet.Packaging.Core;
-using NuGet.Protocol;
-using NuGet.Protocol.Core.Types;
-
-namespace KoreBuild.Tasks.Utilities
-{
-    public class PackageDownloader
-    {
-        private static readonly Task<bool> FalseTask = Task.FromResult(false);
-        private readonly NuGet.Common.ILogger logger;
-
-        public PackageDownloader(NuGet.Common.ILogger logger)
-        {
-            this.logger = logger;
-        }
-
-        public async Task<bool> DownloadPackagesAsync(ICollection<PackageDownloadRequest> requests, TimeSpan timeout, CancellationToken cancellationToken)
-        {
-            logger.LogMinimal($"Downloading {requests.Count} package(s)");
-
-            var cts = new CancellationTokenSource(timeout);
-            cancellationToken.Register(() => cts.Cancel());
-
-            using (var cacheContext = new SourceCacheContext())
-            using (var throttle = new SemaphoreSlim(8))
-            {
-                var defaultSettings = Settings.LoadDefaultSettings(root: null, configFileName: null, machineWideSettings: null);
-                var sourceProvider = new CachingSourceProvider(new PackageSourceProvider(defaultSettings));
-                var tasks = new List<Task<bool>>();
-
-                foreach (var request in requests)
-                {
-                    var feeds = request.Sources
-                        .Select(s => s?.Trim())
-                        .Where(s => !string.IsNullOrEmpty(s))
-                        .Distinct()
-                        .Select(sourceProvider.CreateRepository);
-                    tasks.Add(DownloadPackageAsync(request, feeds, cacheContext, throttle, logger, cts.Token));
-                }
-
-                var all = Task.WhenAll(tasks);
-                var delay = Task.Delay(timeout);
-
-                var finished = await Task.WhenAny(all, delay);
-                if (ReferenceEquals(delay, finished))
-                {
-                    logger.LogError($"Timed out after {timeout.TotalSeconds}s");
-                    cts.Cancel();
-                    return false;
-                }
-
-                if (!tasks.All(a => a.Result))
-                {
-                    logger.LogError("Failed to download all packages");
-                    return false;
-                }
-
-                return true;
-            }
-        }
-
-        private async Task<bool> DownloadPackageAsync(
-            PackageDownloadRequest request,
-            IEnumerable<SourceRepository> repositories,
-            SourceCacheContext cacheContext,
-            SemaphoreSlim throttle,
-            NuGet.Common.ILogger logger,
-            CancellationToken cancellationToken)
-        {
-            foreach (var repo in repositories)
-            {
-                var findPackageByIdResource = await repo.GetResourceAsync<FindPackageByIdResource>(cancellationToken);
-
-                if (findPackageByIdResource == null)
-                {
-                    logger.LogError($"{nameof(FindPackageByIdResource)} for '{repo}' could not be loaded.");
-                    return false;
-                }
-
-                using (var downloader = await findPackageByIdResource.GetPackageDownloaderAsync(request.Identity, cacheContext, logger, cancellationToken))
-                {
-                    if (downloader == null)
-                    {
-                        logger.LogInformation($"Package {request.Identity.Id} {request.Identity.Version} is not available on '{repo}'");
-                        // Skip to the next source if a package cannot be found in a given source.
-                        continue;
-                    }
-
-                    downloader.SetThrottle(throttle);
-                    if (!await downloader.CopyNupkgFileToAsync(request.OutputPath, cancellationToken))
-                    {
-                        logger.LogError($"Could not download {request.Identity.Id} {request.Identity.Version} from {repo}.");
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-
-            logger.LogError($"{request.Identity.Id} {request.Identity.Version} is not available.'");
-            return false;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Utilities/PackageVersionVariable.cs b/modules/KoreBuild.Tasks/Utilities/PackageVersionVariable.cs
deleted file mode 100644
index 4131e2113..000000000
--- a/modules/KoreBuild.Tasks/Utilities/PackageVersionVariable.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Build.Construction;
-
-namespace KoreBuild.Tasks.Utilities
-{
-    public class PackageVersionVariable
-    {
-        private readonly ProjectPropertyElement _element;
-
-        public PackageVersionVariable(ProjectPropertyElement element, bool isReadOnly)
-            : this(element, element.Value?.Trim(), isReadOnly)
-        {
-        }
-
-        public PackageVersionVariable(ProjectPropertyElement element, string version, bool isReadOnly)
-        {
-            _element = element ?? throw new ArgumentNullException(nameof(element));
-            IsReadOnly = isReadOnly;
-            Name = element.Name.ToString();
-            Version = version ?? string.Empty;
-        }
-
-        public string Name { get; }
-
-        public string Version
-        {
-            get => _element.Value;
-            private set => _element.Value = value;
-        }
-
-        public bool IsReadOnly { get; private set; }
-
-        public void UpdateVersion(string version)
-        {
-            if (IsReadOnly)
-            {
-                throw new InvalidOperationException("You cannot updated a pinned package version variable automatically");
-            }
-
-            Version = version;
-        }
-
-        public void AddToGroup(ProjectPropertyGroupElement group)
-        {
-            group.AppendChild(_element);
-        }
-
-        public void SetLabel(string label)
-        {
-            _element.Label = label;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/Utilities/VsInstallerHelper.cs b/modules/KoreBuild.Tasks/Utilities/VsInstallerHelper.cs
new file mode 100644
index 000000000..bdb1b6ef4
--- /dev/null
+++ b/modules/KoreBuild.Tasks/Utilities/VsInstallerHelper.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Build.Utilities;
+using Newtonsoft.Json;
+
+namespace KoreBuild.Tasks.Utilities
+{
+    internal class VsInstallerHelper
+    { 
+        public static async Task<string> DownloadVsExe(TaskLoggingHelper log, string vsProductType)
+        {
+            var exeName = $"vs_{vsProductType}.exe";
+            var tempPath = Path.Combine(Path.GetTempPath(), exeName);
+
+            await DownloadFileHelper.DownloadFileAsync(uri: $"https://aka.ms/vs/15/release/{exeName}",
+                destinationPath: tempPath,
+                overwrite: true,
+                cancellationToken: new CancellationToken(),
+                timeoutSeconds: 60 * 15,
+                log);
+
+            log.LogMessage($"Downloaded visual studio exe to {tempPath}.");
+
+            return tempPath;
+        }
+
+        private class VsJsonFile
+        {
+            [JsonProperty(PropertyName = "channelUri")]
+            public string ChannelUri { get; set; }
+            [JsonProperty(PropertyName = "channelId")]
+            public string ChannelId { get; set; }
+            [JsonProperty(PropertyName = "productId")]
+            public string ProductId { get; set; }
+            [JsonProperty(PropertyName = "includeRecommended")]
+            public bool IncludeRecommended { get; set; }
+            [JsonProperty(PropertyName = "addProductLang")]
+            public List<string> AddProductLang { get; set; }
+            [JsonProperty(PropertyName = "add")]
+            public List<string> Add { get; set; }
+        }
+
+        public static string CreateVsFileFromRequiredToolset(KoreBuildSettings.VisualStudioToolset vsToolset, TaskLoggingHelper log, string vsProductType)
+        {
+            var vsFile = new VsJsonFile
+            {
+                ChannelUri = "https://aka.ms/vs/15/release/channel",
+                ChannelId = "VisualStudio.15.Release",
+                ProductId = $"Microsoft.VisualStudio.Product.{vsProductType}",
+                IncludeRecommended = false,
+                AddProductLang = new List<string>
+                {
+                    "en-US"
+                },
+                Add = new List<string>(vsToolset.RequiredWorkloads)
+            };
+
+            var tempFile = Path.Combine(Path.GetTempPath(), $"vs_{vsProductType}.json");
+
+            var json = JsonConvert.SerializeObject(vsFile);
+            File.WriteAllText(tempFile, json);
+
+            return tempFile;
+        }
+    }
+}
diff --git a/modules/KoreBuild.Tasks/VerifyChecksum.cs b/modules/KoreBuild.Tasks/VerifyChecksum.cs
deleted file mode 100644
index 3cb7d48c7..000000000
--- a/modules/KoreBuild.Tasks/VerifyChecksum.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Build.Framework;
-
-namespace KoreBuild.Tasks
-{
-    /// <summary>
-    /// Verify the checksum for a single file.
-    /// </summary>
-    public class VerifyChecksum : Microsoft.Build.Utilities.Task
-    {
-        /// <summary>
-        /// The file path.
-        /// </summary>
-        [Required]
-        public string File { get; set; }
-
-        /// <summary>
-        /// The algorithm. Allowed values: SHA256, SHA384, SHA512.
-        /// </summary>
-        public string Algorithm { get; set; } = "SHA256";
-
-        /// <summary>
-        /// The hash.
-        /// </summary>
-        [Required]
-        public string Hash { get; set; }
-
-        public override bool Execute()
-        {
-            var actualHash = HashHelper.GetFileHash(Algorithm, File);
-
-            if (!actualHash.Equals(Hash, StringComparison.OrdinalIgnoreCase))
-            {
-                Log.LogError($"Checksum mismatch. Expected {File} to have {Algorithm} checksum of {Hash}, but it was {actualHash}");
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/modules/KoreBuild.Tasks/module.props b/modules/KoreBuild.Tasks/module.props
index cfa690448..58949fc17 100644
--- a/modules/KoreBuild.Tasks/module.props
+++ b/modules/KoreBuild.Tasks/module.props
@@ -1,5 +1,6 @@
 <Project>
   <Import Project="PackageVersions.props" />
+  <Import Project="CodeSign.props" />
 
   <PropertyGroup>
     <KoreBuildTasksDll>$(MSBuildThisFileDirectory)Internal.AspNetCore.KoreBuild.Tasks.dll</KoreBuildTasksDll>
@@ -10,22 +11,10 @@
     </CodeSignDependsOn>
   </PropertyGroup>
 
-  <UsingTask TaskName="KoreBuild.Tasks.CheckPackageReferences" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.ComputeChecksum" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.DisableSkipStrongName" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.DownloadFile" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.DownloadNuGetPackages" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.EnableSkipStrongName" AssemblyFile="$(KoreBuildTasksDll)" />
   <UsingTask TaskName="KoreBuild.Tasks.FindVisualStudio" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.GenerateDependenciesPropsFile" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.GeneratePackageVersionPropsFile" AssemblyFile="$(KoreBuildTasksDll)" />
   <UsingTask TaskName="KoreBuild.Tasks.GetPathToFullMSBuild" AssemblyFile="$(KoreBuildTasksDll)" />
   <UsingTask TaskName="KoreBuild.Tasks.GetToolsets" AssemblyFile="$(KoreBuildTasksDll)" />
   <UsingTask TaskName="KoreBuild.Tasks.InstallDotNet" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.PackNuSpec" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.PushNuGetPackages" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.UpgradeDependencies" AssemblyFile="$(KoreBuildTasksDll)" />
-  <UsingTask TaskName="KoreBuild.Tasks.VerifyChecksum" AssemblyFile="$(KoreBuildTasksDll)" />
 
   <PropertyGroup>
     <DefaultDotNetAssetArch>$(KOREBUILD_DOTNET_ARCH)</DefaultDotNetAssetArch>
@@ -72,7 +61,7 @@
       Specifies a required .NET Core SDK.
 
       Examples:
-        <DotNetCoreSdk Include="coherent" Channel="master" InstallDir="$(RepositoryRoot)\.siteextension\" />
+        <DotNetCoreSdk Include="coherent" Channel="main" InstallDir="$(RepoRoot)\.siteextension\" />
     -->
     <DotNetCoreSdk>
       <Arch>$(DefaultDotNetAssetArch)</Arch>
diff --git a/modules/KoreBuild.Tasks/module.targets b/modules/KoreBuild.Tasks/module.targets
index 9989d3471..01c047af4 100644
--- a/modules/KoreBuild.Tasks/module.targets
+++ b/modules/KoreBuild.Tasks/module.targets
@@ -3,11 +3,10 @@
 
   <PropertyGroup>
     <PrepareDependsOn Condition=" '$(DisableDefaultTargets)' != 'true' ">GetToolsets;$(PrepareDependsOn)</PrepareDependsOn>
-    <RestoreDependsOn Condition=" '$(DisableDefaultTargets)' != 'true' ">InstallDotNet;CheckPackageReferences;$(RestoreDependsOn)</RestoreDependsOn>
+    <RestoreDependsOn Condition=" '$(DisableDefaultTargets)' != 'true' ">InstallDotNet;$(RestoreDependsOn)</RestoreDependsOn>
 
-    <DisablePackageReferenceRestrictions Condition=" '$(DisablePackageReferenceRestrictions)' == '' ">false</DisablePackageReferenceRestrictions>
-    <KoreBuildConfigFile Condition="'$(KoreBuildConfigFile)' == ''">$(RepositoryRoot)korebuild.json</KoreBuildConfigFile>
-    <DependencyVersionsFile Condition="'$(DependencyVersionsFile)' == ''">$(RepositoryRoot)build\dependencies.props</DependencyVersionsFile>
+    <KoreBuildConfigFile Condition="'$(KoreBuildConfigFile)' == ''">$(RepoRoot)korebuild.json</KoreBuildConfigFile>
+    <DependencyVersionsFile Condition="'$(DependencyVersionsFile)' == ''">$(RepoRoot)build\dependencies.props</DependencyVersionsFile>
   </PropertyGroup>
 
 <!--
@@ -47,84 +46,6 @@ Downloads and extracts .NET Core shared runtimes and SDKs.
       InstallScript="$(_DotNetInstall)"/>
   </Target>
 
-
-<!--
-####################################################################################
-Target: CheckPackageReferences
-
-Validates that all PackageReference's use the $(IdPackageVersion) pattern.
-####################################################################################
--->
-  <ItemGroup>
-    <CommonlyImportedFiles Include="$(RepositoryRoot)Directory.Build.props" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)Directory.Build.targets" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)benchmarks\Directory.Build.props" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)benchmarks\Directory.Build.targets" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)samples\Directory.Build.props" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)samples\Directory.Build.targets" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)src\Directory.Build.props" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)src\Directory.Build.targets" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)test\Directory.Build.props" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)test\Directory.Build.targets" />
-    <CommonlyImportedFiles Include="$(RepositoryRoot)build\common.props" />
-  </ItemGroup>
-
-  <Target Name="CheckPackageReferences"
-          DependsOnTargets="ResolveSolutions"
-          Condition="'$(DisablePackageReferenceRestrictions)' != 'true'">
-    <ItemGroup>
-      <CommonlyImportedFiles Remove="@(CommonlyImportedFiles)" Condition="!Exists(%(CommonlyImportedFiles.Identity))" />
-    </ItemGroup>
-
-    <CheckPackageReferences
-      Projects="@(Solutions);@(CommonlyImportedFiles)"
-      DependenciesFile="$(DependencyVersionsFile)"
-      Properties="$(BuildProperties)"/>
-  </Target>
-
-<!--
-####################################################################################
-Target: UpgradeDependencies
-
-Fetchs a remote configuration of latest dependencies to use, and modifies the
-dependencies.props file in the current project to use latest versions.
-####################################################################################
--->
-
-  <!-- See also DependenciesUpgradeCommand.cs in KoreBuild.Console for a more discoverable way to run this. -->
-  <Target Name="UpgradeDependencies">
-    <Error Text="LineupPackageId was not set." Condition="'$(LineupPackageId)' == ''" />
-    <Error Text="LineupPackageRestoreSource was not set." Condition="'$(LineupPackageRestoreSource)' == ''" />
-
-    <UpgradeDependencies
-      DependenciesFile="$(DependencyVersionsFile)"
-      LineupPackageId="$(LineupPackageId)"
-      LineupPackageVersion="$(LineupPackageVersion)"
-      LineupPackageRestoreSource="$(LineupPackageRestoreSource)"
-      LineupDependenciesFile="$(LineupDependenciesFile)" />
-  </Target>
-
-<!--
-####################################################################################
-Target: GenerateDependenciesPropsFile
-
-Generates a dependencies.props file from existing MSBuild projects, replacing
-explicit versions with version variables.
-####################################################################################
--->
-  <!-- See also DependenciesGenerateCommand.cs in KoreBuild.Console for a more discoverable way to run this. -->
-  <Target Name="GenerateDependenciesPropsFile" DependsOnTargets="ResolveSolutions">
-    <ItemGroup>
-      <CommonlyImportedFiles Remove="@(CommonlyImportedFiles)" Condition="!Exists(%(CommonlyImportedFiles.Identity))" />
-    </ItemGroup>
-
-    <GenerateDependenciesPropsFile
-      Projects="@(Solutions)"
-      OtherImports="@(CommonlyImportedFiles)"
-      DependenciesFile="$(DependencyVersionsFile)"
-      Properties="$(BuildProperties)" />
-  </Target>
-
 <!--
 ####################################################################################
 Target: GetToolsets
diff --git a/modules/NuGetPackageVerifier/console/CompositeRules/DefaultCompositeRule.cs b/modules/NuGetPackageVerifier/console/CompositeRules/DefaultCompositeRule.cs
index 9867d598b..bf2ae18a2 100644
--- a/modules/NuGetPackageVerifier/console/CompositeRules/DefaultCompositeRule.cs
+++ b/modules/NuGetPackageVerifier/console/CompositeRules/DefaultCompositeRule.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
-
 namespace NuGetPackageVerifier.Rules
 {
     public class DefaultCompositeRule : CompositeRule
@@ -18,6 +16,7 @@ public class DefaultCompositeRule : CompositeRule
             new AssemblyHasServicingAttributeRule(),
             new AssemblyHasVersionAttributesRule(),
             new AssemblyStrongNameRule(),
+            new PackageRepoMetadataRule(),
             new PackageCopyrightRule(),
             new PackageAuthorRule(),
             new RequiredPackageMetadataRule(),
diff --git a/modules/NuGetPackageVerifier/console/CompositeRules/SigningVerificationCompositeRule.cs b/modules/NuGetPackageVerifier/console/CompositeRules/SigningVerificationCompositeRule.cs
index e393af92c..90ca32a97 100644
--- a/modules/NuGetPackageVerifier/console/CompositeRules/SigningVerificationCompositeRule.cs
+++ b/modules/NuGetPackageVerifier/console/CompositeRules/SigningVerificationCompositeRule.cs
@@ -1,7 +1,6 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
 
 namespace NuGetPackageVerifier.Rules
 {
@@ -14,6 +13,7 @@ public class SigningVerificationCompositeRule : CompositeRule
             new AuthenticodeSigningRule(),
             new PowerShellScriptIsSignedRule(),
             new PackageOwnershipRule(),
+            new PackageSigningRule(),
         };
     }
 }
diff --git a/modules/NuGetPackageVerifier/console/AssemblyHelpers.cs b/modules/NuGetPackageVerifier/console/ExtensionMethods.cs
similarity index 77%
rename from modules/NuGetPackageVerifier/console/AssemblyHelpers.cs
rename to modules/NuGetPackageVerifier/console/ExtensionMethods.cs
index b801a3b89..c81eea64c 100644
--- a/modules/NuGetPackageVerifier/console/AssemblyHelpers.cs
+++ b/modules/NuGetPackageVerifier/console/ExtensionMethods.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Runtime.Loader;
+using NuGet.Packaging;
 
 namespace NuGetPackageVerifier
 {
-    public class AssemblyHelpers
+    public static class AssemblyHelpers
     {
         public static bool IsAssemblyManaged(string assemblyPath)
         {
@@ -31,5 +33,8 @@ public static bool IsAssemblyManaged(string assemblyPath)
             }
             return false;
         }
+
+        public static bool IsDotNetToolPackage(this IPackageMetadata metadata)
+            => metadata.PackageTypes.Count() > 0 && metadata.PackageTypes.All(p => p == Constants.DotNetTool);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/NuGetPackageVerifier/console/PackageIssueFactory.cs b/modules/NuGetPackageVerifier/console/PackageIssueFactory.cs
index 444637440..bc1ae3387 100644
--- a/modules/NuGetPackageVerifier/console/PackageIssueFactory.cs
+++ b/modules/NuGetPackageVerifier/console/PackageIssueFactory.cs
@@ -19,6 +19,38 @@ public static PackageVerifierIssue DotNetToolMustHaveManifest(string packageType
             );
         }
 
+        public static PackageVerifierIssue PackageRepositoryMetadataMissing()
+        {
+            return new PackageVerifierIssue(
+                "PACKAGE_MISSING_REPO_METADATA",
+                "The package is missing metadata about the repository that produced this package.",
+                PackageIssueLevel.Warning);
+        }
+
+        public static PackageVerifierIssue PackageRepositoryUrl()
+        {
+            return new PackageVerifierIssue(
+              "PACKAGE_MISSING_REPO_URL",
+              "The package is missing metadata about the repository url.",
+              PackageIssueLevel.Warning);
+        }
+
+        public static PackageVerifierIssue PackageRepositoryType()
+        {
+            return new PackageVerifierIssue(
+              "PACKAGE_MISSING_REPO_TYPE",
+              "The package is missing metadata about the repository type.",
+              PackageIssueLevel.Warning);
+        }
+
+        public static PackageVerifierIssue PackageRepositoryCommit()
+        {
+            return new PackageVerifierIssue(
+             "PACKAGE_MISSING_REPO_COMMIT",
+             "The package is missing metadata about the repository commit.",
+             PackageIssueLevel.Warning);
+        }
+
         public static PackageVerifierIssue DotNetToolMissingEntryPoint(string manifestPath, string filePath)
         {
             return new PackageVerifierIssue(
@@ -196,6 +228,15 @@ public static PackageVerifierIssue CopyrightIsIncorrect(string packageId, string
                 PackageIssueLevel.Error);
         }
 
+        public static PackageVerifierIssue PackageSignVerificationFailed(string packageId, string issueText)
+        {
+            return new PackageVerifierIssue(
+                "PACKAGE_SIGN_VERIFICATION_FAILED",
+                packageId,
+                $"Sign verification for package {packageId} failed: {issueText}",
+                PackageIssueLevel.Error);
+        }
+
         public static PackageVerifierIssue AuthorIsIncorrect(string packageId, string expectedAuthor, string actualAuthor)
         {
             return new PackageVerifierIssue("PACKAGE_AUTHOR_INCORRECT", packageId, string.Format(
diff --git a/modules/NuGetPackageVerifier/console/Rules/AssemblyHasNeutralResourcesLanguageAttributeRule.cs b/modules/NuGetPackageVerifier/console/Rules/AssemblyHasNeutralResourcesLanguageAttributeRule.cs
index d032fd188..0165b3ad7 100644
--- a/modules/NuGetPackageVerifier/console/Rules/AssemblyHasNeutralResourcesLanguageAttributeRule.cs
+++ b/modules/NuGetPackageVerifier/console/Rules/AssemblyHasNeutralResourcesLanguageAttributeRule.cs
@@ -14,6 +14,11 @@ public class AssemblyHasNeutralResourcesLanguageAttributeRule : IPackageVerifier
     {
         public IEnumerable<PackageVerifierIssue> Validate(PackageAnalysisContext context)
         {
+            if (context.Metadata.IsDotNetToolPackage())
+            {
+                yield break;
+            }
+
             AssemblyAttributesDataHelper.SetAssemblyAttributesData(context);
             foreach (var assemblyData in context.AssemblyData)
             {
diff --git a/modules/NuGetPackageVerifier/console/Rules/AssemblyHasServicingAttributeRule.cs b/modules/NuGetPackageVerifier/console/Rules/AssemblyHasServicingAttributeRule.cs
index 87bd5f688..e1fd1ee3e 100644
--- a/modules/NuGetPackageVerifier/console/Rules/AssemblyHasServicingAttributeRule.cs
+++ b/modules/NuGetPackageVerifier/console/Rules/AssemblyHasServicingAttributeRule.cs
@@ -13,6 +13,11 @@ public class AssemblyHasServicingAttributeRule : IPackageVerifierRule
     {
         public IEnumerable<PackageVerifierIssue> Validate(PackageAnalysisContext context)
         {
+            if (context.Metadata.IsDotNetToolPackage())
+            {
+                yield break;
+            }
+
             AssemblyAttributesDataHelper.SetAssemblyAttributesData(context);
             foreach (var assemblyData in context.AssemblyData)
             {
diff --git a/modules/NuGetPackageVerifier/console/Rules/AssemblyStrongNameRule.cs b/modules/NuGetPackageVerifier/console/Rules/AssemblyStrongNameRule.cs
index b444e3677..afa288b65 100644
--- a/modules/NuGetPackageVerifier/console/Rules/AssemblyStrongNameRule.cs
+++ b/modules/NuGetPackageVerifier/console/Rules/AssemblyStrongNameRule.cs
@@ -16,6 +16,11 @@ public class AssemblyStrongNameRule : IPackageVerifierRule
 
         public IEnumerable<PackageVerifierIssue> Validate(PackageAnalysisContext context)
         {
+            if (context.Metadata.IsDotNetToolPackage())
+            {
+                yield break;
+            }
+
             foreach (var currentFile in context.PackageReader.GetFiles())
             {
                 var extension = Path.GetExtension(currentFile);
diff --git a/modules/NuGetPackageVerifier/console/Rules/PackageRepoMetadataRule.cs b/modules/NuGetPackageVerifier/console/Rules/PackageRepoMetadataRule.cs
new file mode 100644
index 000000000..a86074aa5
--- /dev/null
+++ b/modules/NuGetPackageVerifier/console/Rules/PackageRepoMetadataRule.cs
@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace NuGetPackageVerifier.Rules
+{
+    public class PackageRepoMetadataRule : IPackageVerifierRule
+    {
+        public IEnumerable<PackageVerifierIssue> Validate(PackageAnalysisContext context)
+        {
+            var repoMetadata = context.PackageReader.NuspecReader.GetRepositoryMetadata();
+
+            if (repoMetadata == null)
+            {
+                yield return PackageIssueFactory.PackageRepositoryMetadataMissing();
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(repoMetadata.Url))
+                {
+                    yield return PackageIssueFactory.PackageRepositoryUrl();
+                }
+
+                if (string.IsNullOrEmpty(repoMetadata.Type))
+                {
+                    yield return PackageIssueFactory.PackageRepositoryType();
+                }
+
+                if (string.IsNullOrEmpty(repoMetadata.Commit))
+                {
+                    yield return PackageIssueFactory.PackageRepositoryCommit();
+                }
+            }
+        }
+    }
+}
diff --git a/modules/NuGetPackageVerifier/console/Rules/PackageSigningrule.cs b/modules/NuGetPackageVerifier/console/Rules/PackageSigningrule.cs
new file mode 100644
index 000000000..d6ffccc13
--- /dev/null
+++ b/modules/NuGetPackageVerifier/console/Rules/PackageSigningrule.cs
@@ -0,0 +1,80 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace NuGetPackageVerifier.Rules
+{
+    public class PackageSigningRule : IPackageVerifierRule
+    {
+        private readonly string _nuGetExePath;
+
+        public PackageSigningRule()
+            : this(GetKorebuildNuGetPath())
+        {
+        }
+
+        public PackageSigningRule(string exePath)
+        {
+            if (!File.Exists(exePath))
+            {
+                throw new ArgumentException($"NuGet.exe could not be located at {exePath}", nameof(exePath));
+            }
+
+            _nuGetExePath = exePath;
+        }
+
+        private static string GetKorebuildNuGetPath()
+        {
+            var searchPaths = new[]
+            {
+                // KoreBuild/nuget.exe
+                // KoreBuild/modules/NuGetPackageVerifier/
+                Path.Combine(AppContext.BaseDirectory, "..", "..", "nuget.exe"),
+
+                // obj/nuget.exe in local build root
+                Path.Combine(AppContext.BaseDirectory, "..", "..", "..", "..", "..", "..", "obj", "nuget.exe"),
+            };
+
+            return searchPaths.First(File.Exists);
+        }
+
+        public IEnumerable<PackageVerifierIssue> Validate(PackageAnalysisContext context)
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                throw new InvalidOperationException("Package sign verification is only supported on Windows machines");
+            }
+
+            var args = new[]
+            {
+                "verify",
+                "-NonInteractive",
+                "-All",
+                context.PackageFileInfo.FullName,
+            };
+
+            var psi = new ProcessStartInfo
+            {
+                FileName = _nuGetExePath,
+                Arguments = ArgumentEscaper.EscapeAndConcatenate(args),
+                RedirectStandardOutput = true,
+            };
+
+            var process = Process.Start(psi);
+            process.WaitForExit(60 * 1000);
+
+            if (process.ExitCode != 0)
+            {
+                var issueText = process.StandardOutput.ReadToEnd();
+                yield return PackageIssueFactory.PackageSignVerificationFailed(context.Metadata.Id, issueText);
+            }
+        }
+    }
+}
diff --git a/modules/NuGetPackageVerifier/module.targets b/modules/NuGetPackageVerifier/module.targets
index d0ec1e4dc..c02689a67 100644
--- a/modules/NuGetPackageVerifier/module.targets
+++ b/modules/NuGetPackageVerifier/module.targets
@@ -17,7 +17,7 @@ repository root.
 ###################################################################
 -->
   <PropertyGroup>
-    <NuGetVerifierRuleFile Condition=" '$(NuGetVerifierRuleFile)' == '' ">$(RepositoryRoot)NuGetPackageVerifier.json</NuGetVerifierRuleFile>
+    <NuGetVerifierRuleFile Condition=" '$(NuGetVerifierRuleFile)' == '' ">$(RepoRoot)NuGetPackageVerifier.json</NuGetVerifierRuleFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/scripts/UpdateDependencyVersions.ps1 b/scripts/UpdateSdkVersion.ps1
old mode 100755
new mode 100644
similarity index 74%
rename from scripts/UpdateDependencyVersions.ps1
rename to scripts/UpdateSdkVersion.ps1
index 57c1d906d..40253fb00
--- a/scripts/UpdateDependencyVersions.ps1
+++ b/scripts/UpdateSdkVersion.ps1
@@ -9,9 +9,7 @@ to know the internal details of how config files are layed out in this repo.
 [cmdletbinding(SupportsShouldProcess = $true, PositionalBinding = $false)]
 param(
     [Parameter()]
-    [Alias("sdk")]
-    [string]$DotNetSdkVersion = $null,
-    [string]$DotNetRuntimeVersion = $null,
+    [string]$Version = $null,
     [string[]]$GitCommitArgs = @(),
     [switch]$Force
 )
@@ -27,13 +25,13 @@ if (!$git) {
 
 $updates = @()
 
-if ($DotNetSdkVersion -and $PSCmdlet.ShouldProcess("Update dotnet SDK to $DotNetSdkVersion")) {
+if ($Version -and $PSCmdlet.ShouldProcess("Update dotnet SDK to $Version")) {
     $path = "$PSScriptRoot/../files/KoreBuild/config/sdk.version"
     $currentVersion = (Get-Content -path $path -Encoding Ascii).Trim()
-    if ($currentVersion -ne $DotNetSdkVersion) {
-        $DotNetSdkVersion | Set-Content -path $path -Encoding Ascii
+    if ($currentVersion -ne $Version) {
+        $Version | Set-Content -path $path -Encoding Ascii
         if ($git) { & git add $path }
-        $updates += "SDK to $DotNetSdkVersion"
+        $updates += "SDK to $Version"
     }
 }
 
diff --git a/scripts/bootstrapper/run.ps1 b/scripts/bootstrapper/run.ps1
index 2f892843e..b0ca082f1 100755
--- a/scripts/bootstrapper/run.ps1
+++ b/scripts/bootstrapper/run.ps1
@@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
 Example config file:
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
-  "channel": "master",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/main/tools/korebuild.schema.json",
+  "channel": "main",
   "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
 }
 ```
@@ -193,7 +193,7 @@ if (!$DotNetHome) {
         else { Join-Path $PSScriptRoot '.dotnet'}
 }
 
-if (!$Channel) { $Channel = 'master' }
+if (!$Channel) { $Channel = 'main' }
 if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
 
 # Execute
diff --git a/scripts/bootstrapper/run.sh b/scripts/bootstrapper/run.sh
index 129b0b957..89a6442d6 100755
--- a/scripts/bootstrapper/run.sh
+++ b/scripts/bootstrapper/run.sh
@@ -251,7 +251,7 @@ if [ -f "$config_file" ]; then
 fi
 
 [ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
-[ -z "$channel" ] && channel='master'
+[ -z "$channel" ] && channel='main'
 [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
 
 get_korebuild
diff --git a/shared/Microsoft.Extensions.CommandLineUtils.Sources/Utilities/DotNetMuxer.cs b/shared/Microsoft.Extensions.CommandLineUtils.Sources/Utilities/DotNetMuxer.cs
index 75a6042b4..34da57ef6 100644
--- a/shared/Microsoft.Extensions.CommandLineUtils.Sources/Utilities/DotNetMuxer.cs
+++ b/shared/Microsoft.Extensions.CommandLineUtils.Sources/Utilities/DotNetMuxer.cs
@@ -39,7 +39,7 @@ private static string TryFindMuxerPath()
             var fileName = MuxerName;
 #if NET46
             fileName += ".exe";
-#elif NETCOREAPP2_1 || NETSTANDARD2_0
+#elif NETCOREAPP3_1 || NETCOREAPP3_0 || NETCOREAPP2_2 || NETCOREAPP2_1 || NETSTANDARD2_0
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 fileName += ".exe";
diff --git a/src/ApiCheck.Console/ApiCheck.Console.csproj b/src/ApiCheck.Console/ApiCheck.Console.csproj
deleted file mode 100644
index 614dd088c..000000000
--- a/src/ApiCheck.Console/ApiCheck.Console.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
-    <PackageId>Microsoft.AspNetCore.BuildTools.ApiCheck</PackageId>
-    <AssemblyName>ApiCheck</AssemblyName>
-    <RootNamespace>Microsoft.AspNetCore.BuildTools.ApiCheck</RootNamespace>
-    <OutputType>exe</OutputType>
-    <IncludeSymbols>false</IncludeSymbols>
-    <IncludeSource>false</IncludeSource>
-  </PropertyGroup>
-
-  <!-- packaging settings-->
-  <PropertyGroup>
-    <NuspecFile>$(MSBuildThisFileDirectory)Microsoft.AspNetCore.BuildTools.ApiCheck.nuspec</NuspecFile>
-    <IntermediatePackDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\publish\</IntermediatePackDir>
-    <PublishDir>$(IntermediatePackDir)$(TargetFramework)\</PublishDir>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\**\*.cs" />
-
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
-    <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsVersion)" />
-  </ItemGroup>
-
-  <Target Name="PublishAll">
-    <ItemGroup>
-      <_TargetFramework Include="$(TargetFrameworks)" />
-    </ItemGroup>
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="Publish"
-             BuildInParallel="true"
-             Properties="TargetFramework=%(_TargetFramework.Identity)" />
-  </Target>
-
-  <Target Name="SetPackageDependencies" BeforeTargets="GenerateNuspec" DependsOnTargets="PublishAll">
-    <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);id=$(PackageId)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);publishDir=$(IntermediatePackDir)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);taskBuildDir=$(MSBuildThisFileDirectory)..\ApiCheck.Task\bin\$(Configuration)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);version=$(PackageVersion)</NuspecProperties>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="GetPackageVersion" Returns="$(PackageVersion)" />
-</Project>
diff --git a/src/ApiCheck.Console/ApiListing/ApiElement.cs b/src/ApiCheck.Console/ApiListing/ApiElement.cs
deleted file mode 100644
index 849a29104..000000000
--- a/src/ApiCheck.Console/ApiListing/ApiElement.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Diagnostics;
-
-namespace ApiCheck.Description
-{
-    [DebuggerDisplay("{" + nameof(Id) + ",nq}")]
-    public class ApiElement
-    {
-        public virtual string Id { get; }
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/ApiElementVisibility.cs b/src/ApiCheck.Console/ApiListing/ApiElementVisibility.cs
deleted file mode 100644
index f3a04e7e0..000000000
--- a/src/ApiCheck.Console/ApiListing/ApiElementVisibility.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace ApiCheck.Description
-{
-    [JsonConverter(typeof(StringEnumConverter))]
-    public enum ApiElementVisibility
-    {
-        Public,
-        Protected
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/ApiListing.cs b/src/ApiCheck.Console/ApiListing/ApiListing.cs
deleted file mode 100644
index e23db4f91..000000000
--- a/src/ApiCheck.Console/ApiListing/ApiListing.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace ApiCheck.Description
-{
-    public class ApiListing
-    {
-        public string AssemblyIdentity { get; set; }
-
-        public IList<TypeDescriptor> Types { get; } = new List<TypeDescriptor>();
-
-        [JsonIgnore]
-        public IEnumerable<Func<MemberInfo, bool>> SourceFilters { get; set; }
-
-        public TypeDescriptor FindType(string name)
-        {
-            foreach (var type in Types)
-            {
-                if (string.Equals(name, type.Name, StringComparison.Ordinal))
-                {
-                    return type;
-                }
-            }
-
-            return null;
-        }
-
-        public ApiElement FindElement(string typeId, string memberId)
-        {
-            var type = Types.FirstOrDefault(t => t.Id == typeId);
-            if (type == null)
-            {
-                return null;
-            }
-
-            if (memberId == null)
-            {
-                return type;
-            }
-
-            return type.FindMember(memberId);
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/ApiListingFilters.cs b/src/ApiCheck.Console/ApiListing/ApiListingFilters.cs
deleted file mode 100644
index 38d4989e2..000000000
--- a/src/ApiCheck.Console/ApiListing/ApiListingFilters.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Linq;
-using System.Reflection;
-using ApiCheck.Description;
-
-namespace ApiCheck
-{
-    public static class ApiListingFilters
-    {
-        public static bool IsInInternalNamespace(MemberInfo e)
-        {
-            var type = e as TypeInfo;
-            if (type == null)
-            {
-                return false;
-            }
-
-            var segments = type.Namespace.Split('.');
-            return segments.Any(s => s == "Internal");
-        }
-
-        public static bool IsInInternalNamespace(ApiElement e)
-        {
-            var type = e as TypeDescriptor;
-            if (type == null)
-            {
-                return false;
-            }
-
-            var segments = type.Name.Split('.');
-            // Skip the last segment as is the type name.
-            return segments.Take(segments.Length - 1).Any(s => s.Equals("Internal"));
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/GenericParameterDescriptor.cs b/src/ApiCheck.Console/ApiListing/GenericParameterDescriptor.cs
deleted file mode 100644
index 3b174b0b0..000000000
--- a/src/ApiCheck.Console/ApiListing/GenericParameterDescriptor.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace ApiCheck.Description
-{
-    public class GenericParameterDescriptor : ApiElement
-    {
-        [JsonIgnore]
-        public override string Id => HasConstraints() ? $"T{ParameterPosition}" + " : " + GetConstraints() : ParameterName;
-
-        [JsonIgnore]
-        public TypeInfo Source { get; set; }
-
-        public string ParameterName { get; set; }
-
-        public int ParameterPosition { get; set; }
-
-        private string GetConstraints()
-        {
-            var constraints = new List<string>();
-            foreach (var type in BaseTypeOrInterfaces)
-            {
-                constraints.Add(type);
-            }
-            if (Class)
-            {
-                constraints.Add("class");
-            }
-
-            if (Struct)
-            {
-                constraints.Add("struct");
-            }
-
-            if (!Struct && New)
-            {
-                constraints.Add("new()");
-            }
-
-            return string.Join(", ", constraints);
-        }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool New { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Class { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Struct { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public IList<string> BaseTypeOrInterfaces { get; } = new List<string>();
-
-        public bool HasConstraints() => New || Class || Struct || BaseTypeOrInterfaces.Count > 0;
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/MemberDescriptor.cs b/src/ApiCheck.Console/ApiListing/MemberDescriptor.cs
deleted file mode 100644
index 35ef300c6..000000000
--- a/src/ApiCheck.Console/ApiListing/MemberDescriptor.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using Newtonsoft.Json;
-
-namespace ApiCheck.Description
-{
-    public class MemberDescriptor : ApiElement
-    {
-        [JsonIgnore]
-        public override string Id => string.Join(" ", GetComponents());
-
-        [JsonIgnore]
-        public MemberInfo Source { get; set; }
-
-        public MemberKind Kind { get; set; }
-
-        public string Name { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public IList<ParameterDescriptor> Parameters { get; set; } = new List<ParameterDescriptor>();
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public string ReturnType { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Sealed { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Static { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Virtual { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Override { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Abstract { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool New { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Extension { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool ReadOnly { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public string ExplicitInterface { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public string ImplementedInterface { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public ApiElementVisibility? Visibility { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public IList<GenericParameterDescriptor> GenericParameter { get; } = new List<GenericParameterDescriptor>();
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Constant { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public string Literal { get; set; }
-
-        private IEnumerable<string> GetComponents()
-        {
-            if (ExplicitInterface == null && Visibility != null)
-            {
-                switch (Visibility)
-                {
-                    case ApiElementVisibility.Public:
-                        yield return "public";
-                        break;
-                    case ApiElementVisibility.Protected:
-                        yield return "protected";
-                        break;
-                }
-            }
-
-            if (Constant)
-            {
-                yield return "const";
-            }
-            else
-            {
-                if (Static)
-                {
-                    yield return "static";
-                }
-
-                if (ReadOnly)
-                {
-                    yield return "readonly";
-                }
-            }
-
-            if (Abstract)
-            {
-                yield return "abstract";
-            }
-
-            if (Sealed && ImplementedInterface == null)
-            {
-                yield return "sealed";
-            }
-
-            if (!Sealed && Virtual && !Abstract && !Override && ImplementedInterface == null)
-            {
-                yield return "virtual";
-            }
-
-            if (Override)
-            {
-                yield return "override";
-            }
-
-            if (New)
-            {
-                yield return "new";
-            }
-
-            if (ReturnType != null)
-            {
-                yield return ReturnType;
-            }
-
-            if (Kind != MemberKind.Field)
-            {
-                var name = ExplicitInterface != null ? $"{ExplicitInterface}.{Name}" : Name;
-                yield return GetParametersComponent(name);
-
-                foreach (var constraint in GenericParameter.Where(p => p.HasConstraints()))
-                {
-                    yield return "where";
-                    yield return constraint.Id;
-                }
-            }
-            else
-            {
-                yield return Name;
-
-                if (Literal != null)
-                {
-                    yield return "=";
-                    yield return Literal;
-                }
-            }
-        }
-
-        private string GetParametersComponent(string name)
-        {
-            var builder = new StringBuilder();
-
-            builder.Append(name);
-            builder.Append("(");
-            for (var i = 0; i < Parameters.Count; i++)
-            {
-                var parameter = Parameters[i];
-                if (Extension && i == 0)
-                {
-                    builder.Append("this ");
-                }
-                builder.Append(parameter.Id);
-                if (i < Parameters.Count - 1)
-                {
-                    builder.Append(", ");
-                }
-            }
-
-            builder.Append(")");
-            return builder.ToString();
-        }
-
-        public static string GetMemberNameFor(MethodBase member, bool includeGenericParameters = true)
-        {
-            if (!member.IsGenericMethod || !includeGenericParameters)
-            {
-                return member.Name;
-            }
-
-            var genericParameters = string.Join(", ", member.GetGenericArguments().Select(ga => TypeDescriptor.GetTypeNameFor(ga.GetTypeInfo())));
-
-            return $"{member.Name}<{genericParameters}>";
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/MemberKind.cs b/src/ApiCheck.Console/ApiListing/MemberKind.cs
deleted file mode 100644
index d3a64f3e0..000000000
--- a/src/ApiCheck.Console/ApiListing/MemberKind.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace ApiCheck.Description
-{
-    [JsonConverter(typeof(StringEnumConverter))]
-    public enum MemberKind
-    {
-        Constructor,
-        // This includes property and events accessors.
-        Method,
-        Field
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/ParameterDescriptor.cs b/src/ApiCheck.Console/ApiListing/ParameterDescriptor.cs
deleted file mode 100644
index 6d72ac88b..000000000
--- a/src/ApiCheck.Console/ApiListing/ParameterDescriptor.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace ApiCheck.Description
-{
-    public class ParameterDescriptor : ApiElement
-    {
-        [JsonIgnore]
-        public override string Id => string.Join(" ", GetComponents());
-
-        [JsonIgnore]
-        public ParameterInfo Source { get; set; }
-
-        public string Name { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public string Type { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public ParameterDirection Direction { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public string DefaultValue { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool IsParams { get; set; }
-
-        private IEnumerable<string> GetComponents()
-        {
-            switch (Direction)
-            {
-                case ParameterDirection.In:
-                    break;
-                case ParameterDirection.Out:
-                    yield return "out";
-                    break;
-                case ParameterDirection.Ref:
-                    yield return "ref";
-                    break;
-            }
-
-            if (IsParams)
-            {
-                yield return "params";
-            }
-
-            yield return Type;
-            yield return Name;
-
-            if (DefaultValue != null)
-            {
-                yield return "=";
-                yield return DefaultValue;
-            }
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/ParameterDirection.cs b/src/ApiCheck.Console/ApiListing/ParameterDirection.cs
deleted file mode 100644
index 452ecfca2..000000000
--- a/src/ApiCheck.Console/ApiListing/ParameterDirection.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace ApiCheck.Description
-{
-    [JsonConverter(typeof(StringEnumConverter))]
-    public enum ParameterDirection
-    {
-        In,
-        Out,
-        Ref
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/TypeDescriptor.cs b/src/ApiCheck.Console/ApiListing/TypeDescriptor.cs
deleted file mode 100644
index 9b2298fb4..000000000
--- a/src/ApiCheck.Console/ApiListing/TypeDescriptor.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace ApiCheck.Description
-{
-    public class TypeDescriptor : ApiElement
-    {
-        [JsonIgnore]
-        public override string Id => string.Join(" ", GetSignatureComponents());
-
-        [JsonIgnore]
-        public TypeInfo Source { get; set; }
-
-        public string Name { get; set; }
-
-        public ApiElementVisibility Visibility { get; set; }
-
-        public TypeKind Kind { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Abstract { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Static { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public bool Sealed { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public string BaseType { get; set; }
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public IList<string> ImplementedInterfaces { get; } = new List<string>();
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public IList<MemberDescriptor> Members { get; } = new List<MemberDescriptor>();
-
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        public IList<GenericParameterDescriptor> GenericParameters { get; } = new List<GenericParameterDescriptor>();
-
-        private IEnumerable<string> GetSignatureComponents()
-        {
-            switch (Visibility)
-            {
-                case ApiElementVisibility.Public:
-                    yield return "public";
-                    break;
-                case ApiElementVisibility.Protected:
-                    yield return "protected";
-                    break;
-            }
-
-            if (Static)
-            {
-                yield return "static";
-            }
-            else if (Kind == TypeKind.Class)
-            {
-                if (Abstract)
-                {
-                    yield return "abstract";
-                }
-
-                if (Sealed)
-                {
-                    yield return "sealed";
-                }
-            }
-
-            switch (Kind)
-            {
-                case TypeKind.Struct:
-                    yield return "struct";
-                    break;
-                case TypeKind.Interface:
-                    yield return "interface";
-                    break;
-                case TypeKind.Class:
-                    yield return "class";
-                    break;
-                case TypeKind.Enumeration:
-                    yield return "enum";
-                    break;
-                case TypeKind.Unknown:
-                    Console.WriteLine($"Undefined kind for: {Name}");
-                    break;
-                default:
-                    throw new InvalidOperationException("Invalid kind");
-            }
-
-            yield return Name;
-
-            if (BaseType != null || ImplementedInterfaces.Count > 0)
-            {
-                yield return ":";
-                yield return string.Join(", ", GetBaseTypeAndImplementedInterfaces());
-            }
-
-            foreach (var constraint in GenericParameters.Where(p => p.HasConstraints()))
-            {
-                yield return "where";
-                yield return constraint.Id;
-            }
-        }
-
-        public MemberDescriptor FindMember(string id)
-        {
-            foreach (var member in Members)
-            {
-                if (string.Equals(id, member.Id, StringComparison.Ordinal))
-                {
-                    return member;
-                }
-            }
-
-            return null;
-        }
-
-        private IEnumerable<string> GetBaseTypeAndImplementedInterfaces()
-        {
-            if (BaseType != null)
-            {
-                yield return BaseType;
-            }
-
-            foreach (var @interface in ImplementedInterfaces)
-            {
-                if (@interface != null)
-                {
-                    yield return @interface;
-                }
-            }
-        }
-
-        public static string GetTypeNameFor(TypeInfo type)
-        {
-            var typeName = type.FullName ?? type.Name;
-
-            if (type.IsGenericParameter)
-            {
-                typeName = $"T{type.GenericParameterPosition}";
-            }
-
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
-            {
-                var underlyingTypeName = GetTypeNameFor(type.GetGenericArguments().Single().GetTypeInfo());
-                typeName = underlyingTypeName + "?";
-            }
-
-            if (type.IsGenericType)
-            {
-                if (type.DeclaringType == null || Equals(type.DeclaringType.GetTypeInfo(), type))
-                {
-                    var name = type.GetGenericTypeDefinition().FullName;
-                    typeName = name.Substring(0, name.IndexOf('`'));
-                    typeName = $"{typeName}<{string.Join(", ", type.GetGenericArguments().Select(ga => GetTypeNameFor(ga.GetTypeInfo())))}>";
-                }
-                else
-                {
-                    var container = type.DeclaringType.GetTypeInfo();
-                    var prefix = GetTypeNameFor(container);
-                    var name = type.GetGenericTypeDefinition().FullName;
-                    var currentTypeGenericArguments = type.GetGenericTypeDefinition().GetGenericArguments()
-                    .Where(p => container.GetGenericArguments().All(cp => cp.Name != p.Name))
-                    .Select(p => type.GetGenericArguments()[p.GenericParameterPosition])
-                    .ToArray();
-
-                    if (currentTypeGenericArguments.Length == 0)
-                    {
-                        var nestedClassSeparatorIndex = name.LastIndexOf("+");
-                        name = name.Substring(nestedClassSeparatorIndex + 1, name.Length - nestedClassSeparatorIndex - 1);
-                    }
-                    else
-                    {
-                        var lastGenericArityIndex = name.LastIndexOf('`');
-                        var nestedClassSeparatorIndex = name.LastIndexOf("+");
-                        name = name.Substring(nestedClassSeparatorIndex + 1, lastGenericArityIndex - nestedClassSeparatorIndex - 1);
-                        name = $"{name}<{string.Join(", ", currentTypeGenericArguments.Select(ga => GetTypeNameFor(ga.GetTypeInfo())))}>";
-                    }
-
-                    typeName = $"{prefix}+{name}";
-                }
-            }
-
-            if (type.IsArray)
-            {
-                var name = GetTypeNameFor(type.GetElementType().GetTypeInfo());
-                typeName = $"{name}[]";
-            }
-
-            if (type.IsByRef)
-            {
-                typeName = GetTypeNameFor(type.GetElementType().GetTypeInfo());
-            }
-
-            // Parameters passed by reference through out or ref modifiers have an & at the end of their
-            // name to indicate they are pointers to a given type.
-            typeName = typeName.TrimEnd('&');
-
-            return typeName;
-        }
-
-        public static IEnumerable<TypeInfo> GetImplementedInterfacesFor(TypeInfo type)
-        {
-            if (type.IsGenericParameter)
-            {
-                var interfaces = type.ImplementedInterfaces.ToArray();
-                foreach (var t in interfaces)
-                {
-                    var implementedInterface = t.GetTypeInfo();
-                    var implementedOnBaseType = type.BaseType != null &&
-                                                InterfaceIsImplementedOnBaseType(type.BaseType.GetTypeInfo(),
-                                                    implementedInterface);
-
-                    if (!implementedOnBaseType && !InterfaceIsTransitivelyImplemented(type, implementedInterface))
-                    {
-                        yield return implementedInterface;
-                    }
-                }
-            }
-            else if (!type.IsInterface)
-            {
-                var interfaces = type.ImplementedInterfaces.ToArray();
-                foreach (var t in interfaces)
-                {
-                    var implementedInterface = t.GetTypeInfo();
-                    if ((!InterfaceIsImplementedOnBaseType(type.BaseType.GetTypeInfo(), implementedInterface) &&
-                         !InterfaceIsTransitivelyImplemented(type, implementedInterface)) ||
-                        InterfaceIsReimplementedOnCurrentType(type, implementedInterface))
-                    {
-                        yield return implementedInterface;
-                    }
-                }
-            }
-            else
-            {
-                var interfaces = type.ImplementedInterfaces.ToArray();
-                foreach (var t in interfaces)
-                {
-                    var implementedInterface = t.GetTypeInfo();
-                    if (!InterfaceIsTransitivelyImplemented(type, implementedInterface))
-                    {
-                        yield return implementedInterface;
-                    }
-                }
-            }
-        }
-
-        private static bool InterfaceIsReimplementedOnCurrentType(TypeInfo type, TypeInfo implementedInterface)
-        {
-            var mapping = type.GetRuntimeInterfaceMap(implementedInterface.AsType());
-            return InterfaceIsImplementedOnBaseType(type.BaseType.GetTypeInfo(), implementedInterface) &&
-                mapping.TargetMethods.Any(tm => tm.DeclaringType.GetTypeInfo().Equals(type) &&
-                (tm.IsPrivate || tm.Equals(tm.GetBaseDefinition())));
-        }
-
-        private static bool InterfaceIsTransitivelyImplemented(TypeInfo type, TypeInfo implementedInterface)
-        {
-            return type.ImplementedInterfaces
-                .SelectMany(ii => ii.GetTypeInfo().ImplementedInterfaces)
-                .Any(bii => bii.GetTypeInfo().Equals(implementedInterface));
-        }
-
-        private static bool InterfaceIsImplementedOnBaseType(TypeInfo typeInfo, TypeInfo implementedInterface)
-        {
-            return typeInfo.ImplementedInterfaces.Any(ii => ii.GetTypeInfo().Equals(implementedInterface));
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListing/TypeKind.cs b/src/ApiCheck.Console/ApiListing/TypeKind.cs
deleted file mode 100644
index eac324545..000000000
--- a/src/ApiCheck.Console/ApiListing/TypeKind.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace ApiCheck.Description
-{
-    [JsonConverter(typeof(StringEnumConverter))]
-    public enum TypeKind
-    {
-        Unknown,
-        Struct,
-        Interface,
-        // Includes delegates as they are extend multicast delegate.
-        Class,
-        Enumeration
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListingComparer.cs b/src/ApiCheck.Console/ApiListingComparer.cs
deleted file mode 100644
index 813404de3..000000000
--- a/src/ApiCheck.Console/ApiListingComparer.cs
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using ApiCheck.Description;
-
-namespace ApiCheck
-{
-    public class ApiListingComparer
-    {
-        private readonly ApiListing _newApiListing;
-        private readonly ApiListing _oldApiListing;
-
-        public ApiListingComparer(
-            ApiListing oldApiListing,
-            ApiListing newApiListing)
-        {
-            _oldApiListing = oldApiListing;
-            _newApiListing = newApiListing;
-        }
-
-        public IList<BreakingChange> GetDifferences()
-        {
-            var breakingChanges = new List<BreakingChange>();
-            var newTypes = _newApiListing.Types;
-
-            foreach (var type in _oldApiListing.Types)
-            {
-                var newType = _newApiListing.FindType(type.Name);
-                if (newType == null)
-                {
-                    breakingChanges.Add(new BreakingChange(type.Id, memberId: null, kind: ChangeKind.Removal));
-                }
-                else
-                {
-                    newTypes.Remove(newType);
-
-                    if (!string.Equals(type.Id, newType.Id, StringComparison.Ordinal)
-                        && !IsAcceptableTypeChange(type, newType))
-                    {
-                        breakingChanges.Add(new BreakingChange(type.Id, memberId: null, kind: ChangeKind.Removal));
-                        continue;
-                    }
-
-                    CompareMembers(type, newType, breakingChanges);
-                }
-            }
-
-            return breakingChanges;
-        }
-
-        private void CompareMembers(TypeDescriptor type, TypeDescriptor newType, List<BreakingChange> breakingChanges)
-        {
-            var newMembers = newType.Members.ToList();
-
-            foreach (var member in type.Members)
-            {
-                if (IsAcceptableMemberChange(newType, member, out var newMember))
-                {
-                    newMembers.Remove(newMember);
-                }
-                else
-                {
-                    breakingChanges.Add(new BreakingChange(type.Id, member.Id, ChangeKind.Removal));
-                }
-            }
-
-            if (newMembers.Count > 0)
-            {
-                if (type.Kind == TypeKind.Interface)
-                {
-                    breakingChanges.AddRange(newMembers.Select(member => new BreakingChange(newType.Id, member.Id, ChangeKind.Addition)));
-                }
-                else
-                {
-                    var disallowedNewMembers = newMembers.Where(member => member.Abstract).ToArray();
-                    if (disallowedNewMembers.Length > 0)
-                    {
-                        breakingChanges.AddRange(disallowedNewMembers.Select(member => new BreakingChange(newType.Id, member.Id, ChangeKind.Addition)));
-                    }
-                }
-            }
-        }
-
-        private bool IsAcceptableMemberChange(TypeDescriptor newType, MemberDescriptor member, out MemberDescriptor newMember)
-        {
-            var acceptable = false;
-            newMember = null;
-            var candidate = newType;
-            while (candidate != null && !acceptable)
-            {
-                var matchingMembers = candidate.Members.Where(m => m.Id == member.Id).ToList();
-
-                if (matchingMembers.Count == 1)
-                {
-                    newMember = matchingMembers.Single();
-                    acceptable = true;
-                }
-                else if (member.Kind == MemberKind.Method)
-                {
-                    var matchingMember = newType.Members.FirstOrDefault(m => SameSignature(member, m));
-                    if (matchingMember != null)
-                    {
-                        acceptable = (member.Sealed || !matchingMember.Sealed)
-                                     && (!member.Virtual || matchingMember.Virtual || matchingMember.Override)
-                                     && member.Static == matchingMember.Static
-                                     && (member.Abstract || !matchingMember.Abstract);
-
-                        if (acceptable)
-                        {
-                            newMember = matchingMember;
-                        }
-                    }
-                }
-
-                candidate = candidate.BaseType == null ? null : FindOrGenerateDescriptorForBaseType(candidate);
-            }
-
-            return acceptable;
-        }
-
-        private TypeDescriptor FindOrGenerateDescriptorForBaseType(TypeDescriptor candidate)
-        {
-            return _newApiListing.FindType(candidate.BaseType) ??
-                ApiListingGenerator.GenerateTypeDescriptor(candidate.Source.BaseType.GetTypeInfo(), _newApiListing.SourceFilters);
-        }
-
-        private bool SameSignature(MemberDescriptor original, MemberDescriptor candidate)
-        {
-            return original.ReturnType == candidate.ReturnType &&
-                original.Name == candidate.Name &&
-                SameGenericParameters(original.GenericParameter, candidate.GenericParameter) &&
-                SameParameters(original.Parameters, candidate.Parameters);
-        }
-
-        private bool SameParameters(
-            IList<ParameterDescriptor> original,
-            IList<ParameterDescriptor> candidate)
-        {
-            if (original.Count != candidate.Count)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < original.Count; i++)
-            {
-                var originalParameter = original[i];
-                var candidatePrameter = candidate[i];
-                if (originalParameter.Type != candidatePrameter.Type ||
-                    originalParameter.Name != candidatePrameter.Name ||
-                    originalParameter.Direction != candidatePrameter.Direction ||
-                    originalParameter.DefaultValue != candidatePrameter.DefaultValue ||
-                    originalParameter.IsParams != candidatePrameter.IsParams)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool SameGenericParameters(IList<GenericParameterDescriptor> original, IList<GenericParameterDescriptor> candidate)
-        {
-            if (original.Count != candidate.Count)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < original.Count; i++)
-            {
-                var originalParameter = original[i];
-                var candidatePrameter = candidate[i];
-                if (originalParameter.ParameterPosition != candidatePrameter.ParameterPosition ||
-                    !originalParameter.BaseTypeOrInterfaces.OrderBy(id => id).SequenceEqual(candidatePrameter.BaseTypeOrInterfaces.OrderBy(id => id)) ||
-                    originalParameter.New != candidatePrameter.New ||
-                    originalParameter.Class != candidatePrameter.Class ||
-                    originalParameter.Struct != candidatePrameter.Struct)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool IsAcceptableTypeChange(TypeDescriptor oldType, TypeDescriptor newType)
-        {
-            var typeChanged = oldType.Kind != newType.Kind;
-            if (typeChanged)
-            {
-                return false;
-            }
-
-            if (!HasCompatibleVisibility(oldType, newType))
-            {
-                return false;
-            }
-
-            if (oldType.GenericParameters.Count > 0 &&
-                !HasCompatibleSetOfGenericParameters(oldType.GenericParameters, newType.GenericParameters))
-            {
-                return false;
-            }
-
-            switch (oldType.Kind)
-            {
-                case TypeKind.Struct:
-                    return ImplementsAllInterfaces(oldType, newType);
-                case TypeKind.Class:
-                    return ImplementsAllInterfaces(oldType, newType) &&
-                        (!newType.Sealed || oldType.Sealed == newType.Sealed) &&
-                        (!newType.Abstract || oldType.Abstract == newType.Abstract) &&
-                        newType.Static == oldType.Static &&
-                        (oldType.BaseType == null || newType.BaseType == oldType.BaseType);
-                case TypeKind.Interface:
-                    return HasCompatibleSetOfInterfaces(oldType, newType);
-                case TypeKind.Enumeration:
-                    return oldType.BaseType == newType.BaseType;
-                case TypeKind.Unknown:
-                    break;
-            }
-
-            return false;
-        }
-
-        private bool HasCompatibleSetOfGenericParameters(
-            IList<GenericParameterDescriptor> oldGenericParameters,
-            IList<GenericParameterDescriptor> newGenericParameters)
-        {
-            if (oldGenericParameters.Count != newGenericParameters.Count)
-            {
-                return false;
-            }
-
-            var oldSet = oldGenericParameters.OrderBy(ogp => ogp.ParameterPosition).ToArray();
-            var newSet = newGenericParameters.OrderBy(ogp => ogp.ParameterPosition).ToArray();
-            for (var i = 0; i < oldSet.Length; i++)
-            {
-                var oldParameter = oldSet[i];
-                var newParameter = newSet[i];
-                var areCompatible = AreCompatible(oldParameter, newParameter);
-                if (!areCompatible)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool AreCompatible(GenericParameterDescriptor oldParameter, GenericParameterDescriptor newParameter)
-        {
-            return ((newParameter.New && oldParameter.New) || !newParameter.New) &&
-                ((newParameter.Class && oldParameter.Class) || !newParameter.Class) &&
-                ((newParameter.Struct && oldParameter.Struct) || !newParameter.Struct) &&
-                newParameter.BaseTypeOrInterfaces.Count == oldParameter.BaseTypeOrInterfaces.Count &&
-                newParameter.BaseTypeOrInterfaces.All(btoi => oldParameter.BaseTypeOrInterfaces.Contains(btoi));
-        }
-
-        private bool HasCompatibleSetOfInterfaces(TypeDescriptor oldType, TypeDescriptor newType)
-        {
-            // An interface can't require new implemented interfaces unless they are marker interfaces (they don't have any member)
-            var newInterfaces = newType.Source.ImplementedInterfaces
-                .Where(i => !oldType.ImplementedInterfaces.Contains(TypeDescriptor.GetTypeNameFor(i.GetTypeInfo())));
-
-            return newInterfaces.All(ni => ni.GetTypeInfo().GetMembers().Length == 0);
-        }
-
-        private bool ImplementsAllInterfaces(TypeDescriptor oldType, TypeDescriptor newType)
-        {
-            var oldInterfaces = oldType.ImplementedInterfaces;
-            var newInterfaces = newType.Source.ImplementedInterfaces.Select(i => TypeDescriptor.GetTypeNameFor(i.GetTypeInfo()));
-
-            return oldInterfaces.All(oi => newInterfaces.Contains(oi));
-        }
-
-        private bool HasCompatibleVisibility(TypeDescriptor oldType, TypeDescriptor newType)
-        {
-            switch (oldType.Visibility)
-            {
-                case ApiElementVisibility.Public:
-                    return newType.Visibility == ApiElementVisibility.Public;
-                case ApiElementVisibility.Protected:
-                    // Is going from protected to public a breaking change ?
-                    return true;
-                default:
-                    throw new InvalidOperationException("Unrecognized visibility");
-            }
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/ApiListingGenerator.cs b/src/ApiCheck.Console/ApiListingGenerator.cs
deleted file mode 100644
index 04d76225e..000000000
--- a/src/ApiCheck.Console/ApiListingGenerator.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using ApiCheck.Description;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace ApiCheck
-{
-    public class ApiListingGenerator
-    {
-        private const BindingFlags SearchFlags = BindingFlags.Public |
-            BindingFlags.NonPublic |
-            BindingFlags.Instance |
-            BindingFlags.Static |
-            BindingFlags.DeclaredOnly;
-
-        private readonly Assembly _assembly;
-        private readonly IEnumerable<Func<MemberInfo, bool>> _filters;
-
-        public ApiListingGenerator(Assembly assembly, IEnumerable<Func<MemberInfo, bool>> filters)
-        {
-            _assembly = assembly;
-            _filters = filters;
-        }
-
-        public static JObject GenerateApiListingReport(Assembly assembly, IEnumerable<Func<MemberInfo, bool>> filters = null)
-        {
-            var generator = new ApiListingGenerator(assembly, filters ?? Enumerable.Empty<Func<MemberInfo, bool>>());
-            var apiListingDocument = generator.GenerateApiListing();
-            return JObject.FromObject(apiListingDocument);
-        }
-
-        public ApiListing GenerateApiListing()
-        {
-            var types = _assembly.DefinedTypes
-#if NETCOREAPP2_1 // Reflection does not provide a hook to enumerate forwarded types in .NET Framework.
-                .Concat(_assembly
-                    .GetForwardedTypes()
-                    .Select(type => type.GetTypeInfo()))
-#endif
-                .Where(t => t.IsPublic || t.IsNestedPublic || t.IsNestedFamily || t.IsNestedFamORAssem);
-
-            var document = new ApiListing
-            {
-                AssemblyIdentity = _assembly.GetName().ToString(),
-                SourceFilters = _filters
-            };
-            foreach (var type in types.Where(t => !_filters.Any(filter => filter(t))))
-            {
-                var apiListingType = GenerateTypeDescriptor(type);
-                document.Types.Add(apiListingType);
-            }
-
-            return document;
-        }
-
-        public static TypeDescriptor GenerateTypeDescriptor(TypeInfo type, IEnumerable<Func<MemberInfo, bool>> filters = null)
-        {
-            filters = filters ?? Enumerable.Empty<Func<MemberInfo, bool>>();
-            var generator = new ApiListingGenerator(type.Assembly, filters);
-            return generator.GenerateTypeDescriptor(type);
-        }
-
-        private TypeDescriptor GenerateTypeDescriptor(TypeInfo type)
-        {
-            var typeDescriptor = new TypeDescriptor
-            {
-                Source = type,
-                Name = TypeDescriptor.GetTypeNameFor(type),
-                Kind = GetTypeKind(type),
-            };
-            if (typeDescriptor.Kind == TypeKind.Unknown)
-            {
-                throw new InvalidOperationException($"Can't determine type for {type.FullName}");
-            }
-
-            // At this point we've filtered away any non public or protected member,
-            // so we only need to check if something is public
-            typeDescriptor.Visibility = type.IsPublic || type.IsNestedPublic ? ApiElementVisibility.Public : ApiElementVisibility.Protected;
-
-            typeDescriptor.Static = typeDescriptor.Kind == TypeKind.Class && type.IsSealed && type.IsAbstract;
-
-            typeDescriptor.Abstract = type.IsAbstract;
-
-            typeDescriptor.Sealed = type.IsSealed;
-
-            if (type.BaseType != null &&
-                type.BaseType != typeof(object) &&
-                type.BaseType != typeof(ValueType) &&
-                !(type.IsEnum && type.GetEnumUnderlyingType() == typeof(int)))
-            {
-                typeDescriptor.BaseType = !type.IsEnum ?
-                    TypeDescriptor.GetTypeNameFor(type.BaseType.GetTypeInfo()) :
-                    TypeDescriptor.GetTypeNameFor(type.GetEnumUnderlyingType().GetTypeInfo());
-            }
-
-            if (type.ImplementedInterfaces.Any())
-            {
-                var interfaces = TypeDescriptor.GetImplementedInterfacesFor(type).ToList();
-                foreach (var @interface in interfaces.Select(TypeDescriptor.GetTypeNameFor))
-                {
-                    typeDescriptor.ImplementedInterfaces.Add(@interface);
-                }
-            }
-
-            if (type.IsGenericType)
-            {
-                var constraints = GetGenericConstraintsFor(type.GetGenericArguments().Select(t => t.GetTypeInfo()).ToArray());
-                foreach (var constraint in constraints)
-                {
-                    typeDescriptor.GenericParameters.Add(constraint);
-                }
-            }
-
-            var members = type.GetMembers(SearchFlags);
-
-            foreach (var member in members)
-            {
-                if (_filters.Any(f => f(member)))
-                {
-                    continue;
-                }
-
-                var memberApiListing = GenerateMemberApiListing(type, member);
-                if (memberApiListing != null)
-                {
-                    memberApiListing.Source = member;
-                    typeDescriptor.Members.Add(memberApiListing);
-                }
-            }
-
-            return typeDescriptor;
-        }
-
-        private static TypeKind GetTypeKind(TypeInfo type)
-        {
-            if (type.IsInterface)
-            {
-                return TypeKind.Interface;
-            }
-
-            if (type.IsEnum)
-            {
-                return TypeKind.Enumeration;
-            }
-
-            if (type.IsValueType)
-            {
-                return TypeKind.Struct;
-            }
-
-            if (type.IsClass)
-            {
-                return TypeKind.Class;
-            }
-
-            return TypeKind.Unknown;
-        }
-
-        private static IEnumerable<GenericParameterDescriptor> GetGenericConstraintsFor(TypeInfo[] genericArguments)
-        {
-            foreach (var typeArgument in genericArguments)
-            {
-                var constraintDescriptor = new GenericParameterDescriptor
-                {
-                    Source = typeArgument
-                };
-                if (typeArgument.IsGenericParameter)
-                {
-                    if (typeArgument.BaseType != null &&
-                        typeArgument.BaseType != typeof(object)
-                        && typeArgument.BaseType != typeof(ValueType))
-                    {
-                        constraintDescriptor.BaseTypeOrInterfaces.Add(TypeDescriptor.GetTypeNameFor(typeArgument.BaseType.GetTypeInfo()));
-                    }
-
-                    foreach (var interfaceType in TypeDescriptor.GetImplementedInterfacesFor(typeArgument))
-                    {
-                        constraintDescriptor.BaseTypeOrInterfaces.Add(TypeDescriptor.GetTypeNameFor(interfaceType));
-                    }
-
-                    constraintDescriptor.ParameterName = typeArgument.Name;
-                    constraintDescriptor.ParameterPosition = typeArgument.GenericParameterPosition;
-                    constraintDescriptor.New = (typeArgument.GenericParameterAttributes & GenericParameterAttributes.DefaultConstructorConstraint) == GenericParameterAttributes.DefaultConstructorConstraint;
-                    constraintDescriptor.Class = (typeArgument.GenericParameterAttributes & GenericParameterAttributes.ReferenceTypeConstraint) == GenericParameterAttributes.ReferenceTypeConstraint;
-                    constraintDescriptor.Struct = (typeArgument.GenericParameterAttributes & GenericParameterAttributes.NotNullableValueTypeConstraint) == GenericParameterAttributes.NotNullableValueTypeConstraint;
-                }
-                else
-                {
-                    constraintDescriptor.ParameterName = TypeDescriptor.GetTypeNameFor(typeArgument);
-                }
-
-                yield return constraintDescriptor;
-            }
-        }
-
-        public static MemberDescriptor GenerateMemberApiListing(TypeInfo type, MemberInfo member)
-        {
-            switch (member.MemberType)
-            {
-                case MemberTypes.Constructor:
-                    var ctor = (ConstructorInfo)member;
-                    if (!ctor.IsPublic && !ctor.IsFamily && !ctor.IsFamilyOrAssembly)
-                    {
-                        return null;
-                    }
-
-                    var constructorDescriptor = new MemberDescriptor
-                    {
-                        Kind = MemberKind.Constructor,
-                        Visibility = ctor.IsPublic ? ApiElementVisibility.Public : ApiElementVisibility.Protected,
-
-                        Name = MemberDescriptor.GetMemberNameFor(ctor)
-                    };
-                    foreach (var parameter in ctor.GetParameters())
-                    {
-                        var parameterDescriptor = GenerateParameterDescriptor(parameter);
-                        constructorDescriptor.Parameters.Add(parameterDescriptor);
-                    }
-
-                    return constructorDescriptor;
-
-                case MemberTypes.Method:
-                    var method = (MethodInfo)member;
-                    if (!method.IsPublic && !method.IsFamily && !method.IsFamilyOrAssembly)
-                    {
-                        return null;
-                    }
-
-                    var methodDescriptor = new MemberDescriptor
-                    {
-                        Kind = MemberKind.Method,
-
-                        Visibility = method.IsPublic ? ApiElementVisibility.Public : ApiElementVisibility.Protected
-                    };
-                    if (!type.IsInterface)
-                    {
-                        methodDescriptor.ExplicitInterface = GetInterfaceImplementation(method, explicitImplementation: true);
-                        methodDescriptor.ImplementedInterface = methodDescriptor.ExplicitInterface ?? GetInterfaceImplementation(method, explicitImplementation: false);
-                    }
-                    else
-                    {
-                        methodDescriptor.Visibility = null;
-                    }
-
-                    methodDescriptor.Name = MemberDescriptor.GetMemberNameFor(method);
-
-                    if (method.IsGenericMethod)
-                    {
-                        var constraints = GetGenericConstraintsFor(method.GetGenericArguments().Select(t => t.GetTypeInfo()).ToArray());
-                        foreach (var constraint in constraints)
-                        {
-                            methodDescriptor.GenericParameter.Add(constraint);
-                        }
-                    }
-
-                    methodDescriptor.Static = method.IsStatic;
-                    methodDescriptor.Sealed = method.IsFinal;
-                    methodDescriptor.Virtual = !type.IsInterface && method.IsVirtual;
-                    methodDescriptor.Override = !type.IsInterface && method.IsVirtual && !Equals(method.GetBaseDefinition(), method);
-                    methodDescriptor.Abstract = !type.IsInterface && method.IsAbstract;
-                    methodDescriptor.New = !method.IsAbstract && !method.IsVirtual && method.IsHideBySig && method
-                                               .DeclaringType.GetMember(method.Name)
-                                               .OfType<MethodInfo>()
-                                               .Count(m => SameSignature(m, method)) > 1;
-                    methodDescriptor.Extension = method.IsDefined(typeof(ExtensionAttribute), false);
-
-                    foreach (var parameter in method.GetParameters())
-                    {
-                        var parameterDescriptor = GenerateParameterDescriptor(parameter);
-                        methodDescriptor.Parameters.Add(parameterDescriptor);
-                    }
-
-                    methodDescriptor.ReturnType = TypeDescriptor.GetTypeNameFor(method.ReturnType.GetTypeInfo());
-
-                    return methodDescriptor;
-
-                case MemberTypes.Field:
-                    var field = (FieldInfo)member;
-                    if (!field.IsPublic && !field.IsFamily && !field.IsFamilyOrAssembly)
-                    {
-                        return null;
-                    }
-
-                    if (type.IsEnum && !field.IsLiteral)
-                    {
-                        // Skip storage for enumerations.
-                        return null;
-                    }
-
-                    var fieldDescriptor = new MemberDescriptor
-                    {
-                        Visibility = field.IsPublic ? ApiElementVisibility.Public : ApiElementVisibility.Protected,
-
-                        Kind = MemberKind.Field,
-                        Name = field.Name
-                    };
-                    if (type.IsEnum || field.IsLiteral)
-                    {
-                        fieldDescriptor.Literal = FormatLiteralValue(field.GetRawConstantValue(), field.FieldType);
-                    }
-
-                    if (type.IsEnum)
-                    {
-                        fieldDescriptor.Visibility = null;
-                    }
-                    else
-                    {
-                        fieldDescriptor.Constant = field.IsLiteral;
-                        fieldDescriptor.Static = field.IsStatic;
-                        fieldDescriptor.ReadOnly = field.IsInitOnly;
-                        fieldDescriptor.ReturnType = TypeDescriptor.GetTypeNameFor(field.FieldType.GetTypeInfo());
-                    }
-
-                    return fieldDescriptor;
-                case MemberTypes.Event:
-                case MemberTypes.Property:
-                case MemberTypes.NestedType:
-                    // All these cases are covered by the methods they implicitly define on the class
-                    // (Properties and Events) and when we enumerate all the types in an assembly (Nested types).
-                    return null;
-
-                case MemberTypes.TypeInfo:
-                    // There should not be any member passed into this method that is not a top level type.
-                case MemberTypes.Custom:
-                    // We don't know about custom member types, so better throw if we find something we don't understand.
-                case MemberTypes.All:
-                    throw new InvalidOperationException($"'{type.MemberType}' [{member}] is not supported.");
-
-                default:
-                    return null;
-            }
-        }
-
-        public static ApiListing LoadFrom(string json, IEnumerable<Func<ApiElement, bool>> oldApiListingFilters = null)
-        {
-            oldApiListingFilters = oldApiListingFilters ?? Enumerable.Empty<Func<ApiElement, bool>>();
-            var oldApiListing = JsonConvert.DeserializeObject<ApiListing>(json);
-            foreach (var type in oldApiListing.Types.ToArray())
-            {
-                if (oldApiListingFilters.Any(filter => filter(type)))
-                {
-                    oldApiListing.Types.Remove(type);
-                }
-
-                foreach (var member in type.Members.ToArray())
-                {
-                    if (oldApiListingFilters.Any(filter => filter(member)))
-                    {
-                        type.Members.Remove(member);
-                    }
-                }
-            }
-            return oldApiListing;
-        }
-
-        private static string GetInterfaceImplementation(MethodInfo method, bool explicitImplementation)
-        {
-            var typeInfo = method.DeclaringType.GetTypeInfo();
-            foreach (var interfaceImplementation in method.DeclaringType.GetInterfaces())
-            {
-                var map = typeInfo.GetRuntimeInterfaceMap(interfaceImplementation);
-                if (map.TargetMethods.Any(m => m.Equals(method)))
-                {
-                    return !explicitImplementation || (method.IsPrivate && method.IsFinal) ?
-                        TypeDescriptor.GetTypeNameFor(interfaceImplementation.GetTypeInfo()) :
-                        null;
-                }
-            }
-
-            return null;
-        }
-
-        private static bool SameSignature(MethodInfo candidate, MethodInfo method)
-        {
-            if (candidate.ReturnType != method.ReturnType)
-            {
-                return false;
-            }
-
-            var candidateParameters = candidate.GetParameters();
-            var methodParameters = method.GetParameters();
-
-            if (candidateParameters.Length != methodParameters.Length)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < candidateParameters.Length; i++)
-            {
-                var candidateParameter = candidateParameters[i];
-                var methodParameter = methodParameters[i];
-                if (candidateParameter.ParameterType != methodParameter.ParameterType ||
-                    candidateParameter.HasDefaultValue != methodParameter.HasDefaultValue ||
-                    candidateParameter.IsIn != methodParameter.IsIn ||
-                    candidateParameter.IsOut != methodParameter.IsOut ||
-                    candidateParameter.IsOptional != methodParameter.IsOptional)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private static ParameterDescriptor GenerateParameterDescriptor(ParameterInfo parameter)
-        {
-            return new ParameterDescriptor
-            {
-                Source = parameter,
-                Name = parameter.Name,
-                Type = TypeDescriptor.GetTypeNameFor(parameter.ParameterType.GetTypeInfo()),
-                Direction = parameter.ParameterType.IsByRef && parameter.IsOut ? ParameterDirection.Out :
-                    parameter.ParameterType.IsByRef && !parameter.IsOut ? ParameterDirection.Ref :
-                    ParameterDirection.In,
-                DefaultValue = parameter.HasDefaultValue ? FormatLiteralValue(parameter) : null,
-                IsParams = parameter.GetCustomAttribute<ParamArrayAttribute>() != null
-            };
-        }
-
-        private static string FormatLiteralValue(ParameterInfo parameter)
-        {
-            return FormatLiteralValue(parameter.RawDefaultValue, parameter.ParameterType);
-        }
-
-        private static string FormatLiteralValue(object rawDefaultValue, Type elementType)
-        {
-            if (rawDefaultValue == null)
-            {
-                var elementTypeInfo = elementType.GetTypeInfo();
-                return elementTypeInfo.IsValueType ? $"default({TypeDescriptor.GetTypeNameFor(elementTypeInfo)})" : "null";
-            }
-
-            if (elementType == typeof(string))
-            {
-                return $"\"{rawDefaultValue}\"";
-            }
-
-            if (elementType == typeof(char))
-            {
-                return $"'{rawDefaultValue}'";
-            }
-
-            if (rawDefaultValue is bool ||
-                rawDefaultValue is byte ||
-                rawDefaultValue is sbyte ||
-                rawDefaultValue is short ||
-                rawDefaultValue is ushort ||
-                rawDefaultValue is int ||
-                rawDefaultValue is uint ||
-                rawDefaultValue is long ||
-                rawDefaultValue is ulong ||
-                rawDefaultValue is double ||
-                rawDefaultValue is float ||
-                rawDefaultValue is decimal)
-            {
-                return rawDefaultValue.ToString();
-            }
-
-            throw new InvalidOperationException("Unsupported default value type");
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/BreakingChange.cs b/src/ApiCheck.Console/BreakingChange.cs
deleted file mode 100644
index dff0d9fbb..000000000
--- a/src/ApiCheck.Console/BreakingChange.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.DotNet.PlatformAbstractions;
-
-namespace ApiCheck
-{
-    public class BreakingChange
-    {
-        public BreakingChange(string typeId, string memberId, ChangeKind kind)
-        {
-            TypeId = typeId;
-            MemberId = memberId;
-            Kind = kind;
-        }
-
-        public string TypeId { get; }
-        public string MemberId { get; }
-        public ChangeKind Kind { get; }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj))
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            return obj.GetType() == GetType() && Equals((BreakingChange)obj);
-        }
-
-        private bool Equals(BreakingChange other)
-        {
-            return string.Equals(TypeId, other.TypeId) && string.Equals(MemberId, other.MemberId) && Kind == other.Kind;
-        }
-
-        public override int GetHashCode()
-        {
-            var hashCodeCombiner = HashCodeCombiner.Start();
-            hashCodeCombiner.Add(TypeId);
-            hashCodeCombiner.Add(MemberId);
-            hashCodeCombiner.Add(Kind);
-
-            return hashCodeCombiner.CombinedHash;
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/ChangeKind.cs b/src/ApiCheck.Console/ChangeKind.cs
deleted file mode 100644
index 9423d0be0..000000000
--- a/src/ApiCheck.Console/ChangeKind.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace ApiCheck
-{
-    [JsonConverter(typeof(StringEnumConverter))]
-    public enum ChangeKind
-    {
-        Removal,
-        Addition,
-    }
-}
diff --git a/src/ApiCheck.Console/Loader/AssemblyLoader.cs b/src/ApiCheck.Console/Loader/AssemblyLoader.cs
deleted file mode 100644
index 90b3ab8f9..000000000
--- a/src/ApiCheck.Console/Loader/AssemblyLoader.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if NET46
-using System.IO;
-#endif
-using System.Reflection;
-#if NETCOREAPP2_1
-using NuGet.ProjectModel;
-using ApiCheck.NuGet;
-#endif
-
-namespace ApiCheck
-{
-    public abstract class AssemblyLoader
-    {
-        public static Assembly LoadAssembly(
-                string assemblyPath,
-                string assetsJson,
-                string framework)
-        {
-#if NETCOREAPP2_1
-            var lockFile = new LockFileFormat().Read(assetsJson);
-            var graph = PackageGraph.Create(lockFile, framework);
-            var loader = new CoreClrAssemblyLoader(graph, assemblyPath);
-#else
-            var assemblyDirectory = Path.GetDirectoryName(assemblyPath);
-            var loader = new FullFrameworkAssemblyLoader(assemblyDirectory);
-#endif
-
-            return loader.Load(assemblyPath);
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/Loader/AssemblyNameComparer.cs b/src/ApiCheck.Console/Loader/AssemblyNameComparer.cs
deleted file mode 100644
index 49b9563c7..000000000
--- a/src/ApiCheck.Console/Loader/AssemblyNameComparer.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace ApiCheck
-{
-    internal class AssemblyNameComparer : IEqualityComparer<AssemblyName>
-    {
-        public static readonly IEqualityComparer<AssemblyName> OrdinalIgnoreCase = new AssemblyNameComparer();
-
-        public bool Equals(AssemblyName x, AssemblyName y)
-        {
-            // Ignore case because that's what Assembly.Load does.
-            return string.Equals(x.Name, y.Name, StringComparison.OrdinalIgnoreCase) &&
-                string.Equals(x.CultureName ?? string.Empty, y.CultureName ?? string.Empty, StringComparison.Ordinal);
-        }
-
-        public int GetHashCode(AssemblyName obj)
-        {
-            var hashCode = 0;
-            if (obj.Name != null)
-            {
-                hashCode ^= obj.Name.GetHashCode();
-            }
-
-            hashCode ^= (obj.CultureName ?? string.Empty).GetHashCode();
-            return hashCode;
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/Loader/CoreClrAssemblyLoader.cs b/src/ApiCheck.Console/Loader/CoreClrAssemblyLoader.cs
deleted file mode 100644
index 87aed447f..000000000
--- a/src/ApiCheck.Console/Loader/CoreClrAssemblyLoader.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if NETCOREAPP2_1
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Runtime.Loader;
-using NuGet.Frameworks;
-using ApiCheck.NuGet;
-
-namespace ApiCheck
-{
-    public class CoreClrAssemblyLoader
-    {
-        private readonly IDictionary<AssemblyName, string> _assemblyPaths;
-        private readonly PackageGraph _graph;
-        private readonly ApiCheckLoadContext _loadContext;
-
-        public CoreClrAssemblyLoader(PackageGraph graph, string assemblyPath)
-        {
-            _graph = graph;
-            _assemblyPaths = new Dictionary<AssemblyName, string>(new AssemblyNameComparer());
-            var directory = new DirectoryInfo(Path.GetDirectoryName(assemblyPath));
-            if (directory.Exists)
-            {
-                foreach (var assembly in directory.EnumerateFiles("*.dll"))
-                {
-                    if (TryGetAssemblyName(assembly.FullName, out var name))
-                    {
-                        _assemblyPaths.Add(name, assembly.FullName);
-                    }
-                }
-            }
-
-            foreach (var path in graph.GetAssembliesFullPath())
-            {
-                if (TryGetAssemblyName(path, out var name) && !_assemblyPaths.ContainsKey(name))
-                {
-                    _assemblyPaths.Add(name, path);
-                }
-            }
-
-            _loadContext = new ApiCheckLoadContext(FindAssemblyPath);
-        }
-
-        public Assembly Load(string assemblyPath)
-        {
-            return _loadContext.LoadFromAssemblyPath(assemblyPath);
-        }
-
-        private bool TryGetAssemblyName(string path, out AssemblyName assemblyName)
-        {
-            assemblyName = null;
-            if (!File.Exists(path))
-            {
-                // Path might be bin\placeholder\** if assembly came from a project-to-project reference. Since those
-                // assemblies are found in the current output directory, just ignore non-existent paths. If this path
-                // came from somewhere else and assembly is used, loading will fail soon enough.
-                return false;
-            }
-
-            // From http://msdn.microsoft.com/en-us/library/ms173100.aspx and AssemblyHelper.IsAssemblyManaged().
-            try
-            {
-                assemblyName = AssemblyLoadContext.GetAssemblyName(path);
-                return true;
-            }
-            catch (FileNotFoundException)
-            {
-                // The file cannot be found (should be redundant).
-            }
-            catch (BadImageFormatException)
-            {
-                // The file is not an assembly.
-            }
-            catch (FileLoadException)
-            {
-                // The assembly has already been loaded.
-            }
-
-            return false;
-        }
-
-        private string FindAssemblyPath(AssemblyName name)
-        {
-            if (_assemblyPaths.TryGetValue(name, out var path))
-            {
-                return path;
-            }
-
-            return null;
-        }
-
-        private class ApiCheckLoadContext : AssemblyLoadContext
-        {
-            private readonly Func<AssemblyName, string> _finder;
-
-            public ApiCheckLoadContext(Func<AssemblyName, string> finder)
-            {
-                _finder = finder;
-            }
-
-            protected override Assembly Load(AssemblyName assemblyName)
-            {
-                try
-                {
-                    var assembly = Default.LoadFromAssemblyName(assemblyName);
-                    if (assembly != null)
-                    {
-                        return assembly;
-                    }
-                }
-                catch (FileNotFoundException)
-                {
-                }
-
-                string path = _finder(assemblyName);
-                if (path != null)
-                {
-                    return LoadFromAssemblyPath(path);
-                }
-
-                return null;
-            }
-        }
-    }
-}
-#endif
diff --git a/src/ApiCheck.Console/Loader/FullFrameworkAssemblyLoader.cs b/src/ApiCheck.Console/Loader/FullFrameworkAssemblyLoader.cs
deleted file mode 100644
index f540ea567..000000000
--- a/src/ApiCheck.Console/Loader/FullFrameworkAssemblyLoader.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-#if !NETCOREAPP2_1
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace ApiCheck
-{
-    public class FullFrameworkAssemblyLoader
-    {
-        private readonly Dictionary<AssemblyName, string> _resolvedDlls;
-
-        public FullFrameworkAssemblyLoader(string probingPath)
-        {
-            var directory = new DirectoryInfo(probingPath);
-            _resolvedDlls = directory.EnumerateFiles("*.dll")
-                .ToDictionary(f => GetAssemblyName(f.FullName), f => f.FullName, new AssemblyNameComparer());
-
-            AppDomain.CurrentDomain.AssemblyResolve += Resolver;
-        }
-
-        private AssemblyName GetAssemblyName(string assemblyPath) => AssemblyName.GetAssemblyName(assemblyPath);
-
-        private Assembly Resolver(object sender, ResolveEventArgs args)
-        {
-            var name = new AssemblyName(args.Name);
-            var path = FindAssemblyPath(name);
-
-            return path != null ? Assembly.LoadFile(path) : null;
-        }
-
-        private string FindAssemblyPath(AssemblyName name) => _resolvedDlls.TryGetValue(name, out var path) ? path : null;
-
-        public Assembly Load(string assemblyPath) => Assembly.LoadFile(assemblyPath);
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/ApiCheck.Console/Microsoft.AspNetCore.BuildTools.ApiCheck.nuspec b/src/ApiCheck.Console/Microsoft.AspNetCore.BuildTools.ApiCheck.nuspec
deleted file mode 100644
index 9d49b2da3..000000000
--- a/src/ApiCheck.Console/Microsoft.AspNetCore.BuildTools.ApiCheck.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <description>Generates API baselines and detects breaking changes in APIs.</description>
-    <dependencies>
-      <group targetFramework=".NETStandard1.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="build\**" target="build\" />
-    <file src="$publishDir$\net46\**" target="tools\net46\" />
-    <file src="$publishDir$\netcoreapp2.1\**" target="tools\netcoreapp2.1\" />
-    <file src="$taskBuildDir$\netstandard2.0\*.dll" target="tools\netstandard2.0\" />
-  </files>
-</package>
diff --git a/src/ApiCheck.Console/NuGet/Package.cs b/src/ApiCheck.Console/NuGet/Package.cs
deleted file mode 100644
index fa4501f78..000000000
--- a/src/ApiCheck.Console/NuGet/Package.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NuGet.LibraryModel;
-using NuGet.Versioning;
-
-namespace ApiCheck.NuGet
-{
-    public class Package : IEquatable<Package>
-    {
-        public Package(
-            string name,
-            string version,
-            string path,
-            string signaturePath,
-            IEnumerable<Package> dependencies,
-            IEnumerable<string> runtimeAssemblies)
-        {
-            Name = name;
-            Version = version;
-            Path = path;
-            PackageHash = signaturePath;
-            Dependencies = dependencies;
-            Assemblies = runtimeAssemblies.Select(ra => new PackageAssembly(ra, GetAssemblyPath(ra)));
-        }
-
-        public Package(Package package)
-        {
-            Name = package.Name;
-            Version = package.Version;
-            Path = package.Path;
-            PackageHash = package.PackageHash;
-            Dependencies = package.Dependencies;
-            Assemblies = package.Assemblies;
-        }
-
-        public LibraryIdentity Identity => new LibraryIdentity(Name, NuGetVersion.Parse(Version), LibraryType.Package);
-        public string Name { get; set; }
-        public string Version { get; set; }
-        public IEnumerable<Package> Dependencies { get; set; }
-        public string Path { get; set; }
-        public string PackageHash { get; set; }
-        public IEnumerable<PackageAssembly> Assemblies { get; set; }
-
-        public bool Equals(Package other) =>
-            Name.Equals(other?.Name, StringComparison.OrdinalIgnoreCase) &&
-                Version.Equals(other?.Version, StringComparison.OrdinalIgnoreCase);
-
-        public override bool Equals(object obj) => Equals(obj as Package);
-
-        public override int GetHashCode() => Name.GetHashCode() ^ Version.GetHashCode();
-
-        public override string ToString() => $"{Name} {Version}";
-
-        public string GetAssemblyPath(string relativeAssemblyPath) =>
-            System.IO.Path.Combine(Path, relativeAssemblyPath);
-    }
-}
diff --git a/src/ApiCheck.Console/NuGet/PackageAssembly.cs b/src/ApiCheck.Console/NuGet/PackageAssembly.cs
deleted file mode 100644
index 317a3bdd9..000000000
--- a/src/ApiCheck.Console/NuGet/PackageAssembly.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-
-namespace ApiCheck.NuGet
-{
-    public class PackageAssembly
-    {
-        public PackageAssembly(string relativePath, string resolvedPath)
-        {
-            RelativePath = relativePath;
-            ResolvedPath = resolvedPath;
-        }
-
-        public string FileName => Path.GetFileName(ResolvedPath);
-        public string RelativePath { get; set; }
-        public string ResolvedPath { get; set; }
-    }
-}
diff --git a/src/ApiCheck.Console/NuGet/PackageGraph.cs b/src/ApiCheck.Console/NuGet/PackageGraph.cs
deleted file mode 100644
index a06bf71e0..000000000
--- a/src/ApiCheck.Console/NuGet/PackageGraph.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using NuGet.Frameworks;
-using NuGet.Packaging.Core;
-using NuGet.ProjectModel;
-
-namespace ApiCheck.NuGet
-{
-    public class PackageGraph
-    {
-        private PackageGraph(
-            IEnumerable<string> packageFolders,
-            IDictionary<string, Package> allPackages,
-            IEnumerable<Package> packages,
-            string targetFrameworkName)
-        {
-            PackageSources = packageFolders;
-            AllPackages = allPackages;
-            Dependencies = packages;
-            Framework = targetFrameworkName;
-        }
-
-        public PackageGraph GetClosure(string packageId)
-        {
-            if (!AllPackages.TryGetValue(packageId, out var package))
-            {
-                return null;
-            }
-
-            var allPackages = new Dictionary<string, Package>();
-            CollectPackages(package, allPackages);
-            return new PackageGraph(PackageSources, allPackages, new[] { package }, Framework);
-        }
-
-        private void CollectPackages(Package package, IDictionary<string, Package> allPackages)
-        {
-            var remainingPackages = new Stack<Package>();
-            remainingPackages.Push(package);
-            while (remainingPackages.Count > 0)
-            {
-                var current = remainingPackages.Pop();
-                if (!allPackages.ContainsKey(current.Name))
-                {
-                    allPackages.Add(current.Name, current);
-                    foreach (var dependency in current.Dependencies)
-                    {
-                        if (!allPackages.ContainsKey(dependency.Name))
-                        {
-                            remainingPackages.Push(dependency);
-                        }
-                    }
-                }
-            }
-        }
-
-        public PackageGraph WithoutPackage(string packageId)
-        {
-            var packages = new Dictionary<string, Package>(AllPackages, StringComparer.OrdinalIgnoreCase);
-            var package = packages.FirstOrDefault(p => p.Key.Equals(packageId, StringComparison.OrdinalIgnoreCase));
-            if (package.Value != null)
-            {
-                var packagesToExclude = GetPackagesToExclude(package);
-                foreach (var exclusion in packagesToExclude)
-                {
-                    packages.Remove(exclusion.Key);
-                }
-
-                var newDependencies = Dependencies.ToList();
-                foreach (var dependency in Dependencies)
-                {
-                    if (packagesToExclude.ContainsKey(dependency.Name))
-                    {
-                        newDependencies.Remove(dependency);
-                    }
-                }
-
-                foreach (var dependency in newDependencies.ToArray())
-                {
-                    var newDependency = RemovePackagesFromTransitiveDependencies(dependency, packagesToExclude);
-                    if (!Equals(newDependency, dependency))
-                    {
-                        newDependencies.Remove(dependency);
-                        newDependencies.Add(newDependency);
-                    }
-                }
-
-                return new PackageGraph(PackageSources, packages, newDependencies, Framework);
-            }
-
-            return this;
-        }
-
-        private Package RemovePackagesFromTransitiveDependencies(
-            Package dependency,
-            Dictionary<string, Package> packagesToExclude)
-        {
-            var dependenciesModified = false;
-            var newDependencies = new List<Package>();
-            foreach (var package in dependency.Dependencies)
-            {
-                if (!packagesToExclude.ContainsKey(package.Name))
-                {
-                    var newDependency = RemovePackagesFromTransitiveDependencies(package, packagesToExclude);
-                    if (!Equals(newDependency, package) || dependenciesModified)
-                    {
-                        dependenciesModified = true;
-                    }
-                    newDependencies.Add(newDependency);
-                }
-                else
-                {
-                    dependenciesModified = true;
-                }
-            }
-
-            if (dependenciesModified)
-            {
-                var newPackage = new Package(dependency)
-                {
-                    Dependencies = newDependencies
-                };
-                return newPackage;
-            }
-            return dependency;
-        }
-
-        private static Dictionary<string, Package> GetPackagesToExclude(KeyValuePair<string, Package> package)
-        {
-            var packagesToExclude = new Dictionary<string, Package>(StringComparer.OrdinalIgnoreCase);
-            var pendingDependencies = new Stack<Package>();
-            pendingDependencies.Push(package.Value);
-            while (pendingDependencies.Count > 0)
-            {
-                var current = pendingDependencies.Pop();
-                if (!packagesToExclude.ContainsKey(current.Name))
-                {
-                    packagesToExclude.Add(current.Name, current);
-                    foreach (var dependency in current.Dependencies)
-                    {
-                        pendingDependencies.Push(dependency);
-                    }
-                }
-            }
-
-            return packagesToExclude;
-        }
-
-        public IEnumerable<Package> Dependencies { get; set; }
-
-        public IDictionary<string, Package> AllPackages { get; set; }
-
-        public IEnumerable<string> PackageSources { get; set; }
-
-        public string Framework { get; set; }
-
-        public static PackageGraph Create(LockFile lockFile, string targetFrameworkName)
-        {
-            var runtimeIdentifier = RuntimeGraph.GetCurrentRuntimeId();
-            var fallbacks = RuntimeGraph.GetCompatibleRuntimes(runtimeIdentifier);
-
-            var parsedFramework = NuGetFramework.Parse(targetFrameworkName);
-            var dependencyGroup = FindCompatibleDependencyGroup(lockFile, parsedFramework);
-            if (dependencyGroup == null)
-            {
-                return null;
-            }
-
-            var chosenFramework = NuGetFramework.Parse(dependencyGroup.FrameworkName);
-            var potentialFrameworks = lockFile.Targets
-                .Where(t => t.TargetFramework.Equals(chosenFramework));
-            var targetFramework = potentialFrameworks
-                .FirstOrDefault(t => runtimeIdentifier.Equals(t.RuntimeIdentifier, StringComparison.OrdinalIgnoreCase));
-
-            targetFramework = targetFramework ?? potentialFrameworks
-                .FirstOrDefault(t => RuntimeIsCompatible(t.RuntimeIdentifier, fallbacks));
-
-            targetFramework = targetFramework ?? potentialFrameworks
-                .FirstOrDefault(t => t.RuntimeIdentifier == null);
-
-            var directDependencies = targetFramework
-                .Libraries
-                .Where(l => dependencyGroup.Dependencies.Any(d => d.StartsWith(l.Name, StringComparison.OrdinalIgnoreCase)))
-                .ToArray();
-
-            var allPackages = new Dictionary<string, Package>(StringComparer.OrdinalIgnoreCase);
-
-            var sources = lockFile.PackageFolders.Select(p => p.Path).ToArray();
-
-            var packages = directDependencies
-                .Select(dd => CreatePackage(dd, targetFramework, lockFile.Libraries, allPackages, sources, fallbacks))
-                .ToArray();
-
-            return new PackageGraph(sources, allPackages, packages, chosenFramework.GetShortFolderName());
-        }
-
-        private static ProjectFileDependencyGroup FindCompatibleDependencyGroup(LockFile lockFile, NuGetFramework parsedFramework)
-        {
-            return lockFile.ProjectFileDependencyGroups.FirstOrDefault(g => NuGetFramework.Parse(g.FrameworkName).Equals(parsedFramework)) ??
-                lockFile.ProjectFileDependencyGroups.FirstOrDefault(g => IsCompatible(parsedFramework, NuGetFramework.Parse(g.FrameworkName)));
-        }
-
-        private static bool IsCompatible(NuGetFramework reference, NuGetFramework target)
-        {
-            return DefaultCompatibilityProvider.Instance.IsCompatible(reference, target);
-        }
-
-        private static bool RuntimeIsCompatible(string runtime, IEnumerable<string> compatibleRuntimes)
-        {
-            // Technically, a null runtime is compatible. But, Create() gives preference to targets with an exact
-            // match and then a compatible match (this method) over targets with a null Runtime.
-            return compatibleRuntimes.Any(r => r.Equals(runtime, StringComparison.OrdinalIgnoreCase));
-        }
-
-        public IEnumerable<string> GetAssembliesFullPath() =>
-            AllPackages.SelectMany(p => p.Value.Assemblies.Select(a => a.ResolvedPath));
-
-        private static Package CreatePackage(
-            LockFileTargetLibrary dependency,
-            LockFileTarget targetFramework,
-            IList<LockFileLibrary> libraries,
-            IDictionary<string, Package> packageDictionary,
-            IEnumerable<string> sources,
-            IEnumerable<string> compatibleRuntimes)
-        {
-            var library = libraries
-                .First(l => string.Equals(l.Name, dependency.Name, StringComparison.OrdinalIgnoreCase) &&
-                    l.Version.Equals(dependency.Version));
-            if (packageDictionary.TryGetValue(library.Name, out var package))
-            {
-                return package;
-            }
-
-            var packagePath = ResolvePackagePath(library.Name, library.Version.ToString(), sources);
-            var signaturePath = library.Files
-                .SingleOrDefault(f => f.EndsWith(".sha512", StringComparison.OrdinalIgnoreCase));
-
-            var dependencies = new List<Package>();
-            if (dependency.Dependencies?.Count > 0)
-            {
-                foreach (var d in dependency.Dependencies)
-                {
-                    if (!packageDictionary.TryGetValue(d.Id, out var dependentPackage))
-                    {
-                        dependentPackage = CreatePackage(
-                            FindLibrary(targetFramework, d),
-                            targetFramework,
-                            libraries,
-                            packageDictionary,
-                            sources,
-                            compatibleRuntimes);
-                    }
-
-                    dependencies.Add(dependentPackage);
-                }
-            }
-
-            var assemblies = dependency
-                .RuntimeAssemblies
-                .Where(assembly => !assembly.Path.EndsWith("_._", StringComparison.Ordinal))
-                .ToArray();
-            if (assemblies.Length == 0)
-            {
-                var targetAssemblyPaths = dependency
-                    .RuntimeTargets
-                    .Where(target => RuntimeIsCompatible(target.Runtime, compatibleRuntimes) &&
-                        !target.Path.EndsWith("_._", StringComparison.Ordinal));
-                assemblies = targetAssemblyPaths.ToArray();
-            }
-
-            var assemblyPaths = assemblies.Select(assembly => assembly.Path);
-            package = new Package(
-                library.Name,
-                library.Version.ToString(),
-                packagePath,
-                signaturePath,
-                dependencies,
-                assemblyPaths);
-
-            packageDictionary.Add(package.Name, package);
-
-            return package;
-        }
-
-        private static string ResolvePath(string path, string libraryName, string version, IEnumerable<string> sources)
-        {
-            foreach (var source in sources)
-            {
-                var fullPath = Path.Combine(source, libraryName, version, path);
-                if (File.Exists(fullPath))
-                {
-                    return fullPath;
-                }
-            }
-
-            return path;
-        }
-
-        private static string ResolvePackagePath(string libraryName, string version, IEnumerable<string> sources)
-        {
-            foreach (var source in sources)
-            {
-                var fullPath = Path.Combine(source, libraryName, version);
-                if (Directory.Exists(fullPath))
-                {
-                    return fullPath;
-                }
-            }
-
-            return string.Empty;
-        }
-
-        private static LockFileTargetLibrary FindLibrary(LockFileTarget targetFramework, PackageDependency d)
-        {
-            return targetFramework.Libraries.First(l => d.Id.Equals(l.Name));
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/NuGet/RuntimeDefinition.cs b/src/ApiCheck.Console/NuGet/RuntimeDefinition.cs
deleted file mode 100644
index 19882c634..000000000
--- a/src/ApiCheck.Console/NuGet/RuntimeDefinition.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-
-namespace ApiCheck.NuGet
-{
-    public class RuntimeDefinition
-    {
-        public string Name { get; set; }
-        public IEnumerable<RuntimeDefinition> Fallbacks { get; set; }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/NuGet/RuntimeGraph.Compatibility.cs b/src/ApiCheck.Console/NuGet/RuntimeGraph.Compatibility.cs
deleted file mode 100644
index ae61c8822..000000000
--- a/src/ApiCheck.Console/NuGet/RuntimeGraph.Compatibility.cs
+++ /dev/null
@@ -1,814 +0,0 @@
-namespace ApiCheck.NuGet
-{
-    public partial class RuntimeGraph
-    {
-        private const string RuntimeCompatibility = @"
-{
-  ""runtimes"": {
-    ""base"": {
-    },
-    ""any"": {
-      ""#import"": [ ""base"" ]
-    },
-    ""win"": {
-      ""#import"": [ ""any"" ]
-    },
-    ""win-x86"": {
-      ""#import"": [ ""win"" ]
-    },
-    ""win-x64"": {
-      ""#import"": [ ""win"" ]
-    },
-    ""win7"": {
-      ""#import"": [ ""win"" ]
-    },
-    ""win7-x86"": {
-      ""#import"": [ ""win7"", ""win-x86"" ]
-    },
-    ""win7-x64"": {
-      ""#import"": [ ""win7"", ""win-x64"" ]
-    },
-    ""win8"": {
-      ""#import"": [ ""win7"" ]
-    },
-    ""win8-x86"": {
-      ""#import"": [ ""win8"", ""win7-x86"" ]
-    },
-    ""win8-x64"": {
-      ""#import"": [ ""win8"", ""win7-x64"" ]
-    },
-    ""win8-arm"": {
-      ""#import"": [ ""win8"" ]
-    },
-    ""win81"": {
-      ""#import"": [ ""win8"" ]
-    },
-    ""win81-x86"": {
-      ""#import"": [ ""win81"", ""win8-x86"" ]
-    },
-    ""win81-x64"": {
-      ""#import"": [ ""win81"", ""win8-x64"" ]
-    },
-    ""win81-arm"": {
-      ""#import"": [ ""win81"", ""win8-arm"" ]
-    },
-    ""win10"": {
-      ""#import"": [ ""win81"" ]
-    },
-    ""win10-x86"": {
-      ""#import"": [ ""win10"", ""win81-x86"" ]
-    },
-    ""win10-x64"": {
-      ""#import"": [ ""win10"", ""win81-x64"" ]
-    },
-    ""win10-arm"": {
-      ""#import"": [ ""win10"", ""win81-arm"" ]
-    },
-    ""win10-arm64"": {
-      ""#import"": [ ""win10"" ]
-    },
-    ""aot"": {
-      ""#import"": [ ""any"" ]
-    },
-    ""win-aot"": {
-      ""#import"": [ ""win"", ""aot"" ]
-    },
-    ""win-x86-aot"": {
-      ""#import"": [ ""win-aot"", ""win-x86"" ]
-    },
-    ""win-x64-aot"": {
-      ""#import"": [ ""win-aot"", ""win-x64"" ]
-    },
-    ""win7-aot"": {
-      ""#import"": [ ""win-aot"", ""win7"" ]
-    },
-    ""win7-x86-aot"": {
-      ""#import"": [ ""win7-aot"", ""win7-x86"" ]
-    },
-    ""win7-x64-aot"": {
-      ""#import"": [ ""win7-aot"", ""win7-x64"" ]
-    },
-    ""win8-aot"": {
-      ""#import"": [ ""win8"", ""win7-aot"" ]
-    },
-    ""win8-x86-aot"": {
-      ""#import"": [ ""win8-aot"", ""win8-x86"", ""win7-x86-aot"" ]
-    },
-    ""win8-x64-aot"": {
-      ""#import"": [ ""win8-aot"", ""win8-x64"", ""win7-x64-aot"" ]
-    },
-    ""win8-arm-aot"": {
-      ""#import"": [ ""win8-aot"", ""win8-arm"" ]
-    },
-    ""win81-aot"": {
-      ""#import"": [ ""win81"", ""win8-aot"" ]
-    },
-    ""win81-x86-aot"": {
-      ""#import"": [ ""win81-aot"", ""win81-x86"", ""win8-x86-aot"" ]
-    },
-    ""win81-x64-aot"": {
-      ""#import"": [ ""win81-aot"", ""win81-x64"", ""win8-x64-aot"" ]
-    },
-    ""win81-arm-aot"": {
-      ""#import"": [ ""win81-aot"", ""win81-arm"", ""win8-arm-aot"" ]
-    },
-    ""win10-aot"": {
-      ""#import"": [ ""win10"", ""win81-aot"" ]
-    },
-    ""win10-x86-aot"": {
-      ""#import"": [ ""win10-aot"", ""win10-x86"", ""win81-x86-aot"" ]
-    },
-    ""win10-x64-aot"": {
-      ""#import"": [ ""win10-aot"", ""win10-x64"", ""win81-x64-aot"" ]
-    },
-    ""win10-arm-aot"": {
-      ""#import"": [ ""win10-aot"", ""win10-arm"", ""win81-arm-aot"" ]
-    },
-    ""win10-arm64-aot"": {
-      ""#import"": [ ""win10-aot"", ""win10-arm64"" ]
-    },
-    ""unix"": {
-      ""#import"": [ ""any"" ]
-    },
-    ""unix-x64"": {
-      ""#import"": [ ""unix"" ]
-    },
-    ""unix-x86"": {
-      ""#import"": [ ""unix"" ]
-    },
-    ""unix-arm"": {
-      ""#import"": [ ""unix"" ]
-    },
-    ""unix-armel"": {
-      ""#import"": [ ""unix"" ]
-    },
-    ""unix-arm64"": {
-      ""#import"": [ ""unix"" ]
-    },
-    ""osx"": {
-      ""#import"": [ ""unix"" ]
-    },
-    ""osx-x64"": {
-      ""#import"": [ ""osx"", ""unix-x64"" ]
-    },
-    ""osx.10.10"": {
-      ""#import"": [ ""osx"" ]
-    },
-    ""osx.10.10-x64"": {
-      ""#import"": [ ""osx.10.10"", ""osx-x64"" ]
-    },
-    ""osx.10.11"": {
-      ""#import"": [ ""osx.10.10"" ]
-    },
-    ""osx.10.11-x64"": {
-      ""#import"": [ ""osx.10.11"", ""osx.10.10-x64"" ]
-    },
-    ""osx.10.12"": {
-      ""#import"": [ ""osx.10.11"" ]
-    },
-    ""osx.10.12-x64"": {
-      ""#import"": [ ""osx.10.12"", ""osx.10.11-x64"" ]
-    },
-    ""linux"": {
-      ""#import"": [ ""unix"" ]
-    },
-    ""linux-x64"": {
-      ""#import"": [ ""linux"", ""unix-x64"" ]
-    },
-    ""linux-x86"": {
-      ""#import"": [ ""linux"", ""unix-x86"" ]
-    },
-    ""linux-arm"": {
-      ""#import"": [ ""linux"", ""unix-arm"" ]
-    },
-    ""linux-armel"": {
-      ""#import"": [ ""linux"", ""unix-armel"" ]
-    },
-    ""linux-arm64"": {
-      ""#import"": [ ""linux"", ""unix-arm64"" ]
-    },
-    ""rhel"": {
-      ""#import"": [ ""linux"" ]
-    },
-    ""rhel-x64"": {
-      ""#import"": [ ""rhel"", ""linux-x64"" ]
-    },
-    ""rhel.7"": {
-      ""#import"": [ ""rhel"" ]
-    },
-    ""rhel.7-x64"": {
-      ""#import"": [ ""rhel.7"", ""rhel-x64"" ]
-    },
-    ""rhel.7.0"": {
-      ""#import"": [ ""rhel.7"" ]
-    },
-    ""rhel.7.0-x64"": {
-      ""#import"": [ ""rhel.7.0"", ""rhel.7-x64"" ]
-    },
-    ""rhel.7.1"": {
-      ""#import"": [ ""rhel.7.0"" ]
-    },
-    ""rhel.7.1-x64"": {
-      ""#import"": [ ""rhel.7.1"", ""rhel.7.0-x64"" ]
-    },
-    ""rhel.7.2"": {
-      ""#import"": [ ""rhel.7.1"" ]
-    },
-    ""rhel.7.2-x64"": {
-      ""#import"": [ ""rhel.7.2"", ""rhel.7.1-x64"" ]
-    },
-    ""rhel.7.3"": {
-      ""#import"": [ ""rhel.7.2"" ]
-    },
-    ""rhel.7.3-x64"": {
-      ""#import"": [ ""rhel.7.3"", ""rhel.7.2-x64"" ]
-    },
-    ""rhel.7.4"": {
-      ""#import"": [ ""rhel.7.3"" ]
-    },
-    ""rhel.7.4-x64"": {
-      ""#import"": [ ""rhel.7.4"", ""rhel.7.3-x64"" ]
-    },
-    ""ol"": {
-      ""#import"": [ ""rhel"" ]
-    },
-    ""ol-x64"": {
-      ""#import"": [ ""ol"", ""rhel-x64"" ]
-    },
-    ""ol.7"": {
-      ""#import"": [ ""ol"", ""rhel.7"" ]
-    },
-    ""ol.7-x64"": {
-      ""#import"": [ ""ol.7"", ""ol-x64"", ""rhel.7-x64"" ]
-    },
-    ""ol.7.0"": {
-      ""#import"": [ ""ol.7"", ""rhel.7.0"" ]
-    },
-    ""ol.7.0-x64"": {
-      ""#import"": [ ""ol.7.0"", ""ol.7-x64"", ""rhel.7.0-x64"" ]
-    },
-    ""ol.7.1"": {
-      ""#import"": [ ""ol.7.0"", ""rhel.7.1"" ]
-    },
-    ""ol.7.1-x64"": {
-      ""#import"": [ ""ol.7.1"", ""ol.7.0-x64"", ""rhel.7.1-x64"" ]
-    },
-    ""ol.7.2"": {
-      ""#import"": [ ""ol.7.1"", ""rhel.7.2"" ]
-    },
-    ""ol.7.2-x64"": {
-      ""#import"": [ ""ol.7.2"", ""ol.7.1-x64"", ""rhel.7.2-x64"" ]
-    },
-    ""centos"": {
-      ""#import"": [ ""rhel"" ]
-    },
-    ""centos-x64"": {
-      ""#import"": [ ""centos"", ""rhel-x64"" ]
-    },
-    ""centos.7"": {
-      ""#import"": [ ""centos"", ""rhel.7"" ]
-    },
-    ""centos.7-x64"": {
-      ""#import"": [ ""centos.7"", ""centos-x64"", ""rhel.7-x64"" ]
-    },
-    ""debian"": {
-      ""#import"": [ ""linux"" ]
-    },
-    ""debian-x64"": {
-      ""#import"": [ ""debian"", ""linux-x64"" ]
-    },
-    ""debian-x86"": {
-      ""#import"": [ ""debian"", ""linux-x86"" ]
-    },
-    ""debian-arm"": {
-      ""#import"": [ ""debian"", ""linux-arm"" ]
-    },
-    ""debian-armel"": {
-      ""#import"": [ ""debian"", ""linux-armel"" ]
-    },
-    ""debian-arm64"": {
-      ""#import"": [ ""debian"", ""linux-arm64"" ]
-    },
-    ""debian.8"": {
-      ""#import"": [ ""debian"" ]
-    },
-    ""debian.8-x64"": {
-      ""#import"": [ ""debian.8"", ""debian-x64"" ]
-    },
-    ""debian.8-x86"": {
-      ""#import"": [ ""debian.8"", ""debian-x86"" ]
-    },
-    ""debian.8-arm"": {
-      ""#import"": [ ""debian.8"", ""debian-arm"" ]
-    },
-    ""debian.8-armel"": {
-      ""#import"": [ ""debian.8"", ""debian-armel"" ]
-    },
-    ""debian.8-arm64"": {
-      ""#import"": [ ""debian.8"", ""debian-arm64"" ]
-    },
-    ""tizen"": {
-      ""#import"": [ ""linux"" ]
-    },
-    ""tizen-armel"": {
-      ""#import"": [ ""tizen"", ""linux-armel"" ]
-    },
-    ""tizen.4.0.0-armel"": {
-      ""#import"": [ ""tizen.4.0.0"", ""tizen-armel"" ]
-    },
-    ""ubuntu"": {
-      ""#import"": [ ""debian"" ]
-    },
-    ""ubuntu-x64"": {
-      ""#import"": [ ""ubuntu"", ""debian-x64"" ]
-    },
-    ""ubuntu-x86"": {
-      ""#import"": [ ""ubuntu"", ""debian-x86"" ]
-    },
-    ""ubuntu-arm"": {
-      ""#import"": [ ""ubuntu"", ""debian-arm"" ]
-    },
-    ""ubuntu.14.04"": {
-      ""#import"": [ ""ubuntu"" ]
-    },
-    ""ubuntu.14.04-x64"": {
-      ""#import"": [ ""ubuntu.14.04"", ""ubuntu-x64"" ]
-    },
-    ""ubuntu.14.04-x86"": {
-      ""#import"": [ ""ubuntu.14.04"", ""ubuntu-x86"" ]
-    },
-    ""ubuntu.14.04-arm"": {
-      ""#import"": [ ""ubuntu.14.04"", ""ubuntu-arm"" ]
-    },
-    ""ubuntu.14.10"": {
-      ""#import"": [ ""ubuntu"" ]
-    },
-    ""ubuntu.14.10-x64"": {
-      ""#import"": [ ""ubuntu.14.10"", ""ubuntu-x64"" ]
-    },
-    ""ubuntu.14.10-x86"": {
-      ""#import"": [ ""ubuntu.14.10"", ""ubuntu-x86"" ]
-    },
-    ""ubuntu.14.10-arm"": {
-      ""#import"": [ ""ubuntu.14.10"", ""ubuntu-arm"" ]
-    },
-    ""ubuntu.15.04"": {
-      ""#import"": [ ""ubuntu"" ]
-    },
-    ""ubuntu.15.04-x64"": {
-      ""#import"": [ ""ubuntu.15.04"", ""ubuntu-x64"" ]
-    },
-    ""ubuntu.15.04-x86"": {
-      ""#import"": [ ""ubuntu.15.04"", ""ubuntu-x86"" ]
-    },
-    ""ubuntu.15.04-arm"": {
-      ""#import"": [ ""ubuntu.15.04"", ""ubuntu-arm"" ]
-    },
-    ""ubuntu.15.10"": {
-      ""#import"": [ ""ubuntu"" ]
-    },
-    ""ubuntu.15.10-x64"": {
-      ""#import"": [ ""ubuntu.15.10"", ""ubuntu-x64"" ]
-    },
-    ""ubuntu.15.10-x86"": {
-      ""#import"": [ ""ubuntu.15.10"", ""ubuntu-x86"" ]
-    },
-    ""ubuntu.15.10-arm"": {
-      ""#import"": [ ""ubuntu.15.10"", ""ubuntu-arm"" ]
-    },
-    ""ubuntu.16.04"": {
-      ""#import"": [ ""ubuntu"" ]
-    },
-    ""ubuntu.16.04-x64"": {
-      ""#import"": [ ""ubuntu.16.04"", ""ubuntu-x64"" ]
-    },
-    ""ubuntu.16.04-x86"": {
-      ""#import"": [ ""ubuntu.16.04"", ""ubuntu-x86"" ]
-    },
-    ""ubuntu.16.04-arm"": {
-      ""#import"": [ ""ubuntu.16.04"", ""ubuntu-arm"" ]
-    },
-    ""ubuntu.16.10"": {
-      ""#import"": [ ""ubuntu"" ]
-    },
-    ""ubuntu.16.10-x64"": {
-      ""#import"": [ ""ubuntu.16.10"", ""ubuntu-x64"" ]
-    },
-    ""ubuntu.16.10-x86"": {
-      ""#import"": [ ""ubuntu.16.10"", ""ubuntu-x86"" ]
-    },
-    ""ubuntu.16.10-arm"": {
-      ""#import"": [ ""ubuntu.16.10"", ""ubuntu-arm"" ]
-    },
-    ""linuxmint.17"": {
-      ""#import"": [ ""ubuntu.14.04"" ]
-    },
-    ""linuxmint.17-x64"": {
-      ""#import"": [ ""linuxmint.17"", ""ubuntu.14.04-x64"" ]
-    },
-    ""linuxmint.17.1"": {
-      ""#import"": [ ""linuxmint.17"" ]
-    },
-    ""linuxmint.17.1-x64"": {
-      ""#import"": [ ""linuxmint.17.1"", ""linuxmint.17-x64"" ]
-    },
-    ""linuxmint.17.2"": {
-      ""#import"": [ ""linuxmint.17.1"" ]
-    },
-    ""linuxmint.17.2-x64"": {
-      ""#import"": [ ""linuxmint.17.2"", ""linuxmint.17.1-x64"" ]
-    },
-    ""linuxmint.17.3"": {
-      ""#import"": [ ""linuxmint.17.2"" ]
-    },
-    ""linuxmint.17.3-x64"": {
-      ""#import"": [ ""linuxmint.17.3"", ""linuxmint.17.2-x64"" ]
-    },
-    ""linuxmint.18"": {
-      ""#import"": [ ""ubuntu.16.04"" ]
-    },
-    ""linuxmint.18-x64"": {
-      ""#import"": [ ""linuxmint.18"", ""ubuntu.16.04-x64"" ]
-    },
-    ""fedora"": {
-      ""#import"": [ ""linux"" ]
-    },
-    ""fedora-x64"": {
-      ""#import"": [ ""fedora"", ""linux-x64"" ]
-    },
-    ""fedora.23"": {
-      ""#import"": [ ""fedora"" ]
-    },
-    ""fedora.23-x64"": {
-      ""#import"": [ ""fedora.23"", ""fedora-x64"" ]
-    },
-    ""fedora.24"": {
-      ""#import"": [ ""fedora"" ]
-    },
-    ""fedora.24-x64"": {
-      ""#import"": [ ""fedora.24"", ""fedora-x64"" ]
-    },
-    ""opensuse"": {
-      ""#import"": [ ""linux"" ]
-    },
-    ""opensuse-x64"": {
-      ""#import"": [ ""opensuse"", ""linux-x64"" ]
-    },
-    ""opensuse.13.2"": {
-      ""#import"": [ ""opensuse"" ]
-    },
-    ""opensuse.13.2-x64"": {
-      ""#import"": [ ""opensuse.13.2"", ""opensuse-x64"" ]
-    },
-    ""opensuse.42.1"": {
-      ""#import"": [ ""opensuse"" ]
-    },
-    ""opensuse.42.1-x64"": {
-      ""#import"": [ ""opensuse.42.1"", ""opensuse-x64"" ]
-    },
-    ""alpine"": {
-      ""#import"": [ ""linux"" ]
-    },
-    ""alpine-x64"": {
-      ""#import"": [ ""alpine"", ""linux-x64"" ]
-    },
-    ""alpine.3"": {
-      ""#import"": [ ""alpine"" ]
-    },
-    ""alpine.3-x64"": {
-      ""#import"": [ ""alpine.3"", ""alpine-x64"" ]
-    },
-    ""alpine.3.4.3"": {
-      ""#import"": [ ""alpine.3"" ]
-    },
-    ""alpine.3.4.3-x64"": {
-      ""#import"": [ ""alpine.3.4.3"", ""alpine.3-x64"" ]
-    },
-    ""corert"": {
-      ""#import"": [ ""any"" ]
-    },
-    ""win-corert"": {
-      ""#import"": [ ""corert"", ""win"" ]
-    },
-    ""win-x86-corert"": {
-      ""#import"": [ ""win-corert"", ""win-x86"" ]
-    },
-    ""win-x64-corert"": {
-      ""#import"": [ ""win-corert"", ""win-x64"" ]
-    },
-    ""win7-corert"": {
-      ""#import"": [ ""win-corert"", ""win7"" ]
-    },
-    ""win7-x86-corert"": {
-      ""#import"": [ ""win7-corert"", ""win7-x86"" ]
-    },
-    ""win7-x64-corert"": {
-      ""#import"": [ ""win7-corert"", ""win7-x64"" ]
-    },
-    ""win8-corert"": {
-      ""#import"": [ ""win7-corert"", ""win8"" ]
-    },
-    ""win8-x86-corert"": {
-      ""#import"": [ ""win8-corert"", ""win7-x86-corert"", ""win8-x86"" ]
-    },
-    ""win8-x64-corert"": {
-      ""#import"": [ ""win8-corert"", ""win7-x64-corert"", ""win8-x64"" ]
-    },
-    ""win8-arm-corert"": {
-      ""#import"": [ ""win8-corert"", ""win8-arm"" ]
-    },
-    ""win81-corert"": {
-      ""#import"": [ ""win8-corert"", ""win81"" ]
-    },
-    ""win81-x86-corert"": {
-      ""#import"": [ ""win81-corert"", ""win8-x86-corert"", ""win81-x86"" ]
-    },
-    ""win81-x64-corert"": {
-      ""#import"": [ ""win81-corert"", ""win8-x64-corert"", ""win81-x64"" ]
-    },
-    ""win81-arm-corert"": {
-      ""#import"": [ ""win81-corert"", ""win8-arm-corert"", ""win81-arm"" ]
-    },
-    ""win10-corert"": {
-      ""#import"": [ ""win81-corert"", ""win10"" ]
-    },
-    ""win10-x86-corert"": {
-      ""#import"": [ ""win10-corert"", ""win81-x86-corert"", ""win10-x86"" ]
-    },
-    ""win10-x64-corert"": {
-      ""#import"": [ ""win10-corert"", ""win81-x64-corert"", ""win10-x64"" ]
-    },
-    ""win10-arm-corert"": {
-      ""#import"": [ ""win10-corert"", ""win81-arm-corert"", ""win10-arm"" ]
-    },
-    ""win10-arm64-corert"": {
-      ""#import"": [ ""win10-corert"", ""win10-arm64"" ]
-    },
-    ""unix-corert"": {
-      ""#import"": [ ""corert"", ""unix"" ]
-    },
-    ""unix-x64-corert"": {
-      ""#import"": [ ""unix-corert"", ""unix-x64"" ]
-    },
-    ""unix-arm-corert"": {
-      ""#import"": [ ""unix-corert"", ""unix-arm"" ]
-    },
-    ""unix-arm64-corert"": {
-      ""#import"": [ ""unix-corert"", ""unix-arm64"" ]
-    },
-    ""osx-corert"": {
-      ""#import"": [ ""unix-corert"", ""osx"" ]
-    },
-    ""osx-x64-corert"": {
-      ""#import"": [ ""osx-corert"", ""unix-x64-corert"", ""osx-x64"" ]
-    },
-    ""osx.10.10-corert"": {
-      ""#import"": [ ""osx-corert"", ""osx.10.10"" ]
-    },
-    ""osx.10.10-x64-corert"": {
-      ""#import"": [ ""osx.10.10-corert"", ""osx-x64-corert"", ""osx.10.10-x64"" ]
-    },
-    ""osx.10.11-corert"": {
-      ""#import"": [ ""osx.10.10-corert"", ""osx.10.11"" ]
-    },
-    ""osx.10.11-x64-corert"": {
-      ""#import"": [ ""osx.10.11-corert"", ""osx.10.10-x64-corert"", ""osx.10.11-x64"" ]
-    },
-    ""osx.10.12-corert"": {
-      ""#import"": [ ""osx.10.11-corert"", ""osx.10.12"" ]
-    },
-    ""osx.10.12-x64-corert"": {
-      ""#import"": [ ""osx.10.12-corert"", ""osx.10.11-x64-corert"", ""osx.10.12-x64"" ]
-    },
-    ""linux-corert"": {
-      ""#import"": [ ""corert"", ""linux"", ""unix-corert"" ]
-    },
-    ""linux-x64-corert"": {
-      ""#import"": [ ""linux-corert"", ""linux-x64"" ]
-    },
-    ""linux-arm-corert"": {
-      ""#import"": [ ""linux-corert"", ""linux-arm"" ]
-    },
-    ""linux-arm64-corert"": {
-      ""#import"": [ ""linux-corert"", ""linux-arm64"" ]
-    },
-    ""rhel-corert"": {
-      ""#import"": [ ""corert"", ""rhel"" ]
-    },
-    ""rhel-x64-corert"": {
-      ""#import"": [ ""rhel-corert"", ""linux-x64-corert"", ""rhel-x64"" ]
-    },
-    ""rhel.7-corert"": {
-      ""#import"": [ ""rhel-corert"", ""rhel.7"" ]
-    },
-    ""rhel.7-x64-corert"": {
-      ""#import"": [ ""rhel.7-corert"", ""rhel-x64-corert"", ""rhel.7-x64"" ]
-    },
-    ""rhel.7.0-corert"": {
-      ""#import"": [ ""rhel.7-corert"", ""rhel.7.0"" ]
-    },
-    ""rhel.7.0-x64-corert"": {
-      ""#import"": [ ""rhel.7.0-corert"", ""rhel.7-x64-corert"", ""rhel.7.0-x64"" ]
-    },
-    ""rhel.7.1-corert"": {
-      ""#import"": [ ""rhel.7.0-corert"", ""rhel.7.1"" ]
-    },
-    ""rhel.7.1-x64-corert"": {
-      ""#import"": [ ""rhel.7.1-corert"", ""rhel.7.0-x64-corert"", ""rhel.7.1-x64"" ]
-    },
-    ""rhel.7.2-corert"": {
-      ""#import"": [ ""rhel.7.1-corert"", ""rhel.7.2"" ]
-    },
-    ""rhel.7.2-x64-corert"": {
-      ""#import"": [ ""rhel.7.2-corert"", ""rhel.7.1-x64-corert"", ""rhel.7.2-x64"" ]
-    },
-    ""ol-corert"": {
-      ""#import"": [ ""rhel-corert"", ""ol"" ]
-    },
-    ""ol-x64-corert"": {
-      ""#import"": [ ""ol-corert"", ""rhel-x64-corert"", ""ol-x64"" ]
-    },
-    ""ol.7-corert"": {
-      ""#import"": [ ""ol-corert"", ""ol.7"" ]
-    },
-    ""ol.7-x64-corert"": {
-      ""#import"": [ ""ol.7-corert"", ""rhel.7-x64-corert"", ""ol.7-x64"" ]
-    },
-    ""ol.7.0-corert"": {
-      ""#import"": [ ""ol.7-corert"", ""ol.7.0"" ]
-    },
-    ""ol.7.0-x64-corert"": {
-      ""#import"": [ ""ol.7.0-corert"", ""rhel.7.0-corert"", ""ol.7.0-x64"" ]
-    },
-    ""ol.7.1-corert"": {
-      ""#import"": [ ""ol.7.0-corert"", ""ol.7.1"" ]
-    },
-    ""ol.7.1-x64-corert"": {
-      ""#import"": [ ""ol.7.1-corert"", ""rhel.7.1-x64-corert"", ""ol.7.1-x64"" ]
-    },
-    ""centos-corert"": {
-      ""#import"": [ ""rel-corert"", ""centos"" ]
-    },
-    ""centos-x64-corert"": {
-      ""#import"": [ ""centos-corert"", ""rhel-x64-corert"", ""centos-x64"" ]
-    },
-    ""centos.7-corert"": {
-      ""#import"": [ ""centos-corert"", ""centos.7"" ]
-    },
-    ""centos.7-x64-corert"": {
-      ""#import"": [ ""centos.7-corert"", ""centos-x64-corert"", ""centos.7-x64"" ]
-    },
-    ""debian-corert"": {
-      ""#import"": [ ""linux-corert"", ""debian"" ]
-    },
-    ""debian-x64-corert"": {
-      ""#import"": [ ""debian-corert"", ""linux-x64-corert"", ""debian-x64"" ]
-    },
-    ""debian-arm-corert"": {
-      ""#import"": [ ""debian-corert"", ""debian-arm"" ]
-    },
-    ""debian-arm64-corert"": {
-      ""#import"": [ ""debian-corert"", ""debian-arm64"" ]
-    },
-    ""debian.8-corert"": {
-      ""#import"": [ ""debian-corert"", ""debian.8"" ]
-    },
-    ""debian.8-x64-corert"": {
-      ""#import"": [ ""debian.8-corert"", ""debian-x64-corert"", ""debian.8-x64"" ]
-    },
-    ""debian.8-arm-corert"": {
-      ""#import"": [ ""debian.8-corert"", ""debian-arm-corert"", ""debian.8-arm"" ]
-    },
-    ""debian.8-arm64-corert"": {
-      ""#import"": [ ""debian.8-corert"", ""debian-arm64-corert"", ""debian.8-arm64"" ]
-    },
-    ""ubuntu-corert"": {
-      ""#import"": [ ""debian-corert"", ""ubuntu"" ]
-    },
-    ""ubuntu-x64-corert"": {
-      ""#import"": [ ""ubuntu-corert"", ""debian-x64-corert"", ""ubuntu-x64"" ]
-    },
-    ""ubuntu.14.04-corert"": {
-      ""#import"": [ ""ubuntu-corert"", ""ubuntu.14.06"" ]
-    },
-    ""ubuntu.14.04-x64-corert"": {
-      ""#import"": [ ""ubuntu.14.04-corert"", ""ubuntu-x64-corert"", ""ubuntu-14.04-x64"" ]
-    },
-    ""ubuntu.14.10-corert"": {
-      ""#import"": [ ""ubuntu.14.04-corert"", ""ubuntu-14.10"" ]
-    },
-    ""ubuntu.14.10-x64-corert"": {
-      ""#import"": [ ""ubuntu.14.10-corert"", ""ubuntu.14.04-x64-corert"", ""ubuntu.14.10-x64"" ]
-    },
-    ""ubuntu.15.04-corert"": {
-      ""#import"": [ ""ubuntu.14.10-corert"", ""ubuntu-15.04"" ]
-    },
-    ""ubuntu.15.04-x64-corert"": {
-      ""#import"": [ ""ubuntu.15.04-corert"", ""ubuntu.14.10-x64-corert"", ""ubuntu.15.04-x64"" ]
-    },
-    ""ubuntu.15.10-corert"": {
-      ""#import"": [ ""ubuntu.15.04-corert"", ""ubuntu-15.10"" ]
-    },
-    ""ubuntu.15.10-x64-corert"": {
-      ""#import"": [ ""ubuntu.15.10-corert"", ""ubuntu.15.04-x64-corert"", ""ubuntu.15.10-x64"" ]
-    },
-    ""ubuntu.16.04-corert"": {
-      ""#import"": [ ""ubuntu.15.10-corert"", ""ubuntu-16.04"" ]
-    },
-    ""ubuntu.16.04-x64-corert"": {
-      ""#import"": [ ""ubuntu.16.04-corert"", ""ubuntu.15.10-x64-corert"", ""ubuntu.16.04-x64"" ]
-    },
-    ""ubuntu.16.10-corert"": {
-      ""#import"": [ ""ubuntu.16.04-corert"", ""ubuntu.16.10"" ]
-    },
-    ""ubuntu.16.10-x64-corert"": {
-      ""#import"": [ ""ubuntu.16.10-corert"", ""ubuntu.16.04-x64-corert"", ""ubuntu.16.10-x64"" ]
-    },
-    ""linuxmint.17-corert"": {
-      ""#import"": [ ""ubuntu.14.04-corert"", ""linuxmint.17"" ]
-    },
-    ""linuxmint.17-x64-corert"": {
-      ""#import"": [ ""linuxmint.17-corert"", ""ubuntu.14.04-x64-corert"", ""linuxmint.17-x64"" ]
-    },
-    ""linuxmint.17.1-corert"": {
-      ""#import"": [ ""linuxmint.17-corert"", ""linuxmint.17.1"" ]
-    },
-    ""linuxmint.17.1-x64-corert"": {
-      ""#import"": [ ""linuxmint.17.1-corert"", ""linuxmint.17-x64-corert"", ""linuxmint.17.1-x64"" ]
-    },
-    ""linuxmint.17.2-corert"": {
-      ""#import"": [ ""linuxmint.17.1-corert"", ""linuxmint.17.2"" ]
-    },
-    ""linuxmint.17.2-x64-corert"": {
-      ""#import"": [ ""linuxmint.17.2-corert"", ""linuxmint.17.1-x64-corert"", ""linuxmint.17.2-x64"" ]
-    },
-    ""linuxmint.17.3-corert"": {
-      ""#import"": [ ""linuxmint.17.2-corert"", ""linuxmint.17.3"" ]
-    },
-    ""linuxmint.17.3-x64-corert"": {
-      ""#import"": [ ""linuxmint.17.3-corert"", ""linuxmint.17.2-x64-corert"", ""linuxmint.17.3-x64"" ]
-    },
-    ""linuxmint.18-corert"": {
-      ""#import"": [ ""ubuntu.16.04-corert"", ""linuxmint.18"" ]
-    },
-    ""linuxmint.18-x64-corert"": {
-      ""#import"": [ ""linuxmint.18-corert"", ""ubuntu.16.04-x64-corert"", ""linuxmint.18-x64"" ]
-    },
-    ""fedora-corert"": {
-      ""#import"": [ ""linux-corert"", ""fedora"" ]
-    },
-    ""fedora-x64-corert"": {
-      ""#import"": [ ""fedora-corert"", ""linux-x64-corert"", ""fedora-x64"" ]
-    },
-    ""fedora.23-corert"": {
-      ""#import"": [ ""fedora-corert"", ""fedora.23"" ]
-    },
-    ""fedora.23-x64-corert"": {
-      ""#import"": [ ""fedora.23-corert"", ""fedora-x64-corert"", ""fedora.23-x64"" ]
-    },
-    ""fedora.24-corert"": {
-      ""#import"": [ ""fedora.23-corert"", ""fedora.24"" ]
-    },
-    ""fedora.24-x64-corert"": {
-      ""#import"": [ ""fedora.24-corert"", ""fedora.23-x64-corert"", ""fedora.24-x64"" ]
-    },
-    ""opensuse-corert"": {
-      ""#import"": [ ""linux-corert"", ""opensuse"" ]
-    },
-    ""opensuse-x64-corert"": {
-      ""#import"": [ ""opensuse-corert"", ""linux-x64-corert"", ""opensuste-x64"" ]
-    },
-    ""opensuse.13.2-corert"": {
-      ""#import"": [ ""opensuse-corert"", ""opensuse.13.2"" ]
-    },
-    ""opensuse.13.2-x64-corert"": {
-      ""#import"": [ ""opensuse.13.2-corert"", ""opensuse-x64-corert"", ""opensuse.13.2-x64"" ]
-    },
-    ""opensuse.42.1-corert"": {
-      ""#import"": [ ""opensuse.13.2-corert"", ""opensuse.42.1"" ]
-    },
-    ""opensuse.42.1-x64-corert"": {
-      ""#import"": [ ""opensuse.42.1-corert"", ""opensuse.13.2-x64-corert"", ""opensuse.42.1-x64"" ]
-    },
-    ""alpine-corert"": {
-      ""#import"": [ ""linux-corert"", ""alpine"" ]
-    },
-    ""alpine-x64-corert"": {
-      ""#import"": [ ""alpine-corert"", ""linux-x64-corert"", ""alpine-x64"" ]
-    },
-    ""alpine.3-corert"": {
-      ""#import"": [ ""alpine-corert"", ""alpine.3"" ]
-    },
-    ""alpine.3-x64-corert"": {
-      ""#import"": [ ""alpine.3-corert"", ""alpine-x64-corert"", ""alpine.3-x64"" ]
-    },
-    ""alpine.3.4.3-corert"": {
-      ""#import"": [ ""alpine.3-corert"", ""alpine.3.4.3"" ]
-    },
-    ""alpine.3.4.3-x64-corert"": {
-      ""#import"": [ ""alpine.3.4.3-corert"", ""alpine.3-x64-corert"", ""alpine.3.4.3-x64"" ]
-    }
-  }
-}";
-    }
-}
diff --git a/src/ApiCheck.Console/NuGet/RuntimeGraph.cs b/src/ApiCheck.Console/NuGet/RuntimeGraph.cs
deleted file mode 100644
index ba6faef5c..000000000
--- a/src/ApiCheck.Console/NuGet/RuntimeGraph.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.DotNet.PlatformAbstractions;
-using Newtonsoft.Json.Linq;
-
-namespace ApiCheck.NuGet
-{
-    public partial class RuntimeGraph
-    {
-        private static readonly RuntimeGraph Instance;
-
-        static RuntimeGraph()
-        {
-            var graph = JObject.Parse(RuntimeCompatibility);
-            var runtimes = (IDictionary<string, JToken>)graph["runtimes"];
-            var runtimesList = runtimes.Select(kvp => new RuntimeDefinition
-            {
-                Name = kvp.Key,
-                Fallbacks = CreateRuntimeDefinitions((IDictionary<string, JToken>)kvp.Value, runtimes).ToArray()
-            }).ToArray();
-
-            Instance = new RuntimeGraph(runtimesList);
-        }
-
-        private static IEnumerable<RuntimeDefinition> CreateRuntimeDefinitions(
-            IDictionary<string, JToken> definition,
-            IDictionary<string, JToken> runtimes)
-        {
-            if (!definition.ContainsKey("#import"))
-            {
-                return Enumerable.Empty<RuntimeDefinition>();
-            }
-            var fallbacks = (JArray)definition["#import"];
-            return fallbacks
-                .Select(fr => (string)fr)
-                .Select(fr =>
-                {
-                    if (runtimes.FirstOrDefault(r => r.Key.Equals(fr)).Key == null)
-                    {
-                        return new RuntimeDefinition
-                        {
-                            Name = fr,
-                            Fallbacks = Enumerable.Empty<RuntimeDefinition>()
-                        };
-                    }
-                    return new RuntimeDefinition
-                    {
-                        Name = runtimes.First(r => r.Key.Equals(fr)).Key,
-                        Fallbacks = CreateRuntimeDefinitions(
-                                   (IDictionary<string, JToken>)runtimes.First(r => r.Key.Equals(fr)).Value,
-                                   runtimes).ToArray()
-                    };
-                });
-        }
-
-        private RuntimeGraph(IEnumerable<RuntimeDefinition> runtimes)
-        {
-            Runtimes = runtimes;
-        }
-
-        public IEnumerable<RuntimeDefinition> Runtimes { get; set; }
-
-        public static IEnumerable<string> GetCompatibleRuntimes(string runtimeId)
-        {
-            var runtimes = new HashSet<string>();
-            var runtime = Instance.Runtimes.FirstOrDefault(r => r.Name.Equals(runtimeId));
-            if (runtime != null)
-            {
-                var pendingRuntimes = new Stack<RuntimeDefinition>();
-                pendingRuntimes.Push(runtime);
-                while (pendingRuntimes.Count > 0)
-                {
-                    var currentRuntime = pendingRuntimes.Pop();
-                    runtimes.Add(currentRuntime.Name);
-                    foreach (var fallback in currentRuntime.Fallbacks)
-                    {
-                        pendingRuntimes.Push(fallback);
-                    }
-                }
-            }
-
-            return runtimes;
-        }
-
-        public static string GetCurrentRuntimeId()
-        {
-            if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows)
-            {
-                return RuntimeEnvironment.GetRuntimeIdentifier();
-            }
-            var arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant();
-            if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.1", StringComparison.Ordinal))
-            {
-                return "win7-" + arch;
-            }
-            if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.2", StringComparison.Ordinal))
-            {
-                return "win8-" + arch;
-            }
-            if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.3", StringComparison.Ordinal))
-            {
-                return "win81-" + arch;
-            }
-            if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("10.0", StringComparison.Ordinal))
-            {
-                return "win10-" + arch;
-            }
-
-            throw new InvalidOperationException("Runtime not supported");
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/Program.cs b/src/ApiCheck.Console/Program.cs
deleted file mode 100644
index 4185a52fd..000000000
--- a/src/ApiCheck.Console/Program.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using ApiCheck.Description;
-using Microsoft.Extensions.CommandLineUtils;
-using Newtonsoft.Json;
-
-namespace ApiCheck
-{
-    public class Program
-    {
-        private const int Ok = 0;
-        private const int Error = 1;
-
-        public static int Main(string[] args)
-        {
-            try
-            {
-                var app = new CommandLineApplication
-                {
-                    Name = "ApiCheck"
-                };
-
-                app.Command("generate", c =>
-                {
-                    var assemblyPathOption = c.Option("-a|--assembly",
-                        "Path to the assembly to generate the ApiListing for", CommandOptionType.SingleValue);
-                    var assetsJson = c.Option("-p|--project", "Path to the project.assets.json file",
-                        CommandOptionType.SingleValue);
-                    var framework = c.Option("-f|--framework",
-                        "The moniker for the framework the assembly to analize was compiled against.",
-                        CommandOptionType.SingleValue);
-                    var noPublicInternal = c.Option("-epi|--exclude-public-internal",
-                        "Exclude types on the .Internal namespace from the generated report",
-                        CommandOptionType.NoValue);
-                    var outputPath = c.Option("-o|--out", "Output path for the generated ApiListing file",
-                        CommandOptionType.SingleValue);
-
-                    c.HelpOption("-h|--help");
-
-                    c.OnExecute(() => OnGenerate(c, assemblyPathOption, assetsJson, framework, noPublicInternal,
-                        outputPath));
-                });
-
-                app.Command("compare", c =>
-                {
-                    var apiListingPathOption = c.Option("-b|--api-listing",
-                        "Path to the API listing file to use as reference.", CommandOptionType.SingleValue);
-                    var exclusionsPathOption = c.Option("-e|--exclusions",
-                        "Path to the exclusions file for the ApiListing", CommandOptionType.SingleValue);
-                    var assemblyPathOption = c.Option("-a|--assembly",
-                        "Path to the assembly to generate the ApiListing for", CommandOptionType.SingleValue);
-                    var assetsJson = c.Option("-p|--project", "Path to the project.assets.json file",
-                        CommandOptionType.SingleValue);
-                    var framework = c.Option("-f|--framework",
-                        "The moniker for the framework the assembly to analize was compiled against.",
-                        CommandOptionType.SingleValue);
-                    var noPublicInternal = c.Option("-epi|--exclude-public-internal",
-                        "Exclude types on the .Internal namespace from the generated report",
-                        CommandOptionType.NoValue);
-
-                    c.HelpOption("-h|--help");
-
-                    c.OnExecute(() => OnCompare(c, apiListingPathOption, exclusionsPathOption, assemblyPathOption,
-                        assetsJson, framework, noPublicInternal));
-                });
-
-                app.HelpOption("-h|--help");
-
-                app.OnExecute(() =>
-                {
-                    app.ShowHelp();
-                    return Ok;
-                });
-
-                return app.Execute(args);
-            }
-            catch (FileNotFoundException e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-            catch (ReflectionTypeLoadException e)
-            {
-                // ReflectionTypeLoadException does not override ToString() to include LoaderExceptions.
-                Console.WriteLine($"{e.GetType().FullName}: {e.Message}");
-
-                var hadLoaderExceptions = false;
-                foreach (var loaderException in e.LoaderExceptions)
-                {
-                    hadLoaderExceptions = true;
-                    Console.WriteLine($"  {loaderException.GetType().FullName}: {loaderException.Message}");
-
-                    var innerException = loaderException.InnerException;
-                    while (innerException != null)
-                    {
-                        Console.WriteLine($"  {innerException.GetType().FullName}: {innerException.Message}");
-                        innerException = innerException.InnerException;
-                    }
-
-                    if (loaderException.InnerException != null)
-                    {
-                        Console.WriteLine("  --- End of inner exceptions ---");
-                    }
-                }
-
-                if (hadLoaderExceptions)
-                {
-                    Console.WriteLine("  --- End of loader exceptions ---");
-                }
-
-                var inner = e.InnerException;
-                while (inner != null)
-                {
-                    Console.WriteLine($"  {inner.GetType().FullName}: {inner.Message}");
-                    inner = inner.InnerException;
-                }
-
-                if (e.InnerException != null)
-                {
-                    Console.WriteLine("  --- End of inner exceptions ---");
-                }
-
-                Console.WriteLine(e.StackTrace);
-            }
-
-            return Error;
-        }
-
-        private static int OnGenerate(
-            CommandLineApplication command,
-            CommandOption assemblyPath,
-            CommandOption assetsJson,
-            CommandOption framework,
-            CommandOption excludeInternalNamespace,
-            CommandOption output)
-        {
-            if (!assemblyPath.HasValue() ||
-                !output.HasValue() ||
-                !assetsJson.HasValue() ||
-                !framework.HasValue())
-            {
-                Console.Error.WriteLine("Missing required option.");
-                command.ShowHelp();
-                return Error;
-            }
-
-            var assembly = AssemblyLoader.LoadAssembly(
-                assemblyPath.Value(),
-                assetsJson.Value(),
-                framework.Value());
-
-            var filters = new List<Func<MemberInfo, bool>>();
-            if (excludeInternalNamespace.HasValue())
-            {
-                filters.Add(ApiListingFilters.IsInInternalNamespace);
-            }
-
-            var report = ApiListingGenerator.GenerateApiListingReport(assembly, filters);
-            using (var writer = new JsonTextWriter(File.CreateText(output.Value())))
-            {
-                writer.Formatting = Formatting.Indented;
-                writer.Indentation = 2;
-                writer.IndentChar = ' ';
-
-                report.WriteTo(writer);
-            }
-
-            return Ok;
-        }
-
-        private static int OnCompare(
-            CommandLineApplication command,
-            CommandOption apiListingPathOption,
-            CommandOption breakingChangesPathOption,
-            CommandOption assemblyPath,
-            CommandOption assetsJson,
-            CommandOption framework,
-            CommandOption excludeInternalNamespace)
-        {
-            if (!apiListingPathOption.HasValue() ||
-                !assemblyPath.HasValue() ||
-                !assetsJson.HasValue() ||
-                !framework.HasValue())
-            {
-                command.ShowHelp();
-                return Error;
-            }
-
-            var assembly = AssemblyLoader.LoadAssembly(
-                assemblyPath.Value(),
-                assetsJson.Value(),
-                framework.Value());
-
-            var newApiListingFilters = new List<Func<MemberInfo, bool>>();
-            var oldApiListingFilters = new List<Func<ApiElement, bool>>();
-
-            if (excludeInternalNamespace.HasValue())
-            {
-                newApiListingFilters.Add(ApiListingFilters.IsInInternalNamespace);
-                oldApiListingFilters.Add(ApiListingFilters.IsInInternalNamespace);
-            }
-
-            var oldApiListing = ApiListingGenerator.LoadFrom(File.ReadAllText(apiListingPathOption.Value()),
-                oldApiListingFilters);
-
-            var generator = new ApiListingGenerator(assembly, newApiListingFilters);
-            var newApiListing = generator.GenerateApiListing();
-            var knownBreakingChanges = (breakingChangesPathOption.HasValue()
-                                           ? JsonConvert.DeserializeObject<IList<BreakingChange>>(
-                                               File.ReadAllText(breakingChangesPathOption.Value()))
-                                           : null) ?? new List<BreakingChange>();
-
-            var comparer = new ApiListingComparer(oldApiListing, newApiListing);
-
-            var breakingChanges = comparer.GetDifferences();
-            var newBreakingChanges = breakingChanges.Except(knownBreakingChanges).ToList();
-            var incorrectBreakingChanges = knownBreakingChanges.Except(breakingChanges).ToList();
-
-            const string indent = "    ";
-
-            var breakingChangesToPrint = new List<BreakingChange>();
-
-            if (newBreakingChanges.Count > 0)
-            {
-                Console.WriteLine(
-                    $"ERROR: Verifying breaking changes for framework {framework.Value()} failed.");
-            }
-
-            var removedTypes = newBreakingChanges.Where(b => b.MemberId == null).OrderBy(b => b.TypeId).ToList();
-            if (removedTypes.Count > 0)
-            {
-                Console.WriteLine();
-                Console.WriteLine("The following types have been removed.");
-                Console.WriteLine();
-                Console.WriteLine(string.Join(Environment.NewLine, removedTypes.Select(b => indent + b.TypeId)));
-                Console.WriteLine();
-            }
-
-            breakingChangesToPrint.AddRange(removedTypes);
-
-            var removedMembers = newBreakingChanges
-                .Where(b => b.MemberId != null && b.Kind == ChangeKind.Removal)
-                .OrderBy(b => b.MemberId)
-                .GroupBy(b => b.TypeId)
-                .ToList();
-            if (removedMembers.Count > 0)
-            {
-                Console.WriteLine();
-                Console.WriteLine();
-                Console.WriteLine("The following types have one or more members removed from them.");
-                Console.WriteLine();
-
-                foreach (var memberGrouping in removedMembers)
-                {
-                    Console.WriteLine(indent + memberGrouping.Key);
-                    Console.WriteLine(string.Join(Environment.NewLine,
-                        memberGrouping.Select(b => indent + indent + b.MemberId).ToList()));
-                    Console.WriteLine();
-                }
-            }
-
-            breakingChangesToPrint.AddRange(removedMembers.SelectMany(t => t.ToList()));
-
-            var newMembersOnInterfaces = newBreakingChanges
-                .Where(b => b.MemberId != null && b.Kind == ChangeKind.Addition)
-                .OrderBy(b => b.MemberId)
-                .GroupBy(b => b.TypeId)
-                .ToList();
-            if (newMembersOnInterfaces.Count > 0)
-            {
-                Console.WriteLine();
-                Console.WriteLine();
-                Console.WriteLine("The following interfaces have one or more members added to them.");
-
-                foreach (var memberGrouping in newMembersOnInterfaces)
-                {
-                    Console.WriteLine(indent + memberGrouping.Key);
-                    Console.WriteLine(string.Join(Environment.NewLine,
-                        memberGrouping.Select(b => indent + indent + b.MemberId).ToList()));
-                    Console.WriteLine();
-                }
-            }
-
-            breakingChangesToPrint.AddRange(newMembersOnInterfaces.SelectMany(t => t.ToList()));
-
-            foreach (var exclusion in incorrectBreakingChanges)
-            {
-                if (breakingChangesPathOption.HasValue())
-                {
-                    Console.Error.WriteLine(
-                        $"ERROR: The following exclusion is in the exclusion file '{breakingChangesPathOption.Value()}', but is no longer necessary:");
-                }
-                else
-                {
-                    Console.Error.WriteLine(
-                        "ERROR: The following exclusion is in the exclusion file, but is no longer necessary:");
-                }
-                Console.WriteLine(JsonConvert.SerializeObject(exclusion, Formatting.Indented));
-                Console.WriteLine();
-            }
-
-            if (breakingChangesToPrint.Any())
-            {
-                Console.WriteLine();
-                Console.WriteLine();
-                Console.WriteLine("Following is the list of exclusions that either need to be added to the list of breaking changes, or the breaking changes themselves need to be reverted:");
-                Console.WriteLine(
-                    JsonConvert.SerializeObject(
-                        breakingChangesToPrint,
-                        Formatting.Indented,
-                        new JsonSerializerSettings
-                        {
-                            NullValueHandling = NullValueHandling.Ignore
-                        }));
-                Console.WriteLine();
-            }
-
-            if (newBreakingChanges.Count > 0 || incorrectBreakingChanges.Count > 0)
-            {
-                Console.WriteLine(
-                    "The process for breaking changes is described in: https://github.com/aspnet/AspNetCore/wiki/Engineering-guidelines#breaking-changes");
-                Console.WriteLine(
-                    "The process to add an exclusion to this tool is described in: https://github.com/aspnet/BuildTools/wiki/Api-Check#apicheck-exceptions");
-                Console.WriteLine();
-
-                return Error;
-            }
-
-            return Ok;
-        }
-    }
-}
diff --git a/src/ApiCheck.Console/README.md b/src/ApiCheck.Console/README.md
deleted file mode 100644
index 6e9559e61..000000000
--- a/src/ApiCheck.Console/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Api Check
-===========
-The documentation for this project can be found [here](https://github.com/aspnet/BuildTools/wiki/Api-Check).
\ No newline at end of file
diff --git a/src/ApiCheck.Console/build/Microsoft.AspNetCore.BuildTools.ApiCheck.props b/src/ApiCheck.Console/build/Microsoft.AspNetCore.BuildTools.ApiCheck.props
deleted file mode 100644
index 705b19be6..000000000
--- a/src/ApiCheck.Console/build/Microsoft.AspNetCore.BuildTools.ApiCheck.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-  WARNING: These targets are intended for building Microsoft's ASP.NET Core repos and are not intended
-  for use outside of Microsoft.
--->
-<Project>
-  <PropertyGroup>
-    <_ApiCheckTaskAssembly>$(MSBuildThisFileDirectory)..\tools\netstandard2.0\Microsoft.AspNetCore.BuildTools.ApiCheck.Task.dll</_ApiCheckTaskAssembly>
-  </PropertyGroup>
-
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.ApiCheck.Task.ApiCheckTask"
-    AssemblyFile="$(_ApiCheckTaskAssembly)"
-    Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
-  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.ApiCheck.Task.ApiCheckGenerateTask"
-    AssemblyFile="$(_ApiCheckTaskAssembly)"
-    Condition=" '$(MSBuildRuntimeType)' == 'Core'" />
-</Project>
diff --git a/src/ApiCheck.Task/ApiCheckGenerateTask.cs b/src/ApiCheck.Task/ApiCheckGenerateTask.cs
deleted file mode 100644
index 38eebd79b..000000000
--- a/src/ApiCheck.Task/ApiCheckGenerateTask.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-
-using System;
-using System.IO;
-using Microsoft.Build.Framework;
-using System.Reflection;
-
-namespace Microsoft.AspNetCore.BuildTools.ApiCheck.Task
-{
-    /// <summary>
-    /// An MSBuild task that acts as a shim to <c>Microsoft.AspNetCore.BuildTools.ApiCheck.exe generate ...</c> or
-    /// <c>dotnet Microsoft.AspNetCore.BuildTools.ApiCheck.dll generate ...</c>.
-    /// </summary>
-    public class ApiCheckGenerateTask : ApiCheckTasksBase
-    {
-        protected override bool ValidateParameters()
-        {
-            if (string.IsNullOrEmpty(ApiListingPath))
-            {
-                Log.LogError($"API listing file '{ApiListingPath}' not specified.");
-                return false;
-            }
-
-            return base.ValidateParameters();
-        }
-
-        protected override string GenerateCommandLineCommands()
-        {
-            return GenerateCommandLineCommands("generate");
-        }
-    }
-}
diff --git a/src/ApiCheck.Task/ApiCheckTask.cs b/src/ApiCheck.Task/ApiCheckTask.cs
deleted file mode 100644
index db72c97f2..000000000
--- a/src/ApiCheck.Task/ApiCheckTask.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Reflection;
-using Microsoft.Build.Framework;
-
-namespace Microsoft.AspNetCore.BuildTools.ApiCheck.Task
-{
-    /// <summary>
-    /// An MSBuild task that acts as a shim to <c>Microsoft.AspNetCore.BuildTools.ApiCheck.exe compare ...</c> or
-    /// <c>dotnet Microsoft.AspNetCore.BuildTools.ApiCheck.dll compare ...</c>.
-    /// </summary>
-    public class ApiCheckTask : ApiCheckTasksBase
-    {
-        /// <summary>
-        /// Path to the exclusions file that narrows <see cref="ApiListingPath"/>, ignoring listed breaking changes.
-        /// </summary>
-        public string ExclusionsPath { get; set; }
-
-        /// <inheritdoc />
-        protected override bool ValidateParameters()
-        {
-            if (string.IsNullOrEmpty(ApiListingPath) || !File.Exists(ApiListingPath))
-            {
-                Log.LogError($"API listing file '{ApiListingPath}' not specified or does not exist.");
-                return false;
-            }
-
-            if (!string.IsNullOrEmpty(ExclusionsPath) && !File.Exists(ExclusionsPath))
-            {
-                Log.LogError($"Exclusions file '{ExclusionsPath}' does not exist.");
-                return false;
-            }
-
-            return base.ValidateParameters();
-        }
-
-        /// <inheritdoc />
-        protected override string GenerateCommandLineCommands()
-        {
-            var arguments = GenerateCommandLineCommands("compare");
-
-            if (!string.IsNullOrEmpty(ExclusionsPath))
-            {
-                arguments += $@" --exclusions ""{ExclusionsPath}""";
-            }
-
-            return arguments;
-        }
-    }
-}
diff --git a/src/ApiCheck.Task/ApiCheckTasksBase.cs b/src/ApiCheck.Task/ApiCheckTasksBase.cs
deleted file mode 100644
index a80e95e87..000000000
--- a/src/ApiCheck.Task/ApiCheckTasksBase.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace Microsoft.AspNetCore.BuildTools.ApiCheck.Task
-{
-    public abstract class ApiCheckTasksBase : ToolTask
-    {
-        protected const string ApiCheckToolName = "ApiCheck";
-
-        public ApiCheckTasksBase()
-        {
-            // Tool does not use stderr for anything. Treat everything that appears there as an error.
-            LogStandardErrorAsError = true;
-        }
-
-        /// <summary>
-        /// Path to the project.assets.json file created when building <see cref="AssemblyPath"/>.
-        /// </summary>
-        [Required]
-        public string ProjectAssetsPath { get; set; }
-
-        /// <summary>
-        /// Path for the API listing file.
-        /// </summary>
-        [Required]
-        public string ApiListingPath { get; set; }
-
-        /// <summary>
-        /// Path to the assembly to consider.
-        /// </summary>
-        [Required]
-        public string AssemblyPath { get; set; }
-
-        /// <summary>
-        /// Exclude types defined in .Internal namespaces from the comparison, ignoring breaking changes in such types.
-        /// </summary>
-        public bool ExcludePublicInternalTypes { get; set; }
-
-        /// <summary>
-        /// The framework moniker for <see cref="AssemblyPath"/>.
-        /// </summary>
-        [Required]
-        public string Framework { get; set; }
-
-        /// <inheritdoc />
-        protected override MessageImportance StandardErrorLoggingImportance => MessageImportance.High;
-
-        /// <inheritdoc />
-        protected override MessageImportance StandardOutputLoggingImportance => MessageImportance.High;
-
-        /// <inheritdoc />
-        protected override string ToolName
-        {
-            get
-            {
-                if (Framework.StartsWith("net4", StringComparison.OrdinalIgnoreCase))
-                {
-                    return ApiCheckToolName + ".exe";
-                }
-
-                var exeExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty;
-                return "dotnet" + exeExtension;
-            }
-        }
-
-        protected override bool ValidateParameters()
-        {
-            if (string.IsNullOrEmpty(AssemblyPath) || !File.Exists(AssemblyPath))
-            {
-                Log.LogError($"Assembly '{AssemblyPath}' not specified or does not exist.");
-                return false;
-            }
-
-            if (string.IsNullOrEmpty(Framework))
-            {
-                Log.LogError("Framework moniker must be specified.");
-                return false;
-            }
-
-            if (string.IsNullOrEmpty(ProjectAssetsPath) || !File.Exists(ProjectAssetsPath))
-            {
-                Log.LogError($"Project assets file '{ProjectAssetsPath}' not specified or does not exist.");
-                return false;
-            }
-
-            return base.ValidateParameters();
-        }
-
-        /// <inheritdoc />
-        protected override string GenerateFullPathToTool()
-        {
-            // ToolExe equals ToolName by default. Assume (as base class does) any user override is in the same directory.
-            if (Framework.StartsWith("net4", StringComparison.OrdinalIgnoreCase))
-            {
-                var taskAssemblyFolder = Path.GetDirectoryName(GetType().GetTypeInfo().Assembly.Location);
-                return Path.GetFullPath(Path.Combine(taskAssemblyFolder, "..", "net46", ToolExe));
-            }
-
-            // If muxer does not find dotnet, fall back to system PATH and hope for the best.
-            return DotNetMuxer.MuxerPath ?? ToolExe;
-        }
-
-        /// <inheritdoc />
-        protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance)
-        {
-            // Since tool prints out formatted list of breaking changes,
-            // anything that starts with Error considered an error; the rest is user information.
-            if (singleLine.StartsWith("Error", StringComparison.OrdinalIgnoreCase))
-            {
-                Log.LogError(singleLine, Array.Empty<object>());
-            }
-            else
-            {
-                base.LogEventsFromTextOutput(singleLine, messageImportance);
-            }
-        }
-
-        protected string GenerateCommandLineCommands(string command)
-        {
-            var arguments = string.Empty;
-            if (!Framework.StartsWith("net4", StringComparison.OrdinalIgnoreCase))
-            {
-                var taskAssemblyFolder = Path.GetDirectoryName(GetType().GetTypeInfo().Assembly.Location);
-                var toolPath = Path.Combine(taskAssemblyFolder, "..", "netcoreapp2.1", ApiCheckToolName + ".dll");
-                arguments = $@"""{Path.GetFullPath(toolPath)}"" ";
-            }
-
-            arguments += command;
-
-            if (ExcludePublicInternalTypes)
-            {
-                arguments += " --exclude-public-internal";
-            }
-
-            arguments += $@" --assembly ""{AssemblyPath}"" --framework {Framework}";
-            arguments += $@" --project ""{ProjectAssetsPath}""";
-            if (command == "compare")
-            {
-                arguments += $@" --api-listing ""{ApiListingPath}""";
-            }
-
-            if (command == "generate")
-            {
-                arguments += $@" --out {ApiListingPath}";
-            }
-
-            return arguments;
-        }
-    }
-}
diff --git a/modules/BuildTools.Tasks/Utilities/FileHelpers.cs b/src/Internal.AspNetCore.BuildTasks/FileHelpers.cs
similarity index 74%
rename from modules/BuildTools.Tasks/Utilities/FileHelpers.cs
rename to src/Internal.AspNetCore.BuildTasks/FileHelpers.cs
index fba111114..a61f8c1fc 100644
--- a/modules/BuildTools.Tasks/Utilities/FileHelpers.cs
+++ b/src/Internal.AspNetCore.BuildTasks/FileHelpers.cs
@@ -1,6 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.IO;
 
 namespace Microsoft.AspNetCore.BuildTools.Utilities
@@ -15,5 +16,10 @@ public static string EnsureTrailingSlash(string path)
         public static bool HasTrailingSlash(string path)
             => !string.IsNullOrEmpty(path) && (path[path.Length - 1] == Path.DirectorySeparatorChar ||
                                                path[path.Length - 1] == Path.AltDirectorySeparatorChar);
+
+        public static string NormalizePath(string path)
+            => string.IsNullOrEmpty(path)
+            ? path
+            : path.Replace('\\', '/');
     }
 }
diff --git a/modules/BuildTools.Tasks/GenerateFileFromTemplate.cs b/src/Internal.AspNetCore.BuildTasks/GenerateFileFromTemplate.cs
similarity index 95%
rename from modules/BuildTools.Tasks/GenerateFileFromTemplate.cs
rename to src/Internal.AspNetCore.BuildTasks/GenerateFileFromTemplate.cs
index 63f061391..059aa1426 100644
--- a/modules/BuildTools.Tasks/GenerateFileFromTemplate.cs
+++ b/src/Internal.AspNetCore.BuildTasks/GenerateFileFromTemplate.cs
@@ -27,13 +27,7 @@ namespace Microsoft.AspNetCore.BuildTools
     /// </code>
     /// </example>
     /// </summary>
-#if SDK
-    public class Sdk_GenerateFileFromTemplate : Task
-#elif BuildTools
     public class GenerateFileFromTemplate : Task
-#else
-#error This must be built either for an SDK or for BuildTools
-#endif
     {
         /// <summary>
         /// The template file.
@@ -76,7 +70,7 @@ public override bool Execute()
             return true;
         }
 
-        internal string Replace(string template, IDictionary<string, string> values)
+        public string Replace(string template, IDictionary<string, string> values)
         {
             var sb = new StringBuilder();
             var varNameSb = new StringBuilder();
diff --git a/src/ApiCheck.Task/ApiCheck.Task.csproj b/src/Internal.AspNetCore.BuildTasks/Internal.AspNetCore.BuildTasks.csproj
similarity index 50%
rename from src/ApiCheck.Task/ApiCheck.Task.csproj
rename to src/Internal.AspNetCore.BuildTasks/Internal.AspNetCore.BuildTasks.csproj
index d05c4b8a6..4279ac44c 100644
--- a/src/ApiCheck.Task/ApiCheck.Task.csproj
+++ b/src/Internal.AspNetCore.BuildTasks/Internal.AspNetCore.BuildTasks.csproj
@@ -2,17 +2,21 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <AssemblyName>Microsoft.AspNetCore.BuildTools.ApiCheck.Task</AssemblyName>
-    <RootNamespace>Microsoft.AspNetCore.BuildTools.ApiCheck.Task</RootNamespace>
+    <Description>Build tasks. This package is intended for Microsoft use only.</Description>
+    <IncludeSymbols>false</IncludeSymbols>
+    <IncludeSource>false</IncludeSource>
+    <BuildOutputTargetFolder>tools\</BuildOutputTargetFolder>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\**\*.cs" />
+    <Content Include="build\**\*" PackagePath="build/" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
   </ItemGroup>
+
 </Project>
diff --git a/shared/Utilities/MSBuildListSplitter.cs b/src/Internal.AspNetCore.BuildTasks/MSBuildListSplitter.cs
similarity index 100%
rename from shared/Utilities/MSBuildListSplitter.cs
rename to src/Internal.AspNetCore.BuildTasks/MSBuildListSplitter.cs
diff --git a/src/Internal.AspNetCore.BuildTasks/build/Internal.AspNetCore.BuildTasks.props b/src/Internal.AspNetCore.BuildTasks/build/Internal.AspNetCore.BuildTasks.props
new file mode 100644
index 000000000..9c99f1b5e
--- /dev/null
+++ b/src/Internal.AspNetCore.BuildTasks/build/Internal.AspNetCore.BuildTasks.props
@@ -0,0 +1,9 @@
+<Project>
+
+  <PropertyGroup>
+    <_BuildTasksAssembly>$(MSBuildThisFileDirectory)..\tools\netstandard2.0\Internal.AspNetCore.BuildTasks.dll</_BuildTasksAssembly>
+  </PropertyGroup>
+
+  <UsingTask TaskName="Microsoft.AspNetCore.BuildTools.GenerateFileFromTemplate" AssemblyFile="$(_BuildTasksAssembly)" />
+
+</Project>
diff --git a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj b/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj
deleted file mode 100644
index ccbd52d58..000000000
--- a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <PackageId>Internal.AspNetCore.Sdk</PackageId>
-    <TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
-    <DefineConstants>$(DefineConstants);SDK</DefineConstants>
-    <Serviceable>false</Serviceable>
-    <Description>Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only.</Description>
-    <RootNamespace>Microsoft.AspNetCore.BuildTools</RootNamespace>
-    <BuildToolsPath>..\..\modules\BuildTools.Tasks\</BuildToolsPath>
-    <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
-    <IncludeSymbols>false</IncludeSymbols>
-    <IncludeSource>false</IncludeSource>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(BuildToolsPath)*.cs" />
-    <Compile Include="$(BuildToolsPath)Utilities\*.cs" />
-    <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\**\*.cs" />
-    <Compile Include="..\..\shared\Utilities\MSBuildListSplitter.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-  </ItemGroup>
-
-  <Target Name="SetPackageDependencies" BeforeTargets="GenerateNuspec">
-    <MSBuild Projects="..\ApiCheck.Console\ApiCheck.Console.csproj" Targets="GetPackageVersion">
-      <Output TaskParameter="TargetOutputs" PropertyName="ApiCheckPackageVersion" />
-    </MSBuild>
-
-    <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);id=$(PackageId)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);apicheckVersion=$(ApiCheckPackageVersion)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);config=$(Configuration)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);version=$(PackageVersion)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);description=$(Description)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);copyright=$(Copyright)</NuspecProperties>
-    </PropertyGroup>
-  </Target>
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec b/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec
deleted file mode 100644
index 159d409ac..000000000
--- a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-    <dependencies>
-      <dependency id="Microsoft.AspNetCore.BuildTools.ApiCheck" version="$apicheckversion$" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="_._" target="lib\netstandard1.0\_._" />
-    <file src="bin\$config$\netcoreapp2.1\Internal.AspNetCore.Sdk.dll" target="tools\netcoreapp2.1\Internal.AspNetCore.Sdk.dll" />
-    <file src="bin\$config$\net46\Internal.AspNetCore.Sdk.dll" target="tools\net46\Internal.AspNetCore.Sdk.dll" />
-    <file src="..\..\modules\BuildTools.Tasks\BuildTools.Tasks.props" target="build\" />
-    <file src="build\" target="build\" />
-    <file src="buildMultiTargeting\" target="buildMultiTargeting\" />
-  </files>
-</package>
diff --git a/src/Internal.AspNetCore.Sdk/_._ b/src/Internal.AspNetCore.Sdk/_._
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Internal.AspNetCore.Sdk/build/ApiCheck.props b/src/Internal.AspNetCore.Sdk/build/ApiCheck.props
deleted file mode 100644
index 8be250a64..000000000
--- a/src/Internal.AspNetCore.Sdk/build/ApiCheck.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  WARNING: These targets are intended for building Microsoft's ASP.NET Core repos and are not intended
-  for use outside of Microsoft.
--->
-<Project>
-  <!-- Set nothing if handled in project file or already done in outer build. -->
-  <PropertyGroup>
-    <!-- Disable API Check on non-Windows platforms -->
-    <_ApiCheckIsSupported Condition=" '$(OS)' != 'Windows_NT' ">false</_ApiCheckIsSupported>
-
-    <!-- Unconditionally disable API checks if running in .NET Framework MSBuild. Task cannot run there. -->
-    <_ApiCheckIsSupported Condition=" '$(MSBuildRuntimeType)' != 'Core' ">false</_ApiCheckIsSupported>
-
-    <!-- Unless overridden in the project or in one of the above situations, always do API checks. -->
-    <EnableApiCheck Condition=" '$(EnableApiCheck)' == '' ">true</EnableApiCheck>
-
-    <ExcludePublicInternalTypes_InApiCheck Condition=" '$(ExcludePublicInternalTypes_InApiCheck)' == '' ">true</ExcludePublicInternalTypes_InApiCheck>
-
-    <!-- Hook API checks into Pack run, prior to creating the .nupkg but after build (if any). -->
-    <GenerateNuspecDependsOn Condition=" '$(GenerateBaselines)' != 'false'">$(GenerateNuspecDependsOn);Generate-ApiCheck-Baselines</GenerateNuspecDependsOn>
-    <GenerateNuspecDependsOn Condition=" '$(ReplaceBaselines)' == 'true' ">$(GenerateNuspecDependsOn);Replace-ApiCheck-Baselines</GenerateNuspecDependsOn>
-    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ApiCheck</GenerateNuspecDependsOn>
-    </PropertyGroup>
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/build/ApiCheck.targets b/src/Internal.AspNetCore.Sdk/build/ApiCheck.targets
deleted file mode 100644
index d27f30a1d..000000000
--- a/src/Internal.AspNetCore.Sdk/build/ApiCheck.targets
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-  WARNING: These targets are intended for building Microsoft's ASP.NET Core repos and are not intended
-  for use outside of Microsoft.
--->
-<Project>
-  <Target Name="_GetApiListingFile">
-    <PropertyGroup>
-      <_ApiListingFileSuffix Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">netframework.json</_ApiListingFileSuffix>
-      <_ApiListingFileSuffix Condition=" '$(_ApiListingFileSuffix)' == '' ">netcore.json</_ApiListingFileSuffix>
-      <_ApiListingFilePath>$(MSBuildProjectDirectory)\baseline.$(_ApiListingFileSuffix)</_ApiListingFilePath>
-      <_ApiListingOutputFile>$(OutputPath)\baseline.$(_ApiListingFileSuffix)</_ApiListingOutputFile>
-      <_ApiExclusionsFilePath>$(MSBuildProjectDirectory)\breakingchanges.$(_ApiListingFileSuffix)</_ApiExclusionsFilePath>
-    </PropertyGroup>
-  </Target>
-
-  <Target
-      Name="Generate-ApiCheck-Baselines"
-      DependsOnTargets="_GetApiListingFile"
-      Condition=" '$(EnableApiCheck)' == 'true' AND '$(_ApiCheckIsSupported)' != 'false' " >
-    <ApiCheckGenerateTask
-      ApiListingPath="$(_ApiListingOutputFile)"
-      AssemblyPath="$(TargetPath)"
-      Framework="$(TargetFramework)"
-      ExcludePublicInternalTypes="$(ExcludePublicInternalTypes_InApiCheck)"
-      ProjectAssetsPath="$(ProjectAssetsFile)" />
-  </Target>
-
-  <Target
-      Name="Replace-ApiCheck-Baselines"
-      DependsOnTargets="Generate-ApiCheck-Baselines"
-      Condition="'$(EnableApiCheck)' == 'true' AND '$(_ApiCheckIsSupported)' != 'false' and Exists('$(_ApiListingOutputFile)')" >
-      <PropertyGroup>
-        <_ApiExclusionsFile Condition=" Exists('$(_ApiExclusionsFilePath)') ">$(_ApiExclusionsFilePath)</_ApiExclusionsFile>
-      </PropertyGroup>
-    <Copy
-      SourceFiles="$(_ApiListingOutputFile)"
-      DestinationFolder="$(MSBuildProjectDirectory)" />
-    <Delete Files="$(_ApiExclusionsFile)" Condition="Exists('$(_ApiExclusionsFile)')" />
-  </Target>
-
-  <Target
-      Name="ApiCheck"
-      DependsOnTargets="_GetApiListingFile"
-      Condition=" '$(EnableApiCheck)' == 'true' AND '$(_ApiCheckIsSupported)' != 'false' ">
-    <PropertyGroup>
-      <_ApiListingFile Condition=" Exists('$(_ApiListingFilePath)') ">$(_ApiListingFilePath)</_ApiListingFile>
-      <_ApiExclusionsFile Condition=" Exists('$(_ApiExclusionsFilePath)') ">$(_ApiExclusionsFilePath)</_ApiExclusionsFile>
-    </PropertyGroup>
-
-    <Message Condition=" '$(_ApiListingFile)' != '' "
-      Importance="normal"
-      Text="Checking for breaking changes in $(MSBuildProjectName), $(TargetFramework)" />
-    <ApiCheckTask Condition=" '$(_ApiListingFile)' != '' "
-      ApiListingPath="$(_ApiListingFile)"
-      AssemblyPath="$(TargetPath)"
-      Framework="$(TargetFramework)"
-      ExcludePublicInternalTypes="$(ExcludePublicInternalTypes_InApiCheck)"
-      ExclusionsPath="$(_ApiExclusionsFile)"
-      ProjectAssetsPath="$(ProjectAssetsFile)" />
-
-    <Warning Condition=" '$(_ApiListingFile)' == '' "
-      Text="No baseline file '$(_ApiListingFilePath)' for $(TargetFramework) found in $(MSBuildProjectName)." />
-  </Target>
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/build/Common.props b/src/Internal.AspNetCore.Sdk/build/Common.props
deleted file mode 100644
index fe971de28..000000000
--- a/src/Internal.AspNetCore.Sdk/build/Common.props
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
-WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
-for use outside of Microsoft.
-
-Usage: this should be imported once via NuGet at the top of the file.
-
--->
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)ApiCheck.props" />
-
-  <!-- common package options -->
-  <PropertyGroup>
-    <Authors>Microsoft</Authors>
-    <Company>Microsoft Corporation.</Company>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <IncludeSymbols>true</IncludeSymbols>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt</PackageLicenseUrl>
-    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
-    <PackageProjectUrl>https://asp.net</PackageProjectUrl>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <Serviceable Condition="'$(Configuration)' == 'Release'">true</Serviceable>
-    <LangVersion Condition="'$(LangVersion)' == ''">7.2</LangVersion>
-    <!-- Instructs the compiler to use SHA256 instead of SHA1 when adding file hashes to PDBs. -->
-    <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
-    <!-- Suppress the message about using a preview version of .NET Core SDK. We are okay with this and don't need the warning. -->
-    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-  </PropertyGroup>
-
-  <!-- Code signing certificate names -->
-  <PropertyGroup Condition=" '$(DisableCodeSigning)' != 'true' ">
-    <AssemblySigningCertName>Microsoft400</AssemblySigningCertName>
-    <AssemblySigning3rdPartyCertName>3PartySHA2</AssemblySigning3rdPartyCertName>
-    <PowerShellSigningCertName>Microsoft400</PowerShellSigningCertName>
-    <PackageSigningCertName>NuGet</PackageSigningCertName>
-    <VsixSigningCertName>VsixSHA2</VsixSigningCertName>
-    <JarSigningCertName>MicrosoftJAR</JarSigningCertName>
-  </PropertyGroup>
-
-  <!-- common build options -->
-  <PropertyGroup>
-    <!-- make disabling warnings opt-out -->
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
-    <WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
-    <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000))</_TwoDigitYear>
-    <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0'))</_ThreeDigitDayOfYear>
-    <AssemblyRevision>$(_TwoDigitYear)$(_ThreeDigitDayOfYear)</AssemblyRevision>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(BuildNumber)' != ''">
-      <_Parameter1>BuildNumber</_Parameter1>
-      <_Parameter2>$(BuildNumber)</_Parameter2>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <!-- Detect this package inclusion. For use by other targets and properties. -->
-    <InternalAspNetCoreSdkImported>true</InternalAspNetCoreSdkImported>
-    <_BuildTasksPrefix>Sdk_</_BuildTasksPrefix>
-    <_BuildToolsAssemblyTfm Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_BuildToolsAssemblyTfm>
-    <_BuildToolsAssemblyTfm Condition="'$(MSBuildRuntimeType)' != 'Core'">net46</_BuildToolsAssemblyTfm>
-    <_BuildToolsAssembly>$(MSBuildThisFileDirectory)..\tools\$(_BuildToolsAssemblyTfm)\Internal.AspNetCore.Sdk.dll</_BuildToolsAssembly>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)BuildTools.Tasks.props" Condition="Exists('$(MSBuildThisFileDirectory)BuildTools.Tasks.props')"/>
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/build/Common.targets b/src/Internal.AspNetCore.Sdk/build/Common.targets
deleted file mode 100644
index afb5caf4c..000000000
--- a/src/Internal.AspNetCore.Sdk/build/Common.targets
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
-for use outside of Microsoft.
-
-Usage: This file needs to be imported into the 'outer build'.
-
-For multi-targeting projects, this will be imported from buildMultiTargeting/Internal.AspNetCore.Sdk.targets.
-For single-tfm projects, this will be imported from build/Internal.AspNetCore.Sdk.targets.
-
--->
-<Project>
-
-  <PropertyGroup>
-    <!-- Suppress warnings about using semver 2.0 versions in packages -->
-    <NoWarn>$(NoWarn);NU5105</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(IncludeSymbols)' != 'false' ">
-    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);_EnsureDebugTypeIsPortable</GenerateNuspecDependsOn>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);_EnsureDebugTypeIsPortable</TargetsForTfmSpecificBuildOutput>
-  </PropertyGroup>
-
-  <Target Name="_EnsureDebugTypeIsPortable">
-    <Error Condition=" '$(DebugType)' != 'portable' "
-      Code="KRB5005"
-      Text="The project was set to produce a symbols package but the project was built using DebugType = $(DebugType). Set DebugType = portable to include portable pdbs required for symbol publishing or stop producing symbols by setting IncludeSymbols=false." />
-  </Target>
-
-  <Target Name="_ShowBuildVersion" BeforeTargets="PrepareForBuild">
-    <Message Text="Build version: $(AssemblyName)/$(TargetFramework)/$(Version)" Importance="normal" />
-
-    <Warning Text="Version does not match RepoVersion. Version = '$(Version)' and RepoVersion = '$(RepoVersion)'."
-             Code="KRB2001"
-             Condition="'$(RepoVersion)' != '' AND '$(RepoVersion)' != '$(Version)' AND '$(VerifyVersion)' != 'false' " />
-
-    <Warning Text="PackageVersion does not match RepoPackageVersion. PackageVersion = '$(PackageVersion)' and RepoPackageVersion = '$(RepoPackageVersion)'"
-             Code="KRB2002"
-             Condition="'$(RepoPackageVersion)' != '' AND '$(RepoPackageVersion)' != '$(PackageVersion)' AND '$(VerifyVersion)' != 'false' " />
-  </Target>
-
-  <Target Name="_CoreGenerateCSharpForResources">
-    <RemoveDuplicates Inputs="@(EmbeddedResource)">
-      <Output TaskParameter="Filtered" ItemName="_ResxFiles"/>
-    </RemoveDuplicates>
-
-    <ItemGroup>
-      <_ResxFiles Update="@(_ResxFiles)" Condition="'%(_ResxFiles.GeneratedFileName)' == ''">
-        <GeneratedFileName>Properties\%(FileName).Designer.cs</GeneratedFileName>
-      </_ResxFiles>
-    </ItemGroup>
-
-    <Message Importance="high" Text="Found @(_ResxFiles ->Count()) resx file(s) in $(MSBuildProjectName)" />
-
-    <Sdk_GenerateResxDesignerFiles ResourceFiles="@(_ResxFiles)">
-      <Output TaskParameter="FileWrites" ItemName="FileWrites" />
-    </Sdk_GenerateResxDesignerFiles>
-  </Target>
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/build/DotNetTool.targets b/src/Internal.AspNetCore.Sdk/build/DotNetTool.targets
deleted file mode 100644
index d4bbb768c..000000000
--- a/src/Internal.AspNetCore.Sdk/build/DotNetTool.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <GetSignedPackageFilesDependsOn>$(GetSignedPackageFilesDependsOn);_GetSignedPackageFilesForGeneratedShims</GetSignedPackageFilesDependsOn>
-    <PackagedShimOutputRootDirectory>$(OutDir)</PackagedShimOutputRootDirectory>
-  </PropertyGroup>
-
-  <Target Name="_GetSignedPackageFilesForGeneratedShims" Condition="'$(AssemblySigningCertName)' != ''">
-    <ItemGroup>
-      <_ShimRids Include="$(PackAsToolShimRuntimeIdentifiers)" />
-      <SignedPackageFile Condition="'%(_ShimRids.Identity)' != ''" Include="$(PackagedShimOutputRootDirectory)shims/$(TargetFramework)/%(_ShimRids.Identity)/$(AssemblyName).exe" Certificate="$(AssemblySigningCertName)">
-        <PackagePath>tools/$(TargetFramework)/any/shims/%(_ShimRids.Identity)/</PackagePath>
-      </SignedPackageFile>
-      <SignedPackageFile Include="$(TargetPath)" Certificate="$(AssemblySigningCertName)">
-        <PackagePath>tools/$(TargetFramework)/any/$(TargetFileName)</PackagePath>
-      </SignedPackageFile>
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets b/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets
deleted file mode 100644
index e6a37337a..000000000
--- a/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <GeneratedInternalAspNetCoreAttributeFile Condition="'$(GeneratedInternalAspNetCoreAttributeFile)'==''">$(IntermediateOutputPath)Internal.AspNetCore.Sdk.AssemblyInfo$(DefaultLanguageSourceExtension)</GeneratedInternalAspNetCoreAttributeFile>
-    <GenerateInternalAspNetCoreAttributes Condition="'$(GenerateInternalAspNetCoreAttributes)'==''">true</GenerateInternalAspNetCoreAttributes>
-  </PropertyGroup>
-
-<!--
-********************************************************************************************
-Target: GenerateInternalAspNetCoreAttributes
-
-Generates assembly attributes for ASP.NET Core binaries
-********************************************************************************************
--->
-  <Target Name="GenerateInternalAspNetCoreAttributes"
-          BeforeTargets="CoreCompile"
-          DependsOnTargets="PrepareForBuild;SetAssemblyFileRevision;CoreGenerateInternalAspNetCoreAttributes"
-          Condition="'$(GenerateInternalAspNetCoreAttributes)'=='true' and '$(DesignTimeBuild)'!='true'" />
-
-  <Target Name="SetAssemblyFileRevision"
-    DependsOnTargets="GetAssemblyVersion"
-    Condition="'$(GenerateAssemblyFileVersionAttribute)'=='true' AND '$(FileVersion)'==''">
-
-    <Sdk_GetAssemblyFileVersion AssemblyVersion="$(AssemblyVersion)" AssemblyRevision="$(AssemblyRevision)">
-      <Output TaskParameter="AssemblyFileVersion" PropertyName="FileVersion" />
-    </Sdk_GetAssemblyFileVersion>
-  </Target>
-
-  <Target Name="CoreGenerateInternalAspNetCoreAttributes"
-          Inputs="$(MSBuildAllProjects)"
-          Outputs="$(GeneratedInternalAspNetCoreAttributeFile)" >
-
-    <ItemGroup>
-      <_InternalAspNetCoreAttributes Remove="@(_InternalAspNetCoreAttributes)" />
-      <_InternalAspNetCoreAttributes Include="System.Reflection.AssemblyMetadata" Condition="'$(Serviceable)'!='false'">
-        <_Parameter1>Serviceable</_Parameter1>
-        <_Parameter2>True</_Parameter2>
-      </_InternalAspNetCoreAttributes>
-    </ItemGroup>
-
-    <ItemGroup>
-      <!--Ensure generated file is not already in compile sources-->
-      <Compile Remove="$(GeneratedInternalAspNetCoreAttributeFile)"  />
-    </ItemGroup>
-
-    <WriteCodeFragment AssemblyAttributes="@(_InternalAspNetCoreAttributes)" Language="$(Language)" OutputFile="$(GeneratedInternalAspNetCoreAttributeFile)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </WriteCodeFragment>
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/Internal.AspNetCore.Sdk/build/Git.targets b/src/Internal.AspNetCore.Sdk/build/Git.targets
deleted file mode 100644
index 23ac18ebf..000000000
--- a/src/Internal.AspNetCore.Sdk/build/Git.targets
+++ /dev/null
@@ -1,131 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <CommitHash Condition="'$(RepositoryCommit)' == ''">$(RepositoryCommit)</CommitHash>
-    <GenerateCommitHashAttribute Condition="'$(GenerateCommitHashAttribute)'==''">true</GenerateCommitHashAttribute>
-    <GeneratedCommitHashAttributeFile Condition="'$(GeneratedCommitHashAttributeFile)'==''">$(IntermediateOutputPath)$(AssemblyName).CommitHash$(DefaultLanguageSourceExtension)</GeneratedCommitHashAttributeFile>
-    <SourceLinkDestination Condition="'$(SourceLinkDestination)' == ''">$(IntermediateOutputPath)sourcelink.json</SourceLinkDestination>
-    <GenerateSourceLinkFile Condition="'$(GenerateSourceLinkFile)' == '' AND '$(IsPackable)' != 'false'">true</GenerateSourceLinkFile>
-    <!--
-      The source root path used for deterministic normalization of source paths.
-
-      If set the value is used in PathMap to instruct the compiler to normalize source paths
-      emitted to the binary and PDB and as a root for Source Link mapping.
-      If set must end with a directory separator.
-
-      The path can't be just a single '/' due to bug in Roslyn compilers:
-      https://github.com/dotnet/roslyn/issues/22815.
-
-      Only set this in CI builds, otherwise it will mess up the debugger.
-    -->
-    <DeterministicSourceRoot Condition=" '$(DisableDeterministicSourceRoot)' != 'true' AND '$(CI)' == 'true' AND '$(RepositoryRoot)' != '' ">/_/</DeterministicSourceRoot>
-
-    <SourceLinkRoot Condition="'$(DeterministicSourceRoot)' != ''">$(DeterministicSourceRoot)</SourceLinkRoot>
-    <SourceLinkRoot Condition="'$(SourceLinkRoot)' == '' AND '$(RepositoryRoot)' != ''">$([MSBuild]::NormalizeDirectory($(RepositoryRoot)))</SourceLinkRoot>
-
-    <PathMap Condition=" '$(DeterministicSourceRoot)' != '' ">$([MSBuild]::NormalizeDirectory($(RepositoryRoot)))=$(DeterministicSourceRoot)</PathMap>
-  </PropertyGroup>
-
-  <!-- This target is optional. Projects can manually call it if they need it. -->
-  <Target Name="ResolveRepositoryBranch" Condition="'$(RepositoryBranch)'==''">
-    <Sdk_GetGitBranch WorkingDirectory="$(MSBuildProjectDirectory)"
-                      ContinueOnError="WarnAndContinue">
-      <Output TaskParameter="Branch" PropertyName="RepositoryBranch" />
-    </Sdk_GetGitBranch>
-  </Target>
-
-  <Target Name="ResolveCommitHash" Condition="'$(RepositoryCommit)'==''">
-
-    <PropertyGroup>
-      <RepositoryCommit Condition="'$(APPVEYOR_REPO_COMMIT)' != ''">$(APPVEYOR_REPO_COMMIT)</RepositoryCommit>
-      <RepositoryCommit Condition="'$(TRAVIS_COMMIT)' != ''">$(TRAVIS_COMMIT)</RepositoryCommit>
-      <RepositoryCommit Condition="'$(CommitHash)' != ''">$(CommitHash)</RepositoryCommit>
-    </PropertyGroup>
-
-    <Sdk_GetGitCommitHash WorkingDirectory="$(MSBuildProjectDirectory)"
-                      Condition="'$(RepositoryCommit)' == ''"
-                      ContinueOnError="WarnAndContinue">
-      <Output TaskParameter="CommitHash" PropertyName="RepositoryCommit" />
-    </Sdk_GetGitCommitHash>
-
-    <PropertyGroup>
-      <!-- Set both CommitHash and RepositoryCommit. CommitHash was the property we started using at first. RepositoryCommit was introduced when NuGet started adding this to nuspec. -->
-      <CommitHash>$(RepositoryCommit)</CommitHash>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="CreateSourceLink"
-          Condition="'$(SourceLink)'=='' AND '$(GenerateSourceLinkFile)' != 'false' "
-          Inputs="$(IntermediateCommitHash);$(MSBuildAllProjects)"
-          Outputs="$(SourceLinkDestination)" >
-
-    <Sdk_CreateSourceLink
-          SourceLinkRoot="$(SourceLinkRoot)"
-          OriginUrl="$(RepositoryUrl)"
-          Commit="$(RepositoryCommit)"
-          DestinationFile="$(SourceLinkDestination)"
-          ContinueOnError="WarnAndContinue"
-          Condition="'$(RepositoryCommit)' != '' AND '$(RepositoryUrl)' != '' AND '$(SourceLinkRoot)' != ''">
-      <Output TaskParameter="SourceLinkFile" PropertyName="SourceLink" />
-    </Sdk_CreateSourceLink>
-
-    <Warning Text="SourceLink not enabled because RepositoryUrl wasn't set."
-             Condition="'$(RepositoryUrl)' == ''" />
-
-    <Warning Text="SourceLink not enabled because this is not a git repo."
-             Condition="'$(RepositoryCommit)' == ''" />
-
-    <Warning Text="SourceLink not enabled because SourceLinkRoot wasn't set."
-             Condition="'$(SourceLinkRoot)' == ''" />
-  </Target>
-
-<!--
-********************************************************************************************
-Target: GenerateCommitHashAttribute
-Generates an assembly attribute with commit hash
-********************************************************************************************
--->
-  <Target Name="GenerateCommitHashAttribute"
-          BeforeTargets="CoreCompile"
-          DependsOnTargets="ResolveCommitHash;PrepareForBuild;GenerateIntermediateCommitHash;CoreGenerateCommitHashAttribute;CreateSourceLink"
-          Condition="'$(GenerateCommitHashAttribute)'=='true' and '$(DesignTimeBuild)'!='true'" >
-    <Warning Text="Property 'RepositoryCommit' was not set"
-             Condition="'$(RepositoryCommit)'==''" />
-  </Target>
-
-  <Target Name="GenerateIntermediateCommitHash" Condition="'$(RepositoryCommit)' != ''">
-    <PropertyGroup>
-      <!-- shorten to help avoid max path length issues -->
-      <IntermediateCommitHash>$(IntermediateOutputPath)$(RepositoryCommit.Substring(0, 10)).commit</IntermediateCommitHash>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_OldCommitFiles Include="$(IntermediateOutputPath)*.commit" Exclude="$(IntermediateCommitHash)" />
-    </ItemGroup>
-
-    <Delete Files="@(_OldCommitFiles)" />
-    <Touch Files="$(IntermediateCommitHash)" AlwaysCreate="true" Condition="!Exists('$(IntermediateCommitHash)')" />
-  </Target>
-
-  <Target Name="CoreGenerateCommitHashAttribute"
-          Condition="'$(RepositoryCommit)'!='' and '$(GenerateCommitHashAttribute)'=='true'"
-          Inputs="$(IntermediateCommitHash)"
-          Outputs="$(GeneratedCommitHashAttributeFile)">
-
-    <ItemGroup>
-      <_CustomAttributes Remove="@(_CustomAttributes)" />
-      <_CustomAttributes Include="System.Reflection.AssemblyMetadataAttribute">
-        <_Parameter1>CommitHash</_Parameter1>
-        <_Parameter2>$(RepositoryCommit)</_Parameter2>
-      </_CustomAttributes>
-    </ItemGroup>
-
-    <WriteCodeFragment AssemblyAttributes="@(_CustomAttributes)" Language="$(Language)" OutputFile="$(GeneratedCommitHashAttributeFile)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </WriteCodeFragment>
-
-    <Message Importance="normal" Text="Generated commit hash attribute file $(GeneratedCommitHashAttributeFile)" />
-  </Target>
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.props b/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.props
deleted file mode 100644
index fe0303c43..000000000
--- a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
-for use outside of Microsoft.
--->
-<Project>
-
-  <Import Project="$(MSBuildThisFileDirectory)Common.props" />
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets b/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets
deleted file mode 100644
index ab26b21b2..000000000
--- a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
-for use outside of Microsoft.
--->
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)Common.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)ApiCheck.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)GenerateAssemblyInfo.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)Git.targets" />
-
-  <Import
-    Project="DotNetTool.targets"
-    Condition="'$(PackAsTool)' == 'true' AND '$(TargetFramework)' != ''" />
-
-  <Target Name="Resx"
-          DependsOnTargets="PrepareResourceNames;_CoreGenerateCSharpForResources" />
-
-  <Target Name="_ResolveEmbeddedResources"
-          DependsOnTargets="PrepareResourceNames"
-          Returns="@(EmbeddedResource)" />
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/buildMultiTargeting/ApiCheck.targets b/src/Internal.AspNetCore.Sdk/buildMultiTargeting/ApiCheck.targets
deleted file mode 100644
index 52ff78833..000000000
--- a/src/Internal.AspNetCore.Sdk/buildMultiTargeting/ApiCheck.targets
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-  WARNING: These targets are intended for building Microsoft's ASP.NET Core repos and are not intended
-  for use outside of Microsoft.
--->
-<Project>
-
-  <Target
-      Name="Generate-ApiCheck-Baselines" >
-    <ItemGroup>
-      <_TargetFrameworks Remove="@(_TargetFrameworks)" />
-      <_TargetFrameworks Include="$(TargetFrameworks)" />
-    </ItemGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-      Targets="Generate-ApiCheck-Baselines"
-      Properties="TargetFramework=%(_TargetFrameworks.Identity)"
-      RemoveProperties="TargetFrameworks" />
-  </Target>
-
-  <Target
-      Name="Replace-ApiCheck-Baselines" >
-    <ItemGroup>
-      <_TargetFrameworks Remove="@(_TargetFrameworks)" />
-      <_TargetFrameworks Include="$(TargetFrameworks)" />
-    </ItemGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-      Targets="Replace-ApiCheck-Baselines"
-      Properties="TargetFramework=%(_TargetFrameworks.Identity)"
-      RemoveProperties="TargetFrameworks" />
-  </Target>
-
-  <Target Name="ApiCheck" Condition=" '$(EnableApiCheck)' == 'true' AND '$(_ApiCheckIsSupported)' != 'false' ">
-    <ItemGroup>
-      <_TargetFrameworks Remove="@(_TargetFrameworks)" />
-      <_TargetFrameworks Include="$(TargetFrameworks)" />
-    </ItemGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-      Targets="ApiCheck"
-      Properties="TargetFramework=%(_TargetFrameworks.Identity)"
-      RemoveProperties="TargetFrameworks" />
-  </Target>
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.props b/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.props
deleted file mode 100644
index 17b7dea67..000000000
--- a/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
-for use outside of Microsoft.
--->
-<Project>
-
-  <ItemDefinitionGroup>
-    <SignedPackageFile>
-      <Visible>false</Visible>
-    </SignedPackageFile>
-    <ExcludePackageFileFromSigning>
-      <Visible>false</Visible>
-    </ExcludePackageFileFromSigning>
-  </ItemDefinitionGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Common.props" />
-
-</Project>
diff --git a/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.targets b/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.targets
deleted file mode 100644
index 4d8a26ed0..000000000
--- a/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.targets
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
-for use outside of Microsoft.
--->
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Common.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)ApiCheck.targets" />
-
-  <Target Name="_ResolveEmbeddedResources">
-    <ItemGroup>
-      <_TargetFrameworks Remove="@(_TargetFrameworks)" />
-      <_TargetFrameworks Include="$(TargetFrameworks)" />
-    </ItemGroup>
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="_ResolveEmbeddedResources"
-             Properties="TargetFramework=%(_TargetFrameworks.Identity)">
-      <Output TaskParameter="TargetOutputs" ItemName="EmbeddedResource"/>
-    </MSBuild>
-  </Target>
-
-  <Target Name="Resx"
-          DependsOnTargets="_ResolveEmbeddedResources;_CoreGenerateCSharpForResources" />
-
-</Project>
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj
deleted file mode 100644
index 03164d8c1..000000000
--- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <PackageId>Internal.AspNetCore.SiteExtension.Sdk</PackageId>
-    <TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
-    <Serviceable>false</Serviceable>
-    <Description>Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only.</Description>
-    <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
-    <IncludeSymbols>false</IncludeSymbols>
-    <IncludeSource>false</IncludeSource>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
-
-    <PackageReference Update="@(PackageReference)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Target Name="SetPackageDependencies" BeforeTargets="GenerateNuspec">
-    <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);id=$(PackageId)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);config=$(Configuration)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);version=$(PackageVersion)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);description=$(Description)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);copyright=$(Copyright)</NuspecProperties>
-    </PropertyGroup>
-  </Target>
-
-</Project>
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec
deleted file mode 100644
index a6552123b..000000000
--- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-  </metadata>
-  <files>
-    <file src="_._" target="lib\netstandard1.0\_._" />
-    <file src="bin\$config$\netcoreapp2.1\Internal.AspNetCore.SiteExtension.Sdk.dll" target="tools\netcoreapp2.1\Internal.AspNetCore.SiteExtension.Sdk.dll" />
-    <file src="bin\$config$\net46\Internal.AspNetCore.SiteExtension.Sdk.dll" target="tools\net46\Internal.AspNetCore.SiteExtension.Sdk.dll" />
-    <file src="build\" target="build\" />
-    <file src="content\" target="content\" />
-  </files>
-</package>
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/TrimDeps.cs b/src/Internal.AspNetCore.SiteExtension.Sdk/TrimDeps.cs
deleted file mode 100644
index f19f610bd..000000000
--- a/src/Internal.AspNetCore.SiteExtension.Sdk/TrimDeps.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace RepoTasks
-{
-    public class TrimDeps : Task
-    {
-        [Required]
-        public ITaskItem[] DepsFiles { get; set; }
-
-        public override bool Execute()
-        {
-            foreach (var depsFile in DepsFiles)
-            {
-                ChangeEntryPointLibraryName(depsFile.ItemSpec);
-            }
-
-            // Parse input
-            return true;
-        }
-
-
-        private void ChangeEntryPointLibraryName(string depsFile)
-        {
-            JToken deps;
-            using (var file = File.OpenText(depsFile))
-            using (JsonTextReader reader = new JsonTextReader(file))
-            {
-                deps = JObject.ReadFrom(reader);
-            }
-
-            foreach (JProperty target in deps["targets"])
-            {
-                var targetLibrary = target.Value.Children<JProperty>().FirstOrDefault();
-                if (targetLibrary == null)
-                {
-                    continue;
-                }
-
-                targetLibrary.Remove();
-            }
-
-            var library = deps["libraries"].Children<JProperty>().First();
-            library.Remove();
-
-            using (var file = File.CreateText(depsFile))
-            using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented })
-            {
-                deps.WriteTo(writer);
-            }
-        }
-    }
-}
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/_._ b/src/Internal.AspNetCore.SiteExtension.Sdk/_._
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/build/Internal.AspNetCore.SiteExtension.Sdk.props b/src/Internal.AspNetCore.SiteExtension.Sdk/build/Internal.AspNetCore.SiteExtension.Sdk.props
deleted file mode 100644
index d1c6e62fe..000000000
--- a/src/Internal.AspNetCore.SiteExtension.Sdk/build/Internal.AspNetCore.SiteExtension.Sdk.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-  This file is automatically imported by NuGet into a user's project
-  when it targets a single framework, or in classic (pre 2017) csproj projects.
--->
-<Project TreatAsLocalProperty="TaskFolder;TaskAssembly">
-  <PropertyGroup>
-    <TaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' ">netcoreapp2.1</TaskFolder>
-    <TaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net46</TaskFolder>
-    <TaskAssembly>$(MSBuildThisFileDirectory)..\tools\$(TaskFolder)\Internal.AspNetCore.SiteExtension.Sdk.dll</TaskAssembly>
-  </PropertyGroup>
-
-  <UsingTask TaskName="RepoTasks.TrimDeps" AssemblyFile="$(TaskAssembly)" />
-</Project>
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/build/Internal.AspNetCore.SiteExtension.Sdk.targets b/src/Internal.AspNetCore.SiteExtension.Sdk/build/Internal.AspNetCore.SiteExtension.Sdk.targets
deleted file mode 100644
index 087de5d39..000000000
--- a/src/Internal.AspNetCore.SiteExtension.Sdk/build/Internal.AspNetCore.SiteExtension.Sdk.targets
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-  This file is automatically imported by NuGet into a user's project
-  when it targets a single framework, or in classic (pre 2017) csproj projects.
--->
-
-<Project>
-
-  <Target Name="GenerateHostingStartupDeps" Condition="'@(HostingStartupPackageReference->Count())' != '0'" BeforeTargets="_GetPackageFiles" >
-
-    <PropertyGroup>
-      <_TemplatesDirectory>$(MSBuildThisFileDirectory)..\content\</_TemplatesDirectory>
-      <_DepsOutputDirectory>$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)</_DepsOutputDirectory>
-      <_WorkingDirectory>$(_DepsOutputDirectory)\depswork</_WorkingDirectory>
-      <_BasePackagePath>content\additionaldeps\</_BasePackagePath>
-      <_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
-      <_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
-    </PropertyGroup>
-
-    <ItemGroup Condition="'@(HostingStartupRuntimeStoreFrameworks->Count())' == '0'">
-      <HostingStartupRuntimeStoreTargets Include="netcoreapp2.1" Runtime="win7-x64" />
-      <HostingStartupRuntimeStoreTargets Include="netcoreapp2.1" Runtime="win7-x86" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <_TemplateFiles Include="$(MSBuildThisFileDirectory)..\content\HostingStartup\**\*" />
-      <_HostingStartupPackageReference
-        Include="%(HostingStartupPackageReference.Identity)"
-        Source="%(HostingStartupPackageReference.Source)"
-        Version="%(HostingStartupPackageReference.Version)"
-        WorkingDirectory="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)"
-        Project="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\HostingStartup.csproj"
-        DepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\p\HostingStartup.deps.json"
-        TrimmedDepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\%(HostingStartupPackageReference.Identity).deps.json"
-        PackagePath="$(_BasePackagePath)%(HostingStartupPackageReference.Identity)\shared\Microsoft.AspNetCore.App\$(MicrosoftAspNetCoreAppPackageVersion)\"
-         />
-
-        <ManifestLines Include="&lt;Project Sdk=&quot;Microsoft.NET.Sdk&quot;&gt;&lt;ItemGroup&gt;" />
-        <ManifestLines Include="&lt;PackageReference Remove=&quot;Internal.AspNetCore.Sdk&quot; /&gt;" />
-        <ManifestLines Include="&lt;PackageReference Include=&quot;Microsoft.AspNetCore.App&quot; Version=&quot;$(MicrosoftAspNetCoreAppPackageVersion)&quot; IsImplicitlyDefined=&quot;true&quot;/&gt;" />
-        <ManifestLines Include="&lt;PackageReference Include=&quot;%(HostingStartupPackageReference.Identity)&quot; Version=&quot;%(HostingStartupPackageReference.Version)&quot; /&gt;" />
-        <ManifestLines Include="&lt;/ItemGroup&gt;&lt;/Project&gt;" />
-
-    </ItemGroup>
-
-    <!-- Generate runtime store -->
-    <WriteLinesToFile File="$(_RuntimeStoreManifestFile)" Lines="@(ManifestLines)" Overwrite="true" Encoding="Unicode"/>
-    <Exec Command="dotnet store -m $(_RuntimeStoreManifestFile) -f %(HostingStartupRuntimeStoreTargets.Identity) --framework-version $(HostingStartupRuntimeFrameworkVersion) -r %(HostingStartupRuntimeStoreTargets.Runtime) --output $(_RuntimeStoreOutput) --skip-optimization /p:DotNetRestoreSourcePropsPath=$(DotNetRestoreSourcePropsPath)" />
-
-    <!-- Generate deps -->
-    <RemoveDir Directories="%(_HostingStartupPackageReference.WorkingDirectory)" />
-
-    <Copy SourceFiles="@(_TemplateFiles)" DestinationFolder="%(_HostingStartupPackageReference.WorkingDirectory)" />
-
-    <MSBuild Projects="%(_HostingStartupPackageReference.Project)"
-             Targets="Restore"
-             Properties="HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)" />
-
-    <MSBuild Projects="%(_HostingStartupPackageReference.Project)"
-             Targets="Publish"
-             Properties="PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p;HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)" />
-
-    <Copy SourceFiles="%(_HostingStartupPackageReference.DepsFile)" DestinationFiles="%(_HostingStartupPackageReference.TrimmedDepsFile)" />
-
-    <RepoTasks.TrimDeps DepsFiles="%(_HostingStartupPackageReference.TrimmedDepsFile)" />
-
-    <ItemGroup>
-      <Content Include="$(_RuntimeStoreOutput)\**\*" PackagePath="content\store\%(RecursiveDir)" />
-
-      <Content Include="%(_HostingStartupPackageReference.TrimmedDepsFile)" PackagePath="%(_HostingStartupPackageReference.PackagePath)" />
-    </ItemGroup>
-
-  </Target>
-
-</Project>
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/content/HostingStartup/HostingStartup.csproj b/src/Internal.AspNetCore.SiteExtension.Sdk/content/HostingStartup/HostingStartup.csproj
deleted file mode 100644
index 3b06dd7e5..000000000
--- a/src/Internal.AspNetCore.SiteExtension.Sdk/content/HostingStartup/HostingStartup.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="None" />
-    <PackageReference Include="$(HostingStartupPackageName)" Version="$(HostingStartupPackageVersion)" PrivateAssets="None" />
-  </ItemGroup>
-</Project>
diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/content/HostingStartup/Program.cs b/src/Internal.AspNetCore.SiteExtension.Sdk/content/HostingStartup/Program.cs
deleted file mode 100644
index 8cd3c0026..000000000
--- a/src/Internal.AspNetCore.SiteExtension.Sdk/content/HostingStartup/Program.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-public class Program
-{
-    public static void Main() { }
-}
\ No newline at end of file
diff --git a/test.ps1 b/test.ps1
index 11da65256..ddde0d73a 100755
--- a/test.ps1
+++ b/test.ps1
@@ -7,6 +7,7 @@ param(
     [string]$RepoPath,
     [switch]$NoBuild = $false,
     [switch]$CI = $false,
+    [switch]$NoReinstall = $false,
     [Parameter(ValueFromRemainingArguments = $true)]
     [string[]]$Arguments
 )
@@ -37,8 +38,7 @@ $Arguments += , "/p:DotNetRestoreSources=$packageDir"
 
 foreach ($pkg in @(
         "Internal.AspNetCore.Sdk",
-        "Internal.AspNetCore.SiteExtension.Sdk",
-        "Microsoft.AspNetCore.BuildTools.ApiCheck")) {
+        "Internal.AspNetCore.SiteExtension.Sdk")) {
 
     $pkgRoot = "${env:USERPROFILE}/.nuget/packages/$pkg/$toolsVersion/"
     if (Test-Path $pkgRoot) {
@@ -46,5 +46,6 @@ foreach ($pkg in @(
     }
 }
 
+$Reinstall = -not $NoReinstall
 
-& .\scripts\bootstrapper\run.ps1 -Update -Reinstall -Command $Command -Path $RepoPath -ToolsSource $toolsSource -Ci:$CI @Arguments
+& .\scripts\bootstrapper\run.ps1 -Update -Reinstall:$Reinstall -Command $Command -Path $RepoPath -ToolsSource $toolsSource -Ci:$CI @Arguments
diff --git a/test/ApiCheck.Test/ApiCheck.Test.csproj b/test/ApiCheck.Test/ApiCheck.Test.csproj
deleted file mode 100644
index 2dbad76da..000000000
--- a/test/ApiCheck.Test/ApiCheck.Test.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\ApiCheck.Console\ApiCheck.Console.csproj" />
-    <ProjectReference Include="..\ApiCheckBaseline.V1\ApiCheckBaseline.V1.csproj" />
-    <ProjectReference Include="..\ApiCheckBaseline.V2\ApiCheckBaseline.V2.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/test/ApiCheck.Test/ApiListingComparerTests.cs b/test/ApiCheck.Test/ApiListingComparerTests.cs
deleted file mode 100644
index 663448a9e..000000000
--- a/test/ApiCheck.Test/ApiListingComparerTests.cs
+++ /dev/null
@@ -1,460 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using ApiCheck.Description;
-using ApiCheckApiListing.V2;
-using Scenarios;
-using Xunit;
-
-namespace ApiCheck.Test
-{
-    public class ApiListingComparerTests
-    {
-        public Assembly V1Assembly => typeof(ApiCheckApiListingV1).GetTypeInfo().Assembly;
-        public Assembly V2Assembly => typeof(ApiCheckApiListingV2).GetTypeInfo().Assembly;
-
-        public IEnumerable<Func<MemberInfo, bool>> TestFilters => new Func<MemberInfo, bool> []
-        {
-            ti => (ti as TypeInfo)?.Namespace?.StartsWith("ComparisonScenarios") == false
-        };
-
-#if NETCOREAPP2_1 // Reflection does not provide a hook to enumerate forwarded types in .NET Framework.
-        [Fact]
-        public void Compare_AllowsTypeToBeForwarded()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-            var typeToCheck = "public class ComparisonScenarios.TypeToBeForwarded";
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            Assert.DoesNotContain(breakingChanges, bc => bc.TypeId == typeToCheck);
-        }
-
-        [Fact]
-        public void Compare_DetectsChangesInForwardedType()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-            var typeToCheck = "public class ComparisonScenarios.TypeToBeForwardedAndChanged";
-            var getterRemoval = new BreakingChange(
-                typeToCheck,
-                "public System.String get_PropertyToBeRemoved()",
-                ChangeKind.Removal);
-            var setterRemoval = new BreakingChange(
-                typeToCheck,
-                "public System.Void set_PropertyToBeRemoved(System.String value)",
-                ChangeKind.Removal);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            Assert.Equal(2, breakingChanges.Count(bc => bc.TypeId == typeToCheck));
-            Assert.Contains(getterRemoval, breakingChanges);
-            Assert.Contains(setterRemoval, breakingChanges);
-        }
-#endif
-
-        [Fact]
-        public void Compare_Detects_ChangesInTypeVisibility_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public class ComparisonScenarios.PublicToInternalClass",
-                memberId: null,
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Fact]
-        public void Compare_Detects_TypeRenames_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public interface ComparisonScenarios.TypeToRename",
-                memberId: null,
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Fact]
-        public void Compare_Detects_TypeGenericAritybreakingChanges_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public struct ComparisonScenarios.StructToMakeGeneric",
-                memberId: null,
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Theory]
-        [InlineData("public class ComparisonScenarios.ClassToRemoveFieldsFrom")]
-        [InlineData("public struct ComparisonScenarios.StructToRemoveFieldsFrom")]
-        public void Compare_DetectsAllFieldRemovals(string typeToCheck)
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Oops. The NewInternalProperty addition is a breaking change; makes it impossible to subclass type in
-            // another assembly.
-            var expected = new List<BreakingChange>
-            {
-                // Changing a const's value doesn't cause a binary incompatibility but often causes problems.
-                new BreakingChange(
-                    typeToCheck,
-                    "public const System.Int32 ConstToChangeValue = 1",
-                    ChangeKind.Removal),
-                // Removing a const doesn't cause a binary incompatibilty but often causes problems.
-                new BreakingChange(
-                    typeToCheck,
-                    "public const System.Int32 ConstToMakeField = 2",
-                    ChangeKind.Removal),
-                // Oops. Making a field writable is not technically a breaking change.
-                new BreakingChange(
-                    typeToCheck,
-                    "public readonly System.Int32 FieldToMakeWritable",
-                    ChangeKind.Removal),
-                new BreakingChange(
-                    typeToCheck,
-                    "public static readonly System.Int32 StaticFieldToMakeConst",
-                    ChangeKind.Removal),
-                // Oops. Making a field writable is not technically a breaking change.
-                new BreakingChange(
-                    typeToCheck,
-                    "public static readonly System.Int32 StaticFieldToMakeWritable",
-                    ChangeKind.Removal),
-                new BreakingChange(
-                    typeToCheck,
-                    "public static System.Int32 StaticFieldToMakeReadonly",
-                    ChangeKind.Removal),
-                new BreakingChange(
-                    typeToCheck,
-                    "public System.Int32 FieldToMakeReadonly",
-                    ChangeKind.Removal),
-                new BreakingChange(
-                    typeToCheck,
-                    "public System.Int32 FieldToRemove",
-                    ChangeKind.Removal),
-            };
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var breakingChanginesInType = breakingChanges
-                .Where(change => string.Equals(change.TypeId, typeToCheck, StringComparison.Ordinal))
-                .OrderBy(change => change.MemberId);
-            Assert.Equal(expected, breakingChanginesInType);
-        }
-
-        [Fact]
-        public void Compare_Detects_NamespacebreakingChanges_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public class ComparisonScenarios.ClassToChangeNamespaces",
-                memberId: null,
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Fact]
-        public void Compare_Detects_ClassBeingNested_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public class ComparisonScenarios.ClassToNest",
-                memberId: null,
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Fact]
-        public void Compare_Detects_ClassBeingUnnested_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public class ComparisonScenarios.ClassToUnnestContainer+ClassToUnnest",
-                memberId: null,
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Fact]
-        public void Compare_Detects_GenericTypeConstraintsBeingAdded_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public class ComparisonScenarios.GenericTypeWithConstraintsToBeAdded<T0>",
-                memberId: null,
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Fact]
-        public void Compare_Detects_MethodParametersBeingAdded_as_removal()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var expected = new BreakingChange(
-                "public class ComparisonScenarios.ClassWithMethods",
-                "public System.Void MethodToAddParameters()",
-                kind: ChangeKind.Removal);
-            Assert.Contains(expected, breakingChanges);
-        }
-
-        [Fact]
-        public void Compare_DoesNotFailForTypeAddingAnInterface()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            Assert.Null(breakingChanges.FirstOrDefault(
-                bc => bc.TypeId == "public ComparisonScenarios.TypeWithExtraInterface"));
-        }
-
-        [Fact]
-        public void Compare_DetectsAbstractMethodAdditions()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-            var typeToCheck = "public abstract class ComparisonScenarios.AbstractClassToAddMethodsTo";
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var breakingChangesInType = breakingChanges
-                .Where(change => string.Equals(change.TypeId, typeToCheck, StringComparison.Ordinal));
-            var breakingChange = Assert.Single(breakingChangesInType);
-            Assert.Equal(ChangeKind.Addition, breakingChange.Kind);
-            Assert.Equal("public abstract System.Void NewAbstractMethod()", breakingChange.MemberId);
-        }
-
-        [Fact]
-        public void Compare_DetectsAbstractPropertyAdditions()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-            var typeToCheck = "public abstract class ComparisonScenarios.AbstractClassToAddPropertiesTo";
-            var expected = new List<BreakingChange>
-            {
-                new BreakingChange(
-                    typeToCheck,
-                    "public abstract System.Int32 get_NewAbstractProperty()",
-                    ChangeKind.Addition),
-                new BreakingChange(
-                    typeToCheck,
-                    "public abstract System.Void set_PropertyToAddSetterTo(System.Int32 value)",
-                    ChangeKind.Addition),
-            };
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var breakingChangesInType = breakingChanges
-                .Where(change => string.Equals(change.TypeId, typeToCheck, StringComparison.Ordinal))
-                .OrderBy(change => change.MemberId);
-            Assert.Equal(expected, breakingChangesInType);
-        }
-
-        [Fact]
-        public void Compare_DetectsNewMembersBeingAddedToAnInterface_as_addition()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var interfaceBreakingChanges = breakingChanges
-                .Where( b => b.TypeId == "public interface ComparisonScenarios.IInterfaceToAddMembersTo")
-                .ToList();
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Int32 get_NewMember()" && b.Kind == ChangeKind.Addition);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void set_NewMember(System.Int32 value)" && b.Kind == ChangeKind.Addition);
-        }
-
-        [Fact]
-        public void Compare_AllowsExclusionsOnNewInterfaceMembers()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            var knownBreakingChanges = new List<BreakingChange>
-            {
-                new BreakingChange(
-                    "public interface ComparisonScenarios.IInterfaceToAddMembersTo",
-                    "System.Int32 get_NewMember()",
-                    ChangeKind.Addition),
-                new BreakingChange(
-                    "public interface ComparisonScenarios.IInterfaceToAddMembersTo",
-                    "System.Void set_NewMember(System.Int32 value)",
-                    ChangeKind.Addition)
-            };
-
-            // Act
-            var breakingChanges = comparer.GetDifferences().Except(knownBreakingChanges);
-
-            // Assert
-            Assert.DoesNotContain(
-                breakingChanges,
-                bc => bc.TypeId == "public interface ComparisonScenarios.IInterfaceToAddMembersTo");
-        }
-
-        [Fact]
-        public void Compare_DetectsNewMembersInThePresenceOfRenamedAndRemovedMembers()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var interfaceBreakingChanges = breakingChanges
-                .Where( b => b.TypeId == "public interface ComparisonScenarios.IInterfaceWithMembersThatWillGetRenamedRemovedAndAdded")
-                .ToList();
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void MemberToBeRenamed()" && b.Kind == ChangeKind.Removal);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void MemberToBeRemoved()" && b.Kind == ChangeKind.Removal);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void RenamedMember()" && b.Kind == ChangeKind.Addition);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void AddedMember()" && b.Kind == ChangeKind.Addition);
-        }
-
-        [Fact]
-        public void Compare_DetectsNewMembersInThePresenceOfTheSameNumberOfRemovedAndAddedMembers()
-        {
-            // Arrange
-            var v1ApiListing = CreateApiListingDocument(V1Assembly);
-            var v2ApiListing = CreateApiListingDocument(V2Assembly);
-            var comparer = new ApiListingComparer(v1ApiListing, v2ApiListing);
-
-            // Act
-            var breakingChanges = comparer.GetDifferences();
-
-            // Assert
-            var interfaceBreakingChanges = breakingChanges
-                .Where(b => b.TypeId == "public interface ComparisonScenarios.IInterfaceWithSameNumberOfRemovedAndAddedMembers")
-                .ToList();
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void FirstMemberToRemove()" && b.Kind == ChangeKind.Removal);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void SecondMemberToRemove()" && b.Kind == ChangeKind.Removal);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void ThirdMemberToRemove()" && b.Kind == ChangeKind.Removal);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void FirstAddedMember()" && b.Kind == ChangeKind.Addition);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void SecondAddedMember()" && b.Kind == ChangeKind.Addition);
-            Assert.Single(interfaceBreakingChanges,
-                b => b.MemberId == "System.Void ThirdAddedMember()" && b.Kind == ChangeKind.Addition);
-        }
-
-        private ApiListing CreateApiListingDocument(Assembly assembly)
-        {
-            var generator = new ApiListingGenerator(assembly, TestFilters);
-
-            return generator.GenerateApiListing();
-        }
-    }
-}
diff --git a/test/ApiCheck.Test/ApiListingGenerationTests.cs b/test/ApiCheck.Test/ApiListingGenerationTests.cs
deleted file mode 100644
index c9deeefe6..000000000
--- a/test/ApiCheck.Test/ApiListingGenerationTests.cs
+++ /dev/null
@@ -1,1258 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection;
-using ApiCheck.Description;
-using ApiCheckApiListing.V2;
-using Scenarios;
-using Xunit;
-
-namespace ApiCheck.Test
-{
-    public class ApiListingGenerationTests
-    {
-        public Assembly V1Assembly => typeof(ApiCheckApiListingV1).GetTypeInfo().Assembly;
-        public Assembly V2Assembly => typeof(ApiCheckApiListingV2).GetTypeInfo().Assembly;
-
-        [Fact]
-        public void DetectsClasses()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public class Scenarios.BasicClass");
-        }
-
-        [Fact]
-        public void DetectsStructs()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public struct Scenarios.BasicStruct");
-        }
-
-        [Fact]
-        public void DetectsDerivedClasses()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public class Scenarios.DerivedClass : Scenarios.BasicClass");
-        }
-
-        [Fact]
-        public void DetectsBasicInterface()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public interface Scenarios.IBasicInterface");
-        }
-
-        [Fact]
-        public void DetectsComplexInterface()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public interface Scenarios.IComplexInterface : Scenarios.IBasicInterface");
-        }
-
-        [Fact]
-        public void DetectsInterfacesThatImplicitlyImplementOtherInterfaces()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public interface Scenarios.IMultipleLevelInterface : Scenarios.IComplexInterface");
-        }
-
-        [Fact]
-        public void DetectsClassImplementingInterface()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassImplementingInterface : Scenarios.IBasicInterfaceForClass");
-        }
-
-        [Fact]
-        public void DetectsClassDerivingClassImplementingInterface()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassDerivingClassImplementingInterface : Scenarios.ClassImplementingInterface");
-        }
-
-        [Fact]
-        public void ParameterlessVoidReturningMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public System.Void ParameterlessVoidReturningMethod()");
-        }
-
-        [Fact]
-        public void DetectsProtectedIntReturningMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == "protected System.Int32 ProtectedIntReturningMethod()");
-        }
-
-        [Fact]
-        public void ProtectedInternalStringReturningMethodWithStringParameter()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            Assert.DoesNotContain(type.Members, m => m.Id == "protected internal System.String ProtectedInternalStringReturningMethodWithStringParameter(System.String stringParameter)");
-        }
-
-        [Fact]
-        public void PublicClassReturningMethodWithOptionalStringParameter()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public Scenarios.MethodTypesClass PublicClassReturningMethodWithOptionalStringParameter(System.String defaultParameter = \"hello\")");
-        }
-
-        [Fact]
-        public void PrivateBoolReturningMethodWithOptionalCharParameter()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            Assert.DoesNotContain(type.Members, m => m.Id == "private System.Boolean PrivateBoolReturningMethodWithOptionalCharParameter(System.Char charParameter = 'c')");
-        }
-
-        [Fact]
-        public void PublicDecimalReturningMethodWithAllDefaultParameterTypes()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-            var parameters = string.Join(", ",
-                "Scenarios.MethodTypesClass methodTypes = null",
-                "System.String nullString = null",
-                @"System.String nonNullString = ""string""",
-                "System.Char charDefault = 'c'",
-                "System.Boolean boolDefault = False",
-                "System.Byte byteDefault = 3",
-                "System.SByte sbyteDefault = 5",
-                "System.Int16 shortDefault = 7",
-                "System.UInt16 ushortDefault = 9",
-                "System.Int32 intDefault = 11",
-                "System.UInt32 uintDefault = 13",
-                "System.Int64 longDefault = 15",
-                "System.UInt64 ulongDefault = 17",
-                "System.Double doubleDefault = 19",
-                "System.Single floatDefault = 21",
-                "System.Decimal decimalDefault = 23.0",
-                "System.Threading.CancellationToken cancellation = default(System.Threading.CancellationToken)");
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == $"public System.Decimal PublicDecimalReturningMethodWithAllDefaultParameterTypes({parameters})");
-        }
-
-        [Fact]
-        public void DetectsVoidReturningMethodWithParamsArgument()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public System.Void VoidReturningMethodWithParamsArgument(params System.String[] stringParams)");
-        }
-
-        [Fact]
-        public void DetectsStaticVoidReturningMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public static System.Void StaticVoidReturningMethod()");
-        }
-
-        [Fact]
-        public void DetectsPublicNestedClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.NestedTypesClass+PublicNestedClass");
-        }
-
-        [Fact]
-        public void DetectsProtectedNestedClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "protected class Scenarios.NestedTypesClass+ProtectedNestedClass");
-        }
-
-        [Fact]
-        public void DetectsProtectedInternalNestedClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Single(report.Types, t => t.Id == "protected class Scenarios.NestedTypesClass+ProtectedInternalNestedClass");
-        }
-
-        [Fact]
-        public void DetectsInternalNestedClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.DoesNotContain(report.Types, t => t.Id == "internal class Scenarios.NestedTypesClass+InternalNestedClass");
-        }
-
-        [Fact]
-        public void DetectsPrivateNestedClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.DoesNotContain(report.Types, t => t.Id == "private class Scenarios.NestedTypesClass+PrivateNestedClass");
-        }
-
-        [Fact]
-        public void DetectsPublicNestedInterface()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public interface Scenarios.NestedTypesClass+PublicNestedInterface");
-        }
-
-        [Fact]
-        public void DetectsMultipleLevelsNestedClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.NestedTypesClass+IntermediateNestedClass+MultiLevelNestedClass");
-        }
-
-        [Fact]
-        public void DetectsAbstractClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public abstract class Scenarios.HierarchyAbstractClass");
-        }
-
-        [Fact]
-        public void DetectsGenericInterfaceNestedWithinGenericClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public interface Scenarios.GenericsAndNestedTypes<T0, T1>+IntermediateNonGenericNestedClass+AnotherNestedGenericClass<T2, T3>+ILeafGenericInterface<T4, T5>");
-        }
-
-        [Fact]
-        public void DetectsInstantiatedNestedGenericsCorrectly()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public interface Scenarios.GenericsAndNestedTypes<T0, T1>+IntermediateNonGenericNestedClass+AnotherNestedGenericClass<T2, T3>+ILeafGenericInterface<T4, T5>");
-            var method = Assert.Single(type.Members, m => m.Id == "Scenarios.GenericsAndNestedTypes<T0, T1>+IntermediateNonGenericNestedClass+AnotherNestedGenericClass<T2, T3>+ILeafGenericInterface<System.Int32, System.Boolean> MultipleLevelGenericReturnType(Scenarios.GenericsAndNestedTypes<T0, T1>+IntermediateNonGenericNestedClass intermediate, Scenarios.GenericsAndNestedTypes<T0, T1>+IntermediateNonGenericNestedClass+AnotherNestedGenericClass<System.Boolean, System.Int32> another)");
-        }
-
-        [Fact]
-        public void DetectsAbstractVoidMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public abstract class Scenarios.HierarchyAbstractClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public abstract System.Void AbstractVoidMethod()");
-        }
-
-        [Fact]
-        public void DetectsVirtualVoidMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public abstract class Scenarios.HierarchyAbstractClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public virtual System.Void VirtualVoidMethod()");
-        }
-
-        [Fact]
-        public void DetectsAbstractImplementationMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.HierarchyDerivedClass : Scenarios.HierarchyAbstractClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public override System.Void AbstractVoidMethod()");
-        }
-
-        [Fact]
-        public void DetectsVirtualOverrideMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.HierarchyDerivedClass : Scenarios.HierarchyAbstractClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public override System.Void VirtualVoidMethod()");
-        }
-
-        [Fact]
-        public void DetectsNewMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.HierarchyDerivedClass : Scenarios.HierarchyAbstractClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public new System.Void NonVirtualNonAbstractMethod()");
-        }
-
-        [Fact]
-        public void DetectsSealedClasses()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public sealed class Scenarios.SealedDerivedClass : Scenarios.HierarchyAbstractClass");
-        }
-
-        [Fact]
-        public void DetectsSealedAbstractImplementationMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public sealed class Scenarios.SealedDerivedClass : Scenarios.HierarchyAbstractClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public sealed override System.Void AbstractVoidMethod()");
-        }
-
-        [Fact]
-        public void DetectsSealedVirtualOverrideMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public sealed class Scenarios.SealedDerivedClass : Scenarios.HierarchyAbstractClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public sealed override System.Void VirtualVoidMethod()");
-        }
-
-        [Fact]
-        public void DetectsStaticClasses()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public static class Scenarios.StaticClass");
-        }
-
-        [Fact]
-        public void DetectsExtensionMethods()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public static class Scenarios.ExtensionMethodsClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public static System.String ExtensionMethod(this System.String self)");
-        }
-
-        [Fact]
-        public void DetectsImmediatelyImplementedInterfaces()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.AuthorizeFilter : Scenarios.IFilterFactory");
-        }
-
-        [Fact]
-        public void DoesNotIncludeInterfacesWhenNotExplicitlyReimplemented()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassOverridingVirtualMethodFromBaseClass : Scenarios.IntermediateSubclassNotPartiallyOverridingImplementation");
-        }
-
-        [Fact]
-        public void DoesNotIncludeInterfacesWhenExtendingAnotherMoreSpecificInterfaceAndNotReimplementingAnyMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ConsumesAttribute : System.Attribute, Scenarios.IConsumesActionConstraint");
-        }
-
-        [Fact]
-        public void DetectsExplicitlyImplementedInterfaces()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ExplicitImplementationClass : Scenarios.IInterfaceForExplicitImplementation");
-            Assert.DoesNotContain(type.Members, m => m.Id == "System.Void Scenarios.IInterfaceForExplicitImplementation.ExplicitImplementationMethod()");
-        }
-
-        [Fact]
-        public void DetectsReimplementedInterfaceExplicitly()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassDerivingClassReimplementingInterface : Scenarios.OriginalClassImplementingInterface, Scenarios.IBasicInterfaceForInterfaceReimplementation");
-            Assert.DoesNotContain(type.Members, m => m.Id == "System.Void Scenarios.IBasicInterfaceForInterfaceReimplementation.A()");
-        }
-
-        [Fact]
-        public void DetectsReimplementedInterfaceImplicitly()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassReimplementingInterfaceFromBaseClassWithExplicitImplementedInterface : Scenarios.ExplicitlyImplementedInterfaceBaseClass, Scenarios.IBasicInterfaceForInterfaceReimplementation");
-            var method = Assert.Single(type.Members, m => m.Id == "public System.Void A()");
-        }
-
-        [Fact]
-        public void DetectsGenericTypes()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.GenericType<T0>");
-        }
-
-        [Fact]
-        public void DetectsClosedGenericTypes()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClosedGenericType : Scenarios.GenericType<System.Int32>");
-        }
-
-        [Fact]
-        public void DetectsMultipleGenericTypes()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public interface Scenarios.IMultipleGenericTypes<T0, T1>");
-        }
-
-        [Fact]
-        public void DetectsSemiClosedGenericTypes()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.SemiClosedGenericClass<T0> : Scenarios.IMultipleGenericTypes<System.String, T0>");
-        }
-
-        [Fact]
-        public void DetectsClassNewGenericTypeConstraints()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public interface Scenarios.IGenericInterfaceWithConstraints<T0> where T0 : class, new()");
-        }
-
-        [Fact]
-        public void DetectsStructGenericTypeConstraints()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            var type = Assert.Single(report.Types, t => t.Id == "public interface Scenarios.IGenericInterfaceWithStructConstraint<T0> where T0 : struct");
-        }
-
-        [Fact]
-        public void DetectsGenericInterfaceWithMultipleInterfaceConstraints()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public interface Scenarios.IGenericWithMultipleTypesAndConstraints<T0, T1, T2> where T0 : Scenarios.BaseClassForConstraint where T1 : Scenarios.BaseClassForConstraint, Scenarios.IInterfaceForConstraint, new() where T2 : System.Collections.Generic.IDictionary<T0, T1>, new()");
-        }
-
-        [Fact]
-        public void DetectsGenericClassImplementingGenericInterfaceWithMultipleInterfaceConstraints()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassImplementingGenericWithMultipleTypesAndConstraints<T0, T1, T2> : Scenarios.IGenericWithMultipleTypesAndConstraints<T0, T1, T2> where T0 : Scenarios.BaseClassForConstraint where T1 : Scenarios.BaseClassForConstraint, Scenarios.IInterfaceForConstraint, new() where T2 : System.Collections.Generic.IDictionary<T0, T1>, new()");
-        }
-
-        [Fact]
-        public void DetectsGenericMethod()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public T0 GenericMethod<T0>(T0 typeClassArgument)");
-        }
-
-        [Fact]
-        public void DetectsGenericMethodWithMultipleGenericArguments()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public T0 GenericMethodWithMultipleGenericParameters<T0, T1>(T0 typeClassArgument)");
-        }
-
-        [Fact]
-        public void DetectsMethodWithGenericArgumentsFromClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.GenericClassForGenericMethods<T0, T1>");
-            var method = Assert.Single(type.Members, m => m.Id == "public virtual System.Void MethodWithGenericArgumentsFromClass(T0 first, T1 second)");
-        }
-
-        [Fact]
-        public void DetectsMethodWithGenericArgumentsFromPartiallyClosedClass()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.PartiallyClosedClass<T0> : Scenarios.GenericClassForGenericMethods<T0, System.String>");
-            var method = Assert.Single(type.Members, m => m.Id == "public override System.Void MethodWithGenericArgumentsFromClass(T0 first, System.String second)");
-        }
-
-        [Fact]
-        public void DetectsMethodWithGenericArgumentsAndConstraints()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.GenericMethodsWithConstraintsClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public System.Void GenericMethod<T0>(T0 argument) where T0 : class, new()");
-        }
-
-        [Fact]
-        public void DetectsMethodWithGenericArgumentsAndStructConstraint()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.GenericMethodsWithConstraintsClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public System.Void GenericMethodWithStructParameter<T0>(T0 argument) where T0 : struct");
-        }
-
-        [Fact]
-        public void DetectsMethodWithGenericArgumentsAndTypeAndImplementedInterfacesConstraints()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.GenericMethodsWithConstraintsClass");
-            var method = Assert.Single(type.Members, m => m.Id == "public System.Void GenericMethodWithClassAndInterfacesConstraint<T0>(T0 argument) where T0 : System.Collections.ObjectModel.Collection<System.Int32>, System.Collections.Generic.IDictionary<System.String, System.Int32>");
-        }
-
-        [Fact]
-        public void DetectsPublicFields()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithFields");
-            var member = Assert.Single(type.Members, m => m.Id == "public System.Int32 PublicField");
-        }
-
-        [Fact]
-        public void DetectsReadonlyFields()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithFields");
-            var member = Assert.Single(type.Members, m => m.Id == "public readonly System.Boolean ReadonlyField");
-        }
-
-        [Fact]
-        public void DetectsConstantFields()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithFields");
-            var member = Assert.Single(type.Members, m => m.Id == "public const System.Char ConstantField = 'c'");
-        }
-
-        [Fact]
-        public void DetectsStaticFields()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithFields");
-            var member = Assert.Single(type.Members, m => m.Id == "public static System.String StaticField");
-        }
-
-        [Fact]
-        public void DetectsStaticReadonlyFields()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithFields");
-            var member = Assert.Single(type.Members, m => m.Id == "public static readonly System.String StaticReadonlyField");
-        }
-
-        [Fact]
-        public void DetectsPropertiesAsMethods()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithPropertiesAndEvents");
-            var getter = Assert.Single(type.Members, m => m.Id == "public System.String get_GetAndSetProperty()");
-            var setter = Assert.Single(type.Members, m => m.Id == "public System.Void set_GetAndSetProperty(System.String value)");
-        }
-
-        [Fact]
-        public void DetectsEventsAsMethods()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithPropertiesAndEvents");
-            var getter = Assert.Single(type.Members, m => m.Id == "public System.Void add_IntEvent(System.Action<System.Int32> value)");
-            var setter = Assert.Single(type.Members, m => m.Id == "public System.Void remove_IntEvent(System.Action<System.Int32> value)");
-        }
-
-        [Fact]
-        public void DetectsEnumerations()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public enum Scenarios.CanonicalEnumeration");
-        }
-
-        [Fact]
-        public void DetectsEnumerationsValues()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public enum Scenarios.CanonicalEnumeration");
-            var firstValue = Assert.Single(type.Members, m => m.Id == "FirstValue = 0");
-            var secondValue = Assert.Single(type.Members, m => m.Id == "SecondValue = 1");
-        }
-
-        [Fact]
-        public void DetectsEnumerationsWithDifferentSizes()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public enum Scenarios.LongEnumeration : System.Int64");
-            var firstValue = Assert.Single(type.Members, m => m.Id == "FirstValue = 0");
-            var secondValue = Assert.Single(type.Members, m => m.Id == "ExplicitValue = 5");
-            var thirdValue = Assert.Single(type.Members, m => m.Id == "ValueAfterExplicit = 6");
-        }
-
-        [Fact]
-        public void DetectsConstructors()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithConstructors");
-            var firstValue = Assert.Single(type.Members, m => m.Id == "public .ctor()");
-            var secondValue = Assert.Single(type.Members, m => m.Id == "public .ctor(System.Boolean parameter)");
-            var thirdValue = Assert.Single(type.Members, m => m.Id == "public .ctor(System.String parameter = \"default\", params System.Int32[] values)");
-        }
-
-        [Fact]
-        public void DetectsExplicitConstructorWithParameters()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.ClassWithoutImplicitParameterlessConstructor");
-            var secondValue = Assert.Single(type.Members, m => m.Id == "public .ctor(System.String parameter)");
-        }
-
-        [Fact]
-        public void DetectsMethodParameterDirections()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var secondValue = Assert.Single(type.Members, m => m.Id == "public System.Void MethodWithParametersInDifferentDirections(System.String inParameter, out System.Boolean outParameter, ref System.Int32 refParameter)");
-        }
-
-        [Fact]
-        public void DetectsArrayParameters()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var secondValue = Assert.Single(type.Members, m => m.Id == "public System.Void MethodWithArrayParameter(System.Linq.Expressions.Expression<System.Func<System.Int32, System.Boolean>>[] arrayExpression)");
-        }
-
-        [Fact]
-        public void DetectsParametersWithGenericTypesCorrectly()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-
-            var type = Assert.Single(report.Types, t => t.Id == "public class Scenarios.MethodTypesClass");
-            var secondValue = Assert.Single(type.Members, m => m.Id == "public static System.Boolean TryParseList(System.Collections.Generic.IList<System.String> inputs, out System.Collections.Generic.IList<System.Int32> parsedValues)");
-        }
-
-        [Fact]
-        public void FiltersNonPublicOrProtectedElements()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            foreach (var type in report.Types)
-            {
-                var typeVisibility = type.Visibility;
-                Assert.True(typeVisibility == ApiElementVisibility.Public ||
-                    typeVisibility == ApiElementVisibility.Protected);
-                Assert.NotNull(type.Members);
-
-                foreach (var member in type.Members)
-                {
-                    var memberVisibility = member.Visibility;
-                    Assert.True(memberVisibility == null ||
-                        memberVisibility == ApiElementVisibility.Public ||
-                        memberVisibility == ApiElementVisibility.Protected);
-                }
-            }
-        }
-
-        [Fact]
-        public void FiltersMembersOnTheInternalNamespace()
-        {
-            // Arrange
-            var generator = CreateGenerator(V1Assembly, ApiListingFilters.IsInInternalNamespace);
-
-            // Act
-            var report = generator.GenerateApiListing();
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.DoesNotContain(report.Types, type => type.Name == "Scenarios.Internal.ExcludedType");
-        }
-
-        [Fact]
-        public void LoadFromFiltersMembersOnTheInternalNamespace()
-        {
-            // Arrange
-            var serialized = @"{
-  ""AssemblyIdentity"": ""Test"",
-  ""Types"": [
-    {
-      ""Name"": ""Scenarios.Internal.ExcludedType""
-    }
-  ]
-}";
-
-            // Act
-            var report = ApiListingGenerator.LoadFrom(serialized, new Func<ApiElement, bool>[] { ApiListingFilters.IsInInternalNamespace });
-
-            // Assert
-            Assert.NotNull(report);
-            Assert.NotNull(report.Types);
-            Assert.Empty(report.Types);
-        }
-
-        private ApiListingGenerator CreateGenerator(Assembly assembly, params Func<MemberInfo, bool>[] filters)
-        {
-            filters = filters ?? new Func<MemberInfo, bool>[] { };
-            return new ApiListingGenerator(assembly, filters);
-        }
-    }
-}
diff --git a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj
deleted file mode 100644
index 851737245..000000000
--- a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net452;netcoreapp2.1</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-</Project>
diff --git a/test/ApiCheckBaseline.V1/ComparisonScenarios.cs b/test/ApiCheckBaseline.V1/ComparisonScenarios.cs
deleted file mode 100644
index 47c51ca69..000000000
--- a/test/ApiCheckBaseline.V1/ComparisonScenarios.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-// V1
-namespace ComparisonScenarios
-{
-    public class TypeToBeForwarded
-    {
-        public string Name { get; set; }
-    }
-
-    public class TypeToBeForwardedAndChanged
-    {
-        public string Name { get; set; }
-
-        public string PropertyToBeRemoved { get; set; }
-    }
-
-    public class PublicToInternalClass
-    {
-    }
-
-    public interface TypeToRename
-    {
-    }
-
-    public struct StructToMakeGeneric
-    {
-    }
-
-    public struct StructToRemoveFieldsFrom
-    {
-        public StructToRemoveFieldsFrom(int fieldToIgnore)
-        {
-            FieldToIgnore = 0;
-            FieldToMakeReadonly = 3;
-            FieldToRemove = 4;
-            FieldToMakeWritable = 5;
-        }
-
-        internal int FieldToIgnore;
-
-        public const int ConstToChangeValue = 1;
-
-        public const int ConstToMakeField = 2;
-
-        public int FieldToMakeReadonly;
-
-        public int FieldToRemove;
-
-        public readonly int FieldToMakeWritable;
-
-        public static int StaticFieldToMakeReadonly = 6;
-
-        public static readonly int StaticFieldToMakeConst = 7;
-
-        public static readonly int StaticFieldToMakeWritable = 8;
-    }
-
-    public class ClassToRemoveFieldsFrom
-    {
-        internal int FieldToIgnore = 0;
-
-        public const int ConstToChangeValue = 1;
-
-        public const int ConstToMakeField = 2;
-
-        public int FieldToMakeReadonly = 3;
-
-        public int FieldToRemove = 4;
-
-        public readonly int FieldToMakeWritable = 5;
-
-        public static int StaticFieldToMakeReadonly = 6;
-
-        public static readonly int StaticFieldToMakeConst = 7;
-
-        public static readonly int StaticFieldToMakeWritable = 8;
-    }
-
-    public class ClassToChangeNamespaces
-    {
-    }
-
-    public class ClassToNestContainer
-    {
-    }
-
-    public class ClassToNest
-    {
-    }
-
-    public class ClassToUnnestContainer
-    {
-        public class ClassToUnnest
-        {
-        }
-    }
-
-    public class GenericTypeWithConstraintsToBeAdded<TToConstrain>
-    {
-    }
-
-    public class ClassWithMethods
-    {
-        public void MethodToAddParameters() { }
-    }
-
-    public class TypeWithExtraInterface
-    {
-    }
-
-    public abstract class AbstractClassToAddMethodsTo
-    {
-    }
-
-    public abstract class AbstractClassToAddPropertiesTo
-    {
-        public abstract int PropertyToAddSetterTo { get; }
-    }
-
-    public interface IInterfaceToAddMembersTo
-    {
-        bool ExistingMember { get; set; }
-    }
-
-    public interface IInterfaceWithMembersThatWillGetRenamedRemovedAndAdded
-    {
-        void MemberToBeRenamed();
-        void MemberToBeRemoved();
-    }
-
-    public interface IInterfaceWithSameNumberOfRemovedAndAddedMembers
-    {
-        void FirstMemberToRemove();
-        void SecondMemberToRemove();
-        void ThirdMemberToRemove();
-        void FirstUnchangedMember();
-        void SecondUnchangedMember();
-    }
-}
diff --git a/test/ApiCheckBaseline.V1/Scenarios.cs b/test/ApiCheckBaseline.V1/Scenarios.cs
deleted file mode 100644
index 395a2808a..000000000
--- a/test/ApiCheckBaseline.V1/Scenarios.cs
+++ /dev/null
@@ -1,483 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq.Expressions;
-using System.Threading;
-
-namespace Scenarios
-{
-    public class ApiCheckApiListingV1
-    {
-    }
-    public class BasicClass
-    {
-    }
-
-    public class DerivedClass : BasicClass
-    {
-    }
-
-    public struct BasicStruct
-    {
-    }
-
-    public interface IBasicInterface
-    {
-    }
-
-    public interface IComplexInterface : IBasicInterface
-    {
-    }
-
-    public interface IMultipleLevelInterface : IComplexInterface
-    {
-    }
-
-    public interface IBasicInterfaceForClass { }
-
-    public class ClassImplementingInterface : IBasicInterfaceForClass
-    {
-    }
-
-    public class ClassDerivingClassImplementingInterface : ClassImplementingInterface
-    {
-    }
-
-    public class NestedTypesClass
-    {
-        public class PublicNestedClass
-        {
-        }
-
-        protected class ProtectedNestedClass
-        {
-        }
-
-        protected internal class ProtectedInternalNestedClass
-        {
-        }
-
-        internal class InternalNestedClass
-        {
-        }
-
-        private class PrivateNestedClass
-        {
-        }
-
-        public interface PublicNestedInterface
-        {
-        }
-
-        public class IntermediateNestedClass
-        {
-            public class MultiLevelNestedClass
-            {
-            }
-        }
-    }
-
-    public abstract class HierarchyAbstractClass
-    {
-        public abstract void AbstractVoidMethod();
-
-        public virtual void VirtualVoidMethod()
-        {
-        }
-
-        public void NonVirtualNonAbstractMethod()
-        {
-        }
-    }
-
-    public class HierarchyDerivedClass : HierarchyAbstractClass
-    {
-        public override void AbstractVoidMethod()
-        {
-        }
-
-        public override void VirtualVoidMethod()
-        {
-        }
-
-        public new void NonVirtualNonAbstractMethod()
-        {
-        }
-    }
-
-    public sealed class SealedDerivedClass : HierarchyAbstractClass
-    {
-        public sealed override void AbstractVoidMethod()
-        {
-        }
-
-        public sealed override void VirtualVoidMethod()
-        {
-        }
-    }
-
-    public static class StaticClass
-    {
-    }
-
-    public static class ExtensionMethodsClass
-    {
-        public static string ExtensionMethod(this string self)
-        {
-            return null;
-        }
-    }
-
-    public interface IInterfaceForExplicitImplementation
-    {
-        void ExplicitImplementationMethod();
-    }
-
-    public class ExplicitImplementationClass : IInterfaceForExplicitImplementation
-    {
-        void IInterfaceForExplicitImplementation.ExplicitImplementationMethod()
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public interface IBasicInterfaceForInterfaceReimplementation
-    {
-        void A();
-    }
-
-    public class OriginalClassImplementingInterface : IBasicInterfaceForInterfaceReimplementation
-    {
-        public void A()
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public class ClassDerivingClassReimplementingInterface : OriginalClassImplementingInterface, IBasicInterfaceForInterfaceReimplementation
-    {
-        void IBasicInterfaceForInterfaceReimplementation.A()
-        {
-        }
-    }
-
-    public class ExplicitlyImplementedInterfaceBaseClass : IBasicInterfaceForInterfaceReimplementation
-    {
-        void IBasicInterfaceForInterfaceReimplementation.A()
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public class ClassReimplementingInterfaceFromBaseClassWithExplicitImplementedInterface : ExplicitlyImplementedInterfaceBaseClass, IBasicInterfaceForInterfaceReimplementation
-    {
-        public void A()
-        {
-        }
-    }
-
-    public class GenericType<TGenericArgument>
-    {
-    }
-
-    public class ClosedGenericType : GenericType<int>
-    {
-    }
-
-    public interface IMultipleGenericTypes<TFirst, TSecond>
-    {
-    }
-
-    public class SemiClosedGenericClass<TSecond> : IMultipleGenericTypes<string, TSecond>
-    {
-    }
-
-    public interface IGenericInterfaceWithConstraints<TClassNew>
-        where TClassNew : class, new()
-    {
-    }
-
-    public interface IGenericInterfaceWithStructConstraint<TStruct>
-    where TStruct : struct
-    {
-    }
-
-    public class BaseClassForConstraint
-    {
-    }
-
-    public class DerivedClassForConstraint : BaseClassForConstraint
-    {
-    }
-
-    public interface IInterfaceForConstraint
-    {
-    }
-
-    public class ImplementedInterfaceForConstraint : BaseClassForConstraint, IInterfaceForConstraint
-    {
-    }
-
-    public interface IGenericWithMultipleTypesAndConstraints<TKey, TValue, TDictionary>
-        where TKey : BaseClassForConstraint
-        where TValue : BaseClassForConstraint, IInterfaceForConstraint, new()
-        where TDictionary : IDictionary<TKey, TValue>, new()
-    {
-    }
-
-    public class ClassImplementingGenericWithMultipleTypesAndConstraints<TKey, TValue, TDictionary> :
-        IGenericWithMultipleTypesAndConstraints<TKey, TValue, TDictionary>
-        where TKey : BaseClassForConstraint
-        where TValue : BaseClassForConstraint, IInterfaceForConstraint, new()
-        where TDictionary : IDictionary<TKey, TValue>, new()
-    {
-    }
-
-    public class MethodTypesClass
-    {
-        public void ParameterlessVoidReturningMethod()
-        {
-        }
-
-        protected int ProtectedIntReturningMethod()
-        {
-            return 0;
-        }
-
-        protected internal string ProtectedInternalStringReturningMethodWithStringParameter(string stringParameter)
-        {
-            return null;
-        }
-
-        public MethodTypesClass PublicClassReturningMethodWithOptionalStringParameter(string defaultParameter = "hello")
-        {
-            return null;
-        }
-
-        private bool PrivateBoolReturningMethodWithOptionalCharParameter(char charParameter = 'c')
-        {
-            return false;
-        }
-
-        public decimal PublicDecimalReturningMethodWithAllDefaultParameterTypes(
-            MethodTypesClass methodTypes = null,
-            string nullString = null,
-            string nonNullString = "string",
-            char charDefault = 'c',
-            bool boolDefault = false,
-            byte byteDefault = 3,
-            sbyte sbyteDefault = 5,
-            short shortDefault = 7,
-            ushort ushortDefault = 9,
-            int intDefault = 11,
-            uint uintDefault = 13,
-            long longDefault = 15,
-            ulong ulongDefault = 17,
-            double doubleDefault = 19,
-            float floatDefault = 21.0f,
-            decimal decimalDefault = 23.0M,
-            CancellationToken cancellation = default(CancellationToken))
-        {
-            return 1.0M;
-        }
-
-        public void MethodWithParametersInDifferentDirections(string inParameter, out bool outParameter, ref int refParameter)
-        {
-            outParameter = false;
-            refParameter = 0;
-        }
-
-        public void VoidReturningMethodWithParamsArgument(params string[] stringParams)
-        {
-        }
-
-        public static void StaticVoidReturningMethod()
-        {
-        }
-
-        public TClassType GenericMethod<TClassType>(TClassType typeClassArgument)
-        {
-            return default(TClassType);
-        }
-
-        public TClassType GenericMethodWithMultipleGenericParameters<TClassType, TSecond>(TClassType typeClassArgument)
-        {
-            return default(TClassType);
-        }
-
-        public void MethodWithArrayParameter(Expression<Func<int, bool>>[] arrayExpression)
-        {
-        }
-
-        public static bool TryParseList(IList<string> inputs, out IList<int> parsedValues)
-        {
-            parsedValues = null;
-            return false;
-        }
-    }
-
-    public class GenericClassForGenericMethods<TFirst, TSecond>
-    {
-        public virtual void MethodWithGenericArgumentsFromClass(TFirst first, TSecond second)
-        {
-        }
-    }
-
-    public class PartiallyClosedClass<TFirst> : GenericClassForGenericMethods<TFirst, string>
-    {
-        public override void MethodWithGenericArgumentsFromClass(TFirst first, string second)
-        {
-        }
-    }
-
-    public class GenericMethodsWithConstraintsClass
-    {
-        public void GenericMethod<TClassNew>(TClassNew argument) where TClassNew : class, new()
-        {
-        }
-
-        public void GenericMethodWithStructParameter<TStruct>(TStruct argument) where TStruct : struct
-        {
-        }
-
-        public void GenericMethodWithClassAndInterfacesConstraint<TExtend>(TExtend argument) where TExtend : Collection<int>, IDictionary<string, int>
-        {
-        }
-    }
-
-    public class ClassWithFields
-    {
-        public int PublicField;
-        public readonly bool ReadonlyField;
-        public const char ConstantField = 'c';
-        public static string StaticField = "Static";
-        public static readonly string StaticReadonlyField = "StaticReadonly";
-    }
-
-    public class ClassWithPropertiesAndEvents
-    {
-        public string GetAndSetProperty { get; set; }
-        public event Action<int> IntEvent
-        {
-            add { }
-            remove { }
-        }
-    }
-
-    public enum CanonicalEnumeration
-    {
-        FirstValue,
-        SecondValue
-    }
-
-    public enum LongEnumeration : long
-    {
-        FirstValue,
-        ExplicitValue = 5,
-        ValueAfterExplicit
-    }
-
-    public class ClassWithConstructors
-    {
-        // Parameterless
-        public ClassWithConstructors()
-        {
-        }
-
-        // Different visibility and a parameter
-        public ClassWithConstructors(bool parameter)
-        {
-        }
-
-        public ClassWithConstructors(string parameter = "default", params int[] values)
-        {
-        }
-    }
-
-    public class ClassWithoutImplicitParameterlessConstructor
-    {
-        public ClassWithoutImplicitParameterlessConstructor(string parameter)
-        {
-        }
-    }
-
-    public class AuthorizeFilter : IFilterFactory
-    {
-    }
-
-    public interface IFilterFactory : IFilterMetadata
-    {
-    }
-
-    public interface IFilterMetadata
-    {
-    }
-
-    public class ClassOverridingVirtualMethodFromBaseClass : IntermediateSubclassNotPartiallyOverridingImplementation
-    {
-        public override bool CanWrite(object value) => false;
-    }
-
-    public class IntermediateSubclassNotPartiallyOverridingImplementation : BaseClassImplementingInterface
-    {
-        public sealed override void Write(bool value)
-        {
-            base.Write(value);
-        }
-    }
-
-    public class BaseClassImplementingInterface : IBaseInterface
-    {
-        public virtual bool CanWrite(object value) => false;
-        public virtual void Write(bool value)
-        {
-        }
-    }
-
-    public interface IBaseInterface
-    {
-        bool CanWrite(object value);
-        void Write(bool value);
-    }
-
-    public class ConsumesAttribute : Attribute, IConsumesActionConstraint
-    {
-        public bool Accept() => true;
-    }
-
-    public interface IConsumesActionConstraint : IActionConstraint
-    {
-    }
-
-    public interface IActionConstraint : IFilterMetadata
-    {
-        bool Accept();
-    }
-
-    public class GenericsAndNestedTypes<T, K>
-    {
-        public class IntermediateNonGenericNestedClass
-        {
-            public class AnotherNestedGenericClass<V, W>
-            {
-                public interface ILeafGenericInterface<A,B>
-                {
-                    void GenericMethod<Z>();
-                    void NonGenericMethod<C>();
-
-                    ILeafGenericInterface<int, bool> MultipleLevelGenericReturnType(IntermediateNonGenericNestedClass intermediate, AnotherNestedGenericClass<bool, int> another);
-                }
-            }
-        }
-    }
-}
-
-namespace Scenarios.Internal
-{
-    public class ExcludedType
-    {
-    }
-}
\ No newline at end of file
diff --git a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj
deleted file mode 100644
index 4ecc7608d..000000000
--- a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net452;netcoreapp2.1</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ApiCheckForwardDestination\ApiCheckForwardDestination.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/test/ApiCheckBaseline.V2/ComparisonScenarios.cs b/test/ApiCheckBaseline.V2/ComparisonScenarios.cs
deleted file mode 100644
index 6e8093cd1..000000000
--- a/test/ApiCheckBaseline.V2/ComparisonScenarios.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-// V2
-[assembly: TypeForwardedTo(typeof(ComparisonScenarios.TypeToBeForwarded))]
-[assembly: TypeForwardedTo(typeof(ComparisonScenarios.TypeToBeForwardedAndChanged))]
-
-namespace ComparisonScenarios
-{
-    internal class PublicToInternalClass
-    {
-    }
-
-    public interface TypeToRenameRenamed
-    {
-    }
-
-    public struct StructToMakeGeneric<TGenericType>
-    {
-    }
-
-    public struct StructToRemoveFieldsFrom
-    {
-        public StructToRemoveFieldsFrom(int fieldToIgnore)
-        {
-            FieldToMakeReadonly = 3;
-            FieldToMakeWritable = 5;
-        }
-
-        public const int ConstToChangeValue = 0;
-
-        public static readonly int ConstToMakeField = 2;
-
-        public readonly int FieldToMakeReadonly;
-
-        public int FieldToMakeWritable;
-
-        public static readonly int StaticFieldToMakeReadonly = 6;
-
-        public const int StaticFieldToMakeConst = 7;
-
-        public static int StaticFieldToMakeWritable = 8;
-    }
-
-    public class ClassToRemoveFieldsFrom
-    {
-        public const int ConstToChangeValue = 0;
-
-        public static readonly int ConstToMakeField = 2;
-
-        public readonly int FieldToMakeReadonly = 3;
-
-        public int FieldToMakeWritable = 5;
-
-        public static readonly int StaticFieldToMakeReadonly = 6;
-
-        public const int StaticFieldToMakeConst = 7;
-
-        public static int StaticFieldToMakeWritable = 8;
-    }
-
-    public class ClassToNestContainer
-    {
-        public class ClassToNest
-        {
-        }
-    }
-
-    public class ClassToUnnestContainer
-    {
-    }
-
-    public class ClassToUnnest
-    {
-    }
-
-    public class GenericTypeWithConstraintsToBeAdded<TToConstrain> where TToConstrain : IEnumerable<TToConstrain>, new()
-    {
-    }
-
-    public class ClassWithMethods
-    {
-        public void MethodToAddParameters(int addedParameter) { }
-    }
-
-    public class TypeWithExtraInterface : IExtraInterface
-    {
-        public int Property { get; set; }
-    }
-
-    public interface IExtraInterface
-    {
-        int Property { get; set; }
-    }
-
-    public abstract class AbstractClassToAddMethodsTo
-    {
-        public abstract void NewAbstractMethod();
-
-        public virtual void NewVirtualMethod() { }
-
-        public void NewMethod() { }
-
-        internal abstract void NewInternalMethod();
-    }
-
-    public abstract class AbstractClassToAddPropertiesTo
-    {
-        public abstract int NewAbstractProperty { get; }
-
-        public abstract int PropertyToAddSetterTo { get; set; }
-
-        public int NewProperty => 0;
-
-        public virtual int NewVirtualProperty => 0;
-
-        internal abstract int NewInternalProperty { get; }
-    }
-
-    public interface IInterfaceToAddMembersTo
-    {
-        bool ExistingMember { get; set; }
-        int NewMember { get; set; }
-    }
-
-    public interface IInterfaceWithMembersThatWillGetRenamedRemovedAndAdded
-    {
-        void RenamedMember();
-        void AddedMember();
-    }
-
-    public interface IInterfaceWithSameNumberOfRemovedAndAddedMembers
-    {
-        void FirstUnchangedMember();
-        void SecondUnchangedMember();
-        void FirstAddedMember();
-        void SecondAddedMember();
-        void ThirdAddedMember();
-    }
-}
-
-namespace ComparisonScenarios.ChangedNamespace
-{
-    public class ClassToChangeNamespaces
-    {
-    }
-}
diff --git a/test/ApiCheckBaseline.V2/Scenarios.cs b/test/ApiCheckBaseline.V2/Scenarios.cs
deleted file mode 100644
index 1ffc918ad..000000000
--- a/test/ApiCheckBaseline.V2/Scenarios.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace ApiCheckApiListing.V2
-{
-    public class ApiCheckApiListingV2
-    {
-    }
-}
diff --git a/test/ApiCheckForwardDestination/ApiCheckForwardDestination.csproj b/test/ApiCheckForwardDestination/ApiCheckForwardDestination.csproj
deleted file mode 100644
index 7b685eeeb..000000000
--- a/test/ApiCheckForwardDestination/ApiCheckForwardDestination.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net452;netcoreapp2.1</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-</Project>
diff --git a/test/ApiCheckForwardDestination/ComparisonScenarios.cs b/test/ApiCheckForwardDestination/ComparisonScenarios.cs
deleted file mode 100644
index 81f050d9c..000000000
--- a/test/ApiCheckForwardDestination/ComparisonScenarios.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace ComparisonScenarios
-{
-    public class TypeToBeForwarded
-    {
-        public string Name { get; set; }
-    }
-
-    public class TypeToBeForwardedAndChanged
-    {
-        public string Name { get; set; }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/BuildTools.Tasks.Tests.csproj b/test/BuildTasks.Tests/BuildTasks.Tests.csproj
similarity index 85%
rename from test/BuildTools.Tasks.Tests/BuildTools.Tasks.Tests.csproj
rename to test/BuildTasks.Tests/BuildTasks.Tests.csproj
index a55fba799..a648451a2 100644
--- a/test/BuildTools.Tasks.Tests/BuildTools.Tasks.Tests.csproj
+++ b/test/BuildTasks.Tests/BuildTasks.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\modules\BuildTools.Tasks\BuildTools.Tasks.csproj" />
+    <ProjectReference Include="..\..\src\Internal.AspNetCore.BuildTasks\Internal.AspNetCore.BuildTasks.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/BuildTools.Tasks.Tests/GenerateFileFromTemplateTests.cs b/test/BuildTasks.Tests/GenerateFileFromTemplateTests.cs
similarity index 100%
rename from test/BuildTools.Tasks.Tests/GenerateFileFromTemplateTests.cs
rename to test/BuildTasks.Tests/GenerateFileFromTemplateTests.cs
diff --git a/test/BuildTools.Tasks.Tests/CreateSourceLinkTest.cs b/test/BuildTools.Tasks.Tests/CreateSourceLinkTest.cs
deleted file mode 100644
index 10854c627..000000000
--- a/test/BuildTools.Tasks.Tests/CreateSourceLinkTest.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using Microsoft.AspNetCore.BuildTools;
-using Microsoft.DotNet.PlatformAbstractions;
-using Xunit;
-
-namespace BuildTools.Tasks.Tests
-{
-    public class CreateSourceLinkTest
-    {
-        [Fact]
-        public void CreatesFile()
-        {
-            var destination = "sourcelink.json";
-
-            var repoName = "aspnet/BuildTools";
-
-            var originUrl = $"git@github.com:{repoName}.git";
-            var commit = "5153bbdfa98dcc27a61d591ce09a0d632875e66f";
-            var sourceLinkRoot = GetSourceLinkRoot();
-
-            var task = new CreateSourceLink
-            {
-                OriginUrl = originUrl,
-                Commit = commit,
-                DestinationFile = destination,
-                SourceLinkRoot = sourceLinkRoot
-            };
-
-            try
-            {
-                Assert.True(task.Execute(), "The task failed but should have passed.");
-                Assert.True(File.Exists(destination), "SourceLink file doesn't exist.");
-
-                var expectedUrl = $"https://raw.githubusercontent.com/{repoName}/{commit}/*";
-                var expected = $"{{\"documents\":{{\"{GetExpectedRootDirectory()}*\":\"{expectedUrl}\"}}}}";
-
-                var resultText = File.ReadAllText(destination);
-
-                Assert.Equal(expected, resultText);
-            }
-            finally
-            {
-                File.Delete(destination);
-            }
-        }
-
-        [Theory]
-        [InlineData("/_/")]
-        [InlineData("C:\\")]
-        [InlineData("/home/src/")]
-        public void DoesNotChangeBackslashes(string sourceLinkRoot)
-        {
-            var destination = "sourcelink.json";
-
-            var repoName = "aspnet/BuildTools";
-
-            var originUrl = $"git@github.com:{repoName}.git";
-            var commit = "5153bbdfa98dcc27a61d591ce09a0d632875e66f";
-
-            var task = new CreateSourceLink
-            {
-                OriginUrl = originUrl,
-                Commit = commit,
-                DestinationFile = destination,
-                SourceLinkRoot = sourceLinkRoot
-            };
-
-            try
-            {
-                Assert.True(task.Execute(), "The task failed but should have passed.");
-                Assert.True(File.Exists(destination), "SourceLink file doesn't exist.");
-                var expectedSourceLinkRoot = sourceLinkRoot.Replace(@"\", @"\\");
-                var expectedUrl = $"https://raw.githubusercontent.com/{repoName}/{commit}/*";
-                var expected = $"{{\"documents\":{{\"{expectedSourceLinkRoot}*\":\"{expectedUrl}\"}}}}";
-
-                var resultText = File.ReadAllText(destination);
-
-                Assert.Equal(expected, resultText);
-            }
-            finally
-            {
-                File.Delete(destination);
-            }
-        }
-
-        [Fact]
-        public void HandlesHttps()
-        {
-            var destination = "sourcelink.json";
-
-            var repoName = "aspnet/BuildTools";
-
-            var originUrl = $"https://github.com/{repoName}.git";
-            var commit = "5153bbdfa98dcc27a61d591ce09a0d632875e66f";
-            var rootDir = GetSourceLinkRoot();
-
-            var task = new CreateSourceLink
-            {
-                OriginUrl = originUrl,
-                Commit = commit,
-                DestinationFile = destination,
-                SourceLinkRoot = rootDir
-            };
-
-            try
-            {
-                Assert.True(task.Execute(), "The task failed but should have passed.");
-                Assert.True(File.Exists(destination), "SourceLink file doesn't exist.");
-
-                var expectedUrl = $"https://raw.githubusercontent.com/{repoName}/{commit}/*";
-                var expected = $"{{\"documents\":{{\"{GetExpectedRootDirectory()}*\":\"{expectedUrl}\"}}}}";
-
-                Assert.Equal(expected, File.ReadAllText(destination));
-            }
-            finally
-            {
-                File.Delete(destination);
-            }
-        }
-
-        private static string GetExpectedRootDirectory()
-        {
-            switch (RuntimeEnvironment.OperatingSystemPlatform)
-            {
-                case Platform.Windows:
-                    return "C:\\\\";
-                case Platform.Linux:
-                case Platform.Darwin:
-                    return "/home/";
-                default:
-                    throw new NotImplementedException($"SourceLink tests don't yet support {RuntimeEnvironment.OperatingSystemPlatform}.");
-            }
-        }
-
-        private static string GetSourceLinkRoot()
-        {
-            switch (RuntimeEnvironment.OperatingSystemPlatform)
-            {
-                case Platform.Windows:
-                    return @"C:\";
-                case Platform.Linux:
-                case Platform.Darwin:
-                    return "/home/";
-                default:
-                    throw new NotImplementedException($"SourceLink tests don't yet support {RuntimeEnvironment.OperatingSystemPlatform}.");
-            }
-        }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/GenerateResxDesignerFilesTest.cs b/test/BuildTools.Tasks.Tests/GenerateResxDesignerFilesTest.cs
deleted file mode 100644
index a2abad593..000000000
--- a/test/BuildTools.Tasks.Tests/GenerateResxDesignerFilesTest.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using Microsoft.AspNetCore.BuildTools;
-using Microsoft.Build.Utilities;
-using Xunit;
-
-namespace BuildTools.Tasks.Tests
-{
-    public class GenerateResxDesignerFilesTest
-    {
-        [Fact]
-        public void GeneratesResx()
-        {
-            var resx = Path.Combine(AppContext.BaseDirectory, "Resources", "Strings.resx");
-
-            var item = new TaskItem(resx);
-            item.SetMetadata("ManifestResourceName", "Microsoft.Extensions.Logging.Abstractions.Resource");
-            item.SetMetadata("Type", "Resx");
-
-            var engine = new MockEngine();
-            var task = new GenerateResxDesignerFiles
-            {
-                ResourceFiles = new[] { item },
-                BuildEngine = engine,
-            };
-
-            var expectedFile = Path.Combine(AppContext.BaseDirectory, "Resources", "Strings.Designer.cs.txt");
-            var actualFile = Path.Combine(AppContext.BaseDirectory, "Resources", "Strings.Designer.cs");
-            if (File.Exists(actualFile))
-            {
-                File.Delete(actualFile);
-            }
-
-            Assert.True(task.Execute(), "Task failed");
-            Assert.Empty(engine.Warnings);
-
-            Assert.Equal(actualFile, Assert.Single(task.FileWrites).ItemSpec);
-            Assert.True(File.Exists(actualFile), "Actual file does not exist");
-            Assert.Equal(File.ReadAllText(expectedFile), File.ReadAllText(actualFile), ignoreLineEndingDifferences: true);
-        }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/GetAssemblyFileVersionTest.cs b/test/BuildTools.Tasks.Tests/GetAssemblyFileVersionTest.cs
deleted file mode 100644
index c16d8aa0b..000000000
--- a/test/BuildTools.Tasks.Tests/GetAssemblyFileVersionTest.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Xunit;
-
-namespace Microsoft.AspNetCore.BuildTools
-{
-    public class GetAssemblyFileVersionTest
-    {
-        [Fact]
-        public void Execute_SetsAssemblyFileVersionToAssemblyVersion_IfRevisionIsSet()
-        {
-            // Arrange
-            var getAssemblyFileVersion = new GetAssemblyFileVersion
-            {
-                AssemblyVersion = "1.2.3.4",
-                AssemblyRevision = 78,
-            };
-
-            // Act
-            var result = getAssemblyFileVersion.Execute();
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal("1.2.3.4", getAssemblyFileVersion.AssemblyFileVersion);
-        }
-
-        [Theory]
-        [InlineData("1.2.3")]
-        [InlineData("1.2.3.0")]
-        public void Execute_UsesAssemblyRevision_IfRevisionIsNotSet(string assemblyVersion)
-        {
-            // Arrange
-            var getAssemblyFileVersion = new GetAssemblyFileVersion
-            {
-                AssemblyVersion = assemblyVersion,
-                AssemblyRevision = 78,
-            };
-
-            // Act
-            var result = getAssemblyFileVersion.Execute();
-
-            // Assert
-            Assert.True(result);
-            Assert.Equal("1.2.3.78", getAssemblyFileVersion.AssemblyFileVersion);
-        }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/GetGitCommitInfoTests.cs b/test/BuildTools.Tasks.Tests/GetGitCommitInfoTests.cs
deleted file mode 100644
index a66ce9f20..000000000
--- a/test/BuildTools.Tasks.Tests/GetGitCommitInfoTests.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.IO.Compression;
-using BuildTools.Tasks.Tests;
-using Xunit;
-
-namespace Microsoft.AspNetCore.BuildTools.Tests
-{
-    public class GetGitCommitInfoTests : IDisposable
-    {
-        private readonly string _tempDir;
-
-        public GetGitCommitInfoTests()
-        {
-            _tempDir = Path.Combine(AppContext.BaseDirectory, Path.GetRandomFileName());
-            Directory.CreateDirectory(_tempDir);
-        }
-
-        public void Dispose()
-        {
-            Directory.Delete(_tempDir, recursive: true);
-        }
-
-        private string CreateTestRepro(string name)
-        {
-            ZipFile.ExtractToDirectory(Path.Combine(AppContext.BaseDirectory, "Resources", name), _tempDir, overwriteFiles: true);
-            return Path.Combine(_tempDir, Path.GetFileNameWithoutExtension(name));
-        }
-
-        [Fact]
-        public void ItFindsCommitHashFromSparseCheckout()
-        {
-            var engine = new MockEngine();
-            var task = new GetGitCommitInfo
-            {
-                BuildEngine = engine,
-                WorkingDirectory = CreateTestRepro("SparseCheckout.zip"),
-            };
-            Assert.True(task.Execute(), "Task should pass");
-
-            Assert.Equal("7896eb0373dac70940819ef6a6494fdeb4880391", task.CommitHash);
-            Assert.Equal("dev", task.Branch);
-        }
-
-        [Fact]
-        public void ItFindsCommitHash()
-        {
-            var engine = new MockEngine();
-            var task = new GetGitCommitInfo
-            {
-                BuildEngine = engine,
-                WorkingDirectory = CreateTestRepro("SimpleGitRepo.zip"),
-            };
-            Assert.True(task.Execute(), "Task should pass");
-
-            Assert.Equal("9c03629e11679f5f3d9dbbd27286239588e0d296", task.CommitHash);
-            Assert.Equal("master", task.Branch);
-        }
-
-        [Fact]
-        public void ItFindsCommitHashInWorktree()
-        {
-            var root = CreateTestRepro("WorktreeRepo.zip");
-
-            var engine = new MockEngine();
-            var task = new GetGitCommitInfo
-            {
-                BuildEngine = engine,
-                WorkingDirectory = Path.Combine(root, "SourceRoot"),
-            };
-
-            Assert.True(task.Execute(), "Task should pass");
-            Assert.Equal("27a9c92f96a117ff926c12beb9d4ea8d0f127e42", task.CommitHash);
-            Assert.Equal("master", task.Branch);
-
-            engine = new MockEngine();
-            task = new GetGitCommitInfo
-            {
-                BuildEngine = engine,
-                WorkingDirectory = Path.Combine(root, "Worktree1"),
-            };
-
-            Assert.True(task.Execute(), "Task should pass");
-            Assert.Equal("51bd19b3825fbc3e96fbdabc9f2cfa9972999bfa", task.CommitHash);
-            Assert.Equal("worktree1", task.Branch);
-        }
-
-        [Fact]
-        public void ItFindsCommitHashInSubmodule()
-        {
-            var root = CreateTestRepro("SubmoduleRepo.zip");
-
-            var engine = new MockEngine();
-            var task = new GetGitCommitInfo
-            {
-                BuildEngine = engine,
-                WorkingDirectory = root,
-            };
-
-            Assert.True(task.Execute(), "Task should pass");
-            Assert.Equal("91314ecce9e7d3cbd1d3f4d1f35664f52a301479", task.CommitHash);
-            Assert.Equal("master", task.Branch);
-
-            engine = new MockEngine();
-            task = new GetGitCommitInfo
-            {
-                BuildEngine = engine,
-                WorkingDirectory = Path.Combine(root, "modules", "submodule1"),
-            };
-
-            Assert.True(task.Execute(), "Task should pass");
-            Assert.Equal("599e691c41f502ed9e062b1822ce13b673fc916e", task.CommitHash);
-            Assert.Equal("dev", task.Branch);
-        }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/Resources/SimpleGitRepo.zip b/test/BuildTools.Tasks.Tests/Resources/SimpleGitRepo.zip
deleted file mode 100644
index 1168f3e73..000000000
Binary files a/test/BuildTools.Tasks.Tests/Resources/SimpleGitRepo.zip and /dev/null differ
diff --git a/test/BuildTools.Tasks.Tests/Resources/SparseCheckout.zip b/test/BuildTools.Tasks.Tests/Resources/SparseCheckout.zip
deleted file mode 100644
index 933a12917..000000000
Binary files a/test/BuildTools.Tasks.Tests/Resources/SparseCheckout.zip and /dev/null differ
diff --git a/test/BuildTools.Tasks.Tests/Resources/Strings.Designer.cs.txt b/test/BuildTools.Tasks.Tests/Resources/Strings.Designer.cs.txt
deleted file mode 100644
index b7e25474d..000000000
--- a/test/BuildTools.Tasks.Tests/Resources/Strings.Designer.cs.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-// <auto-generated />
-namespace Microsoft.Extensions.Logging.Abstractions
-{
-    using System.Globalization;
-    using System.Reflection;
-    using System.Resources;
-
-    internal static class Resource
-    {
-        private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.Extensions.Logging.Abstractions.Resource", typeof(Resource).GetTypeInfo().Assembly);
-
-        /// <summary>
-        /// The format string '{0}' does not have the expected number of named parameters. Expected {1} parameter(s) but found {2} parameter(s).
-        /// </summary>
-        internal static string UnexpectedNumberOfNamedParameters
-        {
-            get => GetString("UnexpectedNumberOfNamedParameters");
-        }
-
-        /// <summary>
-        /// The format string '{0}' does not have the expected number of named parameters. Expected {1} parameter(s) but found {2} parameter(s).
-        /// </summary>
-        internal static string FormatUnexpectedNumberOfNamedParameters(object p0, object p1, object p2)
-            => string.Format(CultureInfo.CurrentCulture, GetString("UnexpectedNumberOfNamedParameters"), p0, p1, p2);
-
-        private static string GetString(string name, params string[] formatterNames)
-        {
-            var value = _resourceManager.GetString(name);
-
-            System.Diagnostics.Debug.Assert(value != null);
-
-            if (formatterNames != null)
-            {
-                for (var i = 0; i < formatterNames.Length; i++)
-                {
-                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
-                }
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/Resources/Strings.resx b/test/BuildTools.Tasks.Tests/Resources/Strings.resx
deleted file mode 100644
index 5112bed03..000000000
--- a/test/BuildTools.Tasks.Tests/Resources/Strings.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="UnexpectedNumberOfNamedParameters" xml:space="preserve">
-    <value>The format string '{0}' does not have the expected number of named parameters. Expected {1} parameter(s) but found {2} parameter(s).</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/test/BuildTools.Tasks.Tests/Resources/SubmoduleRepo.zip b/test/BuildTools.Tasks.Tests/Resources/SubmoduleRepo.zip
deleted file mode 100644
index 13cdf3cde..000000000
Binary files a/test/BuildTools.Tasks.Tests/Resources/SubmoduleRepo.zip and /dev/null differ
diff --git a/test/BuildTools.Tasks.Tests/Resources/WorktreeRepo.zip b/test/BuildTools.Tasks.Tests/Resources/WorktreeRepo.zip
deleted file mode 100644
index 4b1407329..000000000
Binary files a/test/BuildTools.Tasks.Tests/Resources/WorktreeRepo.zip and /dev/null differ
diff --git a/test/BuildTools.Tasks.Tests/Resources/sampledata.json b/test/BuildTools.Tasks.Tests/Resources/sampledata.json
deleted file mode 100644
index c8f0b8aa7..000000000
--- a/test/BuildTools.Tasks.Tests/Resources/sampledata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "sdk": { "version": "1.2.3" },
-  "runtimes": [
-    {
-      "version": "1.0.0-beta"
-    },
-    {
-      "version": "1.0.0-alpha"
-    }
-  ]
-}
diff --git a/test/BuildTools.Tasks.Tests/RunTaskTests.cs b/test/BuildTools.Tasks.Tests/RunTaskTests.cs
deleted file mode 100644
index 6b4761192..000000000
--- a/test/BuildTools.Tasks.Tests/RunTaskTests.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using Microsoft.AspNetCore.BuildTools;
-using Xunit;
-
-namespace BuildTools.Tasks.Tests
-{
-    public class RunTaskTests
-    {
-        [Fact]
-        public void ExitCodeIsNonZeroIfFailedToStart()
-        {
-            var engine = new MockEngine { ContinueOnError = true };
-            var task = new Run
-            {
-                FileName = "sdfkjskldfsjdflkajsdas",
-                BuildEngine = engine,
-            };
-            Assert.False(task.Execute());
-            Assert.NotEqual(0, task.ExitCode);
-        }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/UnzipArchiveTest.cs b/test/BuildTools.Tasks.Tests/UnzipArchiveTest.cs
deleted file mode 100644
index fcbf0c9d9..000000000
--- a/test/BuildTools.Tasks.Tests/UnzipArchiveTest.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using Microsoft.AspNetCore.BuildTools;
-using Xunit;
-
-using ZipArchiveStream = System.IO.Compression.ZipArchive;
-using System.IO.Compression;
-
-namespace BuildTools.Tasks.Tests
-{
-    public class UnzipArchiveTest : IDisposable
-    {
-        private readonly string _tempDir;
-
-        public UnzipArchiveTest()
-        {
-            _tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-            Directory.CreateDirectory(_tempDir);
-        }
-
-        [Fact]
-        public void UnzipsFile()
-        {
-            var files = new[]
-            {
-                "a.txt",
-                "dir/b.txt",
-            };
-
-            var dest = CreateZip(files);
-            var outDir = Path.Combine(_tempDir, "out");
-
-            var task = new UnzipArchive
-            {
-                File = dest,
-                Destination = outDir,
-                BuildEngine = new MockEngine(),
-            };
-
-            Assert.True(task.Execute(), "The task failed but should have passed.");
-            Assert.True(Directory.Exists(outDir), outDir + " does not exist");
-            Assert.Equal(files.Length, task.OutputFiles.Length);
-
-            Assert.All(task.OutputFiles,
-                f => Assert.True(Path.IsPathRooted(f.ItemSpec), $"Entry {f} should be a fullpath rooted"));
-
-            foreach (var file in files)
-            {
-                var outFile = Path.Combine(outDir, file);
-                Assert.True(File.Exists(outFile), outFile + " does not exist");
-            }
-        }
-
-        [Fact]
-        public void UnzipsSubdirectories()
-        {
-            var files = new[]
-            {
-                "a/b/c/d.dll",
-                "e/f/j/k/l.json",
-                "e/f/m/n/o.json"
-            };
-
-            var dest = CreateZip(files);
-            var outDir = Path.Combine(_tempDir, "out");
-
-            var task = new UnzipArchive
-            {
-                File = dest,
-                Destination = outDir,
-                BuildEngine = new MockEngine(),
-            };
-
-            Assert.True(task.Execute(), "The task failed but should have passed.");
-            Assert.True(Directory.Exists(outDir), outDir + " does not exist");
-            Assert.Equal(files.Length, task.OutputFiles.Length);
-
-            Assert.All(task.OutputFiles,
-                f => Assert.True(Path.IsPathRooted(f.ItemSpec), $"Entry {f} should be a fullpath rooted"));
-
-            foreach (var file in files)
-            {
-                var outFile = Path.Combine(outDir, file);
-                Assert.True(File.Exists(outFile), outFile + " does not exist");
-            }
-        }
-
-        [Fact]
-        public void Overwrites()
-        {
-            var files = new[]
-            {
-                "a.txt",
-                "dir/b.txt"
-            };
-
-            var dest = CreateZip(files);
-            var outDir = Path.Combine(_tempDir, "out");
-
-            var task = new UnzipArchive
-            {
-                File = dest,
-                Destination = outDir,
-                BuildEngine = new MockEngine(),
-                Overwrite = true
-            };
-
-            Directory.CreateDirectory(outDir);
-
-            // Create a.txt before trying to unzip
-            var path = Path.Combine(outDir, "a.txt");
-            File.WriteAllText(path, "contents!");
-            Assert.True(task.Execute(), "The task failed but should have passed.");
-            Assert.Empty(File.ReadAllText(path));
-        }
-
-        [Fact]
-        public void DoesNotOverwrite()
-        {
-            var files = new[]
-            {
-                "a.txt",
-                "dir/b.txt"
-            };
-
-            var dest = CreateZip(files);
-            var outDir = Path.Combine(_tempDir, "out");
-
-            var task = new UnzipArchive
-            {
-                File = dest,
-                Destination = outDir,
-                BuildEngine = new MockEngine(),
-                Overwrite = false
-            };
-
-            Directory.CreateDirectory(outDir);
-
-            // Create a.txt before trying to unzip
-            var path = Path.Combine(outDir, "a.txt");
-            var contents = "contents!";
-            File.WriteAllText(path, contents);
-
-            Assert.Throws<IOException>(() => task.Execute());
-
-            Assert.Equal(contents, File.ReadAllText(path));
-        }
-
-        [Fact]
-        public void ItNormalizesBacklashesInPath()
-        {
-            var files = new[]
-            {
-                @"dir\b.txt"
-            };
-
-            var dest = CreateZip(files);
-            var outDir = Path.Combine(_tempDir, "out");
-
-            var engine = new MockEngine();
-            var task = new UnzipArchive
-            {
-                File = dest,
-                Destination = outDir,
-                BuildEngine = engine,
-                Overwrite = false
-            };
-
-            Assert.True(task.Execute(), "The task failed but should have passed.");
-            Assert.True(File.Exists(Path.Combine(outDir, "dir", "b.txt")), "File should exist.");
-        }
-
-        private string CreateZip(string[] files)
-        {
-            var dest = Path.Combine(_tempDir, "test.zip");
-
-            using (var fileStream = new FileStream(dest, FileMode.Create))
-            using (var zipStream = new ZipArchiveStream(fileStream, ZipArchiveMode.Create))
-            {
-                foreach (var file in files)
-                {
-                    zipStream.CreateEntry(file);
-                }
-            }
-
-            return dest;
-        }
-
-        public void Dispose()
-        {
-            Directory.Delete(_tempDir, recursive: true);
-        }
-    }
-}
diff --git a/test/BuildTools.Tasks.Tests/ZipArchiveTest.cs b/test/BuildTools.Tasks.Tests/ZipArchiveTest.cs
deleted file mode 100644
index c39ad48bd..000000000
--- a/test/BuildTools.Tasks.Tests/ZipArchiveTest.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.AspNetCore.BuildTools;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Xunit;
-
-using ZipArchiveStream = System.IO.Compression.ZipArchive;
-
-namespace BuildTools.Tasks.Tests
-{
-    public class ZipArchiveTest : IDisposable
-    {
-        private readonly string _tempDir;
-
-        public ZipArchiveTest()
-        {
-            _tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-            Directory.CreateDirectory(_tempDir);
-        }
-
-        [Fact]
-        public void ZipsLinkItems()
-        {
-            var inputFile = Path.Combine(_tempDir, "..", Guid.NewGuid().ToString());
-            var dest = Path.Combine(_tempDir, "test.zip");
-            var linkItem = new TaskItem(inputFile);
-            linkItem.SetMetadata("Link", "temp/temp/temp/file.txt");
-            try
-            {
-                File.WriteAllText(inputFile, "");
-                var task = new ZipArchive
-                {
-                    SourceFiles = new[] { linkItem },
-                    WorkingDirectory = Path.Combine(_tempDir, "temp"),
-                    File = dest,
-                    BuildEngine = new MockEngine(),
-                };
-                Assert.True(task.Execute());
-
-                using (var fileStream = new FileStream(dest, FileMode.Open))
-                using (var zipStream = new ZipArchiveStream(fileStream))
-                {
-                    var entry = Assert.Single(zipStream.Entries);
-                    Assert.Equal("temp/temp/temp/file.txt", entry.FullName);
-                }
-            }
-            finally
-            {
-                File.Delete(inputFile);
-            }
-        }
-
-        [Fact]
-        public void CreatesZip()
-        {
-            var files = new[]
-            {
-                "a.txt",
-                "dir/b.txt",
-                @"dir\c.txt",
-            };
-
-            var dest = Path.Combine(_tempDir, "test.zip");
-            Assert.False(File.Exists(dest));
-
-            var task = new ZipArchive
-            {
-                SourceFiles = CreateItems(files).ToArray(),
-                WorkingDirectory = _tempDir,
-                File = dest,
-                Overwrite = true,
-                BuildEngine = new MockEngine(),
-            };
-
-            Assert.True(task.Execute());
-            Assert.True(File.Exists(dest));
-
-            using (var fileStream = new FileStream(dest, FileMode.Open))
-            using (var zipStream = new ZipArchiveStream(fileStream))
-            {
-                Assert.Equal(files.Length, zipStream.Entries.Count);
-                Assert.Collection(zipStream.Entries,
-                    a => Assert.Equal("a.txt", a.FullName),
-                    b => Assert.Equal("dir/b.txt", b.FullName),
-                    c => Assert.Equal("dir/c.txt", c.FullName));
-            }
-        }
-
-        [Fact]
-        public void FailsIfFileExists()
-        {
-             var files = new[]
-            {
-                "test.txt",
-            };
-
-            var dest = Path.Combine(_tempDir, "test.zip");
-            File.WriteAllText(dest, "Original");
-
-            var task = new ZipArchive
-            {
-                SourceFiles = CreateItems(files).ToArray(),
-                WorkingDirectory = _tempDir,
-                File = dest,
-                Overwrite = false,
-                BuildEngine = new MockEngine { ContinueOnError = true },
-            };
-
-            Assert.False(task.Execute(), "Task should fail");
-            Assert.Equal("Original", File.ReadAllText(dest));
-        }
-
-        [Fact]
-        public void OverwriteReplacesEntireZip()
-        {
-            var files1 = new[]
-            {
-                "a.txt",
-                "dir/b.txt",
-                @"dir\c.txt",
-            };
-
-            var files2 = new[]
-            {
-                "test.txt",
-            };
-
-            var dest = Path.Combine(_tempDir, "test.zip");
-            Assert.False(File.Exists(dest));
-
-            var task = new ZipArchive
-            {
-                SourceFiles = CreateItems(files1).ToArray(),
-                WorkingDirectory = _tempDir,
-                File = dest,
-                BuildEngine = new MockEngine(),
-            };
-
-            Assert.True(task.Execute());
-            Assert.True(File.Exists(dest));
-
-            task = new ZipArchive
-            {
-                SourceFiles = CreateItems(files2).ToArray(),
-                WorkingDirectory = _tempDir,
-                File = dest,
-                Overwrite = true,
-                BuildEngine = new MockEngine(),
-            };
-
-            Assert.True(task.Execute());
-            Assert.True(File.Exists(dest));
-
-            using (var fileStream = File.OpenRead(dest))
-            using (var zipStream = new ZipArchiveStream(fileStream))
-            {
-                var entry = Assert.Single(zipStream.Entries);
-                Assert.Equal("test.txt", entry.FullName);
-            }
-        }
-
-        [Fact]
-        public void FailsForEmptyFileName()
-        {
-            var inputFile = Path.Combine(_tempDir, "..", Guid.NewGuid().ToString());
-            var dest = Path.Combine(_tempDir, "test.zip");
-            var linkItem = new TaskItem(inputFile);
-            linkItem.SetMetadata("Link", "temp/");
-            try
-            {
-                File.WriteAllText(inputFile, "");
-                var mock = new MockEngine { ContinueOnError = true };
-                var task = new ZipArchive
-                {
-                    SourceFiles = new[] { linkItem },
-                    WorkingDirectory = Path.Combine(_tempDir, "temp"),
-                    File = dest,
-                    BuildEngine = mock,
-                };
-
-                Assert.False(task.Execute(), "Task should fail");
-                Assert.NotEmpty(mock.Errors);
-
-                using (var fileStream = new FileStream(dest, FileMode.Open))
-                using (var zipStream = new ZipArchiveStream(fileStream))
-                {
-                    Assert.Empty(zipStream.Entries);
-                }
-            }
-            finally
-            {
-                File.Delete(inputFile);
-            }
-        }
-
-        private IEnumerable<ITaskItem> CreateItems(string[] files)
-        {
-            foreach (var file in files)
-            {
-                var path = Path.Combine(_tempDir, file);
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
-                File.WriteAllText(path.Replace('\\', '/'), "");
-                // intentionally allow item spec to contain \ and /
-                // this tests that MSBuild normalizes before we create zip entries
-                yield return new TaskItem(path);
-            }
-        }
-
-        public void Dispose()
-        {
-            Directory.Delete(_tempDir, recursive: true);
-        }
-    }
-}
diff --git a/test/KoreBuild.FunctionalTests/KoreBuild.FunctionalTests.csproj b/test/KoreBuild.FunctionalTests/KoreBuild.FunctionalTests.csproj
index bb1605c06..20c0d32dc 100644
--- a/test/KoreBuild.FunctionalTests/KoreBuild.FunctionalTests.csproj
+++ b/test/KoreBuild.FunctionalTests/KoreBuild.FunctionalTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/KoreBuild.FunctionalTests/SimpleRepoTests.cs b/test/KoreBuild.FunctionalTests/SimpleRepoTests.cs
index e6d4aadd9..4ddc095a1 100644
--- a/test/KoreBuild.FunctionalTests/SimpleRepoTests.cs
+++ b/test/KoreBuild.FunctionalTests/SimpleRepoTests.cs
@@ -33,7 +33,7 @@ public void FullBuildCompletes()
         {
             var app = _fixture.CreateTestApp("SimpleRepo");
 
-            var build = app.ExecuteBuild(_output, "/p:BuildNumber=0001");
+            var build = app.ExecuteBuild(_output, "/p:BuildNumber=0001", "/p:DisableCodeSigning=true");
 
             Assert.Equal(0, build);
 
@@ -52,64 +52,6 @@ public void FullBuildCompletes()
             {
                 Assert.Empty(reader.GetFiles().Where(p => Path.GetExtension(p).Equals(".pdb", StringComparison.OrdinalIgnoreCase)));
             }
-
-            // /t:TestNuGetPush
-            Assert.True(File.Exists(Path.Combine(app.WorkingDirectory, "obj", "tmp-nuget", "Simple.CliTool.1.0.0-beta-0001.nupkg")), "Build done a test push of all the packages");
-            Assert.True(File.Exists(Path.Combine(app.WorkingDirectory, "obj", "tmp-nuget", "Simple.Lib.1.0.0-beta-0001.nupkg")), "Build done a test push of all the packages");
-            Assert.True(File.Exists(Path.Combine(app.WorkingDirectory, "obj", "tmp-nuget", "Simple.Sources.1.0.0-beta-0001.nupkg")), "Build done a test push of all the packages");
-        }
-
-        [Fact]
-        public void BuildOfGlobalCliToolIncludesShims()
-        {
-            var app = _fixture.CreateTestApp("RepoWithGlobalTool");
-
-            var build = app.ExecuteBuild(_output, "/p:BuildNumber=0001");
-
-            Assert.Equal(0, build);
-
-            var artifactsDir = Path.Combine(app.WorkingDirectory, "artifacts", "build");
-
-            var pkg = Path.Combine(artifactsDir, "GlobalConsoleTool.1.0.0.nupkg");
-            using (var reader = new PackageArchiveReader(pkg))
-            {
-                var files = reader.GetFiles();
-                foreach (var file in files)
-                {
-                    _output.WriteLine("pkg: " + file);
-                }
-
-                var winx86 = Assert.Single(files, f => f.StartsWith("tools/netcoreapp2.1/any/shims/win-x86/"));
-                Assert.Equal("GlobalConsoleTool.exe", Path.GetFileName(winx86));
-
-                var winx64 = Assert.Single(files, f => f.StartsWith("tools/netcoreapp2.1/any/shims/win-x64/"));
-                Assert.Equal("GlobalConsoleTool.exe", Path.GetFileName(winx64));
-            }
-
-            var toolsDir = Path.Combine(app.WorkingDirectory, "artifacts", "tools");
-            var installPsi = new ProcessStartInfo
-            {
-                FileName = DotNetMuxer.MuxerPathOrDefault(),
-                Arguments = ArgumentEscaper.EscapeAndConcatenate(new[]
-                {
-                    "tool",
-                    "install",
-                    "--tool-path", toolsDir,
-                    "GlobalConsoleTool",
-                    "--add-source", artifactsDir
-                }),
-            };
-            var install = app.Run(_output, installPsi);
-            Assert.Equal(0, install);
-
-            var ext = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                ? ".exe"
-                : string.Empty;
-            var run = app.Run(_output, new ProcessStartInfo
-            {
-                FileName = Path.Combine(toolsDir, "GlobalConsoleTool" + ext),
-            });
-            Assert.Equal(0, run);
         }
 
         [Fact]
@@ -121,84 +63,5 @@ public void BuildShouldReturnNonZeroCode()
 
             Assert.NotEqual(0, build);
         }
-
-        [DockerExistsFact(Skip = "winservercore currently fails on AppVeyor due to breaking changes in winservercore 1710")]
-        public void DockerSuccessful()
-        {
-            var app = _fixture.CreateTestApp("SimpleRepo");
-            var platform = "jessie";
-
-            var dockerPlatform = GetDockerPlatform();
-            if (dockerPlatform == OSPlatform.Windows)
-            {
-                platform = "winservercore";
-            }
-
-            var build = app.ExecuteRun(_output, new string[] { "docker-build", "-Path", app.WorkingDirectory }, platform, "/p:BuildNumber=0001");
-
-            Assert.Equal(0, build);
-        }
-
-        private static OSPlatform GetDockerPlatform()
-        {
-            var startInfo = new ProcessStartInfo("docker", @"version -f ""{{ .Server.Os }}""")
-            {
-                RedirectStandardOutput = true,
-                UseShellExecute = false,
-            };
-
-            using (var process = Process.Start(startInfo))
-            {
-                var output = process.StandardOutput.ReadToEnd().Trim();
-
-                OSPlatform result;
-                switch (output)
-                {
-                    case "windows":
-                        result = OSPlatform.Windows;
-                        break;
-                    case "linux":
-                        result = OSPlatform.Linux;
-                        break;
-                    default:
-                        throw new NotImplementedException($"No default for docker platform {output}");
-                }
-
-                return result;
-            }
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public class DockerExistsFactAttribute : FactAttribute
-    {
-        public DockerExistsFactAttribute()
-        {
-            if (!HasDocker())
-            {
-                Skip = "Docker must be installed to run this test.";
-            }
-        }
-
-        private static bool HasDocker()
-        {
-            try
-            {
-                var startInfo = new ProcessStartInfo("docker", "--version")
-                {
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                    UseShellExecute = false,
-                };
-                using (Process.Start(startInfo))
-                {
-                    return true;
-                }
-            }
-            catch (Win32Exception)
-            {
-                return false;
-            }
-        }
     }
 }
diff --git a/test/KoreBuild.FunctionalTests/Utilities/RepoTestFixture.cs b/test/KoreBuild.FunctionalTests/Utilities/RepoTestFixture.cs
index ea5edaff7..d9d3e5dd1 100644
--- a/test/KoreBuild.FunctionalTests/Utilities/RepoTestFixture.cs
+++ b/test/KoreBuild.FunctionalTests/Utilities/RepoTestFixture.cs
@@ -16,7 +16,6 @@ public class RepoTestFixture : IDisposable
         {
             "Internal.AspNetCore.Sdk",
             "Internal.AspNetCore.SiteExtension.Sdk",
-            "Microsoft.AspNetCore.BuildTools.ApiCheck",
         };
 
         private static readonly string _solutionDir;
diff --git a/test/KoreBuild.Tasks.Tests/CheckPackageReferenceTests.cs b/test/KoreBuild.Tasks.Tests/CheckPackageReferenceTests.cs
deleted file mode 100644
index 6483b6214..000000000
--- a/test/KoreBuild.Tasks.Tests/CheckPackageReferenceTests.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using BuildTools.Tasks.Tests;
-using Microsoft.Build.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace KoreBuild.Tasks.Tests
-{
-    [Collection(nameof(MSBuildTestCollection))]
-    public class CheckPackageReferenceTests : IDisposable
-    {
-        private readonly string _tempDir;
-        private readonly MockEngine _engine;
-
-        public CheckPackageReferenceTests(ITestOutputHelper output, MSBuildTestCollectionFixture fixture)
-        {
-            _tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            Directory.CreateDirectory(_tempDir);
-            _engine = new MockEngine(output);
-            fixture.InitializeEnvironment(output);
-        }
-
-        public void Dispose()
-        {
-            Directory.Delete(_tempDir, recursive: true);
-        }
-
-        [Fact]
-        public void ItAllowsPinnedAndUnpinnedVersions()
-        {
-            var depsProps = Path.Combine(_tempDir, "dependencies.props");
-            File.WriteAllText(depsProps, $@"
-<Project>
-  <PropertyGroup Label=`Package Versions: Latest`>
-    <LatestPackageVersion>1.0.0</LatestPackageVersion>
-  </PropertyGroup>
-
-  <Import Project=`$(DotNetPackageVersionsPropsPath)` />
-
-  <PropertyGroup Label=`Package Versions: Pinned`>
-    <BaseLinePackageVersion>1.0.0</BaseLinePackageVersion>
-  </PropertyGroup>
-</Project>
-".Replace('`', '"'));
-
-            var csproj = Path.Combine(_tempDir, "Test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project>
-  <ItemGroup>
-    <PackageReference Include=`Latest` Version=`$(LatestPackageVersion)` />
-    <PackageReference Include=`BaseLine`>
-       <Version>$(BaseLinePackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
-".Replace('`', '"'));
-
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                DependenciesFile = depsProps,
-                Projects = new[] { new TaskItem(csproj) }
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-        }
-
-        [Fact]
-        public void PassesWhenAllRequirementsAreSatisifed()
-        {
-            var depsProps = Path.Combine(_tempDir, "dependencies.props");
-            File.WriteAllText(depsProps, $@"
-<Project>
-  <PropertyGroup Label=`Package Versions`>
-    <AspNetCorePackageVersion>1.0.0</AspNetCorePackageVersion>
-  </PropertyGroup>
-</Project>
-".Replace('`', '"'));
-
-            var csproj = Path.Combine(_tempDir, "Test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project>
-  <ItemGroup>
-    <PackageReference Include=`AspNetCore` Version=`$(AspNetCorePackageVersion)` />
-    <PackageReference Include=`AspNetCore`>
-       <Version>$(AspNetCorePackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
-".Replace('`', '"'));
-
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                DependenciesFile = depsProps,
-                Projects = new[] { new TaskItem(csproj) }
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-        }
-
-        [Fact]
-        public void IgnoresUpdateAndRemoveItems()
-        {
-            var depsProps = Path.Combine(_tempDir, "dependencies.props");
-            File.WriteAllText(depsProps, $@"
-<Project>
-  <PropertyGroup Label=`Package Versions` />
-</Project>
-".Replace('`', '"'));
-
-            var csproj = Path.Combine(_tempDir, "Test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project>
-  <ItemGroup>
-    <PackageReference Update=`Microsoft.AspNetCore.All` PrivateAssets=`All` />
-    <PackageReference Remove=`Microsoft.AspNetCore.All` />
-  </ItemGroup>
-</Project>
-".Replace('`', '"'));
-
-            _engine.ContinueOnError = true;
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                DependenciesFile = depsProps,
-                Projects = new[] { new TaskItem(csproj) }
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-        }
-
-        [Fact]
-        public void FailsWhenDependenciesHasNoPropGroup()
-        {
-            var depsFile = Path.Combine(_tempDir, "deps.props");
-            File.WriteAllText(depsFile, $@"
-<Project>
-  <PropertyGroup>
-    <AspNetCorePackageVersion>1.0.0</AspNetCorePackageVersion>
-  </PropertyGroup>
-</Project>
-".Replace('`', '"'));
-
-            _engine.ContinueOnError = true;
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                Projects = new[] { new TaskItem(depsFile) },
-                DependenciesFile = depsFile,
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-            Assert.NotEmpty(_engine.Warnings);
-            Assert.Contains(_engine.Warnings, e => e.Code == KoreBuildErrors.Prefix + KoreBuildErrors.PackageRefPropertyGroupNotFound);
-        }
-
-        [Fact]
-        public void FailsWhenVariableIsNotInDependenciesPropsFile()
-        {
-            var depsProps = Path.Combine(_tempDir, "dependencies.props");
-            File.WriteAllText(depsProps, $@"
-<Project>
-  <PropertyGroup Label=`Package Versions`>
-  </PropertyGroup>
-</Project>
-".Replace('`', '"'));
-
-            var csproj = Path.Combine(_tempDir, "Test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project>
-  <ItemGroup>
-    <PackageReference Include=`AspNetCore` Version=`$(AspNetCorePackageVersion)` />
-  </ItemGroup>
-</Project>
-".Replace('`', '"'));
-
-            _engine.ContinueOnError = true;
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                Projects = new[] { new TaskItem(csproj) },
-                DependenciesFile = depsProps,
-            };
-
-            Assert.False(task.Execute(), "Task is expected to fail");
-            Assert.NotEmpty(_engine.Errors);
-            Assert.Contains(_engine.Errors, e => e.Code == KoreBuildErrors.Prefix + KoreBuildErrors.VariableNotFoundInDependenciesPropsFile);
-        }
-
-        [Fact]
-        public void FailsWhenPackageVersionFloat()
-        {
-            var depsProps = Path.Combine(_tempDir, "dependencies.props");
-            File.WriteAllText(depsProps, $@"
-<Project>
-  <PropertyGroup Label=`Package Versions`>
-    <AspNetCorePackageVersion>1.0.0-*</AspNetCorePackageVersion>
-  </PropertyGroup>
-</Project>
-".Replace('`', '"'));
-
-            var csproj = Path.Combine(_tempDir, "Test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project>
-  <ItemGroup>
-    <PackageReference Include=`AspNetCore` Version=`$(AspNetCorePackageVersion)` />
-  </ItemGroup>
-</Project>
-".Replace('`', '"'));
-
-            _engine.ContinueOnError = true;
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                Projects = new[] { new TaskItem(csproj) },
-                DependenciesFile = depsProps,
-            };
-
-            Assert.False(task.Execute(), "Task is expected to fail");
-            Assert.NotEmpty(_engine.Errors);
-            Assert.Contains(_engine.Errors, e => e.Code == KoreBuildErrors.Prefix + KoreBuildErrors.PackageRefHasFloatingVersion);
-        }
-
-        [Fact]
-        public void FailsWhenPackageVersionIsInvalid()
-        {
-            var depsProps = Path.Combine(_tempDir, "dependencies.props");
-            File.WriteAllText(depsProps, $@"
-<Project>
-  <PropertyGroup Label=`Package Versions`>
-    <AspNetCorePackageVersion>1</AspNetCorePackageVersion>
-  </PropertyGroup>
-</Project>
-".Replace('`', '"'));
-
-            var csproj = Path.Combine(_tempDir, "Test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project>
-  <ItemGroup>
-    <PackageReference Include=`AspNetCore` Version=`$(AspNetCorePackageVersion)` />
-  </ItemGroup>
-</Project>
-".Replace('`', '"'));
-
-            _engine.ContinueOnError = true;
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                Projects = new[] { new TaskItem(csproj) },
-                DependenciesFile = depsProps,
-            };
-
-            Assert.False(task.Execute(), "Task is expected to fail");
-            Assert.NotEmpty(_engine.Errors);
-            Assert.Contains(_engine.Errors, e => e.Code == KoreBuildErrors.Prefix + KoreBuildErrors.InvalidPackageVersion);
-        }
-
-        [Theory]
-        [InlineData("1.0.0")]
-        [InlineData("1.0.0-$(Suffix)")]
-        [InlineData("$(Prefix)-1.0.0-$(Suffix)")]
-        [InlineData("$(Prefix)-1.0.0")]
-        public void FailsWhenPackagesReferenceVersionDoesNotCompletelyUseVariables(string version)
-        {
-            var depsProps = Path.Combine(_tempDir, "dependencies.props");
-            File.WriteAllText(depsProps, $@"
-<Project>
-   <PropertyGroup Label=`Package Versions` />
-</Project>
-".Replace('`', '"'));
-
-            var csproj = Path.Combine(_tempDir, "Test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project>
-  <ItemGroup>
-    <PackageReference Include=`AspNetCore` Version=`{version}` />
-  </ItemGroup>
-</Project>
-".Replace('`', '"'));
-
-            _engine.ContinueOnError = true;
-            var task = new CheckPackageReferences
-            {
-                BuildEngine = _engine,
-                Projects = new[] { new TaskItem(csproj) },
-                DependenciesFile = depsProps,
-            };
-
-            Assert.False(task.Execute(), "Task is expected to fail");
-            Assert.NotEmpty(_engine.Errors);
-            var error = Assert.Single(_engine.Errors, e => e.Code == KoreBuildErrors.Prefix + KoreBuildErrors.PackageRefHasLiteralVersion);
-            Assert.Equal(4, error.LineNumber);
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/ChecksumTests.cs b/test/KoreBuild.Tasks.Tests/ChecksumTests.cs
deleted file mode 100644
index ddef3ff31..000000000
--- a/test/KoreBuild.Tasks.Tests/ChecksumTests.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using BuildTools.Tasks.Tests;
-using Microsoft.Build.Utilities;
-using Xunit;
-
-namespace KoreBuild.Tasks.Tests
-{
-    public class ChecksumTests
-    {
-        [Theory]
-        [InlineData("SHA256", "BCFAF334240356E1B97824A866F643B1ADA3C16AA0B5B2BFA8390D8BB54A244C")]
-        [InlineData("sha256", "BCFAF334240356E1B97824A866F643B1ADA3C16AA0B5B2BFA8390D8BB54A244C")]
-        [InlineData("SHA384", "5520B01FDE8A8A7EA38DCADFBF3CFAB2818FA0D5A8A16CB11A2FC7F5C9F1497F7B3C528FDB8CE10AA293A4E5FF32297F")]
-        [InlineData("SHA512", "7774962C97EAC52B45291E1410F06AC6EFF6AF9ED38A57E2CEB720650282E46CFE512FAAD68AD9C45B74ED1B7E460198E0B00D5C9EF0404FF76B12F8AD2D329F")]
-        public void ComputesFileChecksum(string algoritm, string hash)
-        {
-            var task = new ComputeChecksum
-            {
-                File = Path.Combine(AppContext.BaseDirectory, "TestResources", "lorem.bin"),
-                BuildEngine = new MockEngine(),
-                Algorithm = algoritm,
-            };
-            Assert.True(task.Execute(), "Task should pass");
-            Assert.Equal(hash, task.Hash);
-        }
-
-        [Theory]
-        [InlineData("SHA256", "C442A45BB8D0938AFB2B5B0AA61C3ADA1B346F668A42879B1E653042433FAFCB")]
-        [InlineData("SHA384", "F79223FF5E4A392AA01EC8BDF825C3B7F7941F9C5F7CF2A11BC61A8A5D0AF8182BAFC3FBFDACD83AE7A8A8EDF10B0255")]
-        [InlineData("SHA512", "F923D2DA8F21B67FF4040FE9C5D00B0E891064E7B1DE47B54C9DA86DAAF215EFC64E282056027BEC2E75A83DE9FA6FFE6CA60F0141E19254B25CAE79C2694777")]
-        public void VerifyFileChecksum_Fails(string algoritm, string hash)
-        {
-            var task = new VerifyChecksum
-            {
-                File = Path.Combine(AppContext.BaseDirectory, "TestResources", "lorem.bin"),
-                BuildEngine = new MockEngine { ContinueOnError = true },
-                Algorithm = algoritm,
-                Hash = hash,
-            };
-
-            Assert.False(task.Execute(), "Task should fail");
-        }
-
-        [Theory]
-        [InlineData("SHA256", "BCFAF334240356E1B97824A866F643B1ADA3C16AA0B5B2BFA8390D8BB54A244C")]
-        [InlineData("sha256", "bcfaf334240356e1b97824a866f643b1ada3c16aa0b5b2bfa8390d8bb54a244c")]
-        [InlineData("SHA384", "5520B01FDE8A8A7EA38DCADFBF3CFAB2818FA0D5A8A16CB11A2FC7F5C9F1497F7B3C528FDB8CE10AA293A4E5FF32297F")]
-        [InlineData("SHA512", "7774962C97EAC52B45291E1410F06AC6EFF6AF9ED38A57E2CEB720650282E46CFE512FAAD68AD9C45B74ED1B7E460198E0B00D5C9EF0404FF76B12F8AD2D329F")]
-        public void VerifyFileChecksum_Pass(string algoritm, string hash)
-        {
-            var task = new VerifyChecksum
-            {
-                File = Path.Combine(AppContext.BaseDirectory, "TestResources", "lorem.bin"),
-                BuildEngine = new MockEngine(),
-                Algorithm = algoritm,
-                Hash = hash,
-            };
-
-            Assert.True(task.Execute(), "Task should pass");
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/DependencyVersionsFileTests.cs b/test/KoreBuild.Tasks.Tests/DependencyVersionsFileTests.cs
deleted file mode 100644
index 8b030706f..000000000
--- a/test/KoreBuild.Tasks.Tests/DependencyVersionsFileTests.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Linq;
-using BuildTools.Tasks.Tests;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace KoreBuild.Tasks.Tests
-{
-    [Collection(nameof(MSBuildTestCollection))]
-    public class DependencyVersionsFileTests : IDisposable
-    {
-        private readonly string _tempFile;
-        private readonly ITestOutputHelper _output;
-
-        public DependencyVersionsFileTests(ITestOutputHelper output, MSBuildTestCollectionFixture fixture)
-        {
-            _output = output;
-            fixture.InitializeEnvironment(output);
-            _tempFile = Path.Combine(AppContext.BaseDirectory, Path.GetRandomFileName());
-        }
-
-        public void Dispose()
-        {
-            if (File.Exists(_tempFile))
-            {
-                File.Delete(_tempFile);
-            }
-        }
-
-        [Fact]
-        public void ItSortsVariablesAlphabetically()
-        {
-            var depsFile = DependencyVersionsFile.Create(addOverrideImport: true);
-            depsFile.Update("XyzPackageVersion", "123");
-            depsFile.Update("AbcPackageVersion", "456");
-            depsFile.Save(_tempFile);
-
-            var project = ProjectRootElement.Open(_tempFile);
-            _output.WriteLine(File.ReadAllText(_tempFile));
-
-            var versions = Assert.Single(project.PropertyGroups, p => p.Label == DependencyVersionsFile.AutoPackageVersionsLabel);
-            Assert.Collection(versions.Properties,
-                v => Assert.Equal("AbcPackageVersion", v.Name),
-                v => Assert.Equal("XyzPackageVersion", v.Name));
-        }
-
-        [Fact]
-        public void SetIsCaseInsensitive()
-        {
-            var depsFile = DependencyVersionsFile.Create(addOverrideImport: true);
-            depsFile.Update("XunitRunnerVisualStudioVersion", "2.3.0");
-            depsFile.Update("XunitRunnerVisualstudioVersion", "2.4.0");
-            depsFile.Save(_tempFile);
-
-            var project = ProjectRootElement.Open(_tempFile);
-            _output.WriteLine(File.ReadAllText(_tempFile));
-
-            var versions = Assert.Single(project.PropertyGroups, p => p.Label == DependencyVersionsFile.AutoPackageVersionsLabel);
-            var prop = Assert.Single(versions.Properties);
-            Assert.Equal("XunitRunnerVisualStudioVersion", prop.Name);
-            Assert.Equal("2.4.0", prop.Value);
-        }
-
-        [Theory]
-        [InlineData("Microsoft.Data.Sqlite", "MicrosoftDataSqlitePackageVersion")]
-        [InlineData("SQLitePCLRaw.bundle_green", "SQLitePCLRawBundleGreenPackageVersion")]
-        [InlineData("runtime.win-x64.Microsoft.NETCore", "RuntimeWinX64MicrosoftNETCorePackageVersion")]
-        public void GeneratesVariableName(string id, string varName)
-        {
-            Assert.Equal(varName, DependencyVersionsFile.GetVariableName(id));
-        }
-
-        [Fact]
-        public void AdditionalImportsAreAdded_WithOverrideImportFalse()
-        {
-            // Arrange
-            var path = "obj/test.props";
-            var depsFile = DependencyVersionsFile.Create(addOverrideImport: false, additionalImports: new[] { path });
-            depsFile.Save(_tempFile);
-
-            // Act
-             var project = ProjectRootElement.Open(_tempFile);
-            _output.WriteLine(File.ReadAllText(_tempFile));
-
-            // Assert
-            var import = Assert.Single(project.Imports);
-            Assert.Equal(path, import.Project);
-        }
-
-        [Fact]
-        public void AdditionalImportsAreAdded_WithOverrideImportTrue()
-        {
-            // Arrange
-            var path = "obj/external.props";
-            var depsFile = DependencyVersionsFile.Create(addOverrideImport: true, additionalImports: new[] { path });
-            depsFile.Save(_tempFile);
-
-            // Act
-             var project = ProjectRootElement.Open(_tempFile);
-            _output.WriteLine(File.ReadAllText(_tempFile));
-
-            // Assert
-            Assert.Collection(
-                project.Imports,
-                import => Assert.Equal(path, import.Project),
-                import => Assert.Equal("$(DotNetPackageVersionPropsPath)", import.Project));
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/DownloadFileTests.cs b/test/KoreBuild.Tasks.Tests/DownloadFileTests.cs
deleted file mode 100644
index ec741500a..000000000
--- a/test/KoreBuild.Tasks.Tests/DownloadFileTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using BuildTools.Tasks.Tests;
-using Xunit;
-using Xunit.Abstractions;
-using Task = System.Threading.Tasks.Task;
-
-namespace KoreBuild.Tasks.Tests
-{
-    public class DownloadFileTests
-    {
-        private readonly ITestOutputHelper _output;
-
-        public DownloadFileTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
-        [Fact]
-        public async Task ItDownloadAFile()
-        {
-            var expectedPath = Path.Combine(AppContext.BaseDirectory, "microsoft.com.2.html");
-            var task = new DownloadFile
-            {
-                Uri = "http://example.org/index.html",
-                DestinationPath = expectedPath,
-                BuildEngine = new MockEngine(_output),
-            };
-
-            if (File.Exists(expectedPath))
-            {
-                File.Delete(expectedPath);
-            }
-
-            Assert.True(await task.ExecuteAsync(), "Task should pass");
-            Assert.True(File.Exists(expectedPath), "The file should exist");
-        }
-
-        [Fact]
-        public async Task ItDoesNotRedownloadDownloadAFileThatExists()
-        {
-            var expectedPath = Path.Combine(AppContext.BaseDirectory, "microsoft.com.1.html");
-            var task = new DownloadFile
-            {
-                Uri = "http://example.org/index.html",
-                DestinationPath = expectedPath,
-                BuildEngine = new MockEngine(_output),
-            };
-
-            const string placeholder = "Dummy content";
-            File.WriteAllText(expectedPath, placeholder);
-
-            Assert.True(await task.ExecuteAsync(), "Task should pass");
-
-            Assert.Equal(placeholder, File.ReadAllText(expectedPath));
-
-            task.Overwrite = true;
-
-            Assert.True(await task.ExecuteAsync(), "Task should pass");
-            Assert.NotEqual(placeholder, File.ReadAllText(expectedPath));
-        }
-
-        [Fact]
-        public async Task ItFailsForFilesThatDoNotExist()
-        {
-            var engine = new MockEngine(_output) { ContinueOnError = true };
-            var task = new DownloadFile
-            {
-                Uri = "http://localhost/this/file/does/not/exist",
-                DestinationPath = Path.Combine(AppContext.BaseDirectory, "dummy.txt"),
-                BuildEngine = engine,
-            };
-
-            Assert.False(await task.ExecuteAsync(), "Task should fail");
-            Assert.NotEmpty(engine.Errors);
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/DownloadNuGetPackagesTests.cs b/test/KoreBuild.Tasks.Tests/DownloadNuGetPackagesTests.cs
deleted file mode 100644
index a1a72f3ef..000000000
--- a/test/KoreBuild.Tasks.Tests/DownloadNuGetPackagesTests.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections;
-using System.IO;
-using BuildTools.Tasks.Tests;
-using Microsoft.Build.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-using Task = System.Threading.Tasks.Task;
-
-namespace KoreBuild.Tasks.Tests
-{
-    public class DownloadNuGetPackagesTest
-    {
-        private readonly ITestOutputHelper _output;
-
-        public DownloadNuGetPackagesTest(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
-        [Fact]
-        public async Task ItDownloadPackages()
-        {
-            var packages = new[]
-            {
-                new TaskItem("Newtonsoft.Json", new Hashtable
-                {
-                    ["Version"] = "9.0.1",
-                    ["Source"] = "  https://api.nuget.org/v3/index.json  ; ;https://api.nuget.org/v3/index.json; https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json "
-                }),
-            };
-
-            var task = new DownloadNuGetPackages
-            {
-                Packages = packages,
-                DestinationFolder = AppContext.BaseDirectory,
-                BuildEngine = new MockEngine(_output),
-                TimeoutSeconds = 120,
-            };
-            var expectedPath = Path.Combine(AppContext.BaseDirectory, "newtonsoft.json.9.0.1.nupkg").Replace('\\', '/');
-            if (File.Exists(expectedPath))
-            {
-                File.Delete(expectedPath);
-            }
-
-            Assert.False(File.Exists(expectedPath), "The file should not exist yet");
-            Assert.True(await task.ExecuteAsync(), "Task should pass");
-            var file = Assert.Single(task.Files);
-            Assert.Equal(expectedPath, file.ItemSpec.Replace('\\', '/'));
-            Assert.True(File.Exists(expectedPath), "The file should exist");
-        }
-
-        [Fact]
-        public async Task ItFailsForPackagesThatDoNotExist()
-        {
-            var packages = new[]
-            {
-                new TaskItem("SomePackage", new Hashtable { ["Version"] = "1.0.0", ["Source"] = AppContext.BaseDirectory }),
-            };
-
-            var engine = new MockEngine(_output) { ContinueOnError = true };
-            var task = new DownloadNuGetPackages
-            {
-                Packages = packages,
-                DestinationFolder = AppContext.BaseDirectory,
-                BuildEngine = engine,
-                TimeoutSeconds = 120,
-            };
-
-            Assert.False(await task.ExecuteAsync(), "Task should fail");
-            Assert.NotEmpty(engine.Errors);
-            Assert.Contains(engine.Errors, m => m.Message.Contains("SomePackage 1.0.0 is not available"));
-        }
-
-        [Fact]
-        public async Task ItFindsPackageWhenMultipleFeedsAreSpecified()
-        {
-            var packages = new[]
-            {
-                new TaskItem("Newtonsoft.Json", new Hashtable { ["Version"] = "9.0.1", ["Source"] = $"{AppContext.BaseDirectory};https://api.nuget.org/v3/index.json"} ),
-            };
-
-            var task = new DownloadNuGetPackages
-            {
-                Packages = packages,
-                DestinationFolder = AppContext.BaseDirectory,
-                BuildEngine = new MockEngine(_output),
-                TimeoutSeconds = 120,
-            };
-            var expectedPath = Path.Combine(AppContext.BaseDirectory, "newtonsoft.json.9.0.1.nupkg").Replace('\\', '/');
-            if (File.Exists(expectedPath))
-            {
-                File.Delete(expectedPath);
-            }
-
-            Assert.False(File.Exists(expectedPath), "The file should not exist yet");
-            Assert.True(await task.ExecuteAsync(), "Task should pass");
-            var file = Assert.Single(task.Files);
-            Assert.Equal(expectedPath, file.ItemSpec.Replace('\\', '/'));
-            Assert.True(File.Exists(expectedPath), "The file should exist");
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/GenerateDependenciesPropsFileTests.cs b/test/KoreBuild.Tasks.Tests/GenerateDependenciesPropsFileTests.cs
deleted file mode 100644
index 0748aec14..000000000
--- a/test/KoreBuild.Tasks.Tests/GenerateDependenciesPropsFileTests.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections;
-using System.IO;
-using BuildTools.Tasks.Tests;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace KoreBuild.Tasks.Tests
-{
-    [Collection(nameof(MSBuildTestCollection))]
-    public class GenerateDependenciesPropsFileTests : IDisposable
-    {
-        private readonly ITestOutputHelper _output;
-        private readonly string _tempDir;
-
-        public GenerateDependenciesPropsFileTests(ITestOutputHelper output, MSBuildTestCollectionFixture fixture)
-        {
-            _output = output;
-            _tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            Directory.CreateDirectory(_tempDir);
-            fixture.InitializeEnvironment(output);
-        }
-
-        [Fact]
-        public void GeneratesVariableName()
-        {
-            var generatedFile = Path.Combine(_tempDir, "deps.props");
-            var csproj = Path.Combine(_tempDir, "test.csproj");
-            CreateProject(csproj, "1.2.3");
-
-            var task = new GenerateDependenciesPropsFile
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = generatedFile,
-                Projects = new[] { new TaskItem(csproj) },
-                Properties = Array.Empty<string>(),
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-            var depsFile = ProjectRootElement.Open(generatedFile);
-            _output.WriteLine(File.ReadAllText(generatedFile));
-            var pg = Assert.Single(depsFile.PropertyGroups, p => p.Label == DependencyVersionsFile.AutoPackageVersionsLabel);
-            var prop = Assert.Single(pg.Properties, p => p.Name == "MyDependencyPackageVersion");
-            Assert.Equal("1.2.3", prop.Value);
-        }
-
-        [Fact]
-        public void IgnoresImplicitlyDefinedVariables()
-        {
-            var generatedFile = Path.Combine(_tempDir, "deps.props");
-            var csproj = Path.Combine(_tempDir, "test.csproj");
-            File.WriteAllText(csproj, $@"
-<Project Sdk=`Microsoft.NET.Sdk`>
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-</Project>".Replace('`', '"'));
-
-            var task = new GenerateDependenciesPropsFile
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = generatedFile,
-                Projects = new[] { new TaskItem(csproj) },
-                Properties = Array.Empty<string>(),
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-            var depsFile = ProjectRootElement.Open(generatedFile);
-            _output.WriteLine(File.ReadAllText(generatedFile));
-            var pg = Assert.Single(depsFile.PropertyGroups, p => p.Label == DependencyVersionsFile.AutoPackageVersionsLabel);
-            Assert.Empty(pg.Properties);
-        }
-
-        [Fact]
-        public void FailsWhenConflictingVersions()
-        {
-            var generatedFile = Path.Combine(_tempDir, "deps.props");
-            var csproj1 = Path.Combine(_tempDir, "test1.csproj");
-            var csproj2 = Path.Combine(_tempDir, "test2.csproj");
-            CreateProject(csproj1, "1.2.3");
-            CreateProject(csproj2, "4.5.6");
-
-            var engine = new MockEngine(_output) { ContinueOnError = true };
-            var task = new GenerateDependenciesPropsFile
-            {
-                BuildEngine = engine,
-                DependenciesFile = generatedFile,
-                Projects = new[] { new TaskItem(csproj1), new TaskItem(csproj2) },
-                Properties = Array.Empty<string>(),
-            };
-
-            Assert.False(task.Execute(), "Task is expected to fail");
-            Assert.Single(engine.Errors, e => e.Code == KoreBuildErrors.Prefix + KoreBuildErrors.ConflictingPackageReferenceVersions);
-        }
-
-        [Fact]
-        public void DoesNotFailWhenConflictingVersionsAreSuppressed()
-        {
-            var generatedFile = Path.Combine(_tempDir, "deps.props");
-            var csproj1 = Path.Combine(_tempDir, "test1.csproj");
-            var csproj2 = Path.Combine(_tempDir, "test2.csproj");
-            CreateProject(csproj1, "1.2.3");
-
-            File.WriteAllText(csproj2, $@"
-<Project Sdk=`Microsoft.NET.Sdk`>
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include=`MyDependency` Version=`4.5.6` NoWarn=`KRB4002` />
-  </ItemGroup>
-</Project>".Replace('`', '"'));
-
-            var task = new GenerateDependenciesPropsFile
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = generatedFile,
-                Projects = new[] { new TaskItem(csproj1), new TaskItem(csproj2) },
-                Properties = Array.Empty<string>(),
-            };
-
-            Assert.True(task.Execute(), "Task is expected to oass");
-        }
-
-        private static void CreateProject(string csprojFilePath, string version)
-        {
-            File.WriteAllText(csprojFilePath, $@"
-<Project Sdk=`Microsoft.NET.Sdk`>
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include=`MyDependency` Version=`{version}` />
-  </ItemGroup>
-</Project>".Replace('`', '"'));
-        }
-
-
-        public void Dispose()
-        {
-            Directory.Delete(_tempDir, recursive: true);
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/GeneratePackageVersionPropsFileTests.cs b/test/KoreBuild.Tasks.Tests/GeneratePackageVersionPropsFileTests.cs
deleted file mode 100644
index 86c731b8c..000000000
--- a/test/KoreBuild.Tasks.Tests/GeneratePackageVersionPropsFileTests.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections;
-using System.IO;
-using BuildTools.Tasks.Tests;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace KoreBuild.Tasks.Tests
-{
-    [Collection(nameof(MSBuildTestCollection))]
-    public class GeneratePackageVersionPropsFileTests : IDisposable
-    {
-        private readonly ITestOutputHelper _output;
-        private readonly string _tempFile;
-
-        public GeneratePackageVersionPropsFileTests(ITestOutputHelper output, MSBuildTestCollectionFixture fixture)
-        {
-            _output = output;
-            _tempFile = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            fixture.InitializeEnvironment(output);
-        }
-
-        [Fact]
-        public void GeneratesFile()
-        {
-            var engine = new MockEngine(_output);
-            var task = new GeneratePackageVersionPropsFile
-            {
-                BuildEngine = engine,
-                Packages = new[]
-                {
-                    // Order is important. These are intentionally reverse sorted to ensure the generated file sorts properties by prop name
-                    new TaskItem("Newtonsoft.Json", new Hashtable{["Version"] = "10.0.3", ["VariableName"] = "JsonNetVersion"}),
-                    new TaskItem("Microsoft.Azure", new Hashtable{["Version"] = "1.2.0"}),
-                    new TaskItem("Another.Package", new Hashtable{["Version"] = "0.0.1", ["TargetFramework"] = "netstandard1.0"}),
-                },
-                OutputPath = _tempFile,
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-
-            var project = ProjectRootElement.Open(_tempFile);
-            _output.WriteLine(File.ReadAllText(_tempFile));
-
-            Assert.Empty(project.Imports);
-            Assert.Empty(project.ImportGroups);
-
-            var defaultPropGroup = Assert.Single(project.PropertyGroups, pg => string.IsNullOrEmpty(pg.Label));
-            var allProjectsProp = Assert.Single(defaultPropGroup.Properties);
-            Assert.Equal("MSBuildAllProjects", allProjectsProp.Name);
-            Assert.Empty(allProjectsProp.Condition);
-            Assert.Equal("$(MSBuildAllProjects);$(MSBuildThisFileFullPath)", allProjectsProp.Value);
-
-            var versions = Assert.Single(project.PropertyGroups, pg => pg.Label == DependencyVersionsFile.AutoPackageVersionsLabel);
-
-            // Order is important. These should be sorted.
-            Assert.Collection(versions.Properties,
-                p =>
-                {
-                    Assert.Equal("AnotherPackagePackageVersion", p.Name);
-                    Assert.Equal("Another.Package", p.Label);
-                    Assert.Equal("0.0.1", p.Value);
-                    Assert.Empty(p.Condition);
-                },
-                p =>
-                {
-                    Assert.Equal("JsonNetVersion", p.Name);
-                    Assert.Equal("Newtonsoft.Json", p.Label);
-                    Assert.Equal("10.0.3", p.Value);
-                    Assert.Empty(p.Condition);
-                },
-                p =>
-                {
-                    Assert.Equal("MicrosoftAzurePackageVersion", p.Name);
-                    Assert.Equal("Microsoft.Azure", p.Label);
-                    Assert.Equal("1.2.0", p.Value);
-                    Assert.Empty(p.Condition);
-                });
-        }
-
-        [Fact]
-        public void GeneratesImport()
-        {
-            var task = new GeneratePackageVersionPropsFile
-            {
-                BuildEngine = new MockEngine(_output),
-                Packages = Array.Empty<ITaskItem>(),
-                AddOverrideImport = true,
-                OutputPath = _tempFile,
-            };
-
-            Assert.True(task.Execute(), "Task is expected to pass");
-            var project = ProjectRootElement.Open(_tempFile);
-            _output.WriteLine(File.ReadAllText(_tempFile));
-
-            var import = Assert.Single(project.Imports);
-            Assert.Equal("$(DotNetPackageVersionPropsPath)", import.Project);
-            Assert.Equal(" '$(DotNetPackageVersionPropsPath)' != '' ", import.Condition);
-        }
-
-        public void Dispose()
-        {
-            if (File.Exists(_tempFile))
-            {
-                File.Delete(_tempFile);
-            }
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/InstallDotNetTests.cs b/test/KoreBuild.Tasks.Tests/InstallDotNetTests.cs
index 29f364631..646753257 100644
--- a/test/KoreBuild.Tasks.Tests/InstallDotNetTests.cs
+++ b/test/KoreBuild.Tasks.Tests/InstallDotNetTests.cs
@@ -30,7 +30,7 @@ public void InstallsDotnetCoreRuntime()
                 Directory.Delete(path, recursive: true);
             }
 
-            var request = new TaskItem("1.0.5", new Hashtable
+            var request = new TaskItem("2.1.21", new Hashtable
             {
                 ["Runtime"] = "dotnet",
                 ["InstallDir"] = path
@@ -47,7 +47,7 @@ public void InstallsDotnetCoreRuntime()
                 InstallScript = script,
             };
 
-            var expected = Path.Combine(path, "shared", "Microsoft.NETCore.App", "1.0.5", ".version");
+            var expected = Path.Combine(path, "shared", "Microsoft.NETCore.App", "2.1.21", ".version");
             Assert.False(File.Exists(expected), "Test folder should have been deleted");
 
             Assert.True(task.Execute(), "Task should pass");
diff --git a/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj b/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj
index 3a8903d13..31400d05e 100644
--- a/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj
+++ b/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,10 +27,4 @@
     <ProjectReference Include="..\..\modules\KoreBuild.Tasks\KoreBuild.Tasks.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="TestResources\lorem.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/test/KoreBuild.Tasks.Tests/MockTaskItem.cs b/test/KoreBuild.Tasks.Tests/MockTaskItem.cs
new file mode 100644
index 000000000..3b750d4be
--- /dev/null
+++ b/test/KoreBuild.Tasks.Tests/MockTaskItem.cs
@@ -0,0 +1,65 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.Build.Framework;
+
+namespace KoreBuild.Tasks.Tests
+{
+    internal class MockTaskItem : ITaskItem
+    {
+        private Dictionary<string, string> _metadata = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+        public MockTaskItem(string itemSpec)
+        {
+            ItemSpec = itemSpec;
+        }
+
+        public string this[string index]
+        {
+            get => GetMetadata(index);
+            set => SetMetadata(index, value);
+        }
+
+        public string ItemSpec { get; set; }
+
+        public ICollection MetadataNames => _metadata.Keys;
+
+        public int MetadataCount => _metadata.Count;
+
+        public IDictionary CloneCustomMetadata()
+        {
+            return new Dictionary<string, string>(_metadata);
+        }
+
+        public void CopyMetadataTo(ITaskItem destinationItem)
+        {
+            destinationItem.ItemSpec = ItemSpec;
+            foreach (var item in _metadata)
+            {
+                destinationItem.SetMetadata(item.Key, item.Value);
+            }
+        }
+
+        public string GetMetadata(string metadataName)
+        {
+            _metadata.TryGetValue(metadataName, out var retVal);
+            return retVal;
+        }
+
+        public void RemoveMetadata(string metadataName)
+        {
+            if (_metadata.ContainsKey(metadataName))
+            {
+                _metadata.Remove(metadataName);
+            }
+        }
+
+        public void SetMetadata(string metadataName, string metadataValue)
+        {
+            _metadata[metadataName] = metadataValue;
+        }
+    }
+}
diff --git a/test/KoreBuild.Tasks.Tests/PackNuSpecTests.cs b/test/KoreBuild.Tasks.Tests/PackNuSpecTests.cs
deleted file mode 100644
index bdadd3e38..000000000
--- a/test/KoreBuild.Tasks.Tests/PackNuSpecTests.cs
+++ /dev/null
@@ -1,393 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using BuildTools.Tasks.Tests;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NuGet.Frameworks;
-using NuGet.Packaging;
-using NuGet.Versioning;
-using Xunit;
-
-namespace KoreBuild.Tasks.Tests
-{
-    public class PackNuSpecTests : IDisposable
-    {
-        private readonly string _tempDir;
-
-        public PackNuSpecTests()
-        {
-            _tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-            Directory.CreateDirectory(_tempDir);
-        }
-
-        [Fact]
-        public void CreatesPackage()
-        {
-            var outputPath = Path.Combine(_tempDir, $"TestPackage.1.0.0.nupkg");
-            Directory.CreateDirectory(Path.Combine(_tempDir, "tools"));
-            Directory.CreateDirectory(Path.Combine(_tempDir, "lib", "netstandard2.0"));
-            File.WriteAllText(Path.Combine(_tempDir, "tools", "test.sh"), "");
-            File.WriteAllText(Path.Combine(_tempDir, "lib", "netstandard2.0", "TestPackage.dll"), "");
-
-            var nuspec = CreateNuspec(@"
-                <?xml version=`1.0` encoding=`utf-8`?>
-                <package xmlns=`http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd`>
-                  <metadata>
-                    <id>TestPackage</id>
-                    <version>1.0.0</version>
-                    <authors>Test</authors>
-                    <description>Test</description>
-                  </metadata>
-                  <files>
-                    <file src=`tools\*` target=`tools/` />
-                    <file src=`lib/netstandard2.0/TestPackage.dll` target=`lib/netstandard2.0/` />
-                  </files>
-                </package>
-                ");
-
-            var task = new PackNuSpec
-            {
-                NuspecPath = nuspec,
-                BasePath = _tempDir,
-                BuildEngine = new MockEngine(),
-                DestinationFolder = _tempDir,
-            };
-
-            Assert.True(task.Execute(), "The task should have passed");
-            Assert.True(File.Exists(outputPath), "Should have produced a nupkg file in " + _tempDir);
-            var result = Assert.Single(task.Packages);
-            Assert.Equal(outputPath, result.ItemSpec);
-            using (var reader = new PackageArchiveReader(outputPath))
-            {
-                var libItems = reader.GetLibItems().ToList();
-                var libItem = Assert.Single(libItems);
-                Assert.Equal(FrameworkConstants.CommonFrameworks.NetStandard20, libItem.TargetFramework);
-                var assembly = Assert.Single(libItem.Items);
-                Assert.Equal("lib/netstandard2.0/TestPackage.dll", assembly);
-
-                Assert.Contains(reader.GetFiles(), f => f == "tools/test.sh");
-            }
-        }
-
-        [Fact]
-        public void AppliesProperties()
-        {
-            var nuspec = CreateNuspec(@"
-                <?xml version=`1.0` encoding=`utf-8`?>
-                <package xmlns=`http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd`>
-                  <metadata>
-                    <id>HasProperties</id>
-                    <version>$version$</version>
-                    <authors>Microsoft</authors>
-                    <description>$description$</description>
-                    <copyright>$copyright$</copyright>
-                    <dependencies>
-                      <dependency id=`somepackage` version=`1.0.0` />
-                    </dependencies>
-                  </metadata>
-                  <files />
-                </package>
-                ");
-
-            var version = "1.2.3";
-            var description = "A test package\n\n\nwith newlines";
-            var outputPath = Path.Combine(_tempDir, $"HasProperties.{version}.nupkg");
-            var task = new PackNuSpec
-            {
-                NuspecPath = nuspec,
-                BasePath = _tempDir,
-                BuildEngine = new MockEngine(),
-                DestinationFolder = _tempDir,
-                Properties = new[] { $"version={version}", "", "", $" description ={description}", "copyright=", },
-            };
-
-            Assert.True(task.Execute(), "The task should have passed");
-            Assert.True(File.Exists(outputPath), "Should have produced a nupkg file in " + _tempDir);
-
-            using (var reader = new PackageArchiveReader(outputPath))
-            {
-                var metadata = new PackageBuilder(reader.GetNuspec(), basePath: null);
-                Assert.Equal(version, metadata.Version.ToString());
-                Assert.Empty(metadata.Copyright);
-                Assert.Equal(description, metadata.Description);
-            }
-        }
-
-        [Fact]
-        public void AddsDependencies()
-        {
-            var nuspec = CreateNuspec(@"
-                <?xml version=`1.0` encoding=`utf-8`?>
-                <package xmlns=`http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd`>
-                  <metadata>
-                    <id>HasDependencies</id>
-                    <version>1.0.0</version>
-                    <authors>Test</authors>
-                    <description>Test</description>
-                    <dependencies>
-                        <dependency id=`AlreadyInNuspec` version=`[2.0.0]` />
-                    </dependencies>
-                  </metadata>
-                  <files />
-                </package>
-                ");
-
-            var task = new PackNuSpec
-            {
-                NuspecPath = nuspec,
-                BasePath = _tempDir,
-                BuildEngine = new MockEngine(),
-                DestinationFolder = _tempDir,
-                Dependencies = new[]
-                {
-                    new TaskItem("OtherPackage", new Hashtable { ["Version"] = "[1.0.0, 2.0.0)"}),
-                    new TaskItem("PackageInTfm", new Hashtable { ["TargetFramework"] = "netstandard1.0", ["Version"] = "0.1.0-beta" }),
-                    new TaskItem("PackageInTfm", new Hashtable { ["TargetFramework"] = "netstandard1.1", ["Version"] = "0.2.0-beta" }),
-                }
-            };
-
-            Assert.True(task.Execute(), "The task should have passed");
-            var result = Assert.Single(task.Packages);
-
-            using (var reader = new PackageArchiveReader(result.ItemSpec))
-            {
-                var metadata = new PackageBuilder(reader.GetNuspec(), basePath: null);
-
-                var noTfmGroup = Assert.Single(metadata.DependencyGroups, d => d.TargetFramework.Equals(NuGetFramework.UnsupportedFramework));
-                Assert.Equal(2, noTfmGroup.Packages.Count());
-                Assert.Single(noTfmGroup.Packages, p => p.Id == "OtherPackage" && p.VersionRange.Equals(VersionRange.Parse("[1.0.0, 2.0.0)")));
-                Assert.Single(noTfmGroup.Packages, p => p.Id == "AlreadyInNuspec" && p.VersionRange.Equals(VersionRange.Parse("[2.0.0]")));
-
-                var netstandard10Group = Assert.Single(metadata.DependencyGroups, d => d.TargetFramework.Equals(FrameworkConstants.CommonFrameworks.NetStandard10));
-                var package1 = Assert.Single(netstandard10Group.Packages);
-                Assert.Equal("PackageInTfm", package1.Id);
-                Assert.Equal(VersionRange.Parse("0.1.0-beta"), package1.VersionRange);
-
-                var netstandard11Group = Assert.Single(metadata.DependencyGroups, d => d.TargetFramework.Equals(FrameworkConstants.CommonFrameworks.NetStandard11));
-                var package2 = Assert.Single(netstandard11Group.Packages);
-                Assert.Equal("PackageInTfm", package2.Id);
-                Assert.Equal(VersionRange.Parse("0.2.0-beta"), package2.VersionRange);
-            }
-        }
-
-        [Fact]
-        public void WarnIfMissingFilesNodes()
-        {
-            var nuspec = CreateNuspec(@"
-                <?xml version=`1.0` encoding=`utf-8`?>
-                <package xmlns=`http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd`>
-                  <metadata>
-                    <id>HasNoFiles</id>
-                    <version>1.0.0</version>
-                    <authors>Test</authors>
-                    <description>Test</description>
-                  </metadata>
-                </package>
-                ");
-
-            var engine = new MockEngine();
-            var task = new PackNuSpec
-            {
-                NuspecPath = nuspec,
-                BasePath = _tempDir,
-                BuildEngine = engine,
-                DestinationFolder = _tempDir,
-            };
-            Assert.True(task.Execute());
-            var warning = Assert.Single(engine.Warnings);
-            Assert.Equal("KRB" + KoreBuildErrors.NuspecMissingFilesNode, warning.Code);
-        }
-
-        [Fact]
-        public void PacksFiles()
-        {
-            var files = new[]
-            {
-                Path.Combine("lib", "netstandard1.0", "_._"),
-                "top.txt",
-            };
-
-            var items = new List<ITaskItem>();
-
-            foreach (var file in files)
-            {
-                var path = Path.Combine(_tempDir, file);
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
-                File.WriteAllText(path, "");
-                items.Add(new TaskItem(path, new Hashtable { ["PackagePath"] = file }));
-            }
-
-            var nuspec = CreateNuspec(@"
-                <?xml version=`1.0` encoding=`utf-8`?>
-                <package xmlns=`http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd`>
-                  <metadata>
-                    <id>HasFiles</id>
-                    <version>1.0.0</version>
-                    <authors>Test</authors>
-                    <description>Test</description>
-                  </metadata>
-                  <files />
-                </package>
-                ");
-
-            var engine = new MockEngine();
-            var task = new PackNuSpec
-            {
-                NuspecPath = nuspec,
-                BasePath = _tempDir,
-                BuildEngine = engine,
-                PackageFiles = items.ToArray(),
-                DestinationFolder = _tempDir,
-            };
-
-            Assert.True(task.Execute());
-            var result = Assert.Single(task.Packages);
-
-            using (var reader = new PackageArchiveReader(result.ItemSpec))
-            {
-                Assert.Contains("lib/netstandard1.0/_._", reader.GetFiles());
-                Assert.Contains("top.txt", reader.GetFiles());
-            }
-        }
-
-        [Theory]
-        [InlineData("")]
-        [InlineData("/")]
-        [InlineData("somedir/")]
-        public void FailsForBadPackagePath(string path)
-        {
-            var nuspec = CreateNuspec(@"
-                <?xml version=`1.0` encoding=`utf-8`?>
-                <package xmlns=`http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd`>
-                  <metadata>
-                    <id>HasFiles</id>
-                    <version>1.0.0</version>
-                    <authors>Test</authors>
-                    <description>Test</description>
-                  </metadata>
-                  <files />
-                </package>
-                ");
-
-            var engine = new MockEngine { ContinueOnError = true };
-            var task = new PackNuSpec
-            {
-                NuspecPath = nuspec,
-                BasePath = _tempDir,
-                BuildEngine = engine,
-                PackageFiles = new[] { new TaskItem("file.txt", new Hashtable { ["PackagePath"] = path }) },
-                DestinationFolder = _tempDir,
-            };
-
-            Assert.False(task.Execute(), "Task should fail");
-            var error = Assert.Single(engine.Errors);
-            Assert.Equal("KRB" + KoreBuildErrors.InvalidPackagePathMetadata, error.Code);
-        }
-
-        [Fact]
-        public void SetsLibraryIncludeFlagsOnDependency()
-        {
-            var nuspec = CreateNuspec(@"
-                <?xml version=`1.0` encoding=`utf-8`?>
-                <package xmlns=`http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd`>
-                  <metadata>
-                    <id>HasDependencies</id>
-                    <version>1.0.0</version>
-                    <authors>Test</authors>
-                    <description>Test</description>
-                  </metadata>
-                  <files />
-                </package>
-                ");
-
-            var task = new PackNuSpec
-            {
-                NuspecPath = nuspec,
-                BasePath = _tempDir,
-                BuildEngine = new MockEngine(),
-                DestinationFolder = _tempDir,
-                Dependencies = new[]
-                {
-                    new TaskItem("Include", new Hashtable { ["Version"] = "1.0.0", ["IncludeAssets"] = "Build;Analyzers"}),
-                    new TaskItem("Exclude", new Hashtable { ["Version"] = "1.0.0", ["ExcludeAssets"] = "Compile;Native"}),
-                    new TaskItem("Both", new Hashtable { ["Version"] = "1.0.0", ["IncludeAssets"] = "Build; Analyzers", ["ExcludeAssets"] = "Build; Native; ContentFiles"}),
-                }
-            };
-
-            Assert.True(task.Execute(), "The task should have passed");
-            var result = Assert.Single(task.Packages);
-
-            using (var reader = new PackageArchiveReader(result.ItemSpec))
-            {
-                var metadata = new PackageBuilder(reader.GetNuspec(), basePath: null);
-                var packages = Assert.Single(metadata.DependencyGroups).Packages;
-                Assert.Equal(3, packages.Count());
-
-                var include = Assert.Single(packages, p => p.Id == "Include").Include;
-                Assert.Equal(new[] { "Build", "Analyzers" }, include);
-
-                var exclude = Assert.Single(packages, p => p.Id == "Exclude").Exclude;
-                Assert.Equal(new[] { "Compile", "Native" }, exclude);
-
-                var both = Assert.Single(packages, p => p.Id == "Both");
-                Assert.Equal(new[] { "Build", "Analyzers" }, both.Include);
-                Assert.Equal(new[] { "Build", "Native", "ContentFiles" }, both.Exclude);
-            }
-        }
-
-        [Fact]
-        public void FailsIfBothOutputPathAndDestinationFolderAreGiven()
-        {
-            var engine = new MockEngine { ContinueOnError = true };
-            var task = new PackNuSpec
-            {
-                BuildEngine = engine,
-                OutputPath = _tempDir,
-                DestinationFolder = _tempDir,
-                NuspecPath = CreateNuspec(""),
-            };
-
-            Assert.False(task.Execute(), "Task should fail");
-            Assert.Contains("Either DestinationFolder and OutputPath must be specified, but only not both.", engine.Errors.Select(e => e.Message));
-        }
-
-        [Fact]
-        public void FailsIfNeitherOutputPathAndDestinationFolderAreGiven()
-        {
-            var engine = new MockEngine { ContinueOnError = true };
-            var task = new PackNuSpec
-            {
-                BuildEngine = engine,
-                NuspecPath = CreateNuspec(""),
-            };
-
-            Assert.False(task.Execute(), "Task should fail");
-            Assert.Contains("Either DestinationFolder and OutputPath must be specified, but only not both.", engine.Errors.Select(e => e.Message));
-        }
-
-        private string CreateNuspec(string xml)
-        {
-            var nuspecPath = Path.Combine(_tempDir, Path.GetRandomFileName() + ".nuspec");
-            File.WriteAllText(nuspecPath, xml.Replace('`', '"').TrimStart());
-            return nuspecPath;
-        }
-
-        public void Dispose()
-        {
-            try
-            {
-                Directory.Delete(_tempDir, recursive: true);
-            }
-            catch
-            {
-                Console.WriteLine("Failed to delete " + _tempDir);
-            }
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/SolutionInfoFactoryTests.cs b/test/KoreBuild.Tasks.Tests/SolutionInfoFactoryTests.cs
deleted file mode 100644
index f2eaad004..000000000
--- a/test/KoreBuild.Tasks.Tests/SolutionInfoFactoryTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using KoreBuild.Tasks.ProjectModel;
-using Xunit;
-
-namespace KoreBuild.Tasks.Tests
-{
-    public class SolutionInfoFactoryTests : IDisposable
-    {
-        private readonly string _slnFile;
-
-        public SolutionInfoFactoryTests()
-        {
-            _slnFile = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-        }
-
-        [Theory]
-        [InlineData("", new[] { "ClassLib1", "VsixProject" })]
-        [InlineData("Debug", new[] { "ClassLib1", "VsixProject" })]
-        [InlineData("DebugNoVSIX", new[] { "ClassLib1" })]
-        public void FindsProjectsByDefaultConfiguration(string config, string[] projects)
-        {
-            File.WriteAllText(_slnFile, @"
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project(`{2150E333-8FDC-42A3-9474-1A3956D46DE8}`) = `src`, `src`, `{6BC8A037-601B-412E-B394-92F55C01C7A6}`
-EndProject
-Project(`{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}`) = `ClassLib1`, `src\ClassLib1\ClassLib1.csproj`, `{89EF0B05-98D4-4C4D-8870-718571091F79}`
-EndProject
-Project(`{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}`) = `VsixProject`, `src\VsixProject\VsixProject.csproj`, `{86986537-8DF5-423F-A3A8-0CA568A9FFC4}`
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		DebugNoVSIX|Any CPU = DebugNoVSIX|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{89EF0B05-98D4-4C4D-8870-718571091F79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89EF0B05-98D4-4C4D-8870-718571091F79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86986537-8DF5-423F-A3A8-0CA568A9FFC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86986537-8DF5-423F-A3A8-0CA568A9FFC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89EF0B05-98D4-4C4D-8870-718571091F79}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{89EF0B05-98D4-4C4D-8870-718571091F79}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{86986537-8DF5-423F-A3A8-0CA568A9FFC4}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{89EF0B05-98D4-4C4D-8870-718571091F79} = {6BC8A037-601B-412E-B394-92F55C01C7A6}
-		{86986537-8DF5-423F-A3A8-0CA568A9FFC4} = {6BC8A037-601B-412E-B394-92F55C01C7A6}
-	EndGlobalSection
-EndGlobal
-".Replace('`', '"'));
-
-            var solution = SolutionInfoFactory.Create(_slnFile, config);
-            Assert.Equal(projects.Length, solution.Projects.Count);
-            Assert.All(projects, expected => Assert.Contains(solution.Projects, proj => Path.GetFileNameWithoutExtension(proj) == expected));
-        }
-
-        [Fact]
-        public void ThrowsForBadConfigName()
-        {
-            File.WriteAllText(_slnFile, @"
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-".Replace('`', '"'));
-
-            Assert.Throws<InvalidOperationException>(() => SolutionInfoFactory.Create(_slnFile, "Release"));
-        }
-
-        public void Dispose()
-        {
-            try
-            {
-                File.Delete(_slnFile);
-            }
-            catch { }
-        }
-    }
-}
diff --git a/test/KoreBuild.Tasks.Tests/TaskTestBase.cs b/test/KoreBuild.Tasks.Tests/TaskTestBase.cs
new file mode 100644
index 000000000..4b1f2c646
--- /dev/null
+++ b/test/KoreBuild.Tasks.Tests/TaskTestBase.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using BuildTools.Tasks.Tests;
+using System;
+using System.IO;
+using Xunit.Abstractions;
+
+namespace KoreBuild.Tasks.Tests
+{
+    public abstract class TaskTestBase : IDisposable
+    {
+        protected string TempDir { get; }
+        protected MockEngine MockEngine { get; }
+        protected ITestOutputHelper Output { get; }
+
+        protected TaskTestBase(ITestOutputHelper output, MSBuildTestCollectionFixture fixture)
+        {
+            TempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+            Directory.CreateDirectory(TempDir);
+            MockEngine = new MockEngine(output);
+            fixture.InitializeEnvironment(output);
+            Output = output;
+        }
+
+        public void Dispose()
+        {
+            Directory.Delete(TempDir, recursive: true);
+        }
+    }
+}
diff --git a/test/KoreBuild.Tasks.Tests/TestResources/lorem.bin b/test/KoreBuild.Tasks.Tests/TestResources/lorem.bin
deleted file mode 100644
index 2408fe952..000000000
--- a/test/KoreBuild.Tasks.Tests/TestResources/lorem.bin
+++ /dev/null
@@ -1 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et nulla laoreet ex pharetra congue. Sed gravida justo orci. Nunc nec est vitae purus accumsan consectetur et vel risus. Sed lobortis nulla eu feugiat ornare. Pellentesque ornare semper lorem at vestibulum. Aliquam molestie erat nunc. Curabitur suscipit aliquet quam quis fringilla.
diff --git a/test/KoreBuild.Tasks.Tests/UpgradeDependenciesTests.cs b/test/KoreBuild.Tasks.Tests/UpgradeDependenciesTests.cs
deleted file mode 100644
index 3de7997f3..000000000
--- a/test/KoreBuild.Tasks.Tests/UpgradeDependenciesTests.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using BuildTools.Tasks.Tests;
-using KoreBuild.Tasks.Utilities;
-using Microsoft.Build.Construction;
-using Microsoft.Build.Evaluation;
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
-using NuGet.Versioning;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace KoreBuild.Tasks.Tests
-{
-    [Collection(nameof(MSBuildTestCollection))]
-    public class UpgradeDependenciesTests : IDisposable
-    {
-        private readonly string _tempDir;
-        private readonly ITestOutputHelper _output;
-
-        public UpgradeDependenciesTests(ITestOutputHelper output, MSBuildTestCollectionFixture fixture)
-        {
-            fixture.InitializeEnvironment(output);
-            _tempDir = Path.Combine(AppContext.BaseDirectory, Path.GetRandomFileName());
-            Directory.CreateDirectory(_tempDir);
-            _output = output;
-        }
-
-        [Fact]
-        public async Task WarnsWhenVariableIsNotInPackage()
-        {
-            // arrange
-            var packageId = new PackageIdentity("Lineup", NuGetVersion.Parse("1.0.0"));
-            var lineupPackagePath = CreateLineup(packageId);
-            var depsFilePath = CreateProjectDepsFile(new VersionVariable("PackageVersionVar", "1.0.0"));
-            var engine = new MockEngine(_output);
-
-            // act
-            var task = new UpgradeDependencies
-            {
-                BuildEngine = engine,
-                DependenciesFile = depsFilePath,
-                LineupPackageId = packageId.Id,
-                LineupPackageRestoreSource = _tempDir,
-            };
-
-            // assert
-            Assert.True(await task.ExecuteAsync(), "Task is expected to pass");
-            var warning = Assert.Single(engine.Warnings);
-            Assert.Equal(KoreBuildErrors.Prefix + KoreBuildErrors.PackageVersionNotFoundInLineup, warning.Code);
-
-            var modifiedDepsFile = DependencyVersionsFile.Load(depsFilePath);
-            Assert.Equal("1.0.0", modifiedDepsFile.VersionVariables["PackageVersionVar"].Version);
-        }
-
-        [Fact]
-        public async Task ModifiesVariableValue()
-        {
-            // arrange
-            var packageId = new PackageIdentity("Lineup", NuGetVersion.Parse("1.0.0"));
-            var lineupPackagePath = CreateLineup(packageId, new VersionVariable("PackageVersionVar", "2.0.0"));
-            var depsFilePath = CreateProjectDepsFile(new VersionVariable("PackageVersionVar", "1.0.0"));
-
-            // act
-            var task = new UpgradeDependencies
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = depsFilePath,
-                LineupPackageId = packageId.Id,
-                LineupPackageRestoreSource = _tempDir,
-            };
-
-            // assert
-            Assert.True(await task.ExecuteAsync(), "Task is expected to pass");
-            var modifiedDepsFile = DependencyVersionsFile.Load(depsFilePath);
-            Assert.Equal("2.0.0", modifiedDepsFile.VersionVariables["PackageVersionVar"].Version);
-            Assert.False(modifiedDepsFile.VersionVariables["PackageVersionVar"].IsReadOnly);
-        }
-
-
-        [Fact]
-        public async Task DoesNotModifyPinnedVariableValue()
-        {
-            // arrange
-            var packageId = new PackageIdentity("Lineup", NuGetVersion.Parse("1.0.0"));
-            var lineupPackagePath = CreateLineup(packageId, new VersionVariable("PackageVersionVar", "2.0.0"));
-            var depsFilePath = CreateProjectDepsFile(new VersionVariable("PackageVersionVar", "1.0.0") { IsReadOnly = true });
-
-            // act
-            var task = new UpgradeDependencies
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = depsFilePath,
-                LineupPackageId = packageId.Id,
-                LineupPackageRestoreSource = _tempDir,
-            };
-
-            // assert
-            Assert.True(await task.ExecuteAsync(), "Task is expected to pass");
-            _output.WriteLine(File.ReadAllText(depsFilePath));
-            var modifiedDepsFile = DependencyVersionsFile.Load(depsFilePath);
-            Assert.Equal("1.0.0", modifiedDepsFile.VersionVariables["PackageVersionVar"].Version);
-            Assert.True(modifiedDepsFile.VersionVariables["PackageVersionVar"].IsReadOnly);
-        }
-
-
-        [Fact]
-        public async Task ModifiesVariableValueUsingDepsFile()
-        {
-            // arrange
-            var depsFilePath = CreateProjectDepsFile(new VersionVariable("PackageVersionVar", "1.0.0"));
-            var updatedDepsFilePath = CreateProjectDepsFile(Path.Combine(_tempDir, "dependencies.props"), new VersionVariable("PackageVersionVar", "2.0.0"));
-
-            // act
-            var task = new UpgradeDependencies
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = depsFilePath,
-                LineupDependenciesFile = updatedDepsFilePath
-            };
-
-            // assert
-            Assert.True(await task.ExecuteAsync(), "Task is expected to pass");
-            var modifiedDepsFile = DependencyVersionsFile.Load(depsFilePath);
-            Assert.Equal("2.0.0", modifiedDepsFile.VersionVariables["PackageVersionVar"].Version);
-        }
-
-        [Fact]
-        public async Task SnapsInternalAspNetCoreSdkToBuildTools()
-        {
-            // arrange
-            var packageId = new PackageIdentity("Lineup", NuGetVersion.Parse("1.0.0"));
-            var lineupPackagePath = CreateLineup(packageId, new VersionVariable("InternalAspNetCoreSdkPackageVersion", "2.0.0"));
-            var depsFilePath = CreateProjectDepsFile(new VersionVariable("InternalAspNetCoreSdkPackageVersion", "1.0.0"));
-
-            // act
-            var task = new UpgradeDependencies
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = depsFilePath,
-                LineupPackageId = packageId.Id,
-                LineupPackageRestoreSource = _tempDir,
-            };
-
-            // assert
-            Assert.True(await task.ExecuteAsync(), "Task is expected to pass");
-            var modifiedDepsFile = DependencyVersionsFile.Load(depsFilePath);
-            Assert.Equal(KoreBuildVersion.Current, modifiedDepsFile.VersionVariables["InternalAspNetCoreSdkPackageVersion"].Version);
-        }
-
-        [Fact]
-        public async Task DoesNotModifiesFileIfNoChanges()
-        {
-            // arrange
-            var packageId = new PackageIdentity("Lineup", NuGetVersion.Parse("1.0.0"));
-            var pkg = new VersionVariable("PackageVersionVar", "1.0.0");
-            var lineupPackagePath = CreateLineup(packageId, pkg);
-            var depsFilePath = CreateProjectDepsFile(pkg);
-            var created = File.GetLastWriteTime(depsFilePath);
-
-            // act
-            var task = new UpgradeDependencies
-            {
-                BuildEngine = new MockEngine(_output),
-                DependenciesFile = depsFilePath,
-                LineupPackageId = packageId.Id,
-                LineupPackageRestoreSource = _tempDir,
-            };
-
-            // assert
-            Assert.True(await task.ExecuteAsync(), "Task is expected to pass");
-            var modifiedDepsFile = DependencyVersionsFile.Load(depsFilePath);
-            Assert.Equal("1.0.0", modifiedDepsFile.VersionVariables["PackageVersionVar"].Version);
-            Assert.Equal(created, File.GetLastWriteTime(depsFilePath));
-        }
-
-        private string CreateProjectDepsFile(params VersionVariable[] variables)
-        {
-            return CreateProjectDepsFile(Path.Combine(_tempDir, "projectdeps.props"), variables);
-        }
-
-        private string CreateProjectDepsFile(string depsFilePath, params VersionVariable[] variables)
-        {
-            var proj = ProjectRootElement.Create(NewProjectFileOptions.None);
-            var originalDepsFile = DependencyVersionsFile.Load(proj);
-            foreach (var item in variables)
-            {
-                if (item.IsReadOnly)
-                {
-                    originalDepsFile.AddPinnedVariable(item.Name, item.Version);
-                }
-                else
-                {
-                    originalDepsFile.Update(item.Name, item.Version);
-                }
-            }
-            originalDepsFile.Save(depsFilePath);
-            return depsFilePath;
-        }
-
-        private string CreateLineup(PackageIdentity identity, params VersionVariable[] variables)
-        {
-            var output = Path.Combine(_tempDir, $"{identity.Id}.{identity.Version}.nupkg");
-
-            var proj = ProjectRootElement.Create(NewProjectFileOptions.None);
-            var depsFiles = DependencyVersionsFile.Load(proj);
-            foreach (var item in variables)
-            {
-                depsFiles.Update(item.Name, item.Version);
-            }
-            depsFiles.Save(Path.Combine(_tempDir, "dependencies.props"));
-
-            var builder = new PackageBuilder
-            {
-                Id = identity.Id,
-                Version = identity.Version,
-                Owners = { "Test" },
-                Authors = { "Test" },
-                Description = "Test lineup package"
-            };
-
-            builder.AddFiles(_tempDir, "dependencies.props", "build/dependencies.props");
-
-            using (var stream = File.Create(output))
-            {
-                builder.Save(stream);
-            }
-
-            return output;
-        }
-
-        public void Dispose()
-        {
-            Directory.Delete(_tempDir, recursive: true);
-        }
-
-        private struct VersionVariable
-        {
-            public string Name;
-            public string Version;
-            internal bool IsReadOnly;
-
-            public VersionVariable(string varName, string version) : this()
-            {
-                this.Name = varName;
-                this.Version = version;
-            }
-        }
-    }
-}
diff --git a/test/NuGetPackageVerifier.Tests/NuGetPackageVerifier.Tests.csproj b/test/NuGetPackageVerifier.Tests/NuGetPackageVerifier.Tests.csproj
new file mode 100644
index 000000000..6b52ebb17
--- /dev/null
+++ b/test/NuGetPackageVerifier.Tests/NuGetPackageVerifier.Tests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\modules\NuGetPackageVerifier\console\NuGetPackageVerifier.Console.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="SignedNupkg.nupkg" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/NuGetPackageVerifier.Tests/Rules/PackageRepoMetadataRuleTests.cs b/test/NuGetPackageVerifier.Tests/Rules/PackageRepoMetadataRuleTests.cs
new file mode 100644
index 000000000..b882d80fc
--- /dev/null
+++ b/test/NuGetPackageVerifier.Tests/Rules/PackageRepoMetadataRuleTests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using NuGet.Packaging;
+using NuGet.Packaging.Core;
+using NuGetPackageVerifier.Rules;
+using NuGetPackageVerifier.Utilities;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NuGetPackageVerifier
+{
+    public class PackageRepoMetadataRuleTests
+    {
+        private readonly ITestOutputHelper _output;
+
+        public PackageRepoMetadataRuleTests(ITestOutputHelper output)
+        {
+            _output = output;
+        }
+
+        [Fact]
+        public void ItWarnsAboutMissingMetadata()
+        {
+            var metadata = new ManifestMetadata
+            {
+                Repository = new RepositoryMetadata { },
+            };
+
+            var rule = new PackageRepoMetadataRule();
+
+            using (var context = TestPackageAnalysisContext.Create(_output, metadata))
+            {
+                Assert.Contains(rule.Validate(context), r => string.Equals(r.IssueId, "PACKAGE_MISSING_REPO_TYPE", StringComparison.Ordinal));
+                Assert.Contains(rule.Validate(context), r => string.Equals(r.IssueId, "PACKAGE_MISSING_REPO_URL", StringComparison.Ordinal));
+                Assert.Contains(rule.Validate(context), r => string.Equals(r.IssueId, "PACKAGE_MISSING_REPO_COMMIT", StringComparison.Ordinal));
+            }
+        }
+    }
+}
diff --git a/test/NuGetPackageVerifier.Tests/Rules/PackageSigningRuleTests.cs b/test/NuGetPackageVerifier.Tests/Rules/PackageSigningRuleTests.cs
new file mode 100644
index 000000000..f8ef79bde
--- /dev/null
+++ b/test/NuGetPackageVerifier.Tests/Rules/PackageSigningRuleTests.cs
@@ -0,0 +1,96 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using NuGetPackageVerifier.Rules;
+using NuGetPackageVerifier.Utilities;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NuGetPackageVerifier
+{
+    public class PackageSigningRuleTests
+    {
+        private readonly ITestOutputHelper _output;
+
+        public PackageSigningRuleTests(ITestOutputHelper output)
+        {
+            _output = output;
+        }
+
+        [Fact]
+        public void Validate_ReturnsErrorIssue_IfPackageNotSigned()
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                // PackageSign verification only works on desktop
+                return;
+            }
+
+            // Arrange
+            var context = TestPackageAnalysisContext.CreateContext(
+                _output,
+                new[] { "lib/netstandard2.0/Test.dll", "tools/MyScript.psd1" });
+
+            using (context)
+            {
+                var rule = GetRule();
+
+                // Act
+                var issues = rule.Validate(context);
+
+                // Assert
+                Assert.Collection(
+                    issues,
+                    issue =>
+                    {
+                        Assert.Equal(TestPackageAnalysisContext.PackageId, issue.Instance);
+                        Assert.Equal("PACKAGE_SIGN_VERIFICATION_FAILED", issue.IssueId);
+                        Assert.Equal(PackageIssueLevel.Error, issue.Level);
+                        Assert.StartsWith($"Sign verification for package {TestPackageAnalysisContext.PackageId} failed:", issue.Issue);
+                    });
+            }
+        }
+
+        [Fact]
+        public void Validate_ReturnsEmpty()
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                // PackageSign verification only works on desktop
+                return;
+            }
+
+            // Arrange
+            var signedNupkgFile = Path.Combine(AppContext.BaseDirectory, "SignedNupkg.nupkg");
+
+            var context = new PackageAnalysisContext
+            {
+                Logger = new TestLogger(_output),
+                PackageFileInfo = new FileInfo(signedNupkgFile),
+            };
+
+            var rule = GetRule();
+
+            // Act
+            var issues = rule.Validate(context);
+
+            // Assert
+            Assert.Empty(issues);
+        }
+
+        private static PackageSigningRule GetRule()
+        {
+            var solutionDir = SolutionDirectory.GetSolutionRootDirectory();
+            var nugetExe = Path.Combine(solutionDir, "obj", "nuget.exe");
+            if (!File.Exists(nugetExe))
+            {
+                throw new FileNotFoundException($"File {nugetExe} could not be found. Ensure build /t:Prepare is invoked from the root of this repository, before this test is executed.");
+            }
+
+            return new PackageSigningRule(nugetExe);
+        }
+    }
+}
diff --git a/test/NuGetPackageVerifier.Tests/SignedNupkg.nupkg b/test/NuGetPackageVerifier.Tests/SignedNupkg.nupkg
new file mode 100644
index 000000000..afcb98896
Binary files /dev/null and b/test/NuGetPackageVerifier.Tests/SignedNupkg.nupkg differ
diff --git a/test/NuGetPackageVerifier.Tests/Utilities/DisposableDirectory.cs b/test/NuGetPackageVerifier.Tests/Utilities/DisposableDirectory.cs
new file mode 100644
index 000000000..c3d21b2bc
--- /dev/null
+++ b/test/NuGetPackageVerifier.Tests/Utilities/DisposableDirectory.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using IOPath = System.IO.Path;
+
+namespace NuGetPackageVerifier.Utilities
+{
+    internal class DisposableDirectory : IDisposable
+    {
+        public DisposableDirectory()
+        {
+            Path = IOPath.Combine(AppContext.BaseDirectory, IOPath.GetRandomFileName());
+            Directory.CreateDirectory(Path);
+        }
+
+        public string Path { get; }
+
+        public void Dispose()
+        {
+            try
+            {
+                if (Directory.Exists(Path))
+                {
+                    Directory.Delete(Path, recursive: true);
+                }
+            }
+            catch
+            {
+                // Don't throw if we fail to delete the test directory.
+            }
+        }
+    }
+}
diff --git a/test/NuGetPackageVerifier.Tests/Utilities/SolutionDirectory.cs b/test/NuGetPackageVerifier.Tests/Utilities/SolutionDirectory.cs
new file mode 100644
index 000000000..d121cf5ba
--- /dev/null
+++ b/test/NuGetPackageVerifier.Tests/Utilities/SolutionDirectory.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+
+namespace NuGetPackageVerifier.Utilities
+{
+    internal static class SolutionDirectory
+    {
+        public static string GetSolutionRootDirectory()
+        {
+            const string SolutionFileName = "BuildTools.sln";
+            var applicationBasePath = AppContext.BaseDirectory;
+            var directoryInfo = new DirectoryInfo(applicationBasePath);
+
+            do
+            {
+                var projectFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, SolutionFileName));
+                if (projectFileInfo.Exists)
+                {
+                    return projectFileInfo.DirectoryName;
+                }
+
+                directoryInfo = directoryInfo.Parent;
+            }
+            while (directoryInfo.Parent != null);
+
+            throw new FileNotFoundException(
+                $"Solution file {SolutionFileName} could not be found in {applicationBasePath} or its parent directories.",
+                SolutionFileName);
+        }
+    }
+}
diff --git a/test/NuGetPackageVerifier.Tests/Utilities/TestLogger.cs b/test/NuGetPackageVerifier.Tests/Utilities/TestLogger.cs
new file mode 100644
index 000000000..7d9d60928
--- /dev/null
+++ b/test/NuGetPackageVerifier.Tests/Utilities/TestLogger.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using NuGetPackageVerifier.Logging;
+using Xunit.Abstractions;
+
+namespace NuGetPackageVerifier.Utilities
+{
+    internal class TestLogger : IPackageVerifierLogger
+    {
+        private ITestOutputHelper _output;
+
+        public TestLogger(ITestOutputHelper output)
+        {
+            _output = output;
+        }
+
+        public void Log(LogLevel logLevel, string message)
+        {
+            _output.WriteLine($"{logLevel}: {message}");
+        }
+    }
+}
diff --git a/test/NuGetPackageVerifier.Tests/Utilities/TestPackageAnalysisContext.cs b/test/NuGetPackageVerifier.Tests/Utilities/TestPackageAnalysisContext.cs
new file mode 100644
index 000000000..d9386d28a
--- /dev/null
+++ b/test/NuGetPackageVerifier.Tests/Utilities/TestPackageAnalysisContext.cs
@@ -0,0 +1,87 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Linq;
+using NuGet.Packaging;
+using NuGet.Versioning;
+using Xunit.Abstractions;
+
+namespace NuGetPackageVerifier.Utilities
+{
+    internal class TestPackageAnalysisContext : PackageAnalysisContext
+    {
+        public const string PackageId = "TestPackage";
+        private readonly DisposableDirectory _disposableDirectory;
+
+        private TestPackageAnalysisContext(DisposableDirectory disposableDirectory)
+        {
+            _disposableDirectory = disposableDirectory;
+        }
+
+        public static PackageAnalysisContext CreateContext(
+            ITestOutputHelper output,
+            string[] emptyFiles,
+            string version = "1.0.0")
+        {
+            return Create(output,
+                new ManifestMetadata
+                {
+                    Id = PackageId,
+                    Version = new NuGetVersion(version),
+                },
+                emptyFiles);
+        }
+
+        public static PackageAnalysisContext Create(
+            ITestOutputHelper output,
+            ManifestMetadata metadata,
+            string[] emptyFiles = null)
+        {
+            var disposableDirectory = new DisposableDirectory();
+            var basePath = disposableDirectory.Path;
+            var nupkgFileName = $"{PackageId}.{metadata.Version}.nupkg";
+            var nupkgPath = Path.Combine(basePath, nupkgFileName);
+
+            // set required metadata
+            metadata.Id = metadata.Id ?? "Test";
+            metadata.Version = metadata.Version ?? new NuGetVersion("1.0.0");
+            metadata.Authors = metadata.Authors.Any() ? metadata.Authors : new[] { "test" };
+            metadata.Description = metadata.Description ?? "Description";
+
+            // prevent PackageException for packages with no dependencies or content
+            emptyFiles = emptyFiles ?? new[] { "_._" };
+
+            var builder = new PackageBuilder();
+
+            builder.Populate(metadata);
+
+            using (var nupkg = File.Create(nupkgPath))
+            {
+                foreach (var dest in emptyFiles)
+                {
+                    var fileName = Path.GetFileName(dest);
+                    File.WriteAllText(Path.Combine(basePath, fileName), "");
+                    builder.AddFiles(basePath, fileName, dest);
+                }
+
+                builder.Save(nupkg);
+            }
+
+            var context = new TestPackageAnalysisContext(disposableDirectory)
+            {
+                Logger = new TestLogger(output),
+                PackageFileInfo = new FileInfo(nupkgPath),
+                Metadata = builder,
+            };
+
+            return context;
+        }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            _disposableDirectory.Dispose();
+        }
+    }
+}
diff --git a/testassets/RepoThatShouldFailToBuild/korebuild.json b/testassets/RepoThatShouldFailToBuild/korebuild.json
index 678d8bb94..9217392b1 100644
--- a/testassets/RepoThatShouldFailToBuild/korebuild.json
+++ b/testassets/RepoThatShouldFailToBuild/korebuild.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "release/2.1"
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/main/tools/korebuild.schema.json",
+  "channel": "main"
 }
diff --git a/testassets/RepoThatShouldFailToBuild/src/BadConsole/BadConsole.csproj b/testassets/RepoThatShouldFailToBuild/src/BadConsole/BadConsole.csproj
index 23df6047f..c73e0d169 100644
--- a/testassets/RepoThatShouldFailToBuild/src/BadConsole/BadConsole.csproj
+++ b/testassets/RepoThatShouldFailToBuild/src/BadConsole/BadConsole.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/testassets/RepoWithGlobalTool/Directory.Build.props b/testassets/RepoWithGlobalTool/Directory.Build.props
deleted file mode 100644
index 058246e40..000000000
--- a/testassets/RepoWithGlobalTool/Directory.Build.props
+++ /dev/null
@@ -1 +0,0 @@
-<Project />
diff --git a/testassets/RepoWithGlobalTool/Directory.Build.targets b/testassets/RepoWithGlobalTool/Directory.Build.targets
deleted file mode 100644
index b207ca315..000000000
--- a/testassets/RepoWithGlobalTool/Directory.Build.targets
+++ /dev/null
@@ -1,4 +0,0 @@
-<!--
-This file will be replaced during tests runs.
-It's here in source just to keep local dev work isolated from KoreBuild's context. -->
-<Project />
diff --git a/testassets/RepoWithGlobalTool/RepoWithGlobalTool.sln b/testassets/RepoWithGlobalTool/RepoWithGlobalTool.sln
deleted file mode 100644
index af58340cc..000000000
--- a/testassets/RepoWithGlobalTool/RepoWithGlobalTool.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlobalConsoleTool", "src\GlobalConsoleTool\GlobalConsoleTool.csproj", "{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Debug|x64.Build.0 = Debug|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Debug|x86.Build.0 = Debug|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Release|x64.ActiveCfg = Release|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Release|x64.Build.0 = Release|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Release|x86.ActiveCfg = Release|Any CPU
-		{4F0E73BA-1E8D-41B2-8FE8-59E58228224F}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/testassets/RepoWithGlobalTool/build/dependencies.props b/testassets/RepoWithGlobalTool/build/dependencies.props
deleted file mode 100644
index a932d8361..000000000
--- a/testassets/RepoWithGlobalTool/build/dependencies.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup Label="Package Versions">
-  </PropertyGroup>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' "/>
-</Project>
diff --git a/testassets/RepoWithGlobalTool/korebuild.json b/testassets/RepoWithGlobalTool/korebuild.json
deleted file mode 100644
index 678d8bb94..000000000
--- a/testassets/RepoWithGlobalTool/korebuild.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "release/2.1"
-}
diff --git a/testassets/RepoWithGlobalTool/src/GlobalConsoleTool/GlobalConsoleTool.csproj b/testassets/RepoWithGlobalTool/src/GlobalConsoleTool/GlobalConsoleTool.csproj
deleted file mode 100644
index d99c04c14..000000000
--- a/testassets/RepoWithGlobalTool/src/GlobalConsoleTool/GlobalConsoleTool.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <PackAsTool>true</PackAsTool>
-    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
-  </PropertyGroup>
-
-</Project>
diff --git a/testassets/RepoWithGlobalTool/src/GlobalConsoleTool/Program.cs b/testassets/RepoWithGlobalTool/src/GlobalConsoleTool/Program.cs
deleted file mode 100644
index e91098a2b..000000000
--- a/testassets/RepoWithGlobalTool/src/GlobalConsoleTool/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace GlobalConsoleTool
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Console.WriteLine("Hello World!");
-        }
-    }
-}
diff --git a/testassets/SimpleRepo/Directory.Build.props b/testassets/SimpleRepo/Directory.Build.props
index 49ef3296a..31b0d1447 100644
--- a/testassets/SimpleRepo/Directory.Build.props
+++ b/testassets/SimpleRepo/Directory.Build.props
@@ -1,5 +1,8 @@
 <Project>
   <Import Project="version.props" />
   <Import Project="build\dependencies.props" />
-  <Import Project="build\sources.props" />
+
+  <PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
 </Project>
diff --git a/testassets/SimpleRepo/NuGetPackageVerifier.json b/testassets/SimpleRepo/NuGetPackageVerifier.json
index d2794bf11..08085b450 100644
--- a/testassets/SimpleRepo/NuGetPackageVerifier.json
+++ b/testassets/SimpleRepo/NuGetPackageVerifier.json
@@ -8,7 +8,7 @@
       "Simple.CliTool": {
         "Exclusions": {
           "VERSION_INFORMATIONALVERSION": {
-            "tools/netcoreapp2.1/any/Newtonsoft.Json.dll": "Example exclusion"
+            "tools/netcoreapp3.1/any/Newtonsoft.Json.dll": "Example exclusion"
           }
         }
       }
diff --git a/testassets/SimpleRepo/build/Sample.Lineup.nuspec b/testassets/SimpleRepo/build/Sample.Lineup.nuspec
deleted file mode 100644
index 9dc148902..000000000
--- a/testassets/SimpleRepo/build/Sample.Lineup.nuspec
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>Sample.Lineup</id>
-    <version>$version$</version>
-    <authors>KoreBuild</authors>
-    <description>Description.</description>
-    <packageTypes>
-      <packageType name="lineup" />
-    </packageTypes>
-  </metadata>
-  <files>
-    <file src="dependencies.props" target="build/dependencies.props" />
-  </files>
-</package>
diff --git a/testassets/SimpleRepo/build/dependencies.props b/testassets/SimpleRepo/build/dependencies.props
index 0f0e6a4d7..86a4c4a5a 100644
--- a/testassets/SimpleRepo/build/dependencies.props
+++ b/testassets/SimpleRepo/build/dependencies.props
@@ -3,15 +3,10 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>0.0.1</InternalAspNetCoreSdkPackageVersion>
     <NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.5.0</MicrosoftNETTestSdkPackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- Hack for the tests. Normally, this pattern shouldn't be used, but for our functional tests, we can't commit the verison of this package to source because it doesn't exist yet :).-->
-    <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
-  </PropertyGroup>
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' "/>
 </Project>
diff --git a/testassets/SimpleRepo/build/repo.targets b/testassets/SimpleRepo/build/repo.targets
index c7f3af77e..6971488f7 100644
--- a/testassets/SimpleRepo/build/repo.targets
+++ b/testassets/SimpleRepo/build/repo.targets
@@ -1,27 +1,9 @@
 <Project>
   <PropertyGroup>
     <PrepareDependsOn>$(PrepareDependsOn);Greet</PrepareDependsOn>
-    <PackageDependsOn>$(PackageDependsOn);PackLineup</PackageDependsOn>
-    <VerifyDependsOn>$(VerifyDependsOn);TestNuGetPush;UpgradeDependencies</VerifyDependsOn>
-
-    <LineupPackageId>Sample.Lineup</LineupPackageId>
-    <LineupPackageVersion>$(Version)</LineupPackageVersion>
-    <LineupPackageRestoreSource>$(IntermediateDir)</LineupPackageRestoreSource>
   </PropertyGroup>
 
-  <Target Name="PackLineup">
-    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)Sample.Lineup.nuspec" DestinationFolder="$(IntermediateDir)" Properties="version=$(Version)" />
-  </Target>
-
   <Target Name="Greet">
     <RepoTasks.SayHello />
   </Target>
-
-  <Target Name="TestNuGetPush">
-    <ItemGroup>
-      <Packages Include="$(BuildDir)*.nupkg" />
-    </ItemGroup>
-    <MakeDir Directories="$(RepositoryRoot)obj\tmp-nuget\" />
-    <PushNuGetPackages Packages="@(Packages)" Feed="$(RepositoryRoot)obj\tmp-nuget\" />
-  </Target>
 </Project>
diff --git a/testassets/SimpleRepo/build/sources.props b/testassets/SimpleRepo/build/sources.props
deleted file mode 100644
index a5c9ae8bc..000000000
--- a/testassets/SimpleRepo/build/sources.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(KoreBuildBundledPackageFolder)</RestoreAdditionalProjectSources>
-  </PropertyGroup>
-</Project>
diff --git a/testassets/SimpleRepo/build/tasks/RepoTasks.csproj b/testassets/SimpleRepo/build/tasks/RepoTasks.csproj
index c4fb6c59b..482a8fdf7 100644
--- a/testassets/SimpleRepo/build/tasks/RepoTasks.csproj
+++ b/testassets/SimpleRepo/build/tasks/RepoTasks.csproj
@@ -2,8 +2,7 @@
   <Import Project="$(RepoTasksSdkPath)\Sdk.props" Condition="'$(RepoTasksSdkPath)' != '' "/>
 
   <PropertyGroup>
-    <!-- still required to keep VS happy -->
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <Import Project="$(RepoTasksSdkPath)\Sdk.targets" Condition="'$(RepoTasksSdkPath)' != '' "/>
diff --git a/testassets/SimpleRepo/korebuild.json b/testassets/SimpleRepo/korebuild.json
index 678d8bb94..9217392b1 100644
--- a/testassets/SimpleRepo/korebuild.json
+++ b/testassets/SimpleRepo/korebuild.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "release/2.1"
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/main/tools/korebuild.schema.json",
+  "channel": "main"
 }
diff --git a/testassets/SimpleRepo/samples/Simple.Sample/Simple.Sample.csproj b/testassets/SimpleRepo/samples/Simple.Sample/Simple.Sample.csproj
index 85e1fa1d0..4ef288727 100644
--- a/testassets/SimpleRepo/samples/Simple.Sample/Simple.Sample.csproj
+++ b/testassets/SimpleRepo/samples/Simple.Sample/Simple.Sample.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/testassets/SimpleRepo/src/Simple.CliTool/Simple.CliTool.csproj b/testassets/SimpleRepo/src/Simple.CliTool/Simple.CliTool.csproj
index 5d11ab4ec..524847a43 100644
--- a/testassets/SimpleRepo/src/Simple.CliTool/Simple.CliTool.csproj
+++ b/testassets/SimpleRepo/src/Simple.CliTool/Simple.CliTool.csproj
@@ -1,23 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>exe</OutputType>
     <PackageType>DotnetTool</PackageType>
     <AssemblyName>cowsay</AssemblyName>
     <PackageId>Simple.CliTool</PackageId>
     <PackAsTool>true</PackAsTool>
-    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
     <AssemblySigningCertName>TestCert</AssemblySigningCertName>
     <PackageSigningCertName>MyPackageSigningCert</PackageSigningCertName>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
 
     <SignedPackageFile Include="$(PublishDir)Newtonsoft.Json.dll" Certificate="Test3rdPartyCert">
-      <PackagePath>tools/$(TargetFramework)/any/Newtonsoft.Json.dll</PackagePath>
+      <PackagePath>tools/$(TargetFramework)/any/</PackagePath>
     </SignedPackageFile>
   </ItemGroup>
 
diff --git a/testassets/SimpleRepo/src/Simple.Lib/Simple.Lib.csproj b/testassets/SimpleRepo/src/Simple.Lib/Simple.Lib.csproj
index 864030fdb..72c1a4d8f 100644
--- a/testassets/SimpleRepo/src/Simple.Lib/Simple.Lib.csproj
+++ b/testassets/SimpleRepo/src/Simple.Lib/Simple.Lib.csproj
@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <AssemblySigningCertName>TestCert</AssemblySigningCertName>
+    <PackageSigningCertName>NuGet</PackageSigningCertName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/testassets/SimpleRepo/test/Simple.Test/Simple.Test.csproj b/testassets/SimpleRepo/test/Simple.Test/Simple.Test.csproj
index 0619259c6..3fd2ed02a 100644
--- a/testassets/SimpleRepo/test/Simple.Test/Simple.Test.csproj
+++ b/testassets/SimpleRepo/test/Simple.Test/Simple.Test.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tools/KoreBuild.Console/Commands/ApiBaselinesGenerateCommand.cs b/tools/KoreBuild.Console/Commands/ApiBaselinesGenerateCommand.cs
deleted file mode 100644
index e1bb37c57..000000000
--- a/tools/KoreBuild.Console/Commands/ApiBaselinesGenerateCommand.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class ApiBaselinesGenerateCommand : SubCommandBase
-    {
-        public ApiBaselinesGenerateCommand(CommandContext context) : base(context)
-        {
-        }
-
-        public override void Configure(CommandLineApplication application)
-        {
-            application.Description = "Generates baselines for all projects in this repo.";
-
-            base.Configure(application);
-        }
-
-        protected override int Execute()
-        {
-            var args = new List<string>
-            {
-                "msbuild",
-                "/nologo",
-                "/m",
-                $"/p:KoreBuildVersion={this.Context.KoreBuildVersion}",
-                $"/p:RepositoryRoot=\"{this.Context.RepoPath}/\"",
-                "\"/p:GenerateBaselines=true\"",
-                "\"/p:SkipTests=true\"",
-                "/clp:Summary",
-                Path.Combine(Context.KoreBuildDir, "KoreBuild.proj")
-            };
-
-            if (Reporter.IsVerbose)
-            {
-                args.Add("\"/v:n\"");
-            }
-            else
-            {
-                args.Add("\"/v:m\"");
-            }
-
-            return RunDotnet(args, Context.RepoPath);
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/CommandBase.cs b/tools/KoreBuild.Console/Commands/CommandBase.cs
deleted file mode 100644
index bb8fcc8c9..000000000
--- a/tools/KoreBuild.Console/Commands/CommandBase.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal abstract class CommandBase
-    {
-        private CommandLineApplication _application;
-
-        public virtual void Configure(CommandLineApplication application)
-        {
-            _application = application;
-
-            application.HelpOption("-h|--help");
-
-            application.OnExecute(
-                () =>
-                {
-                    if (IsValid())
-                    {
-                        return Execute();
-                    }
-                    else
-                    {
-                        application.ShowHelp();
-                        return 1;
-                    }
-                });
-        }
-
-        protected virtual int Execute()
-        {
-            _application.ShowHelp();
-
-            return 0;
-        }
-
-        protected virtual bool IsValid()
-        {
-            return true;
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/CommandContext.cs b/tools/KoreBuild.Console/Commands/CommandContext.cs
deleted file mode 100644
index 2373311c8..000000000
--- a/tools/KoreBuild.Console/Commands/CommandContext.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Microsoft.Extensions.CommandLineUtils;
-using Microsoft.Extensions.Tools.Internal;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class CommandContext
-    {
-        private const string _defaultToolsSource = "https://aspnetcore.blob.core.windows.net/buildtools";
-        private const string _dotnetFolderName = ".dotnet";
-
-        private CommandOption _repoPathOption;
-        private CommandOption _dotNetHomeOption;
-        private CommandOption _toolsSourceOption;
-        private CommandOption _verbose;
-
-        private string _koreBuildDir;
-        private CommandOption _korebuildOverrideOpt;
-
-        public CommandContext(CommandLineApplication application)
-        {
-            _korebuildOverrideOpt = application.Option("--korebuild-override <PATH>", "Where is KoreBuild?", CommandOptionType.SingleValue, inherited: true);
-            // for local development only
-            _korebuildOverrideOpt.ShowInHelpText = false;
-
-            _verbose = application.Option("-v|--verbose", "Show verbose output", CommandOptionType.NoValue, inherited: true);
-            _toolsSourceOption = application.Option("--tools-source", "The source to draw tools from.", CommandOptionType.SingleValue, inherited: true);
-            _repoPathOption = application.Option("--repo-path", "The path to the repo to work on.", CommandOptionType.SingleValue, inherited: true);
-            _dotNetHomeOption = application.Option("--dotnet-home", "The place where dotnet lives", CommandOptionType.SingleValue, inherited: true);
-            // TODO: Configure file
-        }
-
-        public string KoreBuildDir
-        {
-            get
-            {
-                if (_koreBuildDir == null)
-                {
-                    _koreBuildDir = FindKoreBuildDirectory();
-                }
-                return _koreBuildDir;
-            }
-        }
-
-        public string ConfigDirectory => Path.Combine(KoreBuildDir, "config");
-        public string RepoPath => _repoPathOption.HasValue() ? _repoPathOption.Value() : Directory.GetCurrentDirectory();
-        public string DotNetHome => GetDotNetHome();
-        public string ToolsSource => _toolsSourceOption.HasValue() ? _toolsSourceOption.Value() : _defaultToolsSource;
-        public string SDKVersion => GetDotnetSDKVersion();
-
-        public string KoreBuildVersion => GetKoreBuildVersion();
-
-        public IReporter Reporter => new ConsoleReporter(PhysicalConsole.Singleton, _verbose != null, false);
-
-        private string GetDotnetSDKVersion()
-        {
-            var sdkVersionEnv = Environment.GetEnvironmentVariable("KOREBUILD_DOTNET_VERSION");
-            if (sdkVersionEnv != null)
-            {
-                return sdkVersionEnv;
-            }
-            else
-            {
-                var sdkVersionPath = Path.Combine(ConfigDirectory, "sdk.version");
-                return File.ReadAllText(sdkVersionPath).Trim();
-            }
-        }
-
-        private string GetDotNetHome()
-        {
-            var dotnetHome = Environment.GetEnvironmentVariable("DOTNET_HOME");
-            var userProfile = Environment.GetEnvironmentVariable("USERPROFILE");
-            var home = Environment.GetEnvironmentVariable("HOME");
-
-            var result = Path.Combine(Directory.GetCurrentDirectory(), _dotnetFolderName);
-            if (_dotNetHomeOption.HasValue())
-            {
-                result = _dotNetHomeOption.Value();
-            }
-            else if (!string.IsNullOrEmpty(dotnetHome))
-            {
-                result = dotnetHome;
-            }
-            else if (!string.IsNullOrEmpty(userProfile))
-            {
-                result = Path.Combine(userProfile, _dotnetFolderName);
-            }
-            else if (!string.IsNullOrEmpty(home))
-            {
-                result = home;
-            }
-
-            return result;
-        }
-
-        private string GetKoreBuildVersion()
-        {
-            var dir = new DirectoryInfo(FindKoreBuildDirectory());
-            return dir.Parent.Name;
-        }
-
-        private string FindKoreBuildDirectory()
-        {
-            if (_korebuildOverrideOpt.HasValue())
-            {
-                return Path.GetFullPath(_korebuildOverrideOpt.Value());
-            }
-
-            var executingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var root = Directory.GetDirectoryRoot(executingDir);
-            while (executingDir != root)
-            {
-                var files = Directory.EnumerateFiles(executingDir);
-                var koreProj = Path.Combine(executingDir, "KoreBuild.proj");
-                if (files.Contains(koreProj))
-                {
-                    return executingDir;
-                }
-
-                var directories = Directory.EnumerateDirectories(executingDir);
-
-                var fileDir = Path.Combine(executingDir, "files");
-                if (directories.Contains(fileDir))
-                {
-                    return Path.Combine(fileDir, "KoreBuild");
-                }
-
-                executingDir = Directory.GetParent(executingDir).FullName;
-            }
-
-            Reporter.Error("Couldn't find the KoreBuild directory.");
-            throw new DirectoryNotFoundException();
-        }
-
-        public string GetDotNetInstallDir()
-        {
-            var dotnetDir = DotNetHome;
-            if (IsWindows())
-            {
-                dotnetDir = Path.Combine(dotnetDir, GetArchitecture());
-            }
-
-            return dotnetDir;
-        }
-
-        public string GetDotNetExecutable()
-        {
-            var dotnetDir = GetDotNetInstallDir();
-
-            var dotnetFile = "dotnet";
-
-            if (IsWindows())
-            {
-                dotnetFile += ".exe";
-            }
-
-            return Path.Combine(dotnetDir, dotnetFile);
-        }
-
-        public string GetArchitecture()
-        {
-            return Environment.GetEnvironmentVariable("KOREBUILD_DOTNET_ARCH") ?? "x64";
-        }
-
-        public bool IsWindows()
-        {
-            return RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/DependenciesGenerateCommand.cs b/tools/KoreBuild.Console/Commands/DependenciesGenerateCommand.cs
deleted file mode 100644
index 274de1c7f..000000000
--- a/tools/KoreBuild.Console/Commands/DependenciesGenerateCommand.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class DependenciesGenerateCommand : SubCommandBase
-    {
-        private CommandOption _configOpt;
-        private CommandOption _fileOpt;
-
-        public DependenciesGenerateCommand(CommandContext context) : base(context)
-        {
-        }
-
-        public override void Configure(CommandLineApplication application)
-        {
-            application.Description = "Generates a build/dependencies.props file and updates csproj files to use variables";
-            application.ExtendedHelpText = @"
-MORE INFO:
-
-    This command will generate a dependencies.props file and adjust all PackageReference's in csproj files
-    to use the MSBuild variables it generates.
-
-    Example output:
-
-    <Project>
-      <PropertyGroup Label=""Package Versions"">
-        <MyPackageVersion>1.0.0</MyPackageVersion>
-      </PropertyGroup>
-    </Project>
-";
-
-            _configOpt = application.Option("-c|--configuration <CONFIG>", "The MSBuild configuration. Defaults to 'Debug'.", CommandOptionType.SingleValue);
-            _fileOpt = application.Option("--deps-file <FILEPATH>", "The dependencies.props file to upgrade.", CommandOptionType.SingleValue);
-
-            base.Configure(application);
-        }
-
-        protected override int Execute()
-        {
-            var args = new List<string>
-            {
-                "msbuild",
-                Path.Combine(Context.KoreBuildDir, "KoreBuild.proj"),
-                "-t:GenerateDependenciesPropsFile",
-            };
-
-            if (_configOpt.HasValue())
-            {
-                args.Add("-p:Configuration=" + _configOpt.Value());
-            }
-
-            if (_fileOpt.HasValue())
-            {
-                var filePath = _fileOpt.Value();
-                if (!Path.IsPathRooted(filePath))
-                {
-                    filePath = Path.GetFullPath(filePath);
-                }
-
-                args.Add("-p:DependencyVersionsFile=" + filePath);
-            }
-
-            if (Reporter.IsVerbose)
-            {
-                args.Add("-v:n");
-            }
-
-            return RunDotnet(args, Context.RepoPath);
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/DependenciesUpgradeCommand.cs b/tools/KoreBuild.Console/Commands/DependenciesUpgradeCommand.cs
deleted file mode 100644
index b830e71a5..000000000
--- a/tools/KoreBuild.Console/Commands/DependenciesUpgradeCommand.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class DependenciesUpgradeCommand : SubCommandBase
-    {
-        private CommandOption _sourceOpt;
-        private CommandOption _packageIdOpt;
-        private CommandOption _packageVersionOpt;
-        private CommandOption _sourceDeps;
-        private CommandOption _fileOpt;
-
-        public DependenciesUpgradeCommand(CommandContext context) : base(context)
-        {
-        }
-
-        public override void Configure(CommandLineApplication application)
-        {
-            application.Description = "Upgrades the build/dependencies.props file to the latest package versions";
-            application.ExtendedHelpText = @"
-MORE INFO:
-
-    The upgrade uses a 'lineup' package as the source of information about which versions to use.
-
-    A lineup package is simply a nuget package that contains a file in build/dependencies.props.
-    Just like the version of the file in this local repo, this file is an MSBuild project file
-    with a list of MSBuild variables. Example:
-
-    <Project>
-      <PropertyGroup Label=""Package Versions"">
-        <MyPackageVersion>1.0.0</MyPackageVersion>
-      </PropertyGroup>
-    </Project>
-";
-
-            _sourceOpt = application.Option("-s|--source <SOURCE>",
-                "Specifies a NuGet package source to use to upgrade dependencies to the latest lineup package.", CommandOptionType.SingleValue);
-            _packageIdOpt = application.Option("--id <PACKAGE_ID>", "Specifies the lineup package id to use.", CommandOptionType.SingleValue);
-            _packageVersionOpt = application.Option("--version <PACKAGE_VERISON>", "Specifies the lineup package version to use.", CommandOptionType.SingleValue);
-            _sourceDeps = application.Option("--source-deps <PACKAGE_VERISON>", "The dependencies.props file to use as a source of versions.", CommandOptionType.SingleValue);
-            _fileOpt = application.Option("--deps-file <FILEPATH>", "The dependencies.props file to upgrade.", CommandOptionType.SingleValue);
-
-            base.Configure(application);
-        }
-
-        protected override int Execute()
-        {
-            var args = new List<string>
-            {
-                "msbuild",
-                Path.Combine(Context.KoreBuildDir, "KoreBuild.proj"),
-                "-t:UpgradeDependencies",
-            };
-
-            if (_sourceOpt.HasValue())
-            {
-                args.Add("-p:LineupPackageRestoreSource=" + _sourceOpt.Value());
-            }
-
-            if (_packageIdOpt.HasValue())
-            {
-                args.Add("-p:LineupPackageId=" + _packageIdOpt.Value());
-            }
-
-            if (_packageVersionOpt.HasValue())
-            {
-                args.Add("-p:LineupPackageVersion=" + _packageVersionOpt.Value());
-            }
-
-            if (_sourceDeps.HasValue())
-            {
-                args.Add("-p:LineupDependenciesFile=" + _sourceDeps.Value());
-            }
-
-            if (_fileOpt.HasValue())
-            {
-                var filePath = _fileOpt.Value();
-                if (!Path.IsPathRooted(filePath))
-                {
-                    filePath = Path.GetFullPath(filePath);
-                }
-
-                args.Add("-p:DependencyVersionsFile=" + filePath);
-            }
-
-            if (Reporter.IsVerbose)
-            {
-                args.Add("-v:n");
-            }
-
-            return RunDotnet(args, Context.RepoPath);
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/DockerBuildCommand.cs b/tools/KoreBuild.Console/Commands/DockerBuildCommand.cs
deleted file mode 100644
index 7e8e8eb9f..000000000
--- a/tools/KoreBuild.Console/Commands/DockerBuildCommand.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class DockerBuildCommand : SubCommandBase
-    {
-        private const string DockerIgnore = ".dockerignore";
-        private const string DockerfileExtension = ".dockerfile";
-        private const string Owner = "aspnetbuild";
-        private const string ImageName = "korebuild";
-
-        public DockerBuildCommand(CommandContext context) : base(context)
-        {
-        }
-
-        public CommandArgument ImageVariant { get; set; }
-
-        public List<string> Arguments { get; set; }
-
-        public string Tag => $@"{Owner}/{ImageName}:{ImageVariant.Value}";
-
-        public override void Configure(CommandLineApplication application)
-        {
-            ImageVariant = application.Argument("image", "The docker image to run on.");
-            Arguments = application.RemainingArguments;
-
-            base.Configure(application);
-        }
-
-        protected override bool IsValid()
-        {
-            if (string.IsNullOrEmpty(ImageVariant?.Value))
-            {
-                Reporter.Error("Image is a required argument.");
-                return false;
-            }
-
-            return true;
-        }
-
-        protected override int Execute()
-        {
-            var dockerFileName = GetDockerFileName(ImageVariant.Value);
-            var dockerFileSource = GetDockerFileSource(dockerFileName);
-            var dockerFileDestination = Path.Combine(Context.RepoPath, GetDockerFileName(ImageVariant.Value));
-
-            File.Copy(dockerFileSource, dockerFileDestination, overwrite: true);
-
-            var dockerIgnoreSource = GetDockerFileSource(DockerIgnore);
-            var dockerIgnoreDestination = Path.Combine(Context.RepoPath, DockerIgnore);
-
-            File.Copy(dockerIgnoreSource, dockerIgnoreDestination, overwrite: true);
-
-            // If our ToolSource isn't http copy it to the docker context
-            var dockerToolsSource = Context.ToolsSource;
-            string toolsSourceDestination = null;
-            if (!Context.ToolsSource.StartsWith("http"))
-            {
-                dockerToolsSource = "ToolsSource";
-                toolsSourceDestination = Path.Combine(Context.RepoPath, dockerToolsSource);
-                DirectoryCopy(Context.ToolsSource, toolsSourceDestination);
-            }
-
-            try
-            {
-                var buildArgs = new List<string> { "build" };
-
-                buildArgs.AddRange(new string[] { "-t", Tag, "-f", dockerFileDestination, Context.RepoPath });
-                var buildResult = RunDockerCommand(buildArgs);
-
-                if (buildResult != 0)
-                {
-                    return buildResult;
-                }
-
-                var containerName = $"{Owner}_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
-
-                var runArgs = new List<string> { "run", "--rm", "-i", "--name", containerName, Tag };
-
-                runArgs.AddRange(new[] { "-ToolsSource", dockerToolsSource });
-
-                if (Arguments?.Count > 0)
-                {
-                    runArgs.AddRange(Arguments);
-                }
-
-                Reporter.Verbose($"Running in container '{containerName}'");
-                return RunDockerCommand(runArgs);
-            }
-            finally
-            {
-                // Clean up the stuff we dumped there in order to get it in the docker context.
-                File.Delete(dockerFileDestination);
-                File.Delete(dockerIgnoreDestination);
-                if (toolsSourceDestination != null)
-                {
-                    Directory.Delete(toolsSourceDestination, recursive: true);
-                }
-            }
-        }
-
-        private string GetDockerFileSource(string fileName)
-        {
-            var executingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var source = Path.Combine(executingDir, "Commands", "DockerFiles", fileName);
-
-            if (!File.Exists(source))
-            {
-                Reporter.Error($"DockerFile '{source}' doesn't exist.");
-                throw new FileNotFoundException();
-            }
-
-            return source;
-        }
-
-        private string GetDockerFileName(string platform)
-        {
-            return $"{platform}{DockerfileExtension}";
-        }
-
-        private int RunDockerCommand(List<string> arguments)
-        {
-            var args = ArgumentEscaper.EscapeAndConcatenate(arguments.ToArray());
-            Reporter.Verbose($"Running 'docker {args}'");
-
-            var psi = new ProcessStartInfo
-            {
-                FileName = "docker",
-                Arguments = args,
-                RedirectStandardError = true
-            };
-
-            var process = Process.Start(psi);
-            process.WaitForExit();
-
-            if (process.ExitCode != 0)
-            {
-                Reporter.Error(process.StandardError.ReadToEnd());
-            }
-
-            return process.ExitCode;
-        }
-
-        private static void DirectoryCopy(string sourceDirName, string destDirName)
-        {
-            // Get the subdirectories for the specified directory.
-            DirectoryInfo dir = new DirectoryInfo(sourceDirName);
-
-            if (!dir.Exists)
-            {
-                throw new DirectoryNotFoundException(
-                    "Source directory does not exist or could not be found: "
-                    + sourceDirName);
-            }
-
-            DirectoryInfo[] dirs = dir.GetDirectories();
-            // If the destination directory doesn't exist, create it.
-            if (!Directory.Exists(destDirName))
-            {
-                Directory.CreateDirectory(destDirName);
-            }
-
-            // Get the files in the directory and copy them to the new location.
-            FileInfo[] files = dir.GetFiles();
-            foreach (FileInfo file in files)
-            {
-                string temppath = Path.Combine(destDirName, file.Name);
-                file.CopyTo(temppath, overwrite: true);
-            }
-
-            // Copy subdirectories and their contents to the new location.
-            foreach (DirectoryInfo subdir in dirs)
-            {
-                string temppath = Path.Combine(destDirName, subdir.Name);
-                DirectoryCopy(subdir.FullName, temppath);
-            }
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/DockerFiles/.dockerignore b/tools/KoreBuild.Console/Commands/DockerFiles/.dockerignore
deleted file mode 100644
index 26f97c87a..000000000
--- a/tools/KoreBuild.Console/Commands/DockerFiles/.dockerignore
+++ /dev/null
@@ -1,4 +0,0 @@
-korebuild-lock.txt
-**/bin
-**/obj
-artifacts
diff --git a/tools/KoreBuild.Console/Commands/DockerFiles/jessie.dockerfile b/tools/KoreBuild.Console/Commands/DockerFiles/jessie.dockerfile
deleted file mode 100644
index cef20b92f..000000000
--- a/tools/KoreBuild.Console/Commands/DockerFiles/jessie.dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM microsoft/dotnet:2.0-runtime-deps-jessie
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-    git \
-    # KoreBuild dependencies
-    jq \
-    curl \
-    unzip \
-    apt-transport-https \
-    && rm -rf /var/lib/apt/lists/*
-
-ADD . .
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-
-RUN ./run.sh install-tools
-
-ENTRYPOINT ["./build.sh"]
diff --git a/tools/KoreBuild.Console/Commands/DockerFiles/winservercore.dockerfile b/tools/KoreBuild.Console/Commands/DockerFiles/winservercore.dockerfile
deleted file mode 100644
index a591f1adf..000000000
--- a/tools/KoreBuild.Console/Commands/DockerFiles/winservercore.dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM microsoft/aspnet:4.6.2
-
-
-# DevPack returns exit 0 immediately, but it's not done, so we wait.
-# A more correct thing would be to block on a registry key existing or similar.
-RUN \
-        Invoke-WebRequest https://download.microsoft.com/download/F/1/D/F1DEB8DB-D277-4EF9-9F48-3A65D4D8F965/NDP461-DevPack-KB3105179-ENU.exe -OutFile ~\\net461dev.exe ; \
-        ~\\net461dev.exe /Passive /NoRestart ; \
-        Start-Sleep -s 10; \
-        Remove-Item ~\\net461dev.exe -Force ;
-
-WORKDIR c:\\repo
-
-ADD . .
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-
-RUN ./run.ps1 install-tools
-
-ENTRYPOINT ["build.cmd"]
diff --git a/tools/KoreBuild.Console/Commands/InstallToolsCommand.cs b/tools/KoreBuild.Console/Commands/InstallToolsCommand.cs
deleted file mode 100644
index ab71baa8a..000000000
--- a/tools/KoreBuild.Console/Commands/InstallToolsCommand.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class InstallToolsCommand : SubCommandBase
-    {
-        public InstallToolsCommand(CommandContext context) : base(context)
-        {
-        }
-
-        private string KoreBuildSkipRuntimeInstall => Environment.GetEnvironmentVariable("KOREBUILD_SKIP_RUNTIME_INSTALL");
-        private string PathENV => Environment.GetEnvironmentVariable("PATH");
-        private string DotNetInstallDir => Environment.GetEnvironmentVariable("DOTNET_INSTALL_DIR");
-
-        public override void Configure(CommandLineApplication application)
-        {
-            base.Configure(application);
-        }
-
-        protected override int Execute()
-        {
-            var installDir = Context.GetDotNetInstallDir();
-
-            Reporter.Verbose($"Installing tools to '{installDir}'");
-
-            if (DotNetInstallDir != null && DotNetInstallDir != installDir)
-            {
-                Reporter.Verbose($"installDir = {installDir}");
-                Reporter.Verbose($"DOTNET_INSTALL_DIR = {DotNetInstallDir}");
-                Reporter.Verbose("The environment variable DOTNET_INSTALL_DIR is deprecated. The recommended alternative is DOTNET_HOME.");
-            }
-
-            var dotnet = Context.GetDotNetExecutable();
-            var dotnetOnPath = GetCommandFromPath("dotnet");
-
-            // TODO: decide case sensitivity and handly symbolic links
-            if (dotnetOnPath != null && (dotnetOnPath != dotnet))
-            {
-                Reporter.Warn($"dotnet found on the system PATH is '{dotnetOnPath}' but KoreBuild will use '{dotnet}'");
-            }
-
-            var pathPrefix = Directory.GetParent(dotnet);
-            if (PathENV.StartsWith($"{pathPrefix}{Path.PathSeparator}", StringComparison.OrdinalIgnoreCase))
-            {
-                Reporter.Output($"Adding {pathPrefix} to PATH");
-                Environment.SetEnvironmentVariable("PATH", $"{pathPrefix};{PathENV}");
-            }
-
-            if (KoreBuildSkipRuntimeInstall == "1")
-            {
-                Reporter.Output("Skipping runtime installation because KOREBUILD_SKIP_RUNTIME_INSTALL = 1");
-                return 0;
-            }
-
-            var scriptExtension = Context.IsWindows() ? "ps1" : "sh";
-
-            var scriptPath = Path.Combine(Context.KoreBuildDir, "dotnet-install." + scriptExtension);
-
-            if (!Context.IsWindows())
-            {
-                var args = ArgumentEscaper.EscapeAndConcatenate(new string[] { "+x", scriptPath });
-                var psi = new ProcessStartInfo
-                {
-                    FileName = "chmod",
-                    Arguments = args
-                };
-
-                var process = Process.Start(psi);
-                process.WaitForExit();
-            }
-
-            var architecture = Context.GetArchitecture();
-
-            InstallCLI(scriptPath, installDir, architecture, Context.SDKVersion);
-
-            return 0;
-        }
-
-        private void InstallCLI(string script, string installDir, string architecture, string version)
-        {
-            var sdkPath = Path.Combine(installDir, "sdk", version, "dotnet.dll");
-
-            if (!File.Exists(sdkPath))
-            {
-                Reporter.Verbose($"Installing dotnet {version} to {installDir}");
-
-                var args = ArgumentEscaper.EscapeAndConcatenate(new string[] {
-                    "-Version", version,
-                    "-Architecture", architecture,
-                    "-InstallDir", installDir
-                });
-
-                var psi = new ProcessStartInfo
-                {
-                    FileName = script,
-                    Arguments = args
-                };
-
-                var process = Process.Start(psi);
-                process.WaitForExit();
-            }
-            else
-            {
-                Reporter.Output($".NET Core SDK {version} is already installed. Skipping installation.");
-            }
-        }
-
-        private static string GetCommandFromPath(string command)
-        {
-            var values = Environment.GetEnvironmentVariable("PATH");
-            foreach (var path in values.Split(';'))
-            {
-                var fullPath = Path.Combine(path, command);
-                if (File.Exists(fullPath))
-                    return fullPath;
-            }
-            return null;
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/MSBuildCommand.cs b/tools/KoreBuild.Console/Commands/MSBuildCommand.cs
deleted file mode 100644
index 1ab4c4414..000000000
--- a/tools/KoreBuild.Console/Commands/MSBuildCommand.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class MSBuildCommand : SubCommandBase
-    {
-        public MSBuildCommand(CommandContext context) : base(context)
-        {
-        }
-
-        private bool EnableBinaryLog => Environment.GetEnvironmentVariable("KOREBUILD_ENABLE_BINARY_LOG") == "1";
-
-        private List<string> Arguments { get; set; }
-
-        public override void Configure(CommandLineApplication application)
-        {
-            base.Configure(application);
-            Arguments = application.RemainingArguments;
-        }
-
-        protected override int Execute()
-        {
-            Reporter.Verbose($"Building {Context.RepoPath}.");
-            Reporter.Verbose($"dotnet = {Context.RepoPath}");
-
-            if (Context.SDKVersion != "latest")
-            {
-                var globalFile = Path.Combine(Context.RepoPath, "global.json");
-                File.WriteAllText(globalFile, $"{{ \"sdk\": {{ \"version\": \"{Context.SDKVersion}\" }} }}", System.Text.Encoding.ASCII);
-            }
-            else
-            {
-                Reporter.Verbose($"Skipping global.json generation because the SDKVersion = {Context.SDKVersion}");
-            }
-
-            var makeFileProj = Path.Combine(Context.KoreBuildDir, "KoreBuild.proj");
-            var msBuildArtifactsDir = Path.Combine(Context.RepoPath, "artifacts", "msbuild");
-            var msBuildResponseFile = Path.Combine(msBuildArtifactsDir, "msbuild.rsp");
-
-            var msBuildLogArgument = string.Empty;
-
-
-            if (EnableBinaryLog)
-            {
-                Reporter.Verbose("Enabling binary logging");
-                var msBuildLogFilePath = Path.Combine(msBuildArtifactsDir, "msbuild.binlog");
-                msBuildLogArgument = $"/bl:{msBuildLogFilePath}";
-            }
-
-            var msBuildArguments = string.Empty;
-
-            foreach (var arg in Arguments)
-            {
-                msBuildArguments += Environment.NewLine + arg;
-            }
-
-            // TODO: naturalize newlines
-            msBuildArguments += $@"
-/nologo
-/m
-/p:RepositoryRoot={Context.RepoPath}\
-{msBuildLogArgument}
-/clp:Summary
-""{makeFileProj}""
-";
-
-            Directory.CreateDirectory(msBuildArtifactsDir);
-
-            var noop = msBuildArguments.IndexOf("/t:Noop", StringComparison.OrdinalIgnoreCase) >= 0
-                || msBuildArguments.IndexOf("/t:Cow", StringComparison.OrdinalIgnoreCase) >= 0;
-
-            File.WriteAllText(msBuildResponseFile, msBuildArguments, System.Text.Encoding.ASCII);
-            Reporter.Verbose($"Noop = {noop}");
-            var firstTime = Environment.GetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE");
-            if (noop)
-            {
-                Environment.SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "true");
-            }
-            else
-            {
-                var buildTaskResult = BuildTaskProject(Context.RepoPath);
-                if (buildTaskResult != 0)
-                {
-                    return buildTaskResult;
-                }
-            }
-
-            return RunDotnet(new[] { "msbuild", $@"@""{msBuildResponseFile}""" });
-        }
-
-        private int BuildTaskProject(string path)
-        {
-            var taskFolder = Path.Combine(Context.RepoPath, "build", "tasks");
-            var taskProj = Path.Combine(taskFolder, "RepoTasks.csproj");
-            var publishFolder = Path.Combine(taskFolder, "bin", "publish");
-
-            if (File.Exists(taskProj))
-            {
-                if (File.Exists(publishFolder))
-                {
-                    Directory.Delete(publishFolder, recursive: true);
-                }
-
-                var sdkPath = $"/p:RepoTasksSdkPath={Path.Combine(Context.KoreBuildDir, "msbuild", "KoreBuild.RepoTasks.Sdk", "Sdk")}";
-
-                var restoreResult = RunDotnet(new[] { "restore", taskProj, sdkPath });
-                if (restoreResult != 0)
-                {
-                    return restoreResult;
-                }
-
-                return RunDotnet(new[] { "publish", taskProj, "--configuration", "Release", "--output", publishFolder, "/nologo", sdkPath });
-            }
-
-            return 0;
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/RootCommand.cs b/tools/KoreBuild.Console/Commands/RootCommand.cs
deleted file mode 100644
index d4ac33bdb..000000000
--- a/tools/KoreBuild.Console/Commands/RootCommand.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Reflection;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace KoreBuild.Console.Commands
-{
-    internal class RootCommand : CommandBase
-    {
-        public override void Configure(CommandLineApplication application)
-        {
-            var context = new CommandContext(application);
-
-            application.FullName = "korebuild";
-
-            application.Command("install-tools", new InstallToolsCommand(context).Configure, throwOnUnexpectedArg: false);
-            application.Command("msbuild", new MSBuildCommand(context).Configure, throwOnUnexpectedArg: false);
-            application.Command("docker-build", new DockerBuildCommand(context).Configure, throwOnUnexpectedArg: false);
-
-            // Commands that upgrade things
-            application.Command("upgrade", c =>
-            {
-                c.HelpOption("-h|--help");
-                c.Command("deps", new DependenciesUpgradeCommand(context).Configure, throwOnUnexpectedArg: false);
-
-                c.OnExecute(() =>
-                {
-                    c.ShowHelp();
-                    return 2;
-                });
-            });
-
-            // Commands that generate code and files
-            application.Command("generate", c =>
-            {
-                c.HelpOption("-h|--help");
-
-                c.Command("deps", new DependenciesGenerateCommand(context).Configure, throwOnUnexpectedArg: false);
-                c.Command("api-baselines", new ApiBaselinesGenerateCommand(context).Configure, throwOnUnexpectedArg: false);
-
-                c.OnExecute(() =>
-                {
-                    c.ShowHelp();
-                    return 2;
-                });
-            });
-
-            application.VersionOption("--version", GetVersion);
-
-            base.Configure(application);
-        }
-
-        private static string GetVersion()
-                => typeof(RootCommand).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
-    }
-}
diff --git a/tools/KoreBuild.Console/Commands/SubCommandBase.cs b/tools/KoreBuild.Console/Commands/SubCommandBase.cs
deleted file mode 100644
index ecd7f088b..000000000
--- a/tools/KoreBuild.Console/Commands/SubCommandBase.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using Microsoft.Extensions.CommandLineUtils;
-using Microsoft.Extensions.Tools.Internal;
-
-namespace KoreBuild.Console.Commands
-{
-    internal abstract class SubCommandBase : CommandBase
-    {
-        protected SubCommandBase(CommandContext context)
-        {
-            Context = context;
-        }
-
-        protected CommandContext Context { get; }
-
-        protected IReporter Reporter => Context.Reporter;
-
-        protected override bool IsValid()
-        {
-            if (!Directory.Exists(Context.RepoPath))
-            {
-                Context.Reporter.Error($"The RepoPath '{Context.RepoPath}' doesn't exist.");
-                return false;
-            }
-
-            return base.IsValid();
-        }
-
-        protected int RunDotnet(params string[] arguments)
-            => RunDotnet(arguments, Directory.GetCurrentDirectory());
-
-        protected int RunDotnet(IEnumerable<string> arguments, string workingDir)
-        {
-            var args = ArgumentEscaper.EscapeAndConcatenate(arguments);
-
-            // use the dotnet.exe file used to start this process
-            var dotnet = DotNetMuxer.MuxerPath;
-            // if it could not be found, fallback to detecting DOTNET_HOME or PATH
-            dotnet = string.IsNullOrEmpty(dotnet) || !Path.IsPathRooted(dotnet)
-                ? Context.GetDotNetExecutable()
-                : dotnet;
-
-            var psi = new ProcessStartInfo
-            {
-                FileName = dotnet,
-                Arguments = args,
-                WorkingDirectory = workingDir,
-            };
-
-            Reporter.Verbose($"Executing '{psi.FileName} {psi.Arguments}'");
-
-            var process = Process.Start(psi);
-            process.WaitForExit();
-
-            return process.ExitCode;
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/KoreBuild.Console.csproj b/tools/KoreBuild.Console/KoreBuild.Console.csproj
deleted file mode 100644
index ea26eda02..000000000
--- a/tools/KoreBuild.Console/KoreBuild.Console.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\**\*.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="Commands\DockerFiles\*.dockerfile" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="Commands\DockerFiles\.dockerignore" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-</Project>
diff --git a/tools/KoreBuild.Console/Program.cs b/tools/KoreBuild.Console/Program.cs
deleted file mode 100644
index 39262ff80..000000000
--- a/tools/KoreBuild.Console/Program.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using KoreBuild.Console.Commands;
-using Microsoft.Extensions.CommandLineUtils;
-using System;
-
-namespace KoreBuild.Console
-{
-    class Program
-    {
-        static int Main(string[] args)
-        {
-            var application = new CommandLineApplication()
-            {
-                Name = "korebuild"
-            };
-
-            new RootCommand().Configure(application);
-
-            try
-            {
-                return application.Execute(args);
-            }
-            catch (Exception ex)
-            {
-                System.Console.Error.WriteLine($"Exception thrown: '{ex.ToString()}'");
-                return 1;
-            }
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Reporter/ConsoleReporter.cs b/tools/KoreBuild.Console/Reporter/ConsoleReporter.cs
deleted file mode 100644
index a9fe89812..000000000
--- a/tools/KoreBuild.Console/Reporter/ConsoleReporter.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-
-namespace Microsoft.Extensions.Tools.Internal
-{
-    public class ConsoleReporter : IReporter
-    {
-        private object _writeLock = new object();
-
-        public ConsoleReporter(IConsole console)
-            : this(console, verbose: false, quiet: false)
-        { }
-
-        public ConsoleReporter(IConsole console, bool verbose, bool quiet)
-        {
-            Console = console;
-            IsVerbose = verbose;
-            IsQuiet = quiet;
-        }
-
-        protected IConsole Console { get; }
-        public bool IsVerbose { get; set; }
-        public bool IsQuiet { get; set; }
-
-        protected virtual void WriteLine(TextWriter writer, string message, ConsoleColor? color)
-        {
-            lock (_writeLock)
-            {
-                if (color.HasValue)
-                {
-                    Console.ForegroundColor = color.Value;
-                }
-
-                writer.WriteLine(message);
-
-                if (color.HasValue)
-                {
-                    Console.ResetColor();
-                }
-            }
-        }
-
-        public virtual void Error(string message)
-            => WriteLine(Console.Error, message, ConsoleColor.Red);
-        public virtual void Warn(string message)
-            => WriteLine(Console.Out, message, ConsoleColor.Yellow);
-
-        public virtual void Output(string message)
-        {
-            if (IsQuiet)
-            {
-                return;
-            }
-            WriteLine(Console.Out, message, color: null);
-        }
-
-        public virtual void Verbose(string message)
-        {
-            if (!IsVerbose)
-            {
-                return;
-            }
-
-            WriteLine(Console.Out, message, ConsoleColor.DarkGray);
-        }
-    }
-}
diff --git a/tools/KoreBuild.Console/Reporter/IConsole.cs b/tools/KoreBuild.Console/Reporter/IConsole.cs
deleted file mode 100644
index 46cae4a05..000000000
--- a/tools/KoreBuild.Console/Reporter/IConsole.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-
-namespace Microsoft.Extensions.Tools.Internal
-{
-    public interface IConsole
-    {
-        event ConsoleCancelEventHandler CancelKeyPress;
-        TextWriter Out { get; }
-        TextWriter Error { get; }
-        TextReader In { get; }
-        bool IsInputRedirected { get; }
-        bool IsOutputRedirected { get; }
-        bool IsErrorRedirected { get; }
-        ConsoleColor ForegroundColor { get; set; }
-        void ResetColor();
-    }
-}
diff --git a/tools/KoreBuild.Console/Reporter/IReporter.cs b/tools/KoreBuild.Console/Reporter/IReporter.cs
deleted file mode 100644
index e57261401..000000000
--- a/tools/KoreBuild.Console/Reporter/IReporter.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.Extensions.Tools.Internal
-{
-    public interface IReporter
-    {
-        void Verbose(string message);
-        void Output(string message);
-        void Warn(string message);
-        void Error(string message);
-        bool IsVerbose { get; }
-    }
-}
diff --git a/tools/KoreBuild.Console/Reporter/PhysicalConsole.cs b/tools/KoreBuild.Console/Reporter/PhysicalConsole.cs
deleted file mode 100644
index 429342ecc..000000000
--- a/tools/KoreBuild.Console/Reporter/PhysicalConsole.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-
-namespace Microsoft.Extensions.Tools.Internal
-{
-    public class PhysicalConsole : IConsole
-    {
-        private PhysicalConsole()
-        {
-            Console.CancelKeyPress += (o, e) =>
-            {
-                CancelKeyPress?.Invoke(o, e);
-            };
-        }
-
-        public static IConsole Singleton { get; } = new PhysicalConsole();
-
-        public event ConsoleCancelEventHandler CancelKeyPress;
-        public TextWriter Error => Console.Error;
-        public TextReader In => Console.In;
-        public TextWriter Out => Console.Out;
-        public bool IsInputRedirected => Console.IsInputRedirected;
-        public bool IsOutputRedirected => Console.IsOutputRedirected;
-        public bool IsErrorRedirected => Console.IsErrorRedirected;
-        public ConsoleColor ForegroundColor
-        {
-            get => Console.ForegroundColor;
-            set => Console.ForegroundColor = value;
-        }
-
-        public void ResetColor() => Console.ResetColor();
-    }
-}
diff --git a/tools/korebuild.schema.json b/tools/korebuild.schema.json
index 94a7015a1..932bb422b 100644
--- a/tools/korebuild.schema.json
+++ b/tools/korebuild.schema.json
@@ -109,9 +109,9 @@
     "channel": {
       "description": "The channel of KoreBuild used to select a version when korebuild-lock.txt is not present.",
       "type": "string",
-      "default": "master",
+      "default": "main",
       "enum": [
-        "master",
+        "main",
         "release/2.2",
         "release/2.1",
         "release/2.0"
diff --git a/version.props b/version.props
index b5b5f26f1..95243317c 100644
--- a/version.props
+++ b/version.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <KoreBuildChannel>release/2.1</KoreBuildChannel>
-    <VersionPrefix>2.1.7</VersionPrefix>
+    <KoreBuildChannel>main</KoreBuildChannel>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <VersionSuffix>build</VersionSuffix>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>