From 441ac9323db9bf56c9c28d8749e3078386ab47ad Mon Sep 17 00:00:00 2001
From: jennyf19 <jeferrie@microsoft.com>
Date: Mon, 15 Jul 2024 12:24:56 -0700
Subject: [PATCH] update for CVE with System.Text.Json (#2707)

---
 build/dependencies.props                                     | 3 +--
 build/dependenciesTest.props                                 | 1 +
 build/targetsTest.props                                      | 2 +-
 .../Microsoft.IdentityModel.JsonWebTokens.csproj             | 5 -----
 .../Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj   | 1 -
 ...icrosoft.IdentityModel.Protocols.SignedHttpRequest.csproj | 1 -
 .../Microsoft.IdentityModel.Tokens.csproj                    | 1 -
 7 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 23e1b91065..f784e563ab 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -10,8 +10,7 @@
     <NewtonsoftVersion>13.0.3</NewtonsoftVersion>
     <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
     <SystemSecurityCryptographyCngVersion>4.5.0</SystemSecurityCryptographyCngVersion>
-    <SystemTextEncodingsWeb>4.7.2</SystemTextEncodingsWeb>
-    <SystemTextJson>4.7.2</SystemTextJson>
+    <SystemTextJson>8.0.4</SystemTextJson>
   </PropertyGroup>
 
 </Project>
diff --git a/build/dependenciesTest.props b/build/dependenciesTest.props
index ccb413a36d..b36f2b6ac0 100644
--- a/build/dependenciesTest.props
+++ b/build/dependenciesTest.props
@@ -7,5 +7,6 @@
     <NewtonsoftVersion>13.0.3</NewtonsoftVersion>
     <SystemSecurityClaimsVersion>4.3.0</SystemSecurityClaimsVersion>
     <XunitVersion>2.4.0</XunitVersion>
+    <SystemTextJson>8.0.4</SystemTextJson>
   </PropertyGroup>
 </Project>
diff --git a/build/targetsTest.props b/build/targetsTest.props
index 3f26b8e2d9..ef2b48a826 100644
--- a/build/targetsTest.props
+++ b/build/targetsTest.props
@@ -3,6 +3,6 @@
     <TestTargets Condition="'$(LocalBuild)' != 'True'">net461;net462;net472;netcoreapp2.1;net6.0;net8.0</TestTargets>
     <TestTargets Condition="'$(LocalBuild)' == 'True'">net461;netcoreapp2.1;net8.0</TestTargets>
     <TestTargets Condition="'$(TargetNet9)' == 'True'">$(TestTargets);net9.0</TestTargets>
-    <TestOnlyCoreTargets>netcoreapp2.1</TestOnlyCoreTargets>
+    <TestOnlyCoreTargets>net6.0</TestOnlyCoreTargets>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
index ac4f4bc0f1..33293983c4 100644
--- a/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
+++ b/src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
@@ -27,11 +27,6 @@
     <ProjectReference Include="..\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-  	<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
-    <PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
diff --git a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj b/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
index f4ecd1f934..96c2cd432f 100644
--- a/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
+++ b/src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
@@ -28,7 +28,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-  	<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
   </ItemGroup>
 
diff --git a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
index b7e2b4cb83..6c35d877ba 100644
--- a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
+++ b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
@@ -32,7 +32,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
   </ItemGroup>
 
diff --git a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
index 3536e2f1b0..7739dce8ff 100644
--- a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
+++ b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
@@ -46,7 +46,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWeb)" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJson)" />
   </ItemGroup>