Merge in 'release/6.0.4xx' 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

src/redist/targets/GenerateBundledVersions.targets

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