Add direct reference to System.Text.Encodings.Web min version 4.7.2

open-telemetry · Apr 17, 2023 · a547e61 · a547e61
1 parent cfc2592
commit a547e61
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/build/Common.props b/build/Common.props
@@ -49,6 +49,7 @@
     <StyleCopAnalyzersPkgVer>[1.2.0-beta.435,2.0)</StyleCopAnalyzersPkgVer>
     <SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>
     <SystemDiagnosticSourcePkgVer>7.0.0</SystemDiagnosticSourcePkgVer>
+    <SystemTextEncodingsWebPkgVer>4.7.2</SystemTextEncodingsWebPkgVer>
     <SystemTextJsonPkgVer>4.7.2</SystemTextJsonPkgVer>
     <SystemThreadingTasksExtensionsPkgVer>4.5.4</SystemThreadingTasksExtensionsPkgVer>
   </PropertyGroup>

diff --git a/src/OpenTelemetry.Exporter.Console/CHANGELOG.md b/src/OpenTelemetry.Exporter.Console/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-* Bumped the minimum required version of `System.Text.Json` to 5.0.2 in response
+* Added direct reference to `System.Text.Encodings.Web` with minimum version of `4.7.2` in response
 to [CVE-2021-26701](https://github.com/dotnet/runtime/issues/49377).
 
 ## 1.5.0-alpha.2

diff --git a/src/OpenTelemetry.Exporter.Console/OpenTelemetry.Exporter.Console.csproj b/src/OpenTelemetry.Exporter.Console/OpenTelemetry.Exporter.Console.csproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPkgVer)" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" />
   </ItemGroup>
 

diff --git a/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md b/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-* Bumped the minimum required version of `System.Text.Json` to 5.0.2 in response
+* Added direct reference to `System.Text.Encodings.Web` with minimum version of `4.7.2` in response
 to [CVE-2021-26701](https://github.com/dotnet/runtime/issues/49377).
 
 ## 1.5.0-alpha.2

diff --git a/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj b/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj
@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPkgVer)" Condition="'$(TargetFramework)' != 'netstandard2.1'" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPkgVer)" Condition="'$(TargetFramework)' != 'net6.0'" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" Condition="'$(TargetFramework)' != 'net6.0'" />
   </ItemGroup>
 

diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-* Bumped the minimum required version of `System.Text.Json` to 5.0.2 in response
+* Added direct reference to `System.Text.Encodings.Web` with minimum version of `4.7.2` in response
 to [CVE-2021-26701](https://github.com/dotnet/runtime/issues/49377).
 
 ## 1.5.0-alpha.2

diff --git a/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj b/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj
@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPkgVer)" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" />
   </ItemGroup>