Skip to content

Commit 8beed69

Browse files
authored
[Instrumentation.Wcf] Replace .NET 6 target with .NET 8 for test project (open-telemetry#2161)
1 parent 0b01daa commit 8beed69

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/OpenTelemetry.Instrumentation.Wcf/OpenTelemetry.Instrumentation.Wcf.csproj

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

33
<PropertyGroup>
44
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
5-
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
6-
<Description>OpenTelemetry instrumentation for WCF</Description>
5+
<TargetFrameworks>$(NetStandardMinimumSupportedVersion);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
6+
<Description>OpenTelemetry instrumentation for WCF.</Description>
77
<PackageTags>$(PackageTags);distributed-tracing;WCF</PackageTags>
88
<MinVerTagPrefix>Instrumentation.Wcf-</MinVerTagPrefix>
99
</PropertyGroup>
@@ -18,12 +18,12 @@
1818
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
1919
</ItemGroup>
2020

21-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
21+
<ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimumSupportedVersion)'">
2222
<Reference Include="System.Configuration" />
2323
<Reference Include="System.ServiceModel" />
2424
</ItemGroup>
2525

26-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
26+
<ItemGroup Condition="'$(TargetFramework)' == '$(NetStandardMinimumSupportedVersion)'">
2727
<PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.1" />
2828
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
2929
</ItemGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Description>Unit test project for OpenTelemetry WCF instrumentation</Description>
54
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
6-
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
7-
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
5+
<TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
6+
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
7+
<Description>Unit test project for OpenTelemetry WCF instrumentation.</Description>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<EmbeddedResource Include="certificate.pfx" />
1212
</ItemGroup>
1313

14-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
14+
<ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimumSupportedVersion)'">
1515
<Reference Include="System.IdentityModel" />
1616
<Reference Include="System.ServiceModel" />
1717
<Reference Include="System.ServiceModel.Web" />
1818
<PackageReference Include="System.Reflection.DispatchProxy" Version="4.7.1" />
1919
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule\OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj" />
2020
</ItemGroup>
2121

22-
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
22+
<ItemGroup Condition="'$(TargetFramework)' != '$(NetFrameworkMinimumSupportedVersion)'">
2323
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
2424
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0" />
2525
<!-- System.Drawing.Common is indirect reference. It is needed to upgrade it directly to avoid https://github.com/advisories/GHSA-rxg9-xrhp-64gj -->

0 commit comments

Comments
 (0)