Skip to content

Commit 2c76d33

Browse files
joegoldman2joegoldman2
authored
[Instrumentation.AspNetCore] Remove .NET 6 target (#2138)
1 parent 9993982 commit 2c76d33

File tree

8 files changed

+27
-17
lines changed

8 files changed

+27
-17
lines changed

‎src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
45
<TargetFrameworks>$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
@@ -7,8 +8,8 @@
78
<MinVerTagPrefix>Instrumentation.AspNet-</MinVerTagPrefix>
89
</PropertyGroup>
910

10-
<!--Do not run Package Baseline Validation as this package has never released a stable version.
11-
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. -->
1213
<PropertyGroup>
1314
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
1415
</PropertyGroup>
@@ -31,4 +32,5 @@
3132
<ItemGroup>
3233
<PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
3334
</ItemGroup>
35+
3436
</Project>

‎src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
45
<TargetFrameworks>$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
5-
<Description>ASP.NET instrumentation for OpenTelemetry .NET</Description>
6+
<Description>ASP.NET instrumentation for OpenTelemetry .NET.</Description>
67
<PackageTags>$(PackageTags);distributed-tracing;AspNet;MVC;WebAPI</PackageTags>
78
<IncludeInstrumentationHelpers>true</IncludeInstrumentationHelpers>
89
<MinVerTagPrefix>Instrumentation.AspNet-</MinVerTagPrefix>
910
</PropertyGroup>
1011

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.-->
12+
<!-- Do not run Package Baseline Validation as this package has never released a stable version.
13+
Remove this property once we have released a stable version and add PackageValidationBaselineVersion property. -->
1314
<PropertyGroup>
1415
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
1516
</PropertyGroup>

‎src/OpenTelemetry.Instrumentation.AspNetCore/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+
([#2138](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2138))
7+
58
## 1.9.0
69

710
Released 2024-Jun-17

‎src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
4-
<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;$(NetStandardMinimumSupportedVersion)</TargetFrameworks>
56
<Description>ASP.NET Core instrumentation for OpenTelemetry .NET</Description>
67
<PackageTags>$(PackageTags);distributed-tracing;AspNetCore</PackageTags>
78
<MinVerTagPrefix>Instrumentation.AspNetCore-</MinVerTagPrefix>

‎test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<Description>Unit test project for ASP.NET HttpModule</Description>
44
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
55
<TargetFrameworks>$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
6+
<Description>Unit test project for ASP.NET HttpModule.</Description>
67
</PropertyGroup>
78

89
<ItemGroup>
@@ -26,4 +27,5 @@
2627
<Link>Resources\web.config.uninstall.xdt</Link>
2728
</EmbeddedResource>
2829
</ItemGroup>
30+
2931
</Project>

‎test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<Description>Unit test project for OpenTelemetry ASP.NET instrumentation</Description>
44
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
55
<TargetFrameworks>$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
6+
<Description>Unit test project for OpenTelemetry ASP.NET instrumentation.</Description>
67
</PropertyGroup>
78

89
<ItemGroup>

‎test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
44
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
5-
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
5+
<TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
6+
<OutputType>Exe</OutputType>
67
</PropertyGroup>
78

89
<ItemGroup>
910
<FrameworkReference Include="Microsoft.AspNetCore.App" />
11+
</ItemGroup>
1012

13+
<ItemGroup>
1114
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPkgVer)" />
1215
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryPkgVer)" />
1316
</ItemGroup>

‎test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<Description>Unit test project for OpenTelemetry ASP.NET Core instrumentation</Description>
4-
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
4+
<TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
5+
<Description>Unit test project for OpenTelemetry ASP.NET Core instrumentation.</Description>
56
</PropertyGroup>
67

7-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'" >
8-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.33" />
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.33"/>
10-
</ItemGroup>
11-
128
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'" >
139
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.8" />
1410
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8"/>
@@ -37,4 +33,5 @@
3733
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3834
</EmbeddedResource>
3935
</ItemGroup>
36+
4037
</Project>

0 commit comments

Comments
 (0)