Remove buildpipelines (#22835)

* Remove old buildpipeline

* Remove obsolete publish-packages

* Remove obsolete helix scripts

29 files changed, 1 insertions, 7083 deletions

diff --git a/build-test.cmd b/build-test.cmd
index 5c48a0230d..d485513bdd 100644
--- a/build-test.cmd
+++ b/build-test.cmd
@@ -52,7 +52,6 @@ set __SkipRestorePackages=
 set __SkipManaged=
 set __SkipNative=
 set __RuntimeId=
-set __ZipTests=
 set __TargetsWindows=1
 set __DoCrossgen=
 
@@ -86,9 +85,8 @@ if /i "%1" == "checked"               (set __BuildType=Checked&set processedArgs
 if /i "%1" == "skipmanaged"           (set __SkipManaged=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "skipnative"            (set __SkipNative=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "buildtesthostonly"     (set __SkipNative=1&set __SkipManaged=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "buildagainstpackages"  (set __ZipTests=1&set __BuildAgainstPackagesArg=/p:BuildTestsAgainstPackages=true&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "buildagainstpackages"  (set __BuildAgainstPackagesArg=/p:BuildTestsAgainstPackages=true&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "skiprestorepackages"   (set __SkipRestorePackages=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "ziptests"              (set __ZipTests=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "crossgen"              (set __DoCrossgen=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "runtimeid"             (set __RuntimeId=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
 if /i "%1" == "targetsNonWindows"     (set __TargetsWindows=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
@@ -535,41 +533,6 @@ rd /s /q "%CORE_ROOT_STAGE%"
 
 REM =========================================================================================
 REM ===
-REM === Prep test binaries for Helix publishing
-REM ===
-REM =========================================================================================
-
-if not defined __ZipTests goto SkipPrepForPublish
-
-echo %__MsgPrefix%Preparing test binaries for Helix publishing
-
-set __BuildLogRootName=Helix_Prep
-set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
-set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn
-set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err
-set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%"
-set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
-set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
-set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr!
-
-call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^
-  /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^
-  /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^
-  /p:UsePartialNGENOptimization=false /maxcpucount^
-  %__ProjectDir%\tests\helixprep.proj^
-  !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %TargetsWindowsMSBuildArg% %__CrossgenArg% %__PriorityArg% %__UnprocessedBuildArgs%
-if errorlevel 1 (
-    echo %__MsgPrefix%Error: build failed. Refer to the build log files for details:
-    echo     %__BuildLog%
-    echo     %__BuildWrn%
-    echo     %__BuildErr%
-    exit /b 1
-)
-
-:SkipPrepForPublish
-
-REM =========================================================================================
-REM ===
 REM === All builds complete!
 REM ===
 REM =========================================================================================
@@ -608,7 +571,6 @@ echo     ubuntu.16.04-x64: Builds overlay for Ubuntu 16.04
 echo     ubuntu.16.10-x64: Builds overlay for Ubuntu 16.10
 echo     win-x64: Builds overlay for portable Windows
 echo     win7-x64: Builds overlay for Windows 7
-echo ziptests: zips CoreCLR tests and Core_Root for a Helix run
 echo crossgen: Precompiles the framework managed assemblies
 echo targetsNonWindows:
 echo Exclude- Optional parameter - specify location of default exclusion file ^(defaults to tests\issues.targets if not specified^)
diff --git a/build-test.sh b/build-test.sh
index 8e38bae3bb..87a185dbd0 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -280,11 +280,6 @@ build_Tests()
     fi
 
     generate_layout
-
-    if [ $__ZipTests -ne 0 ]; then
-        echo "${__MsgPrefix}ZIP tests packages..."
-        build_MSBuild_projects "Helix_Prep" "$__ProjectDir/tests/helixprep.proj" "Prep test binaries for Helix publishing" " "
-    fi
 }
 
 build_MSBuild_projects()
@@ -495,7 +490,6 @@ usage()
     echo "generatetesthostonly - only pull down dependencies and build coreroot and the CoreFX testhost"
     echo "skiprestorepackages - skip package restore"
     echo "runtests - run tests after building them"
-    echo "ziptests - zips CoreCLR tests & Core_Root for a Helix run"
     echo "bindir - output directory (defaults to $__ProjectRoot/bin)"
     echo "msbuildonunsupportedplatform - build managed binaries even if distro is not officially supported."
     echo "priority1 - include priority=1 tests in the build"
@@ -615,7 +609,6 @@ __DistroRid=""
 __cmakeargs=""
 __PortableLinux=0
 __msbuildonunsupportedplatform=0
-__ZipTests=0
 __NativeTestIntermediatesDir=
 __RunTests=0
 __RebuildTests=0
@@ -756,10 +749,6 @@ while :; do
             __BuildTestWrappers=0
             ;;
 
-        ziptests)
-            __ZipTests=1
-            ;;
-
         buildtestwrappersonly)
             __BuildTestWrappersOnly=1
             ;;
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json b/buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json
deleted file mode 100644
index 56e98d6774..0000000000
--- a/buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/clean.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task1",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/clean.sh",
-        "arguments": "-all",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/sync.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task2",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "bash ",
-        "arguments": "-c \"export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar && $(Agent.BuildDirectory)/s/sync.sh -- /p:BuildType=$(PB_BuildType)\"",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/build.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task3",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/build.sh",
-        "arguments": "$(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -clang6.0",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/build-packages.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task4",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/build-packages.sh",
-        "arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task5",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/publish-packages.sh",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbol packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task6",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/publish-packages.sh",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish test native binaries",
-      "timeoutInMinutes": 0,
-      "refName": "Task7",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/publish-packages.sh",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishSymbols -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "CopyFiles1",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "PublishBuildArtifacts1",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
-        "ArtifactName": "BuildLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "PB_BuildType": {
-      "value": "Release"
-    },
-    "Architecture": {
-      "value": "x64"
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput"
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "Label": {
-      "value": "$(Build.BuildNumber)"
-    }
-  },
-  "demands": [
-    "Agent.OS -equals FreeBSD"
-  ],
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 180,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "true",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "670e3783-ab4f-44fc-9786-d332007da311",
-    "type": "TfsGit",
-    "name": "DotNet-CoreCLR-Trusted",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "_links": {
-      "self": {
-        "href": "https://devdiv.visualstudio.com/_apis/build/Queues/832"
-      }
-    },
-    "id": 832,
-    "name": "DotNetCore-Infra",
-    "url": "https://devdiv.visualstudio.com/_apis/build/Queues/832",
-    "pool": {
-      "id": 135,
-      "name": "DotNetCore-Infra"
-    }
-  },
-  "id": 1680,
-  "name": "DotNet-CoreClr-Trusted-FreeBSD",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
deleted file mode 100644
index c39362c3aa..0000000000
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
+++ /dev/null
@@ -1,613 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.sh",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.sh\") {\n   \"Begin.sh script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\Begin.sh\n} else {\n   \"Begin.sh script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Initialize tools",
-      "timeoutInMinutes": 0,
-      "refName": "Task1",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Build.SourcesDirectory)/init-tools.sh",
-        "arguments": "",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Initialize Docker",
-      "timeoutInMinutes": 0,
-      "refName": "Task2",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Build.SourcesDirectory)/Tools/scripts/docker/init-docker.sh",
-        "arguments": "$(DockerImageName)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Clone repository",
-      "timeoutInMinutes": 0,
-      "refName": "Task3",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) git clone $(VsoCoreClrGitUrl) $(GitHubDirectory)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run clean.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task4",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./clean.sh -all",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Check out the specified commit",
-      "timeoutInMinutes": 0,
-      "refName": "Task5",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) git checkout $(Build.SourceVersion)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run sync.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task6",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./sync.sh -- /p:BuildType=$(PB_BuildType)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": false,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build-rootfs.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task7",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "sudo",
-        "arguments": "docker run --privileged --rm $(DockerCommonRunArgs) ./cross/build-rootfs.sh $(Architecture) $(CrossToolsetVersion) $(SkipUnmount)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task8",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build-packages.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task9",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(CrossArchBuildPackagesArgs) -- /p:OfficialBuildId=$(OfficialBuildId)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": false,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Cleanup RootFS",
-      "timeoutInMinutes": 0,
-      "refName": "Task10",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm --privileged $(DockerCommonRunArgs) git clean -xdf $(GitHubDirectory)/cross/",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task11",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbol packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task12",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish test native binaries",
-      "timeoutInMinutes": 0,
-      "refName": "Task13",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Create Copy Container",
-      "timeoutInMinutes": 0,
-      "refName": "Task14",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run $(DockerCommonRunArgs) echo",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Expose Docker repo for publishing",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "Task15",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "cp $(DockerContainerName):$(GitHubDirectory) $(DockerCopyDest)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "CopyFiles1",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "$(DockerCopyDest)",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "PublishBuildArtifacts2",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
-        "ArtifactName": "BuildLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Cleanup Docker",
-      "timeoutInMinutes": 0,
-      "condition": "always()",
-      "refName": "Task16",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Build.SourcesDirectory)/Tools/scripts/docker/cleanup-docker.sh",
-        "arguments": "",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.sh",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.sh\") {\n   \"End.sh script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\End.sh\n} else {\n   \"End.sh script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "Platform": {
-      "value": "x64"
-    },
-    "PB_BuildType": {
-      "value": "Release"
-    },
-    "GitHubRepo": {
-      "value": "http://github.com/dotnet/coreclr.git"
-    },
-    "GitHubDirectory": {
-      "value": "/root/coreclr"
-    },
-    "DockerContainerName": {
-      "value": "coreclr-cross-$(Build.BuildId)"
-    },
-    "DockerImageName": {
-      "value": "$(DockerRepository):$(DockerTag)"
-    },
-    "DockerRepository": {
-      "value": "microsoft/dotnet-buildtools-prereqs"
-    },
-    "DockerTag": {
-      "value": "ubuntu-14.04-cross-0cd4667-20170319080304",
-      "allowOverride": true
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput"
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "Label": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "GitHubBranch": {
-      "value": "sni_plus_latestbuildtools"
-    },
-    "Priority": {
-      "value": "0"
-    },
-    "RepoAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "Architecture": {
-      "value": "arm"
-    },
-    "CrossArchBuildPackagesArgs": {
-       "value": "",
-       "allowOverride": true
-    },
-    "CommitToCheckout": {
-      "value": "HEAD",
-      "allowOverride": true
-    },
-    "DockerCopyDest": {
-      "value": "$(Build.BinariesDirectory)/docker_repo"
-    },
-    "ROOTFS_DIR": {
-      "value": "/crossrootfs/$(Architecture)"
-    },
-    "DockerVolumeName": {
-      "value": "coreclr-cross-$(Build.BuildId)"
-    },
-    "DockerCommonRunArgs": {
-      "value": "--name $(DockerContainerName) --ulimit core=-1 -v \"$(DockerVolumeName):$(GitHubDirectory)\" -w=\"$(GitHubDirectory)\" $(DockerImageName)"
-    },
-    "PB_CleanAgent": {
-      "value": "true"
-    },
-    "VsoAccountName": {
-      "value": "dn-bot"
-    },
-    "VsoCoreClrGitUrl": {
-      "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/"
-    },
-    "VsoPassword": {
-      "value": null,
-      "isSecret": true
-    },
-    "VsoRepositoryName": {
-      "value": "DotNet-CoreCLR-Trusted"
-    }
-  },
-  "demands": [
-    "Agent.OS -equals linux"
-  ],
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(DockerTag)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 90,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "true",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "670e3783-ab4f-44fc-9786-d332007da311",
-    "type": "TfsGit",
-    "name": "DotNet-CoreCLR-Trusted",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "id": 36,
-    "name": "DotNet-Build",
-    "pool": {
-      "id": 39,
-      "name": "DotNet-Build"
-    }
-  },
-  "id": 5019,
-  "name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
deleted file mode 100644
index e60215750f..0000000000
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
+++ /dev/null
@@ -1,572 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.sh",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.sh\") {\n   \"Begin.sh script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\Begin.sh\n} else {\n   \"Begin.sh script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Initialize tools",
-      "timeoutInMinutes": 0,
-      "refName": "Task1",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Build.SourcesDirectory)/init-tools.sh",
-        "arguments": "",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Initialize Docker",
-      "timeoutInMinutes": 0,
-      "refName": "Task2",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Build.SourcesDirectory)/Tools/scripts/docker/init-docker.sh",
-        "arguments": "$(DockerImageName)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Clone repository",
-      "timeoutInMinutes": 0,
-      "refName": "Task3",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) git clone $(VsoCoreClrGitUrl) $(GitHubDirectory)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run clean.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task4",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./clean.sh -all",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Check out the specified commit",
-      "timeoutInMinutes": 0,
-      "refName": "Task5",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) git checkout $(Build.SourceVersion)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run sync.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task6",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./sync.sh -- /p:BuildType=$(PB_BuildType)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task7",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) $(PB_AdditionalBuildArgs) -- /flp:\"v=diag\"",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build-packages.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task8",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OutputRID=$(PB_OutputRID) /p:OfficialBuildId=$(OfficialBuildId)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task9",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbol packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task10",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish test native binaries",
-      "timeoutInMinutes": 0,
-      "refName": "Task11",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Create Copy Container",
-      "timeoutInMinutes": 0,
-      "refName": "Task12",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run $(DockerCommonRunArgs) echo",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Expose Docker repo for publishing",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "Task13",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "cp $(DockerContainerName):$(GitHubDirectory) $(DockerCopyDest)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "CopyFiles1",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "$(DockerCopyDest)",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "PublishBuildArtifacts2",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
-        "ArtifactName": "BuildLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Cleanup Docker",
-      "timeoutInMinutes": 0,
-      "condition": "always()",
-      "refName": "Task14",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Build.SourcesDirectory)/Tools/scripts/docker/cleanup-docker.sh",
-        "arguments": "",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.sh",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.sh\") {\n   \"End.sh script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\End.sh\n} else {\n   \"End.sh script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "Platform": {
-      "value": "x64"
-    },
-    "PB_BuildType": {
-      "value": "Release"
-    },
-    "GitHubRepo": {
-      "value": "http://github.com/dotnet/coreclr.git"
-    },
-    "GitHubDirectory": {
-      "value": "/root/coreclr"
-    },
-    "DockerContainerName": {
-      "value": "coreclr-$(Build.BuildId)"
-    },
-    "DockerImageName": {
-      "value": "$(DockerRepository):$(DockerTag)"
-    },
-    "DockerRepository": {
-      "value": "microsoft/dotnet-buildtools-prereqs"
-    },
-    "DockerTag": {
-      "value": "centos-7-d485f41-20173404063424",
-      "allowOverride": true
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput"
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "Label": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "GitHubBranch": {
-      "value": "sni_plus_latestbuildtools"
-    },
-    "Priority": {
-      "value": "0"
-    },
-    "RepoAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "Architecture": {
-      "value": "x64"
-    },
-    "CommitToCheckout": {
-      "value": "HEAD",
-      "allowOverride": true
-    },
-    "DockerVolumeName": {
-      "value": "coreclr-$(Build.BuildId)"
-    },
-    "DockerCommonRunArgs": {
-      "value": "--name $(DockerContainerName) --ulimit core=-1 -v \"$(DockerVolumeName):$(GitHubDirectory)\" -w=\"$(GitHubDirectory)\" $(DockerImageName)"
-    },
-    "DockerCopyDest": {
-      "value": "$(Build.BinariesDirectory)/docker_repo"
-    },
-    "PB_CleanAgent": {
-      "value": "true"
-    },
-    "PB_AdditionalBuildArgs": {
-      "value": ""
-    },
-    "VsoAccountName": {
-      "value": "dn-bot"
-    },
-    "VsoCoreClrGitUrl": {
-      "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/$(VsoRepositoryName)/"
-    },
-    "VsoPassword": {
-      "value": null,
-      "isSecret": true
-    },
-    "VsoRepositoryName": {
-      "value": "DotNet-CoreCLR-Trusted"
-    },
-    "PB_OutputRID": {
-      "value": ""
-    }
-  },
-  "demands": [
-    "Agent.OS -equals linux"
-  ],
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(DockerTag)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 90,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "true",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "1",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "670e3783-ab4f-44fc-9786-d332007da311",
-    "type": "TfsGit",
-    "name": "DotNet-CoreCLR-Trusted",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "id": 36,
-    "name": "DotNet-Build",
-    "pool": {
-      "id": 39,
-      "name": "DotNet-Build"
-    }
-  },
-  "id": 1713,
-  "name": "DotNet-CoreClr-Trusted-Linux",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
deleted file mode 100644
index bdc5ace779..0000000000
--- a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
+++ /dev/null
@@ -1,362 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.sh",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.sh\") {\n   \"Begin.sh script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\Begin.sh\n} else {\n   \"Begin.sh script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/clean.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task1",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/clean.sh",
-        "arguments": "-all",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/sync.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task2",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/sync.sh",
-        "arguments": " -- /p:BuildType=$(PB_BuildType)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/build.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task3",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/build.sh",
-        "arguments": "$(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run $(Agent.BuildDirectory)/s/build-packages.sh",
-      "timeoutInMinutes": 0,
-      "refName": "Task4",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/build-packages.sh",
-        "arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task5",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/publish-packages.sh",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbol packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task6",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/publish-packages.sh",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish test native binaries",
-      "timeoutInMinutes": 0,
-      "refName": "Task7",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Agent.BuildDirectory)/s/publish-packages.sh",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishSymbols -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "CopyFiles1",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "PublishBuildArtifacts1",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
-        "ArtifactName": "BuildLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.sh",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.sh\") {\n   \"End.sh script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\End.sh\n} else {\n   \"End.sh script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "PB_BuildType": {
-      "value": "Release"
-    },
-    "Architecture": {
-      "value": "x64"
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput"
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "Label": {
-      "value": "$(Build.BuildNumber)"
-    }
-  },
-  "demands": [
-    "Configuration -equals VSTSAgent_Mac_v3.0.0"
-  ],
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 60,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "true",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "670e3783-ab4f-44fc-9786-d332007da311",
-    "type": "TfsGit",
-    "name": "DotNet-CoreCLR-Trusted",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "id": 330,
-    "name": "DotNetCore-Build",
-    "pool": {
-      "id": 97,
-      "name": "DotNetCore-Build"
-    }
-  },
-  "id": 1680,
-  "name": "DotNet-CoreClr-Trusted-Mac",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
deleted file mode 100644
index 3831d21061..0000000000
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+++ /dev/null
@@ -1,490 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n   \"Begin.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\Begin.ps1\n} else {\n   \"Begin.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Install Signing Plugin",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))",
-      "refName": "Task1",
-      "task": {
-        "id": "30666190-6959-11e5-9f96-f56098202fef",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "signType": "real",
-        "zipSources": "false",
-        "version": "",
-        "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json",
-        "legacySigning": "$(PB_UseLegacySigning)"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Setup vs dev env",
-      "timeoutInMinutes": 0,
-      "refName": "Task2",
-      "task": {
-        "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "setup_vs_tools.cmd",
-        "arguments": "",
-        "modifyEnvironment": "true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run clean.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task3",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "clean.cmd",
-        "arguments": "-all",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run sync.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task4",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "sync.cmd",
-        "arguments": "-p -- /p:BuildType=$(PB_BuildType)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task5",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "build.cmd",
-        "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_IBCOptimize) $(PB_EnforcePGO) -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority) -- /p:SignType=$(PB_SignType)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Sign binaries",
-      "timeoutInMinutes": 0,
-      "refName": "Task6",
-      "task": {
-        "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "solution": "src\\sign.builds",
-        "msbuildLocationMethod": "version",
-        "msbuildVersion": "14.0",
-        "msbuildArchitecture": "x86",
-        "msbuildLocation": "",
-        "platform": "",
-        "configuration": "",
-        "msbuildArguments": "/p:SignType=$(PB_SignType) /p:BuildType=$(PB_BuildType) /p:BuildArch=$(Architecture)",
-        "clean": "false",
-        "maximumCpuCount": "false",
-        "restoreNugetPackages": "false",
-        "logProjectEvents": "false",
-        "createLogFile": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build-packages.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task7",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "build-packages.cmd",
-        "arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:SignType=$(PB_SignType) /p:OfficialBuildId=$(OfficialBuildId)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task8",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "publish-packages.cmd",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -Container=$(PB_ContainerName) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbol packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task9",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "publish-packages.cmd",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -Container=$(PB_ContainerName) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Perform Cleanup Tasks",
-      "timeoutInMinutes": 0,
-      "condition": "always()",
-      "refName": "Task10",
-      "task": {
-        "id": "521a94ea-9e68-468a-8167-6dcf361ea776",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {}
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "CopyFiles1",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "PublishBuildArtifacts1",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
-        "ArtifactName": "BuildLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": false,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Copy Publish Artifact: symbols",
-      "timeoutInMinutes": 0,
-      "refName": "PublishBuildArtifacts2",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\symbols",
-        "ArtifactName": "symbols",
-        "ArtifactType": "FilePath",
-        "TargetPath": "\\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\FullSymbols",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n   \"End.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\End.ps1\n} else {\n   \"End.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "PB_BuildType": {
-      "value": "Release"
-    },
-    "Architecture": {
-      "value": "x86"
-    },
-    "Priority": {
-      "value": "0"
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput"
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "Label": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "PB_SignType": {
-      "value": "test",
-      "allowOverride": true
-    },
-    "PB_UseLegacySigning": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "TeamName": {
-      "value": "DotNetCore"
-    },
-    "Jit32Repo": {
-      "value": "https://$(VsoAccountName):$(VsoPassword)@devdiv.visualstudio.com/DefaultCollection/DevDiv/_git/DotNet-JIT32-Internal"
-    },
-    "Jit32Branch": {
-      "value": "master"
-    },
-    "VsoAccountName": {
-      "value": "dn-bot"
-    },
-    "VsoPassword": {
-      "value": null,
-      "isSecret": true
-    },
-    "PB_EnforcePGO": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_IBCOptimize": {
-      "value": "",
-      "allowOverride": true
-    }
-  },
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 180,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "true",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "670e3783-ab4f-44fc-9786-d332007da311",
-    "type": "TfsGit",
-    "name": "DotNet-CoreCLR-Trusted",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "_links": {
-      "self": {
-        "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
-      }
-    },
-    "id": 330,
-    "name": "DotNetCore-Build",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
-    "pool": {
-      "id": 97,
-      "name": "DotNetCore-Build"
-    }
-  },
-  "id": 1828,
-  "name": "DotNet-CoreClr-Trusted-Windows-x86",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
deleted file mode 100644
index 885f3daf1e..0000000000
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+++ /dev/null
@@ -1,497 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n   \"Begin.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\Begin.ps1\n} else {\n   \"Begin.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Install Signing Plugin",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))",
-      "refName": "Task1",
-      "task": {
-        "id": "30666190-6959-11e5-9f96-f56098202fef",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "signType": "real",
-        "zipSources": "false",
-        "version": "",
-        "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json",
-        "legacySigning": "$(PB_UseLegacySigning)"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Setup vs dev env",
-      "timeoutInMinutes": 0,
-      "refName": "Task2",
-      "task": {
-        "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "setup_vs_tools.cmd",
-        "arguments": "",
-        "modifyEnvironment": "true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run clean.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task3",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "clean.cmd",
-        "arguments": "-all",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run sync.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task4",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "sync.cmd",
-        "arguments": "-p -- /p:BuildType=$(PB_BuildType) $(PB_OptionalToolingSyncArguments)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task5",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "build.cmd",
-        "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_IBCOptimize) $(PB_EnforcePGO) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Sign binaries",
-      "timeoutInMinutes": 0,
-      "refName": "Task6",
-      "task": {
-        "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "solution": "src\\sign.builds",
-        "msbuildLocationMethod": "version",
-        "msbuildVersion": "14.0",
-        "msbuildArchitecture": "x86",
-        "msbuildLocation": "",
-        "platform": "",
-        "configuration": "",
-        "msbuildArguments": "/p:SignType=$(PB_SignType) /p:BuildType=$(PB_BuildType) /p:BuildArch=$(Architecture)",
-        "clean": "false",
-        "maximumCpuCount": "false",
-        "restoreNugetPackages": "false",
-        "logProjectEvents": "false",
-        "createLogFile": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build-packages.cmd",
-      "timeoutInMinutes": 0,
-      "refName": "Task7",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "build-packages.cmd",
-        "arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:SignType=$(PB_SignType) /p:OfficialBuildId=$(OfficialBuildId)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task8",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "publish-packages.cmd",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -Container=$(PB_ContainerName) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbol packages",
-      "timeoutInMinutes": 0,
-      "refName": "Task9",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "publish-packages.cmd",
-        "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -Container=$(PB_ContainerName) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Perform Cleanup Tasks",
-      "timeoutInMinutes": 0,
-      "condition": "always()",
-      "refName": "Task10",
-      "task": {
-        "id": "521a94ea-9e68-468a-8167-6dcf361ea776",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {}
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "CopyFiles1",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "PublishBuildArtifacts1",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
-        "ArtifactName": "BuildLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": false,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Copy Publish Artifact: symbols",
-      "timeoutInMinutes": 0,
-      "refName": "PublishBuildArtifacts2",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\symbols",
-        "ArtifactName": "symbols",
-        "ArtifactType": "FilePath",
-        "TargetPath": "\\\\cpvsbuild\\drops\\DotNetCore\\$(Build.DefinitionName)\\$(Build.BuildNumber)\\FullSymbols",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n   \"End.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\End.ps1\n} else {\n   \"End.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "PB_BuildType": {
-      "value": "Release",
-      "allowOverride": true
-    },
-    "Architecture": {
-      "value": "x64",
-      "allowOverride": true
-    },
-    "Priority": {
-      "value": "0"
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput"
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "Label": {
-      "value": "$(Build.BuildNumber)"
-    },
-    "PB_OptionalToolingSyncArguments": {
-      "value": "/p:OptionalToolSource=$(PB_OptionalToolSource) /p:OptionalToolSourceUser=$(PB_OptionalToolSourceUser);OptionalToolSourcePassword=$(PB_OptionalToolSourcePAT)"
-    },
-    "PB_OptionalToolSource": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "PB_OptionalToolSourcePAT": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "PB_OptionalToolSourceUser": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "PB_SignType": {
-      "value": "test",
-      "allowOverride": true
-    },
-    "PB_UseLegacySigning": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "TeamName": {
-      "value": "DotNetCore"
-    },
-    "PB_EnforcePGO": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_IBCOptimize": {
-      "value": "",
-      "allowOverride": true
-    }
-  },
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(Architecture)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 180,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "true",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "670e3783-ab4f-44fc-9786-d332007da311",
-    "type": "TfsGit",
-    "name": "DotNet-CoreCLR-Trusted",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-    "defaultBranch": "refs/heads/master",
-    "clean": "false",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "_links": {
-      "self": {
-        "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
-      }
-    },
-    "id": 330,
-    "name": "DotNetCore-Build",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
-    "pool": {
-      "id": 97,
-      "name": "DotNetCore-Build"
-    }
-  },
-  "id": 1676,
-  "name": "DotNet-CoreClr-Trusted-Windows",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/DotNet-Trusted-Publish-Symbols.json b/buildpipeline/DotNet-Trusted-Publish-Symbols.json
deleted file mode 100644
index ad915ba7da..0000000000
--- a/buildpipeline/DotNet-Trusted-Publish-Symbols.json
+++ /dev/null
@@ -1,390 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n   \"Begin.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\Begin.ps1\n} else {\n   \"Begin.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Set up pipeline-specific git repository",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "-gitUrl $(PB_VstsRepoGitUrl) -root $(Pipeline.SourcesDirectory)",
-        "workingFolder": "",
-        "inlineScript": "param($gitUrl, $root)\n\nif (Test-Path $root)\n{\n  Remove-Item -Recurse -Force $root\n}\ngit clone --no-checkout $gitUrl $root 2>&1 | Write-Host\ncd $root\ngit checkout $env:SourceVersion 2>&1 | Write-Host\n\nWrite-Host (\"##vso[task.setvariable variable=Pipeline.SourcesDirectory;]$root\")",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Setup vs dev env",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Pipeline.SourcesDirectory)\\setup_vs_tools.cmd",
-        "arguments": "",
-        "modifyEnvironment": "true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Sync symbol packages",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "sync.cmd",
-        "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(ConfigurationGroup)/symbolpkg/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(AzureContainerSymbolPackageDirectory)symbolpkg",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Symbol Packages -> Blob Feed",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(),  contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "msbuild",
-        "arguments": "src\\publish.proj /v:D /t:PublishSymbolPackages /p:__PublishSymbols=true $(FeedPublishArguments) /fileloggerparameters:Verbosity=diag;LogFile=publishsympkg.log",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbols to msdl",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), contains(variables.PB_PublishType, 'msdl'), eq(variables.ConfigurationGroup, 'Release'))",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "msbuild",
-        "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols $(FeedPublishArguments) /p:SymbolServerPath=$(PB_MsdlSymbolServerPath) /p:SymbolServerPAT=$(PB_MsdlSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays)",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Publish symbols to symweb",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), contains(variables.PB_PublishType, 'symweb'), eq(variables.ConfigurationGroup, 'Release'))",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "msbuild",
-        "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols $(FeedPublishArguments) /p:SymbolServerPath=$(PB_SymwebSymbolServerPath) /p:SymbolServerPAT=$(PB_SymwebSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays)",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n   \"End.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\End.ps1\n} else {\n   \"End.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "7c555368-ca64-4199-add6-9ebaf0b0137d"
-      },
-      "inputs": {
-        "multipliers": "[]",
-        "parallel": "false",
-        "continueOnError": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "ConfigurationGroup": {
-      "value": "$(PB_BuildType)",
-      "allowOverride": true
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput",
-      "allowOverride": true
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "PB_ContainerName": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "PB_BlobNamePrefix": {
-      "value": "$(PB_PipeBuildIdentifier)/",
-      "allowOverride": true
-    },
-    "AzureBlobFeedAccountName": {
-      "value": "dotnetfeed",
-      "allowOverride": true
-    },
-    "AzureBlobFeedAccessToken": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "AzureBlobFeedContainerName": {
-      "value": "dotnet-core",
-      "allowOverride": true
-    },
-    "Pipeline.SourcesDirectory": {
-      "value": "$(Build.BinariesDirectory)\\pipelineRepository"
-    },
-    "PB_VstsAccountName": {
-      "value": "dn-bot"
-    },
-    "PB_VstsRepositoryName": {
-      "value": "DotNet-CoreCLR-Trusted",
-      "allowOverride": true
-    },
-    "PB_VstsRepoGitUrl": {
-      "value": "https://$(PB_VstsAccountName):$(VstsRepoPat)@devdiv.visualstudio.com/DevDiv/_git/$(PB_VstsRepositoryName)/"
-    },
-    "VstsRepoPat": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "SourceVersion": {
-      "value": "master",
-      "allowOverride": true
-    },
-    "SourceBranch": {
-      "value": "master",
-      "allowOverride": true
-    },
-    "AzureContainerSymbolPackageDirectory": {
-      "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\",
-      "allowOverride": true
-    },
-    "AzureContainerSymbolPackageGlob": {
-      "value": "symbolpkg\\*.nupkg",
-    },
-    "FeedPublishArguments": {
-      "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=$(AzureContainerSymbolPackageDirectory) /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false"
-    },
-    "PB_PublishType": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_PublishBlobFeedUrl": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_PublishBlobFeedKey": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_BuildOutputManifestArguments": {
-      "value": "/p:ManifestBuildId=$(OfficialBuildId) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion)"
-    },
-    "PB_MsdlSymbolServerPath": {
-      "value": "https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection"
-    },
-    "PB_MsdlSymbolServerPAT": {
-      "value": null,
-      "isSecret": true
-    },
-    "PB_SymwebSymbolServerPath": {
-      "value": "https://microsoft.artifacts.visualstudio.com/DefaultCollection"
-    },
-    "PB_SymwebSymbolServerPAT": {
-      "value": null,
-      "isSecret": true
-    },
-    "PB_SymbolExpirationInDays": {
-      "value": "30"
-    },
-  },
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 180,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "false",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "0a2b2664-c1be-429c-9b40-8a24dee27a4a",
-    "type": "TfsGit",
-    "name": "DotNet-BuildPipeline",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-BuildPipeline",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "queue": {
-    "_links": {
-      "self": {
-        "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
-      }
-    },
-    "id": 330,
-    "name": "DotNetCore-Build",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
-    "pool": {
-      "id": 97,
-      "name": "DotNetCore-Build"
-    }
-  },
-  "id": -1,
-  "name": "DotNet-Trusted-Publish-Symbols",
-  "path": "\\",
-  "type": "build",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418097642
-  }
-}
diff --git a/buildpipeline/DotNet-Trusted-Publish.json b/buildpipeline/DotNet-Trusted-Publish.json
deleted file mode 100644
index ed8c3206fa..0000000000
--- a/buildpipeline/DotNet-Trusted-Publish.json
+++ /dev/null
@@ -1,709 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n   \"Begin.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\Begin.ps1\n} else {\n   \"Begin.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Install Signing Plugin",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))",
-      "task": {
-        "id": "30666190-6959-11e5-9f96-f56098202fef",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "signType": "real",
-        "zipSources": "true",
-        "version": "",
-        "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json",
-        "legacySigning": "$(PB_UseLegacySigning)"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Fetch custom tooling (NuGet)",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "filePath",
-        "scriptName": "scripts/DotNet-Trusted-Publish/Fetch-Tools.ps1",
-        "arguments": "$(Build.StagingDirectory)\\ToolingDownload",
-        "workingFolder": "",
-        "inlineScript": "# You can write your powershell scripts inline here. \n# You can also pass predefined and custom variables to this scripts using arguments\n\n Write-Host \"Hello World\"",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Set up pipeline-specific git repository",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "-gitUrl $(VstsRepoGitUrl) -root $(Pipeline.SourcesDirectory)",
-        "workingFolder": "",
-        "inlineScript": "param($gitUrl, $root)\n\nif (Test-Path $root)\n{\n  Remove-Item -Recurse -Force $root\n}\ngit clone $gitUrl $root 2>&1 | Write-Host\ncd $root\ngit checkout $env:SourceVersion 2>&1 | Write-Host\n\nWrite-Host (\"##vso[task.setvariable variable=Pipeline.SourcesDirectory;]$root\")",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Setup vs dev env",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "$(Pipeline.SourcesDirectory)\\setup_vs_tools.cmd",
-        "arguments": "",
-        "modifyEnvironment": "true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Sync packages",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "sync.cmd",
-        "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(ConfigurationGroup)/pkg/flatcontainer/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(AzureContainerPackageDirectory)pkg",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Generate Version Assets",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "inlineScript": "#if ($env:UseLegacyBuildScripts -eq \"true\")\n#{\n  msbuild build.proj /t:CreateOrUpdateCurrentVersionFile /p:OfficialBuildId=$env:OfficialBuildId /p:BuildVersionFile=bin\\obj\\BuildVersion-$env:OfficialBuildId.props\n#}\n#else\n#{\n#  .\\build-managed.cmd -GenerateVersion \"-OfficialBuildId=$env:OfficialBuildId\"\n#}",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Log Native Version Assets Files",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "dir",
-        "arguments": "$(Pipeline.SourcesDirectory)\\bin\\obj\\BuildVersion*",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "packages -> dotnet.myget.org",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), contains(variables.PB_PublishType, 'myget'), eq(variables.ConfigurationGroup, 'Release'))",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(AzureContainerPackageDirectory)$(AzureContainerPackageGlob) -MyGetFeedUrl $(MyGetFeedUrl)",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\n\nif ($ConfigurationGroup.ToLower() -ne \"release\") { Write-host \"Chose not to publish\"; exit }\n\nmsbuild /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Packages -> Blob Feed",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(),  contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "msbuild",
-        "arguments": "src\\publish.proj /t:PublishPackages /p:__PublishPackages=true $(FeedPublishArguments) /fileloggerparameters:Verbosity=diag;LogFile=publishpkg.log",
-        "workingFolder": "$(Pipeline.SourcesDirectory)",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": false,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Create VSTS auth NuGet.Config",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "$(VstsAuthedNuGetConfigPath) $(VstsFeedUrl) $(VstsPat)",
-        "workingFolder": "",
-        "inlineScript": "param($path, $url, $pat)\n\nSet-Content $path @\"\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<configuration>\n  <packageSources>\n    <add key=\"vsts-dotnet-core\" value=\"$url\" />\n  </packageSources>\n  <packageSourceCredentials>\n    <vsts-dotnet-core>\n      <add key=\"Username\" value=\"VssSessionToken\" />\n      <add key=\"ClearTextPassword\" value=\"$pat\" />\n    </vsts-dotnet-core>\n  </packageSourceCredentials>\n</configuration>\n\"@",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": false,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "packages -> VSTS",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "",
-        "workingFolder": "",
-        "inlineScript": "if ($env:ConfigurationGroup -ne \"Release\") { exit }\n& $env:CustomNuGetPath push $env:AzureContainerPackageDirectory$env:AzureContainerPackageGlob placeholderapikey -Source vsts-dotnet-core -ConfigFile $env:VstsAuthedNuGetConfigPath -Timeout 3600",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Update versions repository",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), contains(variables.PB_PublishType, 'versions'), eq(variables.ConfigurationGroup, 'Release'))",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "-gitHubAuthToken $(UpdatePublishedVersions.AuthToken) -root $(Pipeline.SourcesDirectory) -configGroup $(ConfigurationGroup)",
-        "workingFolder": "",
-        "inlineScript": "param($gitHubAuthToken, $root, $configGroup)\nif ($configGroup -ne \"Release\" ) { exit }\ncd $root\n. $root\\UpdatePublishedVersions.ps1 `\n  -gitHubUser dotnet-build-bot -gitHubEmail dotnet-build-bot@microsoft.com `\n  -gitHubAuthToken $gitHubAuthToken `\n  -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo versions `\n  -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n  -nupkgPath $env:AzureContainerPackageDirectory$env:AzureContainerPackageGlob",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Get Build Number",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "scriptType": "inlineScript",
-        "scriptName": "",
-        "arguments": "$(OfficialBuildId) $(Pipeline.SourcesDirectory)",
-        "workingFolder": "",
-        "inlineScript": "param(\n  [string]$OfficialBuildId,\n  [string]$SourcesDir\n)\n$VersionPropsFile=$SourcesDir + \"\\bin\\obj\\BuildVersion-\" + $OfficialBuildId + \".props\"\n[xml]$versionXml=Get-Content $VersionPropsFile\n$env:BuildNumber=$versionXml.Project.PropertyGroup.BuildNumberMajor.InnerText + \".\" + $versionXml.Project.PropertyGroup.BuildNumberMinor.InnerText\nWrite-Host (\"##vso[task.setvariable variable=BuildNumber;]$env:BuildNumber\")",
-        "failOnStandardError": "true"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Publish to Artifact Services Drop (OfficialBuildId)",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "f9d96d25-0c81-4e77-8282-1ad1f785cbb4",
-        "versionSpec": "0.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "dropServiceURI": "https://devdiv.artifacts.visualstudio.com/DefaultCollection",
-        "buildNumber": "dotnet/$(GitHubRepositoryName)/$(SourceBranch)/$(OfficialBuildId)/packages/$(ConfigurationGroup)",
-        "sourcePath": "$(AzureContainerPackageDirectory)",
-        "dropExePath": "",
-        "toLowerCase": "true",
-        "detailedLog": "false",
-        "usePat": "false",
-        "retentionDays": "",
-        "dropMetadataContainerName": "Drop-OfficialBuildId"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Publish to Artifact Services Drop (BuildNumber)",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "f9d96d25-0c81-4e77-8282-1ad1f785cbb4",
-        "versionSpec": "0.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "dropServiceURI": "https://devdiv.artifacts.visualstudio.com/DefaultCollection",
-        "buildNumber": "dotnet/$(GitHubRepositoryName)/$(SourceBranch)/$(BuildNumber)/packages/$(ConfigurationGroup)",
-        "sourcePath": "$(AzureContainerPackageDirectory)",
-        "dropExePath": "",
-        "toLowerCase": "true",
-        "detailedLog": "false",
-        "usePat": "false",
-        "retentionDays": "",
-        "dropMetadataContainerName": "Drop-BuildNumber"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\DebugLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "$(Pipeline.SourcesDirectory)",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\DebugLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: DebugLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\DebugLogs",
-        "ArtifactName": "DebugLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Send Telemetry",
-      "timeoutInMinutes": 0,
-      "condition": "always()",
-      "task": {
-        "id": "521a94ea-9e68-468a-8167-6dcf361ea776",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {}
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n   \"End.ps1 script found. Executing...\"\n   cd $(AgentToolsPath)\n   & $(AgentToolsPath)\\End.ps1\n} else {\n   \"End.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "ConfigurationGroup": {
-      "value": "$(PB_BuildType)",
-      "allowOverride": true
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput",
-      "allowOverride": true
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "PB_ContainerName": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "PB_BlobNamePrefix": {
-      "value": "$(PB_PipeBuildIdentifier)/",
-      "allowOverride": true
-    },
-    "TeamName": {
-      "value": "DotNetCore"
-    },
-    "AzureBlobFeedAccountName": {
-      "value": "dotnetfeed",
-      "allowOverride": true
-    },
-    "AzureBlobFeedAccessToken": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "AzureBlobFeedContainerName": {
-      "value": "dotnet-core",
-      "allowOverride": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "MyGetFeedUrl": {
-      "value": "https://dotnet.myget.org/F/dotnet-core-test/api/v2/package",
-      "allowOverride": true
-    },
-    "MyGetApiKey": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "VstsFeedUrl": {
-      "value": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/dotnet-core-test/nuget/v3/index.json",
-      "allowOverride": true
-    },
-    "VstsPat": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "VstsAuthedNuGetConfigPath": {
-      "value": "$(Build.StagingDirectory)\\VstsAuthed.NuGet.Config"
-    },
-    "UpdatePublishedVersions.AuthToken": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "VersionsRepoOwner": {
-      "value": "dagood",
-      "allowOverride": true
-    },
-    "BuildConfiguration": {
-      "value": "Release"
-    },
-    "BuildPlatform": {
-      "value": "any cpu"
-    },
-    "ReleaseBaseUrl": {
-      "value": "https://devdiv.vsrm.visualstudio.com/DefaultCollection",
-      "allowOverride": true
-    },
-    "ReleaseProjectName": {
-      "value": "DevDiv",
-      "allowOverride": true
-    },
-    "ReleaseDefinitionId": {
-      "value": "40",
-      "allowOverride": true
-    },
-    "ManualReleaseName": {
-      "value": ""
-    },
-    "OfficialBuild": {
-      "value": "fake-test"
-    },
-    "BranchGroup": {
-      "value": ""
-    },
-    "DefinitionNames": {
-      "value": "Fake-Windows Fake-Windows-Native"
-    },
-    "CreateRequestContacts": {
-      "value": "a b c"
-    },
-    "VstsReleaseAccessToken": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "Pipeline.SourcesDirectory": {
-      "value": "$(Build.BinariesDirectory)\\pipelineRepository"
-    },
-    "VstsAccountName": {
-      "value": "dagood",
-      "allowOverride": true
-    },
-    "VstsRepositoryName": {
-      "value": "DotNet-CoreFX-Trusted",
-      "allowOverride": true
-    },
-    "VstsRepoGitUrl": {
-      "value": "https://$(VstsAccountName):$(VstsRepoPat)@devdiv.visualstudio.com/DevDiv/_git/$(VstsRepositoryName)/"
-    },
-    "VstsRepoPat": {
-      "value": null,
-      "allowOverride": true,
-      "isSecret": true
-    },
-    "SourceVersion": {
-      "value": "master",
-      "allowOverride": true
-    },
-    "SourceBranch": {
-      "value": "master",
-      "allowOverride": true
-    },
-    "AzureContainerPackageDirectory": {
-      "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\",
-      "allowOverride": true
-    },
-    "AzureContainerPackageGlob": {
-      "value": "pkg\\*.nupkg",
-    },
-    "GitHubRepositoryName": {
-      "value": "corefx",
-      "allowOverride": true
-    },
-    "UseLegacyBuildScripts": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "FeedPublishArguments": {
-      "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=$(AzureContainerPackageDirectory) /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false",
-    },
-    "PB_PublishType": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_PublishBlobFeedUrl": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_PublishBlobFeedKey": {
-      "value": "",
-      "allowOverride": true
-    },
-    "PB_BuildOutputManifestArguments": {
-      "value": "/p:ManifestBuildId=$(OfficialBuildId) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion)"
-    },
-    "PB_UseLegacySigning": {
-      "value": "false",
-      "allowOverride": true
-    }
-  },
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 180,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "false",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "0a2b2664-c1be-429c-9b40-8a24dee27a4a",
-    "type": "TfsGit",
-    "name": "DotNet-BuildPipeline",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-BuildPipeline",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "_links": {
-      "self": {
-        "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
-      }
-    },
-    "id": 330,
-    "name": "DotNetCore-Build",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
-    "pool": {
-      "id": 97,
-      "name": "DotNetCore-Build"
-    }
-  },
-  "id": 2943,
-  "name": "DotNet-Trusted-Publish",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/README.md b/buildpipeline/README.md
deleted file mode 100644
index 59572ae662..0000000000
--- a/buildpipeline/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-These are the checked-in build definitions used by BuildPipeline.
-
-You may edit build steps, variables, and other artifacts of the definition directly to modify the BuildPipeline builds.
-
-If you want to make major changes to these definitions such as adding / deleting build steps, or other major rewrites, chcosta has tools to assist with those changes and can provide guidance. It is important that we know what kinds of changes are being made to the build definitions so that we can invest in improving those experiences.
\ No newline at end of file
diff --git a/buildpipeline/linux-musl.groovy b/buildpipeline/linux-musl.groovy
deleted file mode 100644
index d82ae726c0..0000000000
--- a/buildpipeline/linux-musl.groovy
+++ /dev/null
@@ -1,24 +0,0 @@
-@Library('dotnet-ci') _
-
-// Incoming parameters.  Access with "params.<param name>".
-// Note that the parameters will be set as env variables so we cannot use names that conflict
-// with the engineering system parameter names.
-// CGroup - Build configuration.
-// TestOuter - If true, runs outerloop, if false runs just innerloop
-
-simpleDockerNode('microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156') {
-    stage ('Checkout source') {
-        checkoutRepo()
-    }
-
-    stage ('Initialize tools') {
-        // Init tools
-        sh './init-tools.sh'
-    }
-    stage ('Sync') {
-        sh "./sync.sh"
-    }
-    stage ('Build Product') {
-        sh "./build.sh -x64 -${params.CGroup} -skiprestore -stripSymbols -portablebuild=false"
-    }
-}
diff --git a/buildpipeline/perf-pipeline.groovy b/buildpipeline/perf-pipeline.groovy
deleted file mode 100644
index f2043dc742..0000000000
--- a/buildpipeline/perf-pipeline.groovy
+++ /dev/null
@@ -1,409 +0,0 @@
-@Library('dotnet-ci') _
-
-// Incoming parameters.  Access with "params.<param name>".
-// Note that the parameters will be set as env variables so we cannot use names that conflict
-// with the engineering system parameter names.
-
-//--------------------- Windows Functions ----------------------------//
-
-def windowsBuild(String arch, String config, String pgo, boolean isBaseline) {
-    checkout scm
-
-    String pgoBuildFlag = ((pgo == 'nopgo') ? '-nopgooptimize' : '-enforcepgo')
-    String baselineString = ""
-
-    // For baseline builds, checkout the merge's parent
-    if (isBaseline) {
-        baselineString = "-baseline"
-        bat "git checkout HEAD^^1"
-    }
-
-    bat "set __TestIntermediateDir=int&&.\\build.cmd -${config} -${arch} -skipbuildpackages ${pgoBuildFlag}"
-    bat "tests\\runtest.cmd ${config} ${arch} GenerateLayoutOnly"
-    bat "rd /s /q bin\\obj"
-
-    // Stash build artifacts. Stash tests in an additional stash to be used by Linux test runs
-    stash name: "nt-${arch}-${pgo}${baselineString}-build-artifacts", includes: 'bin/**'
-    stash name: "nt-${arch}-${pgo}${baselineString}-test-artifacts", includes: 'bin/tests/**'
-}
-
-def windowsPerf(String arch, String config, String uploadString, String runType, String opt_level, String jit, String pgo, String scenario, boolean isBaseline, boolean isProfileOn, int slice) {
-    withCredentials([string(credentialsId: 'CoreCLR Perf BenchView Sas', variable: 'BV_UPLOAD_SAS_TOKEN')]) {
-        checkout scm
-        String baselineString = ""
-        if (isBaseline) {
-            baselineString = "-baseline"
-        }
-        dir ('.') {
-            unstash "nt-${arch}-${pgo}${baselineString}-test-artifacts"
-            unstash "benchview-tools"
-            unstash "metadata"
-        }
-
-        String pgoTestFlag = ((pgo == 'nopgo') ? '-nopgo' : '')
-
-        // We want to use the baseline metadata for baseline runs. We expect to find the submission metadata in
-        // submission-metadata.py
-        if (isBaseline) {
-            bat "move /y submission-metadata-baseline.json submission-metadata.json"
-        }
-
-        String testEnv = ""
-
-        String failedOutputLogFilename = "run-xunit-perf-scenario.log"
-
-        bat "py \".\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\""
-        bat ".\\init-tools.cmd"
-
-        // We run run-xunit-perf differently for each of the different job types
-
-        String profileArg = isProfileOn ? "BranchMispredictions+CacheMisses+InstructionRetired" : "stopwatch"
-
-        String runXUnitCommonArgs = "-arch ${arch} -configuration ${config} -generateBenchviewData \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" ${uploadString} ${pgoTestFlag} -runtype ${runType} ${testEnv} -optLevel ${opt_level} -jitName ${jit} -outputdir \"%WORKSPACE%\\bin\\sandbox_logs\""
-        if (scenario == 'perf') {
-            String runXUnitPerfCommonArgs = "${runXUnitCommonArgs} -stabilityPrefix \"START \\\"CORECLR_PERF_RUN\\\" /B /WAIT /HIGH /AFFINITY 0x2\""
-            if (slice == -1)
-            {
-                String runXUnitPerflabArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\performance\\perflab\\Perflab -library"
-
-                profileArg = isProfileOn ? "default+${profileArg}+gcapi" : profileArg
-                bat "py tests\\scripts\\run-xunit-perf.py ${runXUnitPerflabArgs} -collectionFlags ${profileArg}"
-
-                String runXUnitCodeQualityArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\Jit\\Performance\\CodeQuality\\"
-                bat "py tests\\scripts\\run-xunit-perf.py ${runXUnitCodeQualityArgs} -collectionFlags ${profileArg}"
-            }
-
-            else {
-                String runXUnitCodeQualityArgs = "${runXUnitPerfCommonArgs} -slice ${slice} -sliceConfigFile \"%WORKSPACE%\\tests\\scripts\\perf-slices.json\" -testBinLoc bin\\tests\\${os}.${arch}.${config}"
-                bat "py tests\\scripts\\run-xunit-perf.py ${runXUnitCodeQualityArgs} -collectionFlags ${profileArg}"
-            }
-        }
-        else if (scenario == 'jitbench') {
-            String runXUnitPerfCommonArgs = "${runXUnitCommonArgs} -stabilityPrefix \"START \"CORECLR_PERF_RUN\" /B /WAIT /HIGH\" -scenarioTest"
-            runXUnitPerfCommonArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\performance\\Scenario\\JitBench -group CoreCLR-Scenarios"
-
-            if (!(opt_level == 'min_opt' && isProfileOn)) {
-                bat "py tests\\scripts\\run-xunit-perf.py ${runXUnitPerfCommonArgs} -collectionFlags ${profileArgs}"
-            }
-        }
-        else if (scenario == 'illink') {
-            String runXUnitPerfCommonArgs = "${runXUnitCommonArgs} -scenarioTest"
-            bat "\"%VS140COMNTOOLS%\\..\\..\\VC\\vcvarsall.bat\" x86_amd64\n" +
-                "py tests\\scripts\\run-xunit-perf.py ${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\performance\\linkbench\\linkbench -group ILLink -nowarmup"
-        }
-        archiveArtifacts allowEmptyArchive: false, artifacts:'bin/sandbox_logs/**,machinedata.json', onlyIfSuccessful: false
-    }
-}
-
-def windowsThroughput(String arch, String os, String config, String runType, String optLevel, String jit, String pgo, boolean isBaseline) {
-    withCredentials([string(credentialsId: 'CoreCLR Perf BenchView Sas', variable: 'BV_UPLOAD_SAS_TOKEN')]) {
-        checkout scm
-
-        String baselineString = ""
-        if (isBaseline) {
-            baselineString = "-baseline"
-        }
-
-        String pgoTestFlag = ((pgo == 'nopgo') ? '-nopgo' : '')
-
-        dir ('.') {
-            unstash "nt-${arch}-${pgo}${baselineString}-build-artifacts"
-            unstash "benchview-tools"
-            unstash "throughput-benchmarks-${arch}"
-            unstash "metadata"
-        }
-
-        // We want to use the baseline metadata for baseline runs. We expect to find the submission metadata in
-        // submission-metadata.py
-        if (isBaseline) {
-            bat "move /y submission-metadata-baseline.json submission-metadata.json"
-        }
-
-        bat "py \".\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\""
-        bat ".\\init-tools.cmd"
-        bat "py -u tests\\scripts\\run-throughput-perf.py -arch ${arch} -os ${os} -configuration ${config} -opt_level ${optLevel} -jit_name ${jit} ${pgoTestFlag} -clr_root \"%WORKSPACE%\" -assembly_root \"%WORKSPACE%\\${arch}ThroughputBenchmarks\\lib\" -benchview_path \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" -run_type ${runType}"
-        archiveArtifacts allowEmptyArchive: false, artifacts:'throughput-*.csv,machinedata.json', onlyIfSuccessful: false
-    }
-}
-
-//------------------------ Linux Functions ----------------------------//
-
-def linuxBuild(String arch, String config, String pgo, boolean isBaseline) {
-    checkout scm
-
-    String pgoBuildFlag = ((pgo == 'nopgo') ? '-nopgooptimize' : '')
-    String baselineString = ""
-
-    // For baseline runs, checkout the merge's parent
-    if (isBaseline) {
-        baselineString = "-baseline"
-        sh "git checkout HEAD^1"
-    }
-
-    sh "./build.sh -verbose -${config} -${arch} ${pgoBuildFlag}"
-    stash name: "linux-${arch}-${pgo}${baselineString}-build-artifacts", includes: 'bin/**'
-}
-
-def linuxPerf(String arch, String os, String config, String uploadString, String runType, String optLevel, String pgo, boolean isBaseline) {
-    withCredentials([string(credentialsId: 'CoreCLR Perf BenchView Sas', variable: 'BV_UPLOAD_SAS_TOKEN')]) {
-        checkout scm
-
-        String baselineString = ""
-        if (isBaseline) {
-            baselineString = "-baseline"
-        }
-
-        String pgoTestFlag = ((pgo == 'nopgo') ? '-nopgo' : '')
-
-        dir ('.') {
-            unstash "linux-${arch}-${pgo}${baselineString}-build-artifacts"
-            unstash "nt-${arch}-${pgo}${baselineString}-test-artifacts"
-            unstash "metadata"
-        }
-        dir ('./tests/scripts') {
-            unstash "benchview-tools"
-        }
-
-        // We want to use the baseline metadata for baseline runs. We expect to find the submission metadata in
-        // submission-metadata.py
-        if (isBaseline) {
-            sh "mv -f submission-metadata-baseline.json submission-metadata.json"
-        }
-
-        sh "./tests/scripts/perf-prep.sh --nocorefx"
-        sh "./init-tools.sh"
-        sh "./build-test.sh release $arch generatelayoutonly"
-
-        String runXUnitCommonArgs = "-arch ${arch} -os Ubuntu16.04 -configuration ${config} -stabilityPrefix \"taskset 0x00000002 nice --adjustment=-10\" -generateBenchviewData \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools\" ${uploadString} ${pgoTestFlag} -runtype ${runType} -optLevel ${optLevel} -outputdir \"\${WORKSPACE}/bin/sandbox_logs\""
-
-        sh "python3 ./tests/scripts/run-xunit-perf.py -testBinLoc bin/tests/Windows_NT.${arch}.${config}/JIT/Performance/CodeQuality ${runXUnitCommonArgs}"
-        archiveArtifacts allowEmptyArchive: false, artifacts:'bin/toArchive/**,machinedata.json', onlyIfSuccessful: false
-    }
-}
-
-def linuxThroughput(String arch, String os, String config, String uploadString, String runType, String optLevel, String pgo, boolean isBaseline) {
-    withCredentials([string(credentialsId: 'CoreCLR Perf BenchView Sas', variable: 'BV_UPLOAD_SAS_TOKEN')]) {
-        checkout scm
-
-        String baselineString = ""
-        if (isBaseline) {
-            baselineString = "-baseline"
-        }
-
-        String pgoTestFlag = ((pgo == 'nopgo') ? '-nopgo' : '')
-
-        dir ('.') {
-            unstash "linux-${arch}-${pgo}${baselineString}-build-artifacts"
-            unstash "throughput-benchmarks-${arch}"
-            unstash "metadata"
-        }
-        dir ('./tests/scripts') {
-            unstash "benchview-tools"
-        }
-
-        // We want to use the baseline metadata for baseline runs. We expect to find the submission metadata in
-        // submission-metadata.py
-        if (isBaseline) {
-            sh "mv -f submission-metadata-baseline.json submission-metadata.json"
-        }
-
-        sh "./tests/scripts/perf-prep.sh --throughput"
-        sh "./init-tools.sh"
-        sh "python3 ./tests/scripts/run-throughput-perf.py -arch \"${arch}\" -os \"${os}\" -configuration \"${config}\" -opt_level ${optLevel} ${pgoTestFlag} -clr_root \"\${WORKSPACE}\" -assembly_root \"\${WORKSPACE}/${arch}ThroughputBenchmarks/lib\" -run_type \"${runType}\"  -benchview_path \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools\""
-        archiveArtifacts allowEmptyArchive: false, artifacts:'throughput-*.csv,machinedata.json', onlyIfSuccessful: false
-    }
-}
-
-//-------------------------- Job Definitions --------------------------//
-
-String config = "Release"
-String runType = isPR() ? 'private' : 'rolling'
-
-String uploadString = '-uploadToBenchview'
-
-stage ('Get Metadata and download Throughput Benchmarks') {
-    simpleNode('Windows_NT', '20170427-elevated') {
-        checkout scm
-        String commit = getCommit()
-        def benchViewName = isPR() ? "coreclr private %ghprbPullTitle%" : "coreclr rolling %GIT_BRANCH_WITHOUT_ORIGIN% ${commit}"
-        def benchViewUser = getUserEmail()
-        bat "mkdir tools\n" +
-            "powershell Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe -OutFile %WORKSPACE%\\tools\\nuget.exe"
-        bat "%WORKSPACE%\\tools\\nuget.exe install Microsoft.BenchView.JSONFormat -Source http://benchviewtestfeed.azurewebsites.net/nuget -Prerelease -ExcludeVersion"
-        bat "%WORKSPACE%\\tools\\nuget.exe install Microsoft.BenchView.ThroughputBenchmarks.x64.Windows_NT -Source https://dotnet.myget.org/F/dotnet-core -Prerelease -ExcludeVersion"
-        bat "%WORKSPACE%\\tools\\nuget.exe install Microsoft.BenchView.ThroughputBenchmarks.x86.Windows_NT -Source https://dotnet.myget.org/F/dotnet-core -Prerelease -ExcludeVersion"
-        bat "set \"GIT_BRANCH_WITHOUT_ORIGIN=%GitBranchOrCommit:*/=%\"\n" +
-            "py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name \"${benchViewName}\" --user-email \"${benchViewUser}\"\n" +
-            "py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\build.py\" git --branch %GIT_BRANCH_WITHOUT_ORIGIN% --type ${runType}\n" +
-            "py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name \"${benchViewName}-baseline\" --user-email \"${benchViewUser}\" -o submission-metadata-baseline.json\n"
-
-        // TODO: revisit these moves. Originally, stash could not find the directories as currently named
-        bat "move Microsoft.BenchView.ThroughputBenchmarks.x64.Windows_NT x64ThroughputBenchmarks"
-        bat "move Microsoft.BenchView.ThroughputBenchmarks.x86.Windows_NT x86ThroughputBenchmarks"
-
-        stash includes: 'Microsoft.BenchView.JSONFormat/**/*', name: 'benchview-tools'
-        stash name: "metadata", includes: "*.json"
-        stash name: "throughput-benchmarks-x64", includes: "x64ThroughputBenchmarks/**/*"
-        stash name: "throughput-benchmarks-x86", includes: "x86ThroughputBenchmarks/**/*"
-    }
-}
-
-// TODO: use non-pgo builds for throughput?
-def innerLoopBuilds = [
-    "windows x64 pgo build": {
-        simpleNode('Windows_NT','latest') {
-            windowsBuild('x64', config, 'pgo', false)
-        }
-     },
-    "windows x86 pgo build": {
-        simpleNode('Windows_NT','latest') {
-            windowsBuild('x86', config, 'pgo', false)
-        }
-    },
-    "linux x64 pgo build": {
-        simpleNode('RHEL7.2', 'latest-or-auto') {
-            linuxBuild('x64', config, 'pgo', false)
-        }
-    }
-]
-
-// Only run non-pgo builds on offical builds
-def outerLoopBuilds = [:]
-
-if (!isPR()) {
-    outerLoopBuilds = [
-        "windows x64 nopgo build": {
-            simpleNode('Windows_NT','latest') {
-                windowsBuild('x64', config, 'nopgo', false)
-            }
-        },
-        "windows x86 nopgo build": {
-           simpleNode('Windows_NT','latest') {
-               windowsBuild('x86', config, 'nopgo', false)
-           }
-        },
-        "linux x64 nopgo build": {
-           simpleNode('RHEL7.2', 'latest-or-auto') {
-               linuxBuild('x64', config, 'nopgo', false)
-           }
-        }
-    ]
-}
-
-/*def baselineBuilds = [:]
-
-if (isPR()) {
-   baselineBuilds = [
-       "windows x64 pgo baseline build": {
-           simpleNode('Windows_NT','latest') {
-               windowsBuild('x64', config, 'pgo', true)
-           }
-       },
-       "windows x86 pgo baseline build": {
-           simpleNode('Windows_NT','latest') {
-               windowsBuild('x86', config, 'pgo', true)
-           }
-       }
-   ]
-}*/
-
-stage ('Build Product') {
-    parallel innerLoopBuilds //+ outerLoopBuilds //+ baselineBuilds
-}
-
-// Pipeline builds don't allow outside scripts (ie ArrayList.Add) if running from a script from SCM, so manually list these for now.
-// Run the main test mix on all runs (PR + official)
-
-def innerLoopTests = [:]
-
-['x64', 'x86'].each { arch ->
-    ['full_opt'].each { opt_level ->
-        [false].each { isBaseline ->
-            [0,1,2,3,4,5].each { slice ->
-                String baseline = ""
-                if (isBaseline) {
-                    baseline = " baseline"
-                }
-                if (isPR() || !isBaseline) {
-                    innerLoopTests["windows ${arch} ryujit ${opt_level} pgo ${slice}${baseline} perf"] = {
-                        simpleNode('windows_server_2016_clr_perf', 180) {
-                            windowsPerf(arch, config, uploadString, runType, opt_level, 'ryujit', 'pgo', 'perf', isBaseline, true, slice)
-                        }
-                    }
-
-                }
-            }
-
-            if (arch == 'x64') {
-                innerLoopTests["linux ${arch} ryujit ${opt_level} pgo perf"] = {
-                    simpleNode('ubuntu_1604_clr_perf', 180) {
-                        linuxPerf(arch, 'Ubuntu16.04', config, uploadString, runType, opt_level, 'pgo', false)
-                    }
-                }
-            }
-        }
-    }
-}
-
-// Run the full test mix only on commits, not PRs
-def outerLoopTests = [:]
-
-if (!isPR()) {
-    ['x64', 'x86'].each { arch ->
-        outerLoopTests["windows ${arch} ryujit full_opt pgo${baseline} jitbench"] = {
-            simpleNode('windows_server_2016_clr_perf', 180) {
-                windowsPerf(arch, config, uploadString, runType, 'full_opt', 'ryujit', 'pgo', 'jitbench', false, false, -1)
-            }
-        }
-
-        outerLoopTests["windows ${arch} ryujit full_opt pgo illink"] = {
-            simpleNode('Windows_NT', '20170427-elevated') {
-                windowsPerf(arch, config, uploadString, runType, 'full_opt', 'ryujit', 'pgo', 'illink', false, false, -1)
-            }
-        }
-    }
-
-    ['x64', 'x86'].each { arch ->
-        ['min_opt', 'full_opt'].each { opt_level ->
-            ['ryujit'].each { jit ->
-                ['pgo', 'nopgo'].each { pgo_enabled ->
-                    [true, false].each { isProfileOn ->
-                        outerLoopTests["windows ${arch} ${jit} ${opt_level} ${pgo_enabled} perf"] = {
-                            simpleNode('windows_server_2016_clr_perf', 180) {
-                                windowsPerf(arch, config, uploadString, runType, opt_level, jit, pgo_enabled, 'perf', false, isProfileOn, -1)
-                            }
-                        }
-
-                        outerLoopTests["windows ${arch} ${jit} ${opt_level} ${pgo_enabled} throughput"] = {
-                            simpleNode('windows_server_2016_clr_perf', 180) {
-                                windowsThroughput(arch, 'Windows_NT', config, runType, opt_level, jit, pgo_enabled, false, isProfileOn)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    ['x64'].each { arch ->
-        ['min_opt', 'full_opt'].each { opt_level ->
-            ['pgo', 'nopgo'].each { pgo_enabled ->
-                outerLoopTests["linux ${arch} ryujit ${opt_level} ${pgo_enabled} perf"] = {
-                    simpleNode('ubuntu_1604_clr_perf', 180) {
-                        linuxPerf(arch, 'Ubuntu16.04', config, uploadString, runType, opt_level, pgo_enabled, false)
-                    }
-                }
-
-                outerLoopTests["linux ${arch} ryujit ${opt_level} ${pgo_enabled} throughput"] = {
-                    simpleNode('ubuntu_1604_clr_perf', 180) {
-                        linuxThroughput(arch, 'Ubuntu16.04', config, uploadString, runType, opt_level, pgo_enabled, false)
-                    }
-                }
-            }
-        }
-    }
-}
-
-stage ('Run testing') {
-    parallel innerLoopTests //+ outerLoopTests
-}
diff --git a/buildpipeline/perf_pipelinejobs.groovy b/buildpipeline/perf_pipelinejobs.groovy
deleted file mode 100644
index 26e118a9f4..0000000000
--- a/buildpipeline/perf_pipelinejobs.groovy
+++ /dev/null
@@ -1,35 +0,0 @@
-import jobs.generation.JobReport;
-import jobs.generation.Utilities;
-import org.dotnet.ci.pipelines.Pipeline
-
-// The input project name (e.g. dotnet/corefx)
-def project = GithubProject
-// The input branch name (e.g. master)
-def branch = GithubBranchName
-
-// **************************
-// Define innerloop testing. Any configuration in ForPR will run for every PR but all other configurations
-// will have a trigger that can be
-// **************************
-
-def perfPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/perf-pipeline.groovy')
-
-def triggerName = "Perf Build and Test"
-def pipeline = perfPipeline
-
-// If we were using parameters for the pipeline job, we would define an array of parameter pairs
-// and pass that array as a parameter to the trigger functions. Ie:
-// def params = ['CGroup':'Release',
-//               'AGroup':'x64',
-//               'OGroup':'Windows_NT']
-// pipeline.triggerPipelinOnGithubPRComment(triggerName, params)
-
-params = ['XUNIT_PERFORMANCE_MAX_ITERATION':'6',
-          'XUNIT_PERFORMANCE_MAX_ITERATION_INNER_SPECIFIED':'6']
-
-// Allow PR jobs on request.
-pipeline.triggerPipelineOnGithubPRComment(triggerName, params)
-
-// Disable automatic PR runs until throughput issues are addressed.
-// pipeline.triggerPipelineOnEveryGithubPR(triggerName, params)
-pipeline.triggerPipelinePeriodically('*/12 * * * *', params)
diff --git a/buildpipeline/pipelinejobs.groovy b/buildpipeline/pipelinejobs.groovy
deleted file mode 100644
index 75b26d100d..0000000000
--- a/buildpipeline/pipelinejobs.groovy
+++ /dev/null
@@ -1,55 +0,0 @@
-// Import the utility functionality.
-
-import jobs.generation.JobReport;
-import jobs.generation.Utilities;
-import org.dotnet.ci.pipelines.Pipeline
-
-// The input project name (e.g. dotnet/coreclr)
-def project = GithubProject
-// The input branch name (e.g. master)
-def branch = GithubBranchName
-
-// **************************
-// Define innerloop testing. Any configuration in ForPR will run for every PR but all other configurations
-// will have a trigger that can be
-// **************************
-
-def linmuslPipeline = Pipeline.createPipelineForGithub(this, project, branch, 'buildpipeline/linux-musl.groovy')
-
-def configurations = [
-    ['TGroup':"netcoreapp", 'Pipeline':linmuslPipeline, 'Name':'Linux-musl' ,'ForPR':"Debug-x64", 'Arch':['x64']],
-]
-
-configurations.each { config ->
- ['Debug', 'Release'].each { configurationGroup ->
-  (config.Arch ?: ['x64', 'x86']).each { archGroup ->
-    def triggerName = "${config.Name} ${archGroup} ${configurationGroup} Build"
-
-    def pipeline = config.Pipeline
-    def params = ['TGroup':config.TGroup,
-                  'CGroup':configurationGroup,
-                  'AGroup':archGroup,
-                  'TestOuter': false]
-
-    // Add default PR triggers for particular configurations but manual triggers for all
-    if (config.ForPR.contains("${configurationGroup}-${archGroup}")) {
-        pipeline.triggerPipelineOnEveryGithubPR(triggerName, params)
-    }
-    else {
-        pipeline.triggerPipelineOnGithubPRComment(triggerName, params)
-    }
-
-    // Add trigger for all configurations to run on merge
-    pipeline.triggerPipelineOnGithubPush(params)
-
-    // Add optional PR trigger for Outerloop test runs
-    params.TestOuter = true
-    pipeline.triggerPipelineOnGithubPRComment("Outerloop ${triggerName}", params)
-}}}
-
-JobReport.Report.generateJobReport(out)
-
-// Make the call to generate the help job
-Utilities.createHelperJob(this, project, branch,
-    "Welcome to the ${project} Repository",  // This is prepended to the help message
-    "Have a nice day!")  // This is appended to the help message.  You might put known issues here.
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
deleted file mode 100644
index 8c618c1375..0000000000
--- a/buildpipeline/pipelines.json
+++ /dev/null
@@ -1,390 +0,0 @@
-{
-  "Repository": "coreclr",
-  "Definitions": {
-    "Path": ".",
-    "Type": "VSTS",
-    "BaseUrl":  "https://devdiv.visualstudio.com/DefaultCollection",
-    "SkipBranchAndVersionOverrides": "false"
-  },
-  "PrivateRun": {
-    "property-overrides": {
-      "PB_PublishType": ""
-    }
-  },
-  "DefinitionGroups": [
-    {
-      "Name": "Product-Build",
-      "Definitions": [
-        {
-          "Name": "DotNet-CoreClr-Trusted-Linux",
-          "Parameters": {
-            "DockerTag": "centos-7-d485f41-20173404063424",
-            "Rid": "linux"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Linux",
-            "Type": "build/product/",
-            "Architecture": "x64",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Linux",
-          "Parameters": {
-            "DockerTag": "centos-6-376e1a3-20174311014331",
-            "Rid": "rhel.6",
-            "PB_AdditionalBuildArgs": "-portablebuild=false"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "RedHat6",
-            "Type": "build/product/",
-            "Architecture": "x64",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Linux",
-          "Parameters": {
-            "DockerTag": "alpine-3.6-3148f11-20171119021156",
-            "Rid": "linux-musl",
-            "PB_OutputRID": "linux-musl-x64",
-            "PB_AdditionalBuildArgs": "-portablebuild=false"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Linux-musl",
-            "Type": "build/product/",
-            "Architecture": "x64",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Mac",
-          "Parameters": {
-            "Rid": "osx"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "OSX",
-            "Type": "build/product/",
-            "SubType": "PortableBuild",
-            "Architecture": "x64",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-FreeBSD",
-          "Parameters": {
-            "Rid": "freebsd"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "FreeBSD",
-            "Type": "build/product/",
-            "SubType": "PortableBuild",
-            "Architecture": "x64",
-            "PB_BuildType": null
-          }
-        },        
-        {
-          "Name": "DotNet-CoreClr-Trusted-Windows",
-          "Parameters": {
-            "Architecture": "x64"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Windows",
-            "Type": "build/product/",
-            "SubType" : "PortableBuild",
-            "Architecture": "x64",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Windows",
-          "Parameters": {
-            "Architecture": "arm64",
-            "PB_IBCOptimize": ""
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Windows",
-            "Type": "build/product/",
-            "SubType" : "PortableBuild",
-            "Architecture": "arm64",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Windows",
-          "Parameters": {
-            "Architecture": "arm",
-            "PB_IBCOptimize": ""
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Windows",
-            "Type": "build/product/",
-            "SubType" : "PortableBuild",
-            "Architecture": "arm",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Windows-x86",
-          "Parameters": {
-            "Architecture": "x86"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Windows",
-            "Type": "build/product/",
-            "SubType" : "PortableBuild",
-            "Architecture": "x86",
-            "PB_BuildType": null
-          }
-        }
-      ]
-    },
-    {
-      "Name": "Linux-CrossBuild",
-      "Definitions": [
-        {
-          "Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
-          "Parameters": {
-            "DockerTag": "ubuntu-14.04-cross-e435274-20180426002420",
-            "Architecture": "arm",
-            "Rid": "linux",
-            "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Linux",
-            "SubType": "PortableCrossBuild",
-            "Type": "build/product/",
-            "Architecture": "arm",
-            "PB_BuildType": null
-          }
-        },
-        {
-          "Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild",
-          "Parameters": {
-            "DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180315221921",
-            "Architecture": "arm64",
-            "Rid": "linux",
-            "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1"
-          },
-          "ReportingParameters": {
-            "OperatingSystem": "Linux",
-            "SubType": "PortableCrossBuild",
-            "Type": "build/product/",
-            "Architecture": "arm64",
-            "PB_BuildType": null
-          }
-        }
-      ]
-    }
-  ],
-  "Pipelines": [
-    {
-      "Name": "Trusted-All-Release",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Release",
-        "PublishFlat": "false",
-        "PB_EnforcePGO": "enforcepgo",
-        "PB_IBCOptimize": "-ibcoptimize"
-      },
-      "ReportingParameters": {
-        "PB_BuildType": "Release"
-      },
-      "DefinitionGroupRefs": [
-        "Product-Build"
-      ]
-    },
-    {
-      "Name": "Trusted-All-Debug",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Debug",
-        "PublishFlat": "true"
-      },
-      "ReportingParameters": {
-        "PB_BuildType": "Debug"
-      },
-      "DefinitionGroupRefs": [
-        "Product-Build"
-      ]
-    },
-    {
-      "Name": "Trusted-All-Checked",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Checked",
-        "PublishFlat": "true"
-      },
-      "ReportingParameters": {
-        "PB_BuildType": "Checked"
-      },
-      "DefinitionGroupRefs": [
-        "Product-Build"
-      ]
-    },
-    {
-      "Name": "Trusted-Crossbuild-Release",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Release",
-        "PublishFlat": "false"
-      },
-      "ReportingParameters": {
-        "PB_BuildType": "Release"
-      },
-      "DefinitionGroupRefs": [
-        "Linux-CrossBuild"
-      ]
-    },
-    {
-      "Name": "Trusted-Crossbuild-Debug",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Debug",
-        "PublishFlat": "true"
-      },
-      "ReportingParameters": {
-        "PB_BuildType": "Debug"
-      },
-      "DefinitionGroupRefs": [
-        "Linux-CrossBuild"
-      ]
-    },
-    {
-      "Name": "Trusted-Crossbuild-Checked",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Checked",
-        "PublishFlat": "true"
-      },
-      "ReportingParameters": {
-        "PB_BuildType": "Checked"
-      },
-      "DefinitionGroupRefs": [
-        "Linux-CrossBuild"
-      ]
-    },
-    {
-      "Name": "Publish Packages to Feeds - Release",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Release"
-      },
-      "Definitions": [
-        {
-          "Name": "DotNet-Trusted-Publish",
-          "SkipBranchAndVersionOverrides": "true",
-          "Parameters": {
-            "VstsRepositoryName": "DotNet-CoreCLR-Trusted",
-            "GitHubRepositoryName": "coreclr"
-          },
-          "ReportingParameters": {
-            "TaskName":  "Publish",
-            "Type": "build/publish/",
-            "ConfigurationGroup": "Release"
-          }
-        }
-      ],
-      "DependsOn": [
-        "Trusted-All-Release",
-        "Trusted-Crossbuild-Release"
-      ]
-    },
-    {
-      "Name": "Publish Packages to Drop - Debug",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Debug"
-      },
-      "Definitions": [
-        {
-          "Name": "DotNet-Trusted-Publish",
-          "SkipBranchAndVersionOverrides": "true",
-          "Parameters": {
-            "VstsRepositoryName": "DotNet-CoreCLR-Trusted",
-            "GitHubRepositoryName": "coreclr"
-          },
-          "ReportingParameters": {
-            "TaskName": "Publish",
-            "Type": "build/publish/",
-            "ConfigurationGroup": "Debug"
-          }
-        }
-      ],
-      "DependsOn": [
-        "Trusted-All-Debug",
-        "Trusted-Crossbuild-Debug"
-      ]
-    },
-    {
-      "Name": "Publish Symbols - Release",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Release"
-      },
-      "Definitions": [
-        {
-          "Name": "DotNet-Trusted-Publish-Symbols",
-          "SkipBranchAndVersionOverrides": "true",
-          "Parameters": {
-          },
-          "ReportingParameters": {
-            "TaskName": "Symbol Publish",
-            "Type": "build/publish/",
-            "ConfigurationGroup": "Release"
-          }
-        }
-      ],
-      "DependsOn": [
-        "Trusted-All-Release",
-        "Trusted-Crossbuild-Release"
-      ]
-    },
-    {
-      "Name": "Publish Packages to Drop - Checked",
-      "Parameters": {
-        "TreatWarningsAsErrors": "false"
-      },
-      "BuildParameters": {
-        "PB_BuildType": "Checked"
-      },
-      "Definitions": [
-        {
-          "Name": "DotNet-Trusted-Publish",
-          "SkipBranchAndVersionOverrides": "true",
-          "Parameters": {
-            "VstsRepositoryName": "DotNet-CoreCLR-Trusted",
-            "GitHubRepositoryName": "coreclr"
-          },
-          "ReportingParameters": {
-            "TaskName": "Publish",
-            "Type": "build/publish/",
-            "ConfigurationGroup": "Checked"
-          }
-        }
-      ],
-      "DependsOn": [
-        "Trusted-All-Checked",
-        "Trusted-Crossbuild-Checked"
-      ]
-    }
-  ]
-}
diff --git a/buildpipeline/security/DotNet-CoreClr-Security-Windows.json b/buildpipeline/security/DotNet-CoreClr-Security-Windows.json
deleted file mode 100644
index 4a27f1c2fc..0000000000
--- a/buildpipeline/security/DotNet-CoreClr-Security-Windows.json
+++ /dev/null
@@ -1,581 +0,0 @@
-{
-    "build": [
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Run clean.cmd",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "filename": "clean.cmd",
-                "arguments": "-all",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "failOnStandardError": "false"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Run sync to download packages",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "scriptType": "inlineScript",
-                "scriptName": "",
-                "arguments": "$(PB_CloudDropAccountName) $(PB_CloudDropAccessToken) $(PB_CloudDropContainer)",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "inlineScript": "param($account, $token, $container)\n.\\sync.cmd -ab -- /p:CloudDropAccountName=$account /p:CloudDropAccessToken=$token /p:ContainerName=$container",
-                "failOnStandardError": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Extract downloaded nupkgs",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "scriptType": "inlineScript",
-                "scriptName": "",
-                "arguments": "$(Build.SourcesDirectory)",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$pkgDir = \"$SrcDir\\packages\\AzureTransfer\\Release\\symbolpkg\"\ngci \"$pkgDir\\*.nupkg\" | rename-item -newname { [io.path]::ChangeExtension($_.name, \"zip\") }\ngci \"$pkgDir\\*.zip\" | % {\n$dstDir = Join-Path \"$secDir\" $($_.BaseName)\nExpand-Archive -Path $($_.FullName) -DestinationPath \"$dstDir\" -Force\n}\n",
-                "failOnStandardError": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": false,
-            "alwaysRun": false,
-            "displayName": "List all files",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "scriptType": "inlineScript",
-                "scriptName": "",
-                "arguments": "$(Build.SourcesDirectory)",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n",
-                "failOnStandardError": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Remove api-*, ucrtbase*, and files other than DLLs, PDBs and TXT",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "scriptType": "inlineScript",
-                "scriptName": "",
-                "arguments": "$(Build.SourcesDirectory)",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$extList = \".dll\", \".pdb\", \".txt\"\ngci $secDir -Recurse | where { !$_.PSIsContainer } | % {\nif ($extList -inotcontains $_.Extension -or $_.BaseName -like \"api-*\" -or $_.BaseName -like \"ucrtbase*\")\n{\n    rm $_.FullName -Force\n    Write-Host \"Removed $($_.FullName)\"\n}\n}\n\n",
-                "failOnStandardError": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Workaround for long path - DELETE files with path length greater than or equal to 240 characters",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "scriptType": "inlineScript",
-                "scriptName": "",
-                "arguments": "$(Build.SourcesDirectory)",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "inlineScript": "param($SrcDir)\n$longPath = New-Object System.Collections.ArrayList\ngci \"$SrcDir\\*\" -recurse | where {!$_.PSIsContainer}  | % {\nif ($($_.FullName.Length) -ge 240)\n{\n$longPath.Add($($_.Directory.FullName)) | Out-Null\n}\n}\n$longPath | % {\nStart-Process \"cmd\" -ArgumentList \"/c rd /S /Q $_\" -Wait\nWrite-Host \"DELETED $_\"\n}\n",
-                "failOnStandardError": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": false,
-            "alwaysRun": false,
-            "displayName": "List all files - post delete",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "scriptType": "inlineScript",
-                "scriptName": "",
-                "arguments": "$(Build.SourcesDirectory)",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n",
-                "failOnStandardError": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Run BinSkim ",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "3056813a-40e9-4b2f-8f6b-612d1bc4e045",
-                "versionSpec": "3.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "InputType": "CommandLine",
-                "arguments": "analyze security\\*.dll --recurse --sympath security\\*.pdb --verbose --statistics",
-                "Function": "analyze",
-                "AnalyzeTarget": "$(Build.ArtifactStagingDirectory)",
-                "AnalyzeSymPath": "",
-                "AnalyzeConfigPath": "default",
-                "AnalyzePluginPath": "",
-                "AnalyzeRecurse": "true",
-                "AnalyzeVerbose": "true",
-                "AnalyzeHashes": "true",
-                "AnalyzeStatistics": "false",
-                "AnalyzeEnvironment": "false",
-                "ExportRulesOutputType": "SARIF",
-                "DumpTarget": "$(Build.ArtifactStagingDirectory)",
-                "DumpRecurse": "true",
-                "DumpVerbose": "true",
-                "toolVersion": "Latest"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Run APIScan",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "9adea2b1-3752-438c-80c6-a6f0a812abdd",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "targetMode": "binarysym",
-                "softwareFolder": "$(Build.SourcesDirectory)\\security",
-                "mpdFolder": "",
-                "softwareName": "CoreCLR",
-                "softwareVersionNum": "$(PB_BuildNumber)",
-                "softwareBuildNum": "$(PB_BuildNumber)",
-                "modeType": "prerelease",
-                "noCopySymbols": "false",
-                "noCopyBinaries": "false",
-                "noDecompress": "true",
-                "exclusionList": "",
-                "email": "",
-                "symbolsFolder": "$(Build.SourcesDirectory)\\security",
-                "preBbtBinariesFolder": "",
-                "preBbtSymbolsFolder": "",
-                "isLargeApp": "false",
-                "analyzerTimeout": "00:00:00",
-                "preserveTempFiles": "false",
-                "toolVersion": "Latest"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": false,
-            "alwaysRun": false,
-            "displayName": "git checkout",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "scriptType": "inlineScript",
-                "scriptName": "",
-                "arguments": "$(Build.SourcesDirectory) \"$(PB_Git)\"",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "inlineScript": "param($SrcDir, $git)\n$pkgExtPath= Join-Path \"$SrcDir\" \"security\"\ngci \"$pkgExtPath\\version.txt\" -Recurse | % { \n$sha = gc $_\nWrite-Host \"$sha\"\nif (-not [string]::IsNullOrWhiteSpace($sha))\n{\nStart-Process \"$git\" -ArgumentList \"checkout -- .\" -Wait -Verbose -ErrorAction Stop\nStart-Process \"$git\" -ArgumentList \"checkout $sha\" -Wait -Verbose -ErrorAction Stop\nWrite-Host \"Checked out at $sha\"\nbreak\n}\n}",
-                "failOnStandardError": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Run CredScan",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "ea576cd4-c61f-48f8-97e7-a3cb07b90a6f",
-                "versionSpec": "2.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "outputFormat": "pre",
-                "toolVersion": "Latest",
-                "scanFolder": "$(Build.SourcesDirectory)",
-                "searchersFileType": "Default",
-                "searchersFile": "",
-                "suppressionsFile": "",
-                "suppressAsError": "false",
-                "batchSize": ""
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Run PoliCheck",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "d785890c-0d0d-46bd-8167-8fa9d49990c7",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "inputType": "Basic",
-                "cmdLineArgs": "/F:$(Build.SourcesDirectory) /T:9 /O:PoliCheck.xml",
-                "targetType": "F",
-                "targetArgument": "$(Build.SourcesDirectory)",
-                "importEx": "0",
-                "termTypeT": "0029a9",
-                "termTypeTCustom": "9",
-                "termTypeK": "",
-                "termTypeL": "",
-                "EXGT": "false",
-                "result": "PoliCheck.xml",
-                "optionsFC": "1",
-                "optionsXS": "1",
-                "optionsCTGLEN": "",
-                "optionsSEV": "",
-                "optionsPE": "",
-                "optionsHMENABLE": "",
-                "optionsHPATH": "",
-                "optionsHVER": "",
-                "optionsRulesDBPath": "",
-                "optionsRule": "",
-                "optionsXCLASS": "",
-                "optionsTASKNAME": "",
-                "optionsWORKINGDIRECTORY": "",
-                "optionsFTPATH": "",
-                "optionsD": "",
-                "optionsB1": "",
-                "optionsB2": "",
-                "optionsB3": "",
-                "optionsOCDB": "",
-                "toolVersion": "Latest"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Post Analysis",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "f5679091-e6da-4974-a8dc-0eec03a8ea63",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "APIScan": "true",
-                "BinScope": "false",
-                "BinSkim": "true",
-                "BinSkimBreakOn": "Error",
-                "CredScan": "true",
-                "FortifySCA": "false",
-                "FxCop": "false",
-                "FxCopBreakOn": "ErrorAbove",
-                "ModernCop": "false",
-                "ModernCopBreakOn": "Error",
-                "PoliCheck": "true",
-                "PoliCheckBreakOn": "Severity1",
-                "SDLNativeRules": "false"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Publish Security Analysis Logs",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "4096c760-3a8a-435d-9689-88c0311bbc0e",
-                "versionSpec": "2.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "ArtifactName": "CodeAnalysisLogs",
-                "ArtifactType": "Container",
-                "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-                "RvName": "",
-                "ProductComponentName": "",
-                "ProductVersionNumber": "",
-                "PlatformName": "",
-                "SDLToolName": "",
-                "SDLToolResultFile": ""
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "TSA upload to Codebase: DotNet-CoreCLR-Trusted_$(CodeBase) Stamp: Azure",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "3da26988-bb64-4a23-8f06-45531d297dae",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "codebase": "NewOrUpdate",
-                "tsaStamp": "Azure",
-                "tsaWebApiUrl": "$(TSAStamp)",
-                "codeBaseName": "DotNet-CoreCLR-Trusted_$(CodeBase)",
-                "notificationAlias": "$(NotificationAlias)",
-                "codeBaseAdmins": "NORTHAMERICA\\raeda",
-                "instanceUrlAzure": "MSAZURE",
-                "instanceUrlBing": "",
-                "instanceUrlCarbon": "",
-                "instanceUrlDevDiv": "DEVDIV",
-                "instanceUrlSkype": "",
-                "instanceUrlTsa": "",
-                "instanceUrlPpe": "",
-                "projectNameDAIPVSTF": "",
-                "projectNameDYNAMICSCRM": "",
-                "projectNameMSAZURE": "One",
-                "projectNameMSDYENG": "",
-                "projectNameMSECG": "",
-                "projectNameVSTFRD": "",
-                "projectNameMSASG": "",
-                "projectNameMICROSOFTVSTS": "",
-                "projectNameMSDATA": "",
-                "projectNameMSENG": "",
-                "projectNameDEVDIV": "DevDiv",
-                "projectNameSKYPETEST2": "",
-                "projectNameONEDRIVE": "",
-                "projectNameSQLBUVSTS": "",
-                "projectNamePOWERBI": "",
-                "projectNameAZUREVSTFPPE": "",
-                "projectNameSKYPE": "",
-                "projectNameDOMOREEXP": "",
-                "projectNameSQLBUVSTSTEST": "",
-                "areaPath": "One\\DevDiv\\DotNetCore",
-                "iterationPath": "One",
-                "uploadAPIScan": "true",
-                "uploadBinScope": "false",
-                "uploadBinSkim": "true",
-                "uploadCredScan": "true",
-                "uploadFortifySCA": "false",
-                "uploadFxCop": "false",
-                "uploadModernCop": "false",
-                "uploadPoliCheck": "true",
-                "uploadPREfast": "false",
-                "validateToolOutput": "Warning",
-                "validateCompatibility": "Error",
-                "uploadAsync": "true"
-            }
-        },
-        {
-            "enabled": true,
-            "continueOnError": true,
-            "alwaysRun": false,
-            "displayName": "Run clean.cmd",
-            "timeoutInMinutes": 0,
-            "condition": "succeeded()",
-            "task": {
-                "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-                "versionSpec": "1.*",
-                "definitionType": "task"
-            },
-            "inputs": {
-                "filename": "clean.cmd",
-                "arguments": "-all",
-                "workingFolder": "$(Build.SourcesDirectory)",
-                "failOnStandardError": "false"
-            }
-        }
-    ],
-    "options": [
-        {
-            "enabled": false,
-            "definition": {
-                "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6"
-            },
-            "inputs": {}
-        },
-        {
-            "enabled": false,
-            "definition": {
-                "id": "7c555368-ca64-4199-add6-9ebaf0b0137d"
-            },
-            "inputs": {
-                "multipliers": "[]",
-                "parallel": "false",
-                "continueOnError": "true",
-                "additionalFields": "{}"
-            }
-        },
-        {
-            "enabled": false,
-            "definition": {
-                "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-            },
-            "inputs": {
-                "workItemType": "234347",
-                "assignToRequestor": "true",
-                "additionalFields": "{}"
-            }
-        },
-        {
-            "enabled": false,
-            "definition": {
-                "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-            },
-            "inputs": {}
-        },
-        {
-            "enabled": false,
-            "definition": {
-                "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-            },
-            "inputs": {
-                "branchFilters": "[\"+refs/heads/*\"]",
-                "additionalFields": "{}"
-            }
-        }
-    ],
-    "variables": {
-        "system.debug": {
-            "value": "false"
-        }
-    },
-    "demands": [
-        "Agent.OS -equals windows_nt",
-        "msbuild"
-    ],
-    "retentionRules": [
-        {
-            "branches": [
-                "+refs/heads/*"
-            ],
-            "artifacts": [
-                "build.SourceLabel"
-            ],
-            "artifactTypesToDelete": [],
-            "daysToKeep": 10,
-            "minimumToKeep": 1,
-            "deleteBuildRecord": true,
-            "deleteTestResults": true
-        }
-    ],
-    "_links": {
-        "self": {
-            "href": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6389"
-        },
-        "web": {
-            "href": "https://devdiv.visualstudio.com/_permalink/_build/index?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6389"
-        },
-        "editor": {
-            "href": "https://devdiv.visualstudio.com/_permalink/_build/definitionEditor?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6389"
-        },
-        "badge": {
-            "href": "https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6389/badge"
-        }
-    },
-    "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)",
-    "jobAuthorizationScope": 1,
-    "jobTimeoutInMinutes": 600,
-    "jobCancelTimeoutInMinutes": 5,
-    "badgeEnabled": true,
-    "repository": {
-        "properties": {
-            "cleanOptions": "3",
-            "labelSources": "0",
-            "labelSourcesFormat": "$(build.buildNumber)",
-            "reportBuildStatus": "true",
-            "gitLfsSupport": "false",
-            "skipSyncSource": "false",
-            "checkoutNestedSubmodules": "false",
-            "fetchDepth": "0"
-        },
-        "id": "670e3783-ab4f-44fc-9786-d332007da311",
-        "type": "TfsGit",
-        "name": "DotNet-CoreCLR-Trusted",
-        "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-        "defaultBranch": "refs/heads/master",
-        "clean": "false",
-        "checkoutSubmodules": false
-    },
-    "processParameters": {},
-    "quality": "definition",
-    "authoredBy": {
-        "id": "9d5fdf9f-36b6-4d0c-a12e-2737a673af94",
-        "displayName": "Ravi Eda",
-        "uniqueName": "raeda@microsoft.com",
-        "url": "https://app.vssps.visualstudio.com/Aa44b2c06-f247-425c-8464-4a0676af910a/_apis/Identities/9d5fdf9f-36b6-4d0c-a12e-2737a673af94",
-        "imageUrl": "https://devdiv.visualstudio.com/_api/_common/identityImage?id=9d5fdf9f-36b6-4d0c-a12e-2737a673af94"
-    },
-    "queue": {
-        "id": 36,
-        "name": "DotNet-Build",
-        "pool": {
-            "id": 39,
-            "name": "DotNet-Build"
-        }
-    },
-    "id": 6389,
-    "name": "DotNet-CoreCLR-Security-Windows",
-    "url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6389",
-    "uri": "vstfs:///Build/Definition/6389",
-    "path": "\\",
-    "revision": 2,
-    "createdDate": "2017-06-13T19:06:48.730Z",
-    "project": {
-        "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-        "name": "DevDiv",
-        "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-        "url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-        "state": "wellFormed",
-        "revision": 418097695,
-        "visibility": 0
-    }
-}
diff --git a/buildpipeline/security/pipeline.json b/buildpipeline/security/pipeline.json
deleted file mode 100644
index 95416f09ec..0000000000
--- a/buildpipeline/security/pipeline.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "Repository": "coreclr",
-    "Definitions": {
-        "Path": ".",
-        "Type": "VSTS",
-        "BaseUrl": "https://devdiv.visualstudio.com/DefaultCollection",
-        "SkipBranchAndVersionOverrides": "false"
-    },
-    "Pipelines": [
-        {
-            "Name": "Security Build for Windows",
-            "Parameters": {
-                "TreatWarningsAsErrors": "false"
-            },
-            "Definitions": [
-                {
-                    "Name": "DotNet-CoreCLR-Security-Windows"
-                }
-            ]
-        }
-    ]
-}
diff --git a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
deleted file mode 100644
index 524ff6970f..0000000000
--- a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
+++ /dev/null
@@ -1,432 +0,0 @@
-{
-  "build": [
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": false,
-      "displayName": "Run AgentTools/Begin.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n     \"Begin.ps1 script found. Executing...\"\n     cd $(AgentToolsPath)\n     & $(AgentToolsPath)\\Begin.ps1\n} else {\n   \"Begin.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Setup vs dev env",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
-      "refName": "Task1",
-      "task": {
-        "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "setup_vs_tools.cmd",
-        "arguments": "",
-        "modifyEnvironment": "true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run clean.cmd",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
-      "refName": "Task2",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "clean.cmd",
-        "arguments": "-all",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run sync.cmd",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(),ne(variables['PB_SkipTests'], 'true'))",
-      "refName": "Task3",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "sync.cmd",
-        "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(ParentContainerName) -RuntimeId=$(Rid) -BlobNamePrefix=$(ParentBlobNamePrefix)$(ParentBuildType)/TestNativeBins/$(Rid) -- /p:DownloadDirectory=$(Build.SourcesDirectory)/packages/TestNativeBins/$(Rid)/$(ParentBuildType)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Generate version props file",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
-      "refName": "Task4",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "msbuild",
-        "arguments": "createVersionFile.proj /p:OfficialBuildId=$(ParentOfficialBuildId)",
-        "workingFolder": "src",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Run build-test.cmd",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
-      "refName": "Task5",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "build-test.cmd",
-        "arguments": "$(ParentBuildType) $(Architecture) buildagainstpackages runtimeid $(Rid) $(TargetsNonWindowsArg) $(CrossgenArg) -Priority=$(Priority) -- /p:OfficialBuildId=$(ParentOfficialBuildId) /p:OverwriteCoreClrPackageVersion=true /p:IntermediateAzureFeed=$(IntermediateAzureFeed)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Send job to Helix",
-      "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
-      "refName": "Task6",
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "msbuild",
-        "arguments": "helixpublish.proj /p:CloudDropAccessToken=$(CloudDropAccessToken) /p:CloudDropAccountName=$(CloudDropAccountName) /p:ContainerName=$(ParentContainerName) /p:Platform=$(Architecture) /p:BuildType=$(ParentBuildType) /p:CloudResultsAccountName=$(CloudResultsAccountName) /p:CloudResultsAccessToken=$(CloudResultsAccessToken) /p:TargetsWindows=$(TargetsWindows) /p:OverwriteOnUpload=true /p:Rid=$(Rid) /p:TargetQueues=\"$(TargetQueues)\" /p:TestProduct=$(TestProduct) /p:Branch=$(SourceBranch) /p:HelixApiAccessKey=$(HelixApiAccessKey) /p:HelixApiEndpoint=$(HelixApiEndpoint) /p:FilterToOSGroup=$(FilterToOSGroup) /p:FilterToTestTFM=$(FilterToTestTFM) /p:TimeoutInSeconds=1800 /p:HelixJobType=$(HelixJobType) /fileloggerparameters:Verbosity=diag;LogFile=helix.log",
-        "workingFolder": "tests",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "CopyFiles1",
-      "task": {
-        "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "SourceFolder": "",
-        "Contents": "**/*.log",
-        "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
-        "CleanTargetFolder": "false",
-        "OverWrite": "false",
-        "flattenFolders": "false"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Publish Artifact: BuildLogs",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "refName": "PublishBuildArtifacts1",
-      "task": {
-        "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
-        "ArtifactName": "BuildLogs",
-        "ArtifactType": "Container",
-        "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
-        "Parallel": "false",
-        "ParallelCount": "8"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Run AgentTools/End.ps1",
-      "timeoutInMinutes": 0,
-      "condition": "succeededOrFailed()",
-      "task": {
-        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "targetType": "inline",
-        "filePath": "",
-        "arguments": "",
-        "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n     \"End.ps1 script found. Executing...\"\n     cd $(AgentToolsPath)\n     & $(AgentToolsPath)\\End.ps1\n} else {\n   \"End.ps1 script does not exist. Moving on...\"\n}",
-        "errorActionPreference": "continue",
-        "failOnStderr": "false",
-        "ignoreLASTEXITCODE": "true",
-        "workingDirectory": ""
-      }
-    }
-  ],
-  "options": [
-    {
-      "enabled": false,
-      "definition": {
-        "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
-      },
-      "inputs": {
-        "workItemType": "234347",
-        "assignToRequestor": "true",
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
-      },
-      "inputs": {
-        "additionalFields": "{}"
-      }
-    },
-    {
-      "enabled": false,
-      "definition": {
-        "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
-      },
-      "inputs": {
-        "branchFilters": "[\"+refs/heads/*\"]",
-        "additionalFields": "{}"
-      }
-    }
-  ],
-  "variables": {
-    "system.debug": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "PB_BuildType": {
-      "value": "Release",
-      "allowOverride": true
-    },
-    "Architecture": {
-      "value": "x64",
-      "allowOverride": true
-    },
-    "Priority": {
-      "value": "1"
-    },
-    "CloudDropAccountName": {
-      "value": "dotnetbuildoutput"
-    },
-    "CloudDropAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "OfficialBuildId": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "Label": {
-      "value": "$(Build.BuildNumber)",
-      "allowOverride": true
-    },
-    "PB_SkipTests": {
-      "value": "false",
-      "allowOverride": true
-    },
-    "CloudResultsAccountName": {
-      "value": "dotnetjobresults"
-    },
-    "CloudResultsAccessToken": {
-      "value": null,
-      "isSecret": true
-    },
-    "TargetsWindows": {
-      "value": "false"
-    },
-    "Rid": {
-      "value": "linux-x64"
-    },
-    "TargetQueues": {
-      "value": "Debian.8.Amd64,Fedora.28.Amd64,Redhat.7.Amd64,Ubuntu.1604.Amd64,Ubuntu.1804.Amd64"
-    },
-    "TestProduct": {
-      "value": "coreclr"
-    },
-    "SourceBranch": {
-      "value": "master"
-    },
-    "HelixApiAccessKey": {
-      "value": null,
-      "isSecret": true
-    },
-    "ParentContainerName": {
-      "value": "",
-      "allowOverride": true
-    },
-    "ParentBlobNamePrefix": {
-      "value": "",
-      "allowOverride": true
-    },
-    "ParentBuildType": {
-      "value": "",
-      "allowOverride": true
-    },
-    "ParentOfficialBuildId": {
-      "value": "",
-      "allowOverride": true
-    },
-    "HelixApiEndpoint": {
-      "value": "https://helix.dot.net/api/2016-09-12/jobs"
-    },
-    "FilterToOSGroup": {
-      "value": "Dummy"
-    },
-    "FilterToTestTFM": {
-      "value": "Dummy"
-    },
-    "PB_ContainerName": {
-      "value": "$(Label)-$(TestContainerSuffix)-test"
-    },
-    "TestContainerSuffix": {
-      "value": "linux"
-    },
-    "IntermediateAzureFeed": {
-      "value": "https://dotnetbuildoutput.blob.core.windows.net/$(ParentContainerName)/$(ParentBlobNamePrefix)$(ParentBuildType)/pkg/index.json"
-    },
-    "RuntimeIDArg": {
-      "value": "runtimeid linux-x64"
-    },
-    "TargetsNonWindowsArg": {
-      "value": ""
-    },
-    "CrossgenArg": {
-      "value": ""
-    }
-  },
-  "retentionRules": [
-    {
-      "branches": [
-        "+refs/heads/*"
-      ],
-      "artifacts": [],
-      "artifactTypesToDelete": [
-        "FilePath",
-        "SymbolStore"
-      ],
-      "daysToKeep": 10,
-      "minimumToKeep": 1,
-      "deleteBuildRecord": true,
-      "deleteTestResults": true
-    }
-  ],
-  "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(Rid)",
-  "jobAuthorizationScope": "projectCollection",
-  "jobTimeoutInMinutes": 180,
-  "jobCancelTimeoutInMinutes": 5,
-  "repository": {
-    "properties": {
-      "labelSources": "0",
-      "reportBuildStatus": "true",
-      "fetchDepth": "0",
-      "gitLfsSupport": "false",
-      "skipSyncSource": "false",
-      "cleanOptions": "0",
-      "checkoutNestedSubmodules": "false",
-      "labelSourcesFormat": "$(build.buildNumber)"
-    },
-    "id": "670e3783-ab4f-44fc-9786-d332007da311",
-    "type": "TfsGit",
-    "name": "DotNet-CoreCLR-Trusted",
-    "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
-    "defaultBranch": "refs/heads/master",
-    "clean": "true",
-    "checkoutSubmodules": false
-  },
-  "processParameters": {},
-  "quality": "definition",
-  "drafts": [],
-  "queue": {
-    "_links": {
-      "self": {
-        "href": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330"
-      }
-    },
-    "id": 330,
-    "name": "DotNetCore-Build",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/build/Queues/330",
-    "pool": {
-      "id": 97,
-      "name": "DotNetCore-Build"
-    }
-  },
-  "id": 5159,
-  "name": "Dotnet-CoreClr-Trusted-BuildTests",
-  "path": "\\",
-  "type": "build",
-  "queueStatus": "enabled",
-  "project": {
-    "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "name": "DevDiv",
-    "description": "Visual Studio and DevDiv team project for git source code repositories.  Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv.  ",
-    "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
-    "state": "wellFormed",
-    "revision": 418098432,
-    "visibility": "organization"
-  }
-}
diff --git a/buildpipeline/tests/test_pipelines.json b/buildpipeline/tests/test_pipelines.json
deleted file mode 100644
index 6ee78d5a2c..0000000000
--- a/buildpipeline/tests/test_pipelines.json
+++ /dev/null
@@ -1,232 +0,0 @@
-{
-    "Repository": "coreclr",
-    "Definitions": {
-      "Path": ".",
-      "Type": "VSTS",
-      "BaseUrl":  "https://devdiv.visualstudio.com/DefaultCollection",
-      "SkipBranchAndVersionOverrides": "false"
-    },
-    "Pipelines": [
-        {
-            "Name": "Build And Run Tests - Release",
-            "Parameters": {
-            "TreatWarningsAsErrors": "false"
-            },
-            "BuildParameters": {
-            "PB_BuildType": "Release"
-            },
-            "Definitions": [
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/cli/",
-                "TargetsWindows": "true",
-                "Rid": "win-x64",
-                "TargetQueues": "Windows.10.Amd64,Windows.10.Nano.Amd64,Windows.10.Amd64.Core,Windows.7.Amd64,Windows.81.Amd64",
-                "TestContainerSuffix": "windows",
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "Windows",
-                "SubType":  "Build-Tests",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/r2r/cli/",
-                "TargetsWindows": "true",
-                "Rid": "win-x64",
-                "TargetQueues": "Windows.10.Amd64,Windows.10.Nano.Amd64,Windows.10.Amd64.Core,Windows.7.Amd64,Windows.81.Amd64",
-                "TestContainerSuffix": "windows-r2r",
-                "CrossgenArg": "Crossgen "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "Windows",
-                "SubType":  "Build-Tests-R2R",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "Architecture": "arm",
-                "HelixJobType": "test/functional/cli/",
-                "TargetsWindows": "true",
-                "Rid": "win-arm",
-                "TargetQueues": "Windows.10.Arm64",
-                "TestContainerSuffix": "windows",
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "Windows",
-                "Architecture": "arm64",
-                "SubType":  "Build-Tests",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "Architecture": "arm",
-                "HelixJobType": "test/functional/r2r/cli/",
-                "TargetsWindows": "true",
-                "Rid": "win-arm",
-                "TargetQueues": "Windows.10.Arm64",
-                "TestContainerSuffix": "windows-r2r",
-                "CrossgenArg": "Crossgen "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "Windows",
-                "Architecture": "arm64",
-                "SubType":  "Build-Tests-R2R",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/cli/",
-                "TargetsWindows": "false",
-                "Rid": "osx-x64",
-                "TargetQueues": "OSX.1012.Amd64,OSX.1013.Amd64",
-                "TestContainerSuffix": "osx",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "OSX",
-                "SubType":  "Build-Tests",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/r2r/cli/",
-                "TargetsWindows": "false",
-                "Rid": "osx-x64",
-                "TargetQueues": "OSX.1012.Amd64,OSX.1013.Amd64",
-                "TestContainerSuffix": "osx-r2r",
-                "CrossgenArg": "Crossgen ",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "OSX",
-                "SubType":  "Build-Tests-R2R",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/cli/",
-                "TargetsWindows": "false",
-                "Rid": "linux-x64",
-                "TargetQueues": "Debian.8.Amd64,Fedora.27.Amd64,Fedora.28.Amd64,Redhat.7.Amd64,Ubuntu.1604.Amd64,Ubuntu.1804.Amd64,Opensuse.42.amd64,SLES.12.Amd64",
-                "TestContainerSuffix": "linux",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "RedHat 7",
-                "SubType":  "Build-Tests",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/r2r/cli/",
-                "TargetsWindows": "false",
-                "Rid": "linux-x64",
-                "TargetQueues": "Debian.8.Amd64,Fedora.27.Amd64,Fedora.28.Amd64,Redhat.7.Amd64,Ubuntu.1604.Amd64,Ubuntu.1804.Amd64,Opensuse.42.amd64,SLES.12.Amd64",
-                "TestContainerSuffix": "linux-r2r",
-                "CrossgenArg": "Crossgen ",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "RedHat 7",
-                "SubType":  "Build-Tests-R2R",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/cli/",
-                "TargetsWindows": "false",
-                "Rid": "rhel.6-x64",
-                "TargetQueues": "Redhat.6.Amd64",
-                "TestContainerSuffix": "rhel6",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "RedHat6",
-                "SubType":  "Build-Tests",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/r2r/cli/",
-                "TargetsWindows": "false",
-                "Rid": "rhel.6-x64",
-                "TargetQueues": "Redhat.6.Amd64",
-                "TestContainerSuffix": "rhel6-r2r",
-                "CrossgenArg": "Crossgen ",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "RedHat6",
-                "SubType":  "Build-Tests-R2R",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/cli/",
-                "TargetsWindows": "false",
-                "Rid": "linux-musl-x64",
-                "TargetQueues": "Alpine.36.Amd64",
-                "TestContainerSuffix": "alpine36",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "Alpine3.6",
-                "SubType":  "Build-Tests",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            },
-            {
-                "Name": "Dotnet-CoreClr-Trusted-BuildTests",
-                "Parameters": {
-                "HelixJobType": "test/functional/r2r/cli/",
-                "TargetsWindows": "false",
-                "Rid": "linux-musl-x64",
-                "TargetQueues": "Alpine.36.Amd64",
-                "TestContainerSuffix": "alpine36-r2r",
-                "CrossgenArg": "Crossgen ",
-                "TargetsNonWindowsArg": "TargetsNonWindows "
-                },
-                "ReportingParameters": {
-                "OperatingSystem": "Alpine3.6",
-                "SubType":  "Build-Tests-R2R",
-                "Type": "build/product/",
-                "PB_BuildType": "Release"
-                }
-            }
-            ],
-        }
-    ]
-}
diff --git a/publish-packages.cmd b/publish-packages.cmd
deleted file mode 100644
index 1dd7eaa0eb..0000000000
--- a/publish-packages.cmd
+++ /dev/null
@@ -1,60 +0,0 @@
-@if not defined _echo @echo off
-setlocal EnableDelayedExpansion
-
-
-set "__args=%*"
-set processedArgs=
-set unprocessedArgs=
-set __MSBuildArgs=
-
-:ArgLoop
-
-if "%1" == "" goto ArgsDone
-if /I [%1] == [-?] goto Usage
-if /I [%1] == [-help] goto Usage
-
-REM This for loop splits the remaining arguments, preserving "=".
-REM x gets the next argument, and y gets all remaining arguments after the first.
-FOR /f "tokens=1*" %%x IN ("%*") DO (
-    set param=%%x
-    if /i "!param:~0,14!" == "-AzureAccount=" (set v=!param:~14!&set __MSBuildArgs=!__MSBuildArgs! /p:CloudDropAccountName=!v!)
-    if /i "!param:~0,12!" == "-AzureToken="   (set v=!param:~12!&set __MSBuildArgs=!__MSBuildArgs! /p:CloudDropAccessToken=!v!)
-    if /i "!param:~0,11!" == "-BuildArch="    (set v=!param:~11!&set __MSBuildArgs=!__MSBuildArgs! /p:__BuildArch=!v!)
-    if /i "!param:~0,11!" == "-BuildType="    (set v=!param:~11!&set __MSBuildArgs=!__MSBuildArgs! /p:__BuildType=!v!)
-    if /i "!param:~0,11!" == "-Container="    (set v=!param:~11!&set __MSBuildArgs=!__MSBuildArgs! /p:ContainerName=!v!)
-    if /i "!param!" == "-PublishPackages"     (set __MSBuildArgs=!__MSBuildArgs! /p:__PublishPackages=true)
-    if /i "!param!" == "-PublishSymbols"      (set __MSBuildArgs=!__MSBuildArgs! /p:__PublishSymbols=true)
-    REM all other arguments get passed through to msbuild unchanged.
-    if /i not "!param:~0,1!" == "-"           (set __MSBuildArgs=!__MSBuildArgs! !param!)
-
-    REM The innermost recursive invocation of :ArgLoop will execute
-    REM msbuild, and all other invocations simply exit.
-    call :ArgLoop %%y
-    exit /b
-)
-
-:ArgsDone
-
-call %~dp0dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false /p:__BuildOS=Windows_NT^
-  .\src\publish.proj^
-  /flp:v=detailed;LogFile=publish-packages.log /clp:v=detailed %__MSBuildArgs%
-@exit /b %ERRORLEVEL%
-
-:Usage
-echo.
-echo Publishes the NuGet packages to the specified location.
-echo   -?     - Prints Usage
-echo   -help  - Prints Usage
-echo For publishing to Azure the following properties are required.
-echo   -AzureAccount="account name"
-echo   -AzureToken="access token"
-echo   -BuildType="Configuration"
-echo   -BuildArch="Architecture"
-echo For publishing to Azure, one of the following properties is required.
-echo   -PublishPackages        Pass this switch to publish product packages 
-echo   -PublishSymbols         Pass this switch to publish symbol packages
-echo To specify the name of the container to publish into, use the following property:
-echo   -Container="container name"
-echo Architecture can be x64, x86, arm, or arm64
-echo Configuration can be Release, Debug, or Checked
-exit /b
diff --git a/publish-packages.sh b/publish-packages.sh
deleted file mode 100755
index 492fa462a2..0000000000
--- a/publish-packages.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env bash
-
-usage()
-{
-    echo "Publishes the NuGet packages to the specified location."
-    echo "For publishing to Azure the following properties are required."
-    echo "   -AzureAccount=\"account name\""
-    echo "   -AzureToken=\"access token\""
-    echo "   -BuildType=\"Configuration\""
-    echo "   -BuildArch=\"Architecture\""
-    echo "For publishing to Azure, one of the following properties is required."
-    echo "   -PublishPackages        Pass this switch to publish product packages" 
-    echo "   -PublishSymbols         Pass this switch to publish symbol packages"
-    echo "To specify the name of the container to publish into, use the following property:"
-    echo "   -Container=\"container name\""
-    echo "To specify the OS you're building for, use the following property:"
-    echo "   -DistroRiD=\"RID\""	
-    echo "Configuration can be Release, Checked, or Debug"
-    echo "Architecture can be x64, x86, arm, or arm64"
-    exit 1
-}
-
-working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Use uname to determine what the OS is.
-OSName=$(uname -s)
-case $OSName in
-    Linux)
-        __BuildOS=Linux
-        ;;
-    Darwin)
-        __BuildOS=OSX
-        ;;
-    FreeBSD)
-        __BuildOS=FreeBSD
-        ;;
-    OpenBSD)
-        __BuildOS=OpenBSD
-        ;;
-    NetBSD)
-        __BuildOS=NetBSD
-        ;;
-    SunOS)
-        __BuildOS=SunOS
-        ;;
-    *)
-        echo "Unsupported OS $OSName detected, configuring as if for Linux"
-        __BuildOS=Linux
-        ;;
-esac
-
-buildArgs=
-unprocessedBuildArgs=
-
-# TODO: get rid of argument processing entirely once we remove the
-# uses of -Arg=Value style in buildpipeline.
-while :; do
-    if [ $# -le 0 ]; then
-        break
-    fi
-    case "$1" in
-        -\?|-h|--help)
-            usage
-            exit 1
-            ;;
-        -AzureAccount=*)
-            __Account=$(echo $1| cut -d'=' -f 2)
-            buildArgs="$buildArgs /p:CloudDropAccountName=$__Account"
-            ;;
-        -AzureToken=*)
-            __Token=${1:12}
-            buildArgs="$buildArgs /p:CloudDropAccessToken=$__Token"
-            ;;
-        -BuildType=*)
-            __Type=$(echo $1| cut -d'=' -f 2)
-            buildArgs="$buildArgs /p:__BuildType=$__Type"
-            ;;
-        -BuildArch=*)
-            __Arch=$(echo $1| cut -d'=' -f 2)
-            buildArgs="$buildArgs /p:__BuildArch=$__Arch"
-            ;;
-        -Container=*)
-            __Container=$(echo $1| cut -d'=' -f 2)
-            buildArgs="$buildArgs /p:ContainerName=$__Container"
-            ;;
-        -distroRid=*)
-            __Rid=$(echo $1| cut -d'=' -f 2)
-            buildArgs="$buildArgs /p:__DistroRid=$__Rid"
-            ;;
-        -PublishPackages)
-            buildArgs="$buildArgs /p:__PublishPackages=true"
-            ;;
-        -PublishSymbols)
-            buildArgs="$buildArgs /p:__PublishSymbols=true"
-            ;;
-        -PublishTestNativeBins)
-            buildArgs="$buildArgs /p:PublishTestNativeBins=true"
-            ;;
-        --)
-            ;;
-        *)
-            unprocessedBuildArgs="$unprocessedBuildArgs $1"
-    esac
-    shift
-done
-
-$working_tree_root/dotnet.sh msbuild /nologo /verbosity:minimal /clp:Summary \
-                             ./src/publish.proj \
-                             /flp:v=detailed\;LogFile=publish-packages.log /clp:v=detailed \
-                             /p:__BuildOS=$__BuildOS $buildArgs $unprocessedBuildArgs
-if [ $? -ne 0 ]
-then
-    echo "ERROR: An error occurred while publishing packages; see $working_tree_root/publish-packages.log for more details. There may have been networking problems, so please try again in a few minutes."
-    exit 1
-fi
-
-echo "Publish completed successfully."
-exit 0
\ No newline at end of file
diff --git a/src/publish.proj b/src/publish.proj
deleted file mode 100644
index 53350b36f6..0000000000
--- a/src/publish.proj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-
-  <Import Project="$(PackagesDir)/$(FeedTasksPackage.ToLower())/$(FeedTasksPackageVersion)/build/$(FeedTasksPackage).targets" />
-  <Import Project="$(PackagesDir)/$(PublishSymbolsPackage.ToLower())/$(PublishSymbolsPackageVersion)/build/PublishSymbols.targets" />
-
-  <UsingTask TaskName="CreateAzureContainer" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll"/>
-  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll"/>
-
-  <PropertyGroup>
-    <PackagesPatternDir Condition="'$(PackagesPatternDir)' == ''">$(PackagesBinDir)</PackagesPatternDir>
-    <PackagesPattern Condition="'$(PackagesPattern)' == ''">$(PackagesPatternDir)pkg\*.nupkg</PackagesPattern>
-    <TestNativeBinariesPattern Condition="'$(TestNativeBinariesPattern)' == ''">$(OutputPath)\bin\**</TestNativeBinariesPattern>
-    <SymbolsPackagesPattern Condition="'$(SymbolPackagesPattern)' == ''">$(PackagesPatternDir)symbolpkg\*.nupkg</SymbolsPackagesPattern>
-    <SymbolsExcludePattern Condition="'$(SymbolsExcludePattern)' == ''"></SymbolsExcludePattern>
-    <PublishFlatContainer Condition="'$(PublishFlatContainer)' == ''">true</PublishFlatContainer>
-    <RelativePathWithSlash>$(RelativePath)</RelativePathWithSlash>
-    <RelativePathWithSlash Condition="'$(RelativePathWithSlash)' != '' and !HasTrailingSlash('$(RelativePathWithSlash)')">$(RelativePathWithSlash)/</RelativePathWithSlash>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ContainerName>$(ContainerName.Replace(".","-"))</ContainerName>
-    <AccountName>$(CloudDropAccountName)</AccountName>
-    <AccountKey>$(CloudDropAccessToken)</AccountKey>
-  </PropertyGroup>
-
-  <Target Name="PublishPackages" Condition="'$(__PublishPackages)' == 'true' and ('$(OfficialPublish)' != 'true' or '$(__BuildType)' == 'Release')">
-    <PropertyGroup>
-      <ExpectedFeedUrl Condition="'$(ExpectedFeedUrl)' == ''">https://$(AccountName).blob.core.windows.net/$(ContainerName)/$(RelativePathWithSlash)index.json</ExpectedFeedUrl>
-    </PropertyGroup>
-    <ItemGroup>
-      <ItemsToPush Remove="*.nupkg" />
-      <ItemsToPush Include="$(PackagesPattern)" Exclude="$(SymbolsPackagesPattern)">
-        <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
-      </ItemsToPush>
-      <ItemsToPush>
-        <RelativeBlobPath>$(RelativePathWithSlash)$([System.String]::Copy('%(RecursiveDir)%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
-      </ItemsToPush>
-    </ItemGroup>
-
-    <!-- create the container if it doesn't exist -->
-    <CreateAzureContainer AccountKey="$(AccountKey)"
-                          AccountName="$(AccountName)"
-                          ContainerName="$(ContainerName)"
-                          IsPublic="true" />
-
-    <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'"
-                    ExpectedFeedUrl="$(ExpectedFeedUrl)"
-                    AccountKey="$(AccountKey)"
-                    ItemsToPush="@(ItemsToPush)"
-                    Overwrite="$(OverwriteOnPublish)"
-                    ManifestName="$(GitHubRepositoryName)"
-                    ManifestBuildId="$(ManifestBuildId)"
-                    ManifestBranch="$(ManifestBranch)"
-                    ManifestCommit="$(ManifestCommit)" />
-
-    <!-- now upload the items -->
-    <UploadToAzure  Condition="'$(PublishFlatContainer)' == 'true'"
-                    AccountKey="$(AccountKey)"
-                    AccountName="$(AccountName)"
-                    ContainerName="$(ContainerName)"
-                    Items="@(ItemsToPush)"
-                    Overwrite="$(OverwriteOnPublish)" />
-  </Target>
-
-  <Target Name="PublishSymbolPackages" Condition="'$(__PublishSymbols)' == 'true' and ('$(OfficialPublish)' != 'true' or '$(__BuildType)' == 'Release')">
-    <PropertyGroup>
-      <ExpectedFeedUrl Condition="'$(ExpectedFeedUrl)' == ''">https://$(AccountName).blob.core.windows.net/$(ContainerName)/$(RelativePathWithSlash)index.json</ExpectedFeedUrl>
-    </PropertyGroup>
-    <ItemGroup>
-      <ItemsToPush Remove="*.nupkg" />
-      <ItemsToPush Include="$(SymbolsPackagesPattern)"/>
-      <ItemsToPush>
-        <RelativeBlobPath>$(RelativePathWithSlash)$([System.String]::Copy('%(RecursiveDir)%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
-      </ItemsToPush>
-    </ItemGroup>
-
-   <!-- create the container if it doesn't exist -->
-    <CreateAzureContainer AccountKey="$(AccountKey)"
-                          AccountName="$(AccountName)"
-                          ContainerName="$(ContainerName)"
-                          IsPublic="true" />
-
-    <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'"
-                    ExpectedFeedUrl="$(ExpectedFeedUrl)"
-                    AccountKey="$(AccountKey)"
-                    ItemsToPush="@(ItemsToPush)"
-                    Overwrite="$(OverwriteOnPublish)"
-                    ManifestName="$(GitHubRepositoryName)"
-                    ManifestBuildId="$(ManifestBuildId)"
-                    ManifestBranch="$(ManifestBranch)"
-                    ManifestCommit="$(ManifestCommit)" />
-
-    <!-- now upload the items -->
-    <UploadToAzure  Condition="'$(PublishFlatContainer)' == 'true'"
-                    AccountKey="$(AccountKey)"
-                    AccountName="$(AccountName)"
-                    ContainerName="$(ContainerName)"
-                    Items="@(ItemsToPush)"
-                    Overwrite="$(OverwriteOnPublish)" />
-  </Target>
-
-  <Target Name="PublishTestNativeBinaries" Condition="'$(PublishTestNativeBins)' == 'true' and '$(OfficialPublish)' != 'true'">
-    <PropertyGroup>
-      <RelativePath Condition="'$(RelativePath)' == ''">$(__BuildType)/TestNativeBins</RelativePath>
-      <ExpectedFeedUrl Condition="'$(ExpectedFeedUrl)' == ''">https://$(AccountName).blob.core.windows.net/$(ContainerName)/$(RelativePath)/index.json</ExpectedFeedUrl>
-    </PropertyGroup>
-    <ItemGroup>
-      <ItemsToPush Remove="*.nupkg" />
-      <ItemsToPush Include="$(TestNativeBinariesPattern)" />
-      <ItemsToPush>
-        <RelativeBlobPath>$(RelativePath)/$([System.String]::Copy('%(RecursiveDir)%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
-      </ItemsToPush>
-    </ItemGroup>
-
-    <!-- create the container if it doesn't exist -->
-    <CreateAzureContainer AccountKey="$(AccountKey)"
-                          AccountName="$(AccountName)"
-                          ContainerName="$(ContainerName)"
-                          IsPublic="true" />
-
-    <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'"
-                    ExpectedFeedUrl="$(ExpectedFeedUrl)"
-                    AccountKey="$(AccountKey)"
-                    ItemsToPush="@(ItemsToPush)"
-                    Overwrite="$(OverwriteOnPublish)" />
-
-    <!-- now upload the items -->
-    <UploadToAzure  Condition="'$(PublishFlatContainer)' == 'true'"
-                    AccountKey="$(AccountKey)"
-                    AccountName="$(AccountName)"
-                    ContainerName="$(ContainerName)"
-                    Items="@(ItemsToPush)"
-                    Overwrite="$(OverwriteOnPublish)" />
-  </Target>
-
-  <Target Name="PublishAllSymbols" 
-          DependsOnTargets="SetupPublishSymbols;PublishSymbols" />
-
-  <Target Name="SetupPublishSymbols">
-    <PropertyGroup>
-      <ConvertPortablePdbsToWindowsPdbs Condition="'$(ConvertPortablePdbsToWindowsPdbs)'==''">true</ConvertPortablePdbsToWindowsPdbs>
-    </PropertyGroup>
-    <ItemGroup>
-      <SymbolPackagesToPublish Include="$(SymbolsPackagesPattern)" Exclude="$(SymbolsExcludePattern)" />
-    </ItemGroup>
-    <Error Condition="'$(SymbolServerPath)'==''" Text="Missing property SymbolServerPath" />
-    <Error Condition="'$(SymbolServerPAT)'==''" Text="Missing property SymbolServerPAT" />
-    <Message Importance="High" Text="Publishing @(SymbolPackagesToPublish) to $(SymbolServerPath)"/>
-  </Target>
-
-  <Target Name="Build" DependsOnTargets="PublishPackages;PublishSymbolPackages;PublishTestNativeBinaries"/>
-</Project>
diff --git a/src/sign.builds b/src/sign.builds
deleted file mode 100644
index 4820d909b1..0000000000
--- a/src/sign.builds
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="..\dir.props"/>
-  <Import Project="..\dir.targets" />
-
-  <PropertyGroup>
-    <!-- The SignFiles target needs OutDir to be defined -->
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-
-  <UsingTask AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" TaskName="ReadSigningRequired" />
-
-  <ItemGroup>
-    <WindowsNativeLocation Include="$(BinDir)*.dll" />
-    <WindowsNativeLocation Include="$(BinDir)*.exe" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(BuildArch)' == 'x86'">
-    <!-- Sign api-ms-win-core-xstate-l2-1-0 binary as it is only catalog signed in the current SDK. -->
-    <WindowsNativeLocation Condition="'$(BuildType)'=='Release'" Include="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)\api-ms-win-core-xstate-l2-1-0.dll" />
-  </ItemGroup>
-
-  <!-- sign the cross targeted files as well -->
-  <ItemGroup Condition="'$(CrossTargetComponentFolder)' != ''">
-    <WindowsNativeLocation Include="$(BinDir)$(CrossTargetComponentFolder)/*.dll" />
-    <WindowsNativeLocation Include="$(BinDir)$(CrossTargetComponentFolder)/*.exe" />
-  </ItemGroup>
-
-  <Target Name="GenerateSignForWindowsNative">
-    <!--
-      Managed assemblies should already have a requires_signing file dropped so only generate
-      a requires_signing file for ones that don't exist which should leave just native assembies
-    -->
-    <WriteSigningRequired AuthenticodeSig="$(AuthenticodeSig)"
-                          MarkerFile="%(WindowsNativeLocation.Identity).requires_signing"
-                          Condition="!Exists('%(WindowsNativeLocation.Identity).requires_signing')" />
-  </Target>
-
-  <!-- populates item group FilesToSign with the list of files to sign -->
-  <Target Name="GetFilesToSignItems"
-          DependsOnTargets="GenerateSignForWindowsNative">
-    <!-- read all of the marker files and populate the FilesToSign item group -->
-    <ItemGroup>
-      <SignMarkerFile Include="$(OutDir)**\*.requires_signing" />
-    </ItemGroup>
-    <ReadSigningRequired MarkerFiles="@(SignMarkerFile)">
-      <Output TaskParameter="SigningMetadata" ItemName="FilesToSign" />
-    </ReadSigningRequired>
-
-    <Message Importance="High" Text="Attempting to sign %(FilesToSign.Identity) with authenticode='%(FilesToSign.Authenticode)' and strongname='%(FilesToSign.StrongName)'" />
-
-  </Target>
-
-  <Target Name="Build"
-          Condition="'$(SkipSigning)' != 'true'"
-          DependsOnTargets="GetFilesToSignItems;SignFiles">
-
-    <!-- now that the files have been signed delete the marker files -->
-    <Delete Files="@(SignMarkerFile)" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/tests/helixperftasks.targets b/tests/helixperftasks.targets
deleted file mode 100644
index d578360092..0000000000
--- a/tests/helixperftasks.targets
+++ /dev/null
@@ -1,144 +0,0 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <UsingTask TaskName="RemoveDuplicateAssemblies" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" >
-      <ParameterGroup>
-        <DuplicateAssemblies ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
-        <AssemblyPaths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
-        <UniqueAssemblyPaths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Output="true" />
-      </ParameterGroup>
-      <Task>
-        <Using Namespace="System"/>
-        <Using Namespace="System.IO"/>
-        <Using Namespace="System.Collections.Generic"/>
-        <Code Type="Fragment" Language="cs">
-          <![CDATA[
-                  var uniqueAssemblyPathsList = new List<Microsoft.Build.Framework.ITaskItem>();
-                  var dupeSet = new HashSet<string>();
-                  foreach(var dupe in DuplicateAssemblies)
-                  {
-                    dupeSet.Add(dupe.GetMetadata("Identity"));
-                  }
-                  foreach(var assemPath in AssemblyPaths)
-                  {
-                    if((dupeSet.Contains(assemPath.GetMetadata("FileName")+assemPath.GetMetadata("Extension")) &&
-                        !(assemPath.GetMetadata("Identity").StartsWith("runtime"))))
-                    {
-                      Log.LogMessage("Duplicate assembly filtered: {0}", assemPath.GetMetadata("Identity"));
-                    }
-                    else
-                    {
-                      uniqueAssemblyPathsList.Add(assemPath);
-                    }
-
-                  }
-                  UniqueAssemblyPaths = uniqueAssemblyPathsList.ToArray();
-          ]]>
-        </Code>
-      </Task>
-    </UsingTask>
-
-
-  <UsingTask TaskName="GetPerfTestAssemblies" AssemblyFile="$(ToolsDir)net45/Microsoft.DotNet.Build.CloudTestTasks.dll"/>
-  <Import Project="$(ToolsDir)publishtest.targets" />
-  <Import Project="$(ToolsDir)CloudTest.targets" />
-  <Target Name="UploadPerfAssemblies">
-    <Message Text="Searching for Perf tests in $(BinDir)" Importance = "High"/>
-    <ItemGroup>
-      <TestBinary Include="$(BinDir)**/*.dll" />
-      <TestBinary Include="$(BinDir)**/*.exe" />
-    </ItemGroup>
-    <!-- Get full paths to each of the perf test directories -->
-    <GetPerfTestAssemblies TestBinaries="@(TestBinary)" GetFullPaths="true">
-      <Output TaskParameter="PerfTestAssemblies" ItemName="CoreCLRPerfTest" />
-    </GetPerfTestAssemblies>
-
-    <!-- Restore the runtime dependencies -->
-    <Exec Command="$(DotnetRestoreCommand) &quot;$(TestRuntimeProjectJson)&quot;"
-           StandardOutputImportance="Low"
-           CustomErrorRegularExpression="^Unable to resolve .*"
-           IgnoreExitCode="true"
-           IgnoreStandardErrorWarningFormat="true" />
-
-    <!-- For each perf test, generate assembly list, and zip up the workitem -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Properties="CurrPerfAssembly=%(CoreCLRPerfTest.Identity);TestRuntimeProjectLockJson=$(TestRuntimeProjectLockJson)" Targets="_zipSingleProject"/>
-
-    <!-- After all workitems are packaged, call the CloudBuild Targets from Build Tools which upload these workitems and trigger a test run for these workitems -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Properties="BinDir=$(BinDir)../" Targets="CloudBuild" />
-
-  </Target>
-
-  <Target Name="RunTestsForProject">
-    <Message Text="This is a dummy target to appease DependsOnTargets for ArchiveTestBuild in publishtest.targets" Importance="Low" />
-  </Target>
-
-  <!-- CoreCLR builds do not generate dependency lists yet, we need to archive the whole packages dir so that tests can find dependencies -->
-  <!-- compress the required files from the packages dir in preparation for uploading -->
-  <Target Name="CompressPackagesDir">
-    <ItemGroup>
-      <ExcludeFromArchive Include="nupkg$" />
-      <ExcludeFromArchive Include="Microsoft.DotNet.BuildTools" />
-      <ExcludeFromArchive Include="TestData" />
-    </ItemGroup>
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(PackagesDir)"
-        DestinationArchive="$(PackagesArchiveFile)"
-        ExcludePatterns="@(ExcludeFromArchive)"
-        OverwriteDestination="true" />
-    <ItemGroup>
-      <ForUpload Include="$(PackagesArchiveFile)">
-        <RelativeBlobPath>$(Platform)$(ConfigurationGroup)/$(PackagesArchiveFilename)</RelativeBlobPath>
-      </ForUpload>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_zipSingleProject">
-    <PropertyGroup>
-      <OutDir>$([System.IO.Path]::GetDirectoryName($(CurrPerfAssembly)))/</OutDir>
-      <TestArchiveDir>$(BaseOutputPath)\testStagingDir\</TestArchiveDir>
-      <TestProjectName>$([System.IO.Path]::GetFileNameWithoutExtension($(CurrPerfAssembly)))</TestProjectName>
-      <ProjectLockJson>$(OutDir)project.lock.json</ProjectLockJson>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <TestNugetProjectLockFile Include="$(ProjectLockJson)" Condition="Exists($(ProjectLockJson))"/>
-      <TestNugetProjectLockFile Include="$(TestRuntimeProjectLockJson)" Condition="Exists($(TestRuntimeProjectLockJson))"/>
-    </ItemGroup>
-
-    <!-- Generate Assembly list based on the individual project's project.json as well as the common runtime dependencies generated by AddAssFilesToAssemblyList target -->
-    <PrereleaseResolveNuGetPackageAssets
-                               AllowFallbackOnTargetSelection="true"
-                               IncludeFrameworkReferences="false"
-                               NuGetPackagesDirectory="$(PackagesDir)"
-                               RuntimeIdentifier="$(TestNugetRuntimeId)"
-                               ProjectLanguage="C#"
-                               ProjectLockFile="%(TestNugetProjectLockFile.FullPath)"
-                               TargetMonikers="@(TestTargetFramework)">
-      <Output TaskParameter="ResolvedCopyLocalItems" ItemName="RequiredAssemblies" />
-    </PrereleaseResolveNuGetPackageAssets>
-
-
-    <ItemGroup>
-      <AssemblyPaths Include="$([MSBuild]::MakeRelative($(PackagesDir), %(RequiredAssemblies.FullPath)))" />
-      <AssemblyFiles Include="@(RequiredAssemblies->'%(FileName)%(Extension)')"></AssemblyFiles>
-      <DupeAssemblies Include="%(AssemblyFiles.Identity)" Condition="'@(AssemblyFiles->Count())' &gt; 1"> </DupeAssemblies>
-    </ItemGroup>
-    <!-- There are duplicate dependency assemblies calculated for some projects that we need to fix, this is check/fix to weed out duplicates -->
-    <RemoveDuplicateAssemblies AssemblyPaths="@(AssemblyPaths)" DuplicateAssemblies="@(DupeAssemblies)">
-      <Output TaskParameter="UniqueAssemblyPaths" ItemName="UniqueAssemblyPaths" />
-    </RemoveDuplicateAssemblies>
-
-    <WriteLinesToFile
-      File="$(OutDir)/assemblylist.flat.txt"
-      Lines="@(UniqueAssemblyPaths)"
-      Overwrite="true"
-      Encoding="Ascii" />
-
-    <GenerateAssemblyList
-      InputListLocation="$(OutDir)assemblylist.flat.txt"
-      OutputListLocation="$(OutDir)assemblylist.txt"
-     />
-
-    <Message Text="Archiving Perf test assemblies for project: $(OutDir)" Importance="High" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Properties="OutDir=$(OutDir);TestArchiveDir=$(TestArchiveDir);TestProjectName=$(TestProjectName)" Targets="ArchiveTestBuild"/>
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/tests/helixprep.proj b/tests/helixprep.proj
deleted file mode 100644
index 50d7d9bd76..0000000000
--- a/tests/helixprep.proj
+++ /dev/null
@@ -1,206 +0,0 @@
-<Project ToolsVersion="12.0" DefaultTargets="ArchiveAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\net46\Microsoft.DotNet.Build.Tasks.dll"
-             Condition=" '$(MSBuildRuntimeType)' != 'Core' " />
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\Microsoft.DotNet.Build.Tasks.dll"
-             Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
-
-  <Import Project="dir.props" />
-  <Import Project="..\dir.props" />
-
-  <PropertyGroup>
-    <DiscoveryDirectory>$(TestWorkingDir)</DiscoveryDirectory>
-    <CoreRootName>Core_Root_$(RuntimeID)</CoreRootName>
-    <UsePython Condition=" '$(UsePython)' == '' ">false</UsePython>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <XunitDlls Include="$(DiscoveryDirectory)\**\*.XUnitWrapper.dll" ></XunitDlls>
-    <RequiresSigningFilesToDelete Include="$(DiscoveryDirectory)\**\*.requires_signing" />
-  </ItemGroup>
-
-  <!-- Build the platform-specific wrapper to run an individual xunit wrapper -->
-  <!-- We should remove the generated wrappers once we have transitioned our official build -->
-
-  <Target Name="GenerateWrapperExecutables"
-    Inputs="@(XunitDlls)"
-    Outputs="$(TestWorkingDir)*\runtests.cmd" >
-
-    <MSBuild Projects="helixprep.proj"
-             Properties="BuildPath=%(XunitDlls.RootDir)%(XunitDlls.Directory);ProjectName=%(XunitDlls.Filename)%(XunitDlls.Extension)"
-             Targets="GenerateWrapperCmd" />
-
-    <MSBuild Projects="helixprep.proj"
-             Properties="BuildPath=%(XunitDlls.RootDir)%(XunitDlls.Directory);ProjectName=%(XunitDlls.Filename)%(XunitDlls.Extension)"
-             Targets="GenerateWrapperSh" />
-  </Target>
-
-  <!-- Copy the wrapper script to the xunit directory -->
-  <Target Name="CopyWrapperScript"
-    Inputs="@(XunitDlls)"
-    Outputs="$(TestWorkingDir)*\runtest_helix.py" >
-
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)\runtest_helix.py"
-          DestinationFolder="%(XunitDlls.RootDir)%(XunitDlls.Directory)" />
-
-  </Target>
-
-  <!-- Zip each top-level test folder to send to Helix -->
-
-  <Target Name="ArchiveTests"
-    Inputs="@(XunitDlls)"
-    Outputs="$(TestWorkingDir)archive\**" >
-
-    <Copy SourceFiles="$(CORE_ROOT)\xunit.console.dll"
-          DestinationFolder="%(XunitDlls.RootDir)%(XunitDlls.Directory)"
-          Condition=" '$(UsePython)' == 'false' " />
-
-    <Message Text="Deleting '.requires_signing' files to avoid file name lengths exceeding MAX_PATH" Importance="Low" />
-    <Delete Files="@(RequiresSigningFilesToDelete)" />
-    <MSBuild Projects="helixprep.proj"
-             Properties="BuildPath=%(XunitDlls.RootDir)%(XunitDlls.Directory);ProjectName=%(XunitDlls.Filename);BuildArchiveDir=$(TestWorkingDir)archive\tests\"
-             BuildInParallel="true"
-             Targets="ArchiveBuild" />
-  </Target>
-
-  <!-- Zip Core_Root & Packages payload to send to Helix -->
-
-  <Target Name="ArchiveCoreRoot"
-    Inputs="$(CORE_ROOT)"
-    Outputs="$(TestWorkingDir)archive\Core_Root" >
-    <MSBuild Projects="helixprep.proj"
-             Properties="BuildPath=$(CORE_ROOT);ProjectName=$(CoreRootName);BuildArchiveDir=$(TestWorkingDir)archive\Core_Root\"
-             Targets="ArchiveBuild" />
-
-    <!-- Make dummy packages.zip to upload to Helix -->
-    <PropertyGroup>
-      <DummyDir>$(TestWorkingDir)\archive\dummy</DummyDir>
-      <DummyPackageDir>$(TestWorkingDir)\archive\packages</DummyPackageDir>
-    </PropertyGroup>
-
-    <MakeDir Directories="$(DummyDir)" />
-    <MakeDir Directories="$(DummyPackageDir)" />
-    <ZipFileCreateFromDirectory SourceDirectory="$(DummyDir)" DestinationArchive="$(DummyPackageDir)\Packages.zip" OverwriteDestination="true" />
-  </Target>
-
-  <!-- Generate wrapper .cmd file for an Xunit wrapper -->
-  <Target Name="GenerateWrapperCmd"
-    Condition="'$(TargetsWindows)' == 'true' ">
-
-    <PropertyGroup>
-      <CmdCrossgenVar Condition="'$(Crossgen)' == 'true'">set RunCrossGen=true</CmdCrossgenVar>
-      <WrapperCmdContents>
-        <![CDATA[
-@ECHO OFF
-setlocal ENABLEDELAYEDEXPANSION
-pushd %~dp0
-
-set CORE_ROOT=%HELIX_CORRELATION_PAYLOAD%
-$(CmdCrossgenVar)
-
-ECHO BEGIN EXECUTION
-ECHO %HELIX_CORRELATION_PAYLOAD%\CoreRun.exe %HELIX_WORKITEM_PAYLOAD%\xunit.console.dll %HELIX_WORKITEM_PAYLOAD%\$(ProjectName) -noshadow -xml testResults.xml -notrait category=outerloop -notrait category=failing
-%HELIX_CORRELATION_PAYLOAD%\CoreRun.exe %HELIX_WORKITEM_PAYLOAD%\xunit.console.dll %HELIX_WORKITEM_PAYLOAD%\$(ProjectName) -noshadow -xml testResults.xml -notrait category=outerloop -notrait category=failing
-
-echo Finished running tests. Exit code = %ERRORLEVEL%
-EXIT /B %ERRORLEVEL%
-
-        ]]>
-      </WrapperCmdContents>
-    </PropertyGroup>
-
-    <!-- Write the file -->
-    <WriteLinesToFile
-      File="$(BuildPath)\runtests.cmd"
-      Lines="$(WrapperCmdContents)"
-      Overwrite="true" />
-
-  </Target>
-
-  <Target Name="GenerateWrapperSh"
-    Condition="'$(TargetsWindows)' != 'true' ">
-
-    <!-- Need to force in Unix line endings for Shell script -->
-    <PropertyGroup>
-      <WrapperShContents>#!/bin/sh%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)%0a</WrapperShContents> 
-      <WrapperShContents>$(WrapperShContents)export CORE_ROOT="%24HELIX_CORRELATION_PAYLOAD"%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)for scriptFilePath in %24(find . -type f -iname '%2A.sh' ! -iname "runtests.sh" | sort)%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)do%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents) perl -pi -e 's/\r\n|\n|\r/\n/g' "%24scriptFilePath"%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents) chmod +x "%24scriptFilePath"%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)done%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)%0a</WrapperShContents>
-
-      <!-- Crossgen FX assemblies, if running R2R tests. 
-      TODO - remove this when we build tests on Linux -->
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)export RunCrossGen=true%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)overlayDir=%24CORE_ROOT%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)if [ ! -f %24overlayDir/crossgenCompleted.mrk ]%3B then%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)  filesToPrecompile=%24(find -L %24overlayDir -iname \%2A.dll -not -iname \%2A.ni.dll -not -iname \%2A-ms-win-\%2A -type f )%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)  for fileToPrecompile in %24{filesToPrecompile}%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)  do%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    filename=%24{fileToPrecompile}%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    echo Precompiling %24filename%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    %24overlayDir/crossgen /Platform_Assemblies_Paths %24overlayDir /in %24filename /out %24overlayDir/temp.ni.dll 1> %24filename.stdout 2>%24filename.stderr%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    exitCode=%24%3F%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    if [ %24exitCode != 0 ]%3B then%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)      if grep -q -e '(COR_E_ASSEMBLYEXPECTED)' %24filename.stderr%3B then%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)        printf "\n\t%24filename is not a managed assembly.\n\n"%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)      else%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)        echo Unable to precompile %24filename.%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)      fi%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    else%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)      rm %24filename%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)      mv %24overlayDir/temp.ni.dll %24filename%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    fi%0a</WrapperShContents> 
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    rm %24filename.stdout%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)    rm %24filename.stderr%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)  done%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)  touch %24overlayDir/crossgenCompleted.mrk%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)fi%0a</WrapperShContents>
-      <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)%0a</WrapperShContents>
-
-      <WrapperShContents>$(WrapperShContents)echo BEGIN EXECUTION%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)echo "%24{HELIX_CORRELATION_PAYLOAD}/corerun" %24HELIX_WORKITEM_PAYLOAD/xunit.console.dll %24HELIX_WORKITEM_PAYLOAD/$(ProjectName) -noshadow -xml testResults.xml -notrait category=outerloop -notrait category=failing%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)"%24{HELIX_CORRELATION_PAYLOAD}/corerun" %24HELIX_WORKITEM_PAYLOAD/xunit.console.dll %24HELIX_WORKITEM_PAYLOAD/$(ProjectName) -noshadow -xml testResults.xml -notrait category=outerloop -notrait category=failing%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)ErrorLevel=%24%3F%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)echo Finished running tests. Exit code = %24ErrorLevel%0a</WrapperShContents>
-      <WrapperShContents>$(WrapperShContents)exit %24ErrorLevel%0a</WrapperShContents>
-
-    </PropertyGroup>
-
-    <!-- Write the file -->
-    <WriteLinesToFile
-      File="$(BuildPath)\runtests.sh"
-      Lines="$(WrapperShContents)"
-      Overwrite="true" />
-
-  </Target>
-
-  <!-- archive the test binaries along with some supporting files -->
-  <Target Name="ArchiveBuild">
-    <PropertyGroup Condition="'$(ProjectName)'==''">
-      <TestProjectName>$(MSBuildProjectName)</TestProjectName>
-    </PropertyGroup>
-
-    <!-- the project json and runner script files need to be included in the archive -->
-    <MakeDir Directories="$(BuildArchiveDir)" />
-    <ZipFileCreateFromDirectory SourceDirectory="$(BuildPath)" DestinationArchive="$(BuildArchiveDir)$(ProjectName).zip" OverwriteDestination="true" />
-  </Target>
-
-  <!-- Default target to run - builds executables & archives everything needed for Helix run -->
-
-  <Target Name="ArchiveAll" >
-    <PropertyGroup>
-      <_ArchiveTargets Condition=" '$(UsePython)' == 'false' ">GenerateWrapperExecutables</_ArchiveTargets>
-      <_ArchiveTargets Condition=" '$(UsePython)' == 'true' ">CopyWrapperScript</_ArchiveTargets>
-      <_ArchiveTargets>$(_ArchiveTargets);ArchiveTests;ArchiveCoreRoot</_ArchiveTargets>
-    </PropertyGroup>
-    <MSBuild Projects="helixprep.proj"
-             Targets="$(_ArchiveTargets)" />
-  </Target>
-
-</Project>
diff --git a/tests/helixpublish.proj b/tests/helixpublish.proj
deleted file mode 100644
index cd1d3bf29b..0000000000
--- a/tests/helixpublish.proj
+++ /dev/null
@@ -1,106 +0,0 @@
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <__BuildArch>$(Platform)</__BuildArch>
-  </PropertyGroup>
-  
-  <Import Project="..\dir.props" />
-  <!-- CoreClr-Specific Helix test submission project. -->
-
-  <PropertyGroup>
-    <!-- Workaround for dealing with building on Linux/OSX.  
-         It doesn't seem possible to pass a connection string on the command line, as it contains ';' characters. 
-         Checking for the existence of a connection string will happen inside CloudTest.Helix.targets -->
-    <CloudDropConnectionString    Condition="'$(CloudDropConnectionString)'==''"   >DefaultEndpointsProtocol=https;AccountName=$(CloudDropAccountName);AccountKey=$(CloudDropAccessToken);EndpointSuffix=core.windows.net</CloudDropConnectionString>
-    <CloudResultsConnectionString Condition="'$(CloudResultsConnectionString)'==''">DefaultEndpointsProtocol=https;AccountName=$(CloudResultsAccountName);AccountKey=$(CloudResultsAccessToken);EndpointSuffix=core.windows.net</CloudResultsConnectionString>    
-
-    <!-- Finally, these archives represent the zips of tests that are OSPlatform specific 
-         This is used by CloudTest.Helix.Targets to generate relative blob paths for archives. -->
-    <ArchivesRoot>$(TestWorkingDir)/archive/</ArchivesRoot>
-    <TestArchivesRoot>$(ArchivesRoot)tests</TestArchivesRoot> 
-
-    <RunnerScript Condition="'$(RunnerScript)' == ''">$(TestRunnerScript)</RunnerScript>
-    <SupplementalPayloadDir Condition="'$(SupplementalPayloadDir)' == ''">$(TestWorkingDir)SupplementalPayload/</SupplementalPayloadDir>
-
-    <!-- The old CloudTest.targets forced a single timeout value onto every test -->
-    <!-- Possible TODO: With the CloudTest.Helix.targets refactor, we have the ability to specify variable timeout-->
-    <TimeoutInSeconds Condition="'$(TimeoutInSeconds)' == ''">1000</TimeoutInSeconds>
-
-    <!-- Set required properties for Helix Submission -->
-    <IsOfficial Condition="'$(OfficialBuildId)'!=''">true</IsOfficial>
-    <CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd.mmss))</CurrentDate>
-
-    <HelixJobType Condition="'$(HelixJobType)'==''">test/functional/cli/</HelixJobType>
-
-    <!-- Detect whether we are on a product construction build via ProductBuildId. If so, set source appropriately -->
-    <HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'!='' And '$(TestProduct)'!='' And '$(Branch)'!='' And '$(ProductBuildId)'!=''">prodcon/$(TestProduct)/$(Branch)/</HelixSource>
-    <HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'!='' And '$(TestProduct)'!='' And '$(Branch)'!=''">official/$(TestProduct)/$(Branch)/</HelixSource>
-    <HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'=='' And '$(TestProduct)'!='' And '$(Branch)'!=''">pr/$(TestProduct)/$(Branch)/</HelixSource>
-    <HelixSource Condition="'$(HelixSource)'==''">pr/unknown/</HelixSource>
-
-    <!-- Local path for storing submission-related files -->
-    <HelixLogFolder>$(ArchivesRoot)</HelixLogFolder>
-
-    <!-- Properties used for submission by CloudTest.Helix.Targets-->
-    <BuildMoniker>$(CurrentDate)</BuildMoniker>
-    <BuildMoniker Condition="'$(IsOfficial)'=='true' And '$(ProductBuildId)'==''">$(OfficialBuildId)</BuildMoniker>
-    <BuildMoniker Condition="'$(IsOfficial)'=='true' And '$(ProductBuildId)'!=''">$(ProductBuildId)</BuildMoniker>
-    <HelixArchLabel>$(Platform)</HelixArchLabel>
-    <HelixConfigLabel>$(BuildType)</HelixConfigLabel>
-    <TestListFilename>$(Rid)-$(BuildType)-TestList.json</TestListFilename>
-  </PropertyGroup>
-
-  <!-- Set Helix environment vars based on target platform -->
-  <!-- This is only used in the case where property 'UseScriptRunner' is true.-->
-  <PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
-    <HelixPythonPath>%HELIX_PYTHONPATH%</HelixPythonPath>
-    <RunnerScript>%HELIX_CORRELATION_PAYLOAD%\RunnerScripts\scriptrunner\scriptrunner.py</RunnerScript>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetsWindows)' != 'true'">
-    <HelixPythonPath>$HELIX_PYTHONPATH</HelixPythonPath>
-    <RunnerScript>$HELIX_CORRELATION_PAYLOAD/RunnerScripts/scriptrunner/scriptrunner.py</RunnerScript>
-  </PropertyGroup>
-
-  <Target Name="CoreClrPreCloudBuild" >
-    <!-- Put anything you want to do before submitting the general purpose helix job here.
-         Helix requires properly formatted work items and accessible zip files / others to upload, which we'll construct here. -->
-    
-    <!-- Gather the test archives for this build 
-         If you change binplacing behavior and official runs break, 
-         this is a good place to check.-->
-    <ItemGroup>
-      <HelixWorkItem Include="$(TestArchivesRoot)/*.zip" /> 
-    </ItemGroup>
-    <Message Text="Full test archive collection : @(HelixWorkItem)" Importance="Low" />
-
-    <!-- Verify the test archives exist.  
-         NOTE: It may be better to make this an error, but in the past we chose not to as this causes a build break when triggered, versus just no tests run. -->
-    <Warning Condition="'@(HelixWorkItem->Count())' == '0'" Text="Didn't find any test archives in supplied folders!!! Review logs to see where test archive(s) were placed and fix." />
-
-    <ItemGroup>      
-      <HelixCorrelationPayloadFile Include="$(ArchivesRoot)Core_Root*/*.zip">
-        <RelativeBlobPath>$(Platform)$(BuildType)/%(Identity)</RelativeBlobPath>
-      </HelixCorrelationPayloadFile>
-      <HelixWorkItem>
-        <Command Condition="'$(TargetsWindows)' == 'true'">$(HelixPythonPath) $(RunnerScript) --script %HELIX_WORKITEM_PAYLOAD%\runtests.cmd</Command>
-        <Command Condition="'$(TargetsWindows)' != 'true'">chmod +x $HELIX_WORKITEM_PAYLOAD/runtests.sh &amp;&amp; $(HelixPythonPath) $(RunnerScript) --script $HELIX_WORKITEM_PAYLOAD/runtests.sh</Command>
-        <PayloadFile>%(Identity)</PayloadFile>
-        <WorkItemId>%(Filename)</WorkItemId>
-        <TimeoutInSeconds>$(TimeoutInSeconds)</TimeoutInSeconds>
-        <RelativeBlobPath>$(Platform)-$(BuildType)-$(Rid)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(Filename)%(Extension)</RelativeBlobPath>
-      </HelixWorkItem>      
-    </ItemGroup>
-  </Target>
-
-  <!-- Import this at the end so that it can compose properties as needed -->
-  <Import Project="$(ToolsDir)CloudTest.Helix.targets" />
-
-  <!-- main Entrypoint -->
-  <Target Name="Build">
-    <Message Text="CoreClr-specific Helix test upload project, beginning submission to Helix" />
-    <Message Condition="'$(EnableCloudTest)' == 'false'" Text="... skipping upload / submission due to property 'EnableCloudTest' being set to 'false'" />
-    <CallTarget Condition="'$(EnableCloudTest)' != 'false'" Targets="CoreClrPreCloudBuild;HelixCloudBuild" />
-  </Target>
-  
-</Project>
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index b5036f579b..193856d54f 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -48,7 +48,6 @@ set __IlasmRoundTrip=
 set __CollectDumps=
 set __DoCrossgen=
 set __CrossgenAltJit=
-set __PerfTests=
 set __CoreFXTests=
 set __CoreFXTestsRunAllAvailable=
 set __SkipGenerateLayout=
@@ -95,7 +94,6 @@ if /i "%1" == "GenerateLayoutOnly"                      (set __GenerateLayoutOnl
 if /i "%1" == "skipgeneratelayout"                      (set __SkipGenerateLayout=1&shift&goto Arg_Loop)
 if /i "%1" == "buildxunitwrappers"                      (set __BuildXunitWrappers=1&shift&goto Arg_Loop)
 if /i "%1" == "printlastresultsonly"                    (set __PrintLastResultsOnly=1&shift&goto Arg_Loop)
-if /i "%1" == "PerfTests"                               (set __PerfTests=true&shift&goto Arg_Loop)
 if /i "%1" == "CoreFXTests"                             (set __CoreFXTests=true&shift&goto Arg_Loop)
 if /i "%1" == "CoreFXTestsAll"                          (set __CoreFXTests=true&set __CoreFXTestsRunAllAvailable=true&shift&goto Arg_Loop)
 if /i "%1" == "CoreFXTestList"                          (set __CoreFXTests=true&set __CoreFXTestList=%2&shift&shift&goto Arg_Loop)
@@ -132,7 +130,6 @@ shift
 :: Done with argument processing. Check argument values for validity.
 
 if defined __TestEnv (if not exist %__TestEnv% echo %__MsgPrefix%Error: Test Environment script %__TestEnv% not found && exit /b 1)
-if "%__PerfTests%"=="true" (if defined __GenerateLayoutOnly  echo %__MsgPrefix%Error: Don't specify both "PerfTests" and "GenerateLayoutOnly" && exit /b 1)
 if "%__CoreFXTests%"=="true" (if defined __GenerateLayoutOnly  echo %__MsgPrefix%Error: Don't specify both "CoreFXTests" and "GenerateLayoutOnly" && exit /b 1)
 
 if defined __CoreFXTestList (
@@ -161,7 +158,6 @@ REM runtest.py will handle setup and will then call runtest.proj
 
 if defined __AgainstPackages goto SetupMSBuildAndCallRuntestProj
 if "%__CoreFXTests%"=="true" goto SetupMSBuildAndCallRuntestProj
-if "%__PerfTests%"=="true" goto SetupMSBuildAndCallRuntestProj
 if defined __GenerateLayoutOnly goto SetupMSBuildAndCallRuntestProj
 
 REM We are not running in the official build scenario, call runtest.py
@@ -319,8 +315,6 @@ if not exist %CORE_ROOT%\coreclr.dll (
 
 if "%__CoreFXTests%"=="true" goto RunCoreFXTests
 
-if "%__PerfTests%"=="true" goto RunPerfTests
-
 REM =========================================================================================
 REM ===
 REM === Run normal (non-perf) tests
@@ -389,27 +383,6 @@ goto TestsDone
 
 REM =========================================================================================
 REM ===
-REM === Run perf tests
-REM ===
-REM =========================================================================================
-
-:RunPerfTests 
-echo %__MsgPrefix%CORE_ROOT that will be used is: %CORE_ROOT%  
-echo %__MsgPrefix%Starting test run at %TIME%
-
-set __BuildLogRootName=PerfTestRunResults  
-echo %__MsgPrefix%Running perf tests  
-call :msbuild "%__ProjectFilesDir%\runtest.proj" /t:RunPerfTests /clp:showcommandline  
-
-if errorlevel 1 (  
-    echo %__MsgPrefix%Test Run failed. Refer to the following:  
-    echo     Html report: %__TestRunHtmlLog%  
-)
-
-goto TestsDone
-
-REM =========================================================================================
-REM ===
 REM === Run CoreFX tests
 REM ===
 REM =========================================================================================
@@ -723,7 +696,6 @@ echo link ^<ILlink^>             - Runs the tests after linking via the IL linke
 echo CoreFXTests               - Runs CoreFX tests
 echo CoreFXTestsAll            - Runs all CoreFX tests ^(no exclusions^)
 echo CoreFXTestList ^<file^>     - Specify a file containing a list of CoreFX tests to run, and runs them.
-echo PerfTests                 - Runs perf tests
 echo RunCrossgenTests          - Runs ReadytoRun tests
 echo jitstress ^<n^>             - Runs the tests with COMPlus_JitStress=n
 echo jitstressregs ^<n^>         - Runs the tests with COMPlus_JitStressRegs=n
diff --git a/tests/runtest.proj b/tests/runtest.proj
index 40563b3165..5985423973 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -2,7 +2,6 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="src\dir.props" />
   <Import Project="$(ToolsDir)Build.Post.targets" Condition="Exists('$(ToolsDir)Build.Post.targets') AND '$(BuildWrappers)' == 'true'" />
-  <Import Project="helixperftasks.targets" Condition="'$(Performance)'=='true'"/>
   <PropertyGroup>
     <XunitTestBinBase Condition="'$(XunitTestBinBase)'==''" >$(BaseOutputPathWithConfig)</XunitTestBinBase>
     <XunitWrapperGeneratedCSDirBase>$(XunitTestBinBase)\TestWrappers\</XunitWrapperGeneratedCSDirBase>
@@ -458,21 +457,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
           SkipUnchangedFiles="true" />
   </Target>
 
-  <Target Name="RunPerfTests" Condition="'$(Performance)'=='true'">
-    <Message Text="Executing steps for perf tests" Importance="High"/>
-
-    <!-- generate project.json for runtime dependency -->
-    <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="CreateTestRuntimeJsonFile"/>
-
-    <!-- generate project.lock.json file corresponding to above json file -->
-    <MSBuild Projects="src\Common\test_dependencies\test_dependencies.csproj"/>
-
-    <!-- Package each perf test, upload it and trigger event to execute the tests -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="UploadPerfAssemblies" />
-  </Target>
-
-
   <Target Name="Build">
 
     <!-- generate project.lock.json file corresponding to above json file -->