Skip to content

Commit 0b01daa

Browse files
authored
[Instrumentation.SqlClient] Remove .NET 6 target (open-telemetry#2159)
1 parent e5106b2 commit 0b01daa

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md

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

33
## Unreleased
44

5+
* Drop support for .NET 6 as this target is no longer supported.
6+
([#2159](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2159))
7+
58
## 1.9.0-beta.1
69

710
Released 2024-Jun-17

src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;$(NetStandardMinimumSupportedVersion)</TargetFrameworks>
55
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
6-
<Description>SqlClient instrumentation for OpenTelemetry .NET</Description>
6+
<Description>SqlClient instrumentation for OpenTelemetry .NET.</Description>
77
<PackageTags>$(PackageTags);distributed-tracing</PackageTags>
88
<MinVerTagPrefix>Instrumentation.SqlClient-</MinVerTagPrefix>
99
</PropertyGroup>
1010

11-
<!--Do not run Package Baseline Validation as this package has never released a stable version.
12-
Remove this property once we have released a stable version and add PackageValidationBaselineVersion property.-->
11+
<!-- Do not run Package Baseline Validation as this package has never released a stable version.
12+
Remove this property once we have released a stable version and add PackageValidationBaselineVersion property. -->
1313
<PropertyGroup>
1414
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
1515
</PropertyGroup>

test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<Description>Unit test project for OpenTelemetry SqlClient instrumentations</Description>
4-
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
5-
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
5+
<TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
6+
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
67
</PropertyGroup>
78

89
<ItemGroup>

test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTestsFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public Task DisposeAsync()
2929
private static SqlEdgeContainer CreateSqlEdge()
3030
{
3131
// Note: The Testcontainers.SqlEdge package has been deprecated. Seems
32-
// it will not work with newer GItHub-hosted runners. Need to find an
32+
// it will not work with newer GitHub-hosted runners. Need to find an
3333
// alternative solution. See:
3434
// https://github.com/testcontainers/testcontainers-dotnet/pull/1265
3535
return new SqlEdgeBuilder().Build();

0 commit comments

Comments
 (0)