From aa94be5bbb1c4d58191041dafc8b89180326c394 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Wed, 9 Oct 2024 11:49:33 +0200
Subject: [PATCH 1/4] enable tsa and policheck

---
 .config/tsaoptions.json | 10 ++++++++++
 .vsts-dotnet.yml        |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 .config/tsaoptions.json

diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
new file mode 100644
index 00000000000..4069463a23e
--- /dev/null
+++ b/.config/tsaoptions.json
@@ -0,0 +1,10 @@
+{
+    "instanceUrl": "https://devdiv.visualstudio.com/",
+    "template": "TFSDEVDIV",
+    "projectName": "DEVDIV",
+    "areaPath": "DevDiv\\NET Tools\\MSBuild",
+    "iterationPath": "DevDiv",
+    "notificationAliases": [ "msbtm@microsoft.com" ],
+    "repositoryName": "MSBuild",
+    "codebaseName": "MSBuild"
+}
\ No newline at end of file
diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml
index f48e7b71850..78386e1ddcf 100644
--- a/.vsts-dotnet.yml
+++ b/.vsts-dotnet.yml
@@ -54,6 +54,10 @@ extends:
       name: VSEngSS-MicroBuild2022-1ES
       os: windows
     sdl:
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
       # We generate SBOM ourselves, so don't need steps injected by 1ES.
       sbom:
         enabled: false
@@ -64,10 +68,6 @@ extends:
       credscan:
         suppressionsFile: $(Build.SourcesDirectory)/eng/CredScanSuppressions.json
 
-    stages:
-    - stage: build
-      displayName: Build
-
       jobs:
       # The localization setup for release/ branches. Note difference in LclPackageId. main branch is handled separately below.
       # Used for vs17.2, vs17.4, vs17.6 etc. branches only.

From eb28b8ec0e70e57279af06c2661abc715ff83020 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:52:02 +0200
Subject: [PATCH 2/4] undo extra changes

---
 .vsts-dotnet.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml
index 78386e1ddcf..1cb66face7d 100644
--- a/.vsts-dotnet.yml
+++ b/.vsts-dotnet.yml
@@ -68,6 +68,10 @@ extends:
       credscan:
         suppressionsFile: $(Build.SourcesDirectory)/eng/CredScanSuppressions.json
 
+    stages:
+    - stage: build
+      displayName: Build
+
       jobs:
       # The localization setup for release/ branches. Note difference in LclPackageId. main branch is handled separately below.
       # Used for vs17.2, vs17.4, vs17.6 etc. branches only.

From 4ff3dbd67863d1208b40006f4985c1239e6ce5e8 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Wed, 9 Oct 2024 12:07:06 +0200
Subject: [PATCH 3/4] bump SystemTextJsonVersion

---
 eng/SourceBuildPrebuiltBaseline.xml | 2 +-
 eng/Versions.props                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 765f504dee0..41e59576f29 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -15,7 +15,7 @@
     <UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/*8.0.0*" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*8.0.0*" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Text.Json/*8.0.4*" />
+    <UsagePattern IdentityGlob="System.Text.Json/*8.0.5*" />
     <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
   </IgnorePatterns>
   <Usages>
diff --git a/eng/Versions.props b/eng/Versions.props
index 78ad453b6b3..7df9b218345 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,7 +40,7 @@
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
     <SystemTextRegularExpressionsVersion>4.3.1</SystemTextRegularExpressionsVersion>
-    <SystemTextJsonVersion>8.0.4</SystemTextJsonVersion>
+    <SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
     <SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
     <SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
   </PropertyGroup>

From 44fa583f4f83325349500791f43f14bc4a103e84 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Wed, 9 Oct 2024 12:27:31 +0200
Subject: [PATCH 4/4] update binding redirects

---
 src/MSBuild/app.amd64.config | 4 ++--
 src/MSBuild/app.config       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config
index 826e12a889e..7817604a16e 100644
--- a/src/MSBuild/app.amd64.config
+++ b/src/MSBuild/app.amd64.config
@@ -134,8 +134,8 @@
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-          <bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
-          <codeBase version="8.0.0.4" href="..\System.Text.Json.dll"/>
+          <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+          <codeBase version="8.0.0.5" href="..\System.Text.Json.dll"/>
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config
index 084b86bb3a6..0931bf4a8ce 100644
--- a/src/MSBuild/app.config
+++ b/src/MSBuild/app.config
@@ -94,7 +94,7 @@
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-          <bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
+          <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />