Merge in 'release/6.0.4xx' changes

eng/source-build-tarball-build-official.yml

@@ -4,7 +4,19 @@ resources:
   pipelines:
   - pipeline: installer-build-resource
     source: dotnet-installer-official-ci
-    trigger: true
+    trigger:
+      branches:
+        include:
+        - main
+        - release/*
+        - internal/release/*
+        exclude:
+        - release/6.0.3xx
+        - internal/release/6.0.3xx
+        - release/6.0.4xx
+        - internal/release/6.0.4xx
+      stages:
+      - build
 
 stages:
 - stage: build

src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml

@@ -6,11 +6,20 @@ jobs:
   displayName: Source-Build Create Tarball
   pool:
     ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      name: NetCore-Svc-Public
-      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+      ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+        name: NetCore-Public-XL
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+      ${{ else }}:
+        name: NetCore-Svc-Public
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
     ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-      name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+      ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+        name: NetCore1ESPool-Internal-XL
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+      ${{ else }}:
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+
   variables:
   - name: _BuildConfig
     value: Release

src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml

@@ -17,6 +17,9 @@ parameters:
   fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
   ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
   poolInternalAmd64:
+    name: NetCore1ESPool-Svc-Internal
+    demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+  poolInternalAmd64PR:
     name: NetCore1ESPool-Internal-XL
     demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
   poolInternalArm64:
@@ -76,7 +79,10 @@ jobs:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         ${{ parameters.poolPublicAmd64 }}
       ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        ${{ parameters.poolInternalAmd64 }}
+        ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+          ${{ parameters.poolInternalAmd64PR }}
+        ${{ else }}:
+          ${{ parameters.poolInternalAmd64 }}
 
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml