From e96a53f9e77b2f73e220825c369f2d11f340ec9a Mon Sep 17 00:00:00 2001
From: Doug Bunting <drb24@cornell.edu>
Date: Fri, 19 Apr 2019 18:23:54 -0700
Subject: [PATCH 1/2] Support internal pull requests (#9578)

- aspnet/AspNetCore-Internal#2231
- use internal pools for all internal builds
- do not sign in builds for internal pull requests

nits:
- VSTS -> Azure DevOps
- restore higher `maxParallel` values for E2E tests on Linux and Windows
---
 .azure/pipelines/e2e-tests.yml          |  4 ++--
 .azure/pipelines/jobs/default-build.yml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.azure/pipelines/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml
index 8ec3f37b58..06e544cb49 100644
--- a/.azure/pipelines/e2e-tests.yml
+++ b/.azure/pipelines/e2e-tests.yml
@@ -5,7 +5,7 @@ jobs:
   pool:
     vmImage: vs2017-win2016
   strategy:
-    maxParallel: 4
+    maxParallel: 8
     matrix:
       Portable_Node8:
         Test.RuntimeIdentifier: none
@@ -87,7 +87,7 @@ jobs:
   pool:
     vmImage: ubuntu-16.04
   strategy:
-    maxParallel: 4
+    maxParallel: 8
     matrix:
       Portable_Node8:
         Test.RuntimeIdentifier: none
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 352f4a5bd8..8f27dd286e 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -6,7 +6,7 @@
 #   jobDisplayName: string
 #       The friendly job name to display in the UI. Defaults to the name of the OS.
 #   poolName: string
-#       The name of the VSTS agent queue to use.
+#       The name of the Azure DevOps agent pool to use.
 #   agentOs: string
 #       Used in templates to define variables which are OS specific. Typically from the set { Windows, Linux, macOS }
 #   buildArgs: string
@@ -77,10 +77,10 @@ jobs:
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
       vmImage: ubuntu-16.04
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
-      ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
         name: NetCorePublic-Int-Pool
         queue: BuildPool.Windows.10.Amd64.VS2017.Open
-      ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      ${{ if ne(variables['System.TeamProject'], 'public') }}:
         name: NetCoreInternal-Int-Pool
         queue: BuildPool.Windows.10.Amd64.VS2017
   variables:
@@ -93,9 +93,9 @@ jobs:
     BuildDirectory: ${{ parameters.buildDirectory }}
     ${{ if eq(parameters.agentOs, 'Windows') }}:
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
-    ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}:
+    ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'PullRequest')) }}:
       _SignType:
-    ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }}:
+    ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       TeamName: AspNetCore
       _SignType: real
     ${{ insert }}: ${{ parameters.variables }}

From 6a6a119c9a08ca71d29e6f6750d5f4b64963bddd Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Sat, 4 May 2019 19:42:53 -0700
Subject: [PATCH 2/2] Switch to non `-Int` pools and clear NuGet caches -
 aspnet/AspNetCore-Internal#2436 - aspnet/AspNetCore#9767

---
 .azure/pipelines/jobs/default-build.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 8f27dd286e..7de42c3b98 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -78,10 +78,10 @@ jobs:
       vmImage: ubuntu-16.04
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        name: NetCorePublic-Int-Pool
+        name: NetCorePublic-Pool
         queue: BuildPool.Windows.10.Amd64.VS2017.Open
       ${{ if ne(variables['System.TeamProject'], 'public') }}:
-        name: NetCoreInternal-Int-Pool
+        name: NetCoreInternal-Pool
         queue: BuildPool.Windows.10.Amd64.VS2017
   variables:
     AgentOsName: ${{ parameters.agentOs }}
@@ -109,6 +109,12 @@ jobs:
   - ${{ if eq(parameters.agentOs, 'Windows') }}:
     - powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1'
       displayName: Install JDK 11
+    - task: NuGetCommand@2
+      displayName: 'Clear NuGet caches'
+      condition: succeeded()
+      inputs:
+        command: custom
+        arguments: 'locals all -clear'
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
     - task: MicroBuildSigningPlugin@1
       displayName: Install MicroBuild Signing plugin