Skip to content
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.

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

Bump System.Text.Json version due to CVE-2024-30105 #5744

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
6 changes: 2 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@
-->
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />

<!-- A conservative version of System.Text.Encodings.Web must be used here since there is no backward compatibility guarantee during major version bumps. -->
rajkumar-rangaraj marked this conversation as resolved.
Show resolved Hide resolved
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />

<!-- A conservative version of System.Text.Json must be used here since there is no backward compatibility guarantee during major version bumps. -->
<PackageVersion Include="System.Text.Json" Version="4.7.2" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
rajkumar-rangaraj marked this conversation as resolved.
Show resolved Hide resolved

<!-- A conservative version of System.Threading.Tasks.Extensions must be used here since there is no backward compatibility guarantee during major version bumps. -->
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
Expand Down
2 changes: 1 addition & 1 deletion examples/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
<ItemGroup>
<PackageVersion Update="System.Text.Json" Version="6.0.5" />
<PackageVersion Update="System.Text.Json" Version="8.0.4" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions src/OpenTelemetry.Exporter.Console/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

* Bumped the minimum required version of `System.Text.Json` to 8.0.4 and its
indirect dependency on `System.Text.Encodings.Web` to 8.0.0 in response to
[CVE-2024-30105](https://github.com/dotnet/runtime/issues/104619).
([#5744](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5744))

## 1.9.0

Released 2024-Jun-14
Expand Down
5 changes: 5 additions & 0 deletions src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
`Convert.ToString` will now format using `CultureInfo.InvariantCulture`.
([#5700](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5700))

* Bumped the minimum required version of `System.Text.Json` to 8.0.4 and its
rajkumar-rangaraj marked this conversation as resolved.
Show resolved Hide resolved
indirect dependency on `System.Text.Encodings.Web` to 8.0.0 in response to
rajkumar-rangaraj marked this conversation as resolved.
Show resolved Hide resolved
[CVE-2024-30105](https://github.com/dotnet/runtime/issues/104619).
([#5744](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5744))

## 1.9.0

Released 2024-Jun-14
Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
<ItemGroup>
<PackageVersion Update="System.Text.Json" Version="7.0.1" />
<PackageVersion Update="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageVersion Include="Microsoft.Coyote" Version="1.7.10" />
</ItemGroup>
Expand Down