Skip to content

update for CVE with System.Text.Json #2707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jennyf19 merged 1 commit into from
Jul 15, 2024
Merged

update for CVE with System.Text.Json #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,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>
1 change: 1 addition & 0 deletions build/dependenciesTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions build/targetsTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<TestTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;netcoreapp2.1;net6.0;net8.0</TestTargets>
<TestTargets Condition="'$(LocalBuild)' == 'True'">netcoreapp2.1;net8.0</TestTargets>
<TestTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;net6.0;net8.0</TestTargets>
<TestTargets Condition="'$(LocalBuild)' == 'True'">net8.0</TestTargets>
<TestTargets Condition="'$(TargetNet9)' == 'True'">$(TestTargets);net9.0</TestTargets>
<TestOnlyCoreTargets>netcoreapp2.1</TestOnlyCoreTargets>
Copy link
Contributor Author

@jennyf19 jennyf19 Jul 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got an issue in VS that appears new that netcoreapp2.1 is no longer supported, and netcoreapp3.1 is out of support as wel.

<TestOnlyCoreTargets>net6.0</TestOnlyCoreTargets>
</PropertyGroup>
</Project>
5 changes: 0 additions & 5 deletions src/Microsoft.IdentityModel.JsonWebTokens/Microsoft.IdentityModel.JsonWebTokens.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion ...ntityModel.Protocols.OpenIdConnect/Microsoft.IdentityModel.Protocols.OpenIdConnect.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 0 additions & 1 deletion ...el.Protocols.SignedHttpRequest/Microsoft.IdentityModel.Protocols.SignedHttpRequest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down