Merge branch 'release/2.1' into release/2.2

Author: John Luo

.azure/pipelines/jobs/default-build.yml

@@ -91,14 +91,14 @@ jobs:
     BuildScriptArgs: ${{ parameters.buildArgs }}
     BuildConfiguration: ${{ parameters.configuration }}
     BuildDirectory: ${{ parameters.buildDirectory }}
+    TeamName: AspNetCore
     ${{ if eq(parameters.agentOs, 'Windows') }}:
       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'), in(variables['Build.Reason'], 'PullRequest')) }}:
       _SignType:
     ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      TeamName: AspNetCore
       _SignType: real
     ${{ insert }}: ${{ parameters.variables }}
   steps: