Skip to content

Commit 262a8f1

Browse files
authored
[Instrumentation.Wcf] Revert System.Security.Cryptography.Xml (#4266)
1 parent 49a8567 commit 262a8f1

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

Directory.Packages.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,14 @@
6363
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
6464
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[8.0.0,)" />
6565
<PackageVersion Update="Microsoft.Extensions.Options" Version="[8.0.0,)" />
66-
<PackageVersion Update="System.Security.Cryptography.Xml" Version="[8.0.3,)" />
6766
</ItemGroup>
6867
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
6968
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[9.0.0,)" />
7069
<PackageVersion Update="Microsoft.Extensions.Options" Version="[9.0.0,)" />
71-
<PackageVersion Update="System.Security.Cryptography.Xml" Version="[9.0.15,)" />
7270
</ItemGroup>
7371
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
7472
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[10.0.0,)" />
7573
<PackageVersion Update="Microsoft.Extensions.Options" Version="[10.0.0,)" />
76-
<PackageVersion Update="System.Security.Cryptography.Xml" Version="[10.0.6,)" />
7774
</ItemGroup>
7875

7976
<ItemGroup Label="Production other packages">

examples/wcf/shared/Examples.Wcf.Shared.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<!-- Upgrade transitive references to resolve NuGet Audit warnings -->
88
<ItemGroup>
99
<PackageReference Include="System.Drawing.Common" />
10-
<PackageReference Include="System.Security.Cryptography.Xml" />
10+
<PackageReference Include="System.Security.Cryptography.Xml" Condition=" '$(TargetFramework)' != 'net8.0' "/>
11+
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="[8.0.3,)" Condition=" '$(TargetFramework)' == 'net8.0' " />
1112
</ItemGroup>
1213

1314
<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework'">

src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
* Revert `System.Security.Cryptography.Xml` dependency version update for
6+
.NET 8, 9, and 10 to `4.7.1` released in 1.15.1-beta.1 introduced in [#4103](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/4103).
7+
([#4266](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/4266))
8+
59
## 1.15.1-beta.1
610

711
Released 2026-Apr-21

test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
</ItemGroup>
2020

2121
<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETCoreApp'">
22+
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="8.0.3" />
2223
<PackageReference Include="System.ServiceModel.Http" />
2324
<PackageReference Include="System.ServiceModel.NetTcp" />
2425
</ItemGroup>
2526

2627
<!-- Test compatibility with version that natively supports net10.0 -->
2728
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
29+
<PackageReference Update="System.Security.Cryptography.Xml" VersionOverride="10.0.7" />
2830
<PackageReference Update="System.ServiceModel.Http" VersionOverride="10.0.652802" />
2931
<PackageReference Update="System.ServiceModel.NetTcp" VersionOverride="10.0.652802" />
3032
</ItemGroup>

0 commit comments

Comments
 (0)