From 306e6009b3bdb0092a0302485a70c7fbf49024ee Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 25 Oct 2022 10:58:48 -0700
Subject: [PATCH 1/2] Fix to final 3.1 build

---
 src/redist/targets/GenerateBundledVersions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index f98379cb9..580dd9423 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/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>
 

From 55f53174febea11bc9f9156b36b6010ec7b417d1 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 25 Oct 2022 14:32:46 -0700
Subject: [PATCH 2/2] Enable codeql

---
 .vsts-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 7eca85c35..2a9e08d43 100644
--- a/.vsts-ci.yml
+++ b/.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