Merge in 'release/6.0.1xx' changes

.vsts-ci.yml

@@ -15,6 +15,8 @@ variables:
 - name: PostBuildSign
   value: true
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - name: Codeql.Enabled
+    value: true
   - group: DotNet-DotNetCli-Storage
   - group: DotNet-Installer-SDLValidation-Params
   - name: _PublishUsingPipelines

eng/Versions.props

@@ -8,7 +8,7 @@
     <VersionMajor>6</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionFeature>11</VersionFeature>
+    <VersionFeature>12</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

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

@@ -4,7 +4,14 @@ resources:
   pipelines:
   - pipeline: installer-build-resource
     source: dotnet-installer-official-ci
-    trigger: true
+    trigger:
+      branches:
+        include:
+        - main
+        - release/*
+        - internal/release/*
+      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

@@ -19,10 +19,13 @@ parameters:
   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:
     name: Docker-Linux-Arm-Internal
   poolPublicAmd64:
-    name: NetCore-Svc-Public
+    name: NetCore-Public-XL
     demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
 
 jobs:
@@ -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 and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
   - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml

src/redist/targets/GenerateBundledVersions.targets

@@ -26,7 +26,7 @@
 
   <PropertyGroup>
       <VersionFeature21>30</VersionFeature21>
-      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 20))</VersionFeature31>
+      <VersionFeature31>32</VersionFeature31>
       <VersionFeature50>17</VersionFeature50>
   </PropertyGroup>