Merge branch 'release/2.1' => 'release/2.2' (#9590)

Author: dougbu

.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
@@ -97,7 +97,7 @@ jobs:
   pool:
     vmImage: ubuntu-16.04
   strategy:
-    maxParallel: 4
+    maxParallel: 8
     matrix:
       Portable_Node8:
         Test.RuntimeIdentifier: none

.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:
@@ -95,9 +95,9 @@ jobs:
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
     ${{ if eq(parameters.agentOs, 'Linux') }}:
       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 }}