Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove net452 and net46 from asp.net #2153

Merged
merged 4 commits into from
Jul 19, 2021
Merged

Remove net452 and net46 from asp.net #2153

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9387860
Remove Net452 and Net46 from ASPNET
cijothomas Jul 19, 2021
e85778c
changelog
cijothomas Jul 19, 2021
8bcc491
fix public api
cijothomas Jul 19, 2021
0fbdb8f
remove unwanted lines
cijothomas Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Exporter.Console/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ please check the latest changes
## Unreleased

* Removes .NET Framework 4.5.2 support. The minimum .NET Framework version
supported is .NET 4.6.1. ([2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))
supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))

## 1.1.0

Expand Down
Empty file removed src/OpenTelemetry.Instrumentation.AspNet/.publicApi/net46/PublicAPI.Shipped.txt
View file
Open in desktop
Empty file.
0 ...t/.publicApi/net452/PublicAPI.Shipped.txt → ...t/.publicApi/net461/PublicAPI.Shipped.txt
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions src/OpenTelemetry.Instrumentation.AspNet/.publicApi/net461/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions
OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions.AspNetInstrumentationOptions() -> void
OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions.Enrich.get -> System.Action<System.Diagnostics.Activity, string, object>
OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions.Enrich.set -> void
OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions.Filter.get -> System.Func<System.Web.HttpContext, bool>
OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions.Filter.set -> void
OpenTelemetry.Trace.TracerProviderBuilderExtensions
static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddAspNetInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action<OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions> configureAspNetInstrumentationOptions = null) -> OpenTelemetry.Trace.TracerProviderBuilder
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Instrumentation.AspNet/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Removes .NET Framework 4.5.2, .NET 4.6 support. The minimum .NET Framework
version supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))

## 1.0.0-rc7

Released 2021-Jul-12
Expand Down
6 changes: 5 additions & 1 deletion src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452;net46</TargetFrameworks>
<TargetFrameworks>net461</TargetFrameworks>
<Description>ASP.NET instrumentation for OpenTelemetry .NET</Description>
<PackageTags>$(PackageTags);distributed-tracing;AspNet;MVC;WebAPI</PackageTags>
<IncludeDiagnosticSourceInstrumentationHelpers>true</IncludeDiagnosticSourceInstrumentationHelpers>
</PropertyGroup>
<ItemGroup>
<AdditionalFiles Remove=".publicApi\net461\PublicAPI.Shipped.txt" />
<AdditionalFiles Remove=".publicApi\net461\PublicAPI.Unshipped.txt" />
</ItemGroup>
cijothomas marked this conversation as resolved.
Show resolved Hide resolved

<ItemGroup>
<Reference Include="System.Web" />
Expand Down
1 change: 0 additions & 1 deletion src/OpenTelemetry.Shared/.publicApi/net452/PublicAPI.Shipped.txt
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/OpenTelemetry.Shared/.publicApi/net452/PublicAPI.Unshipped.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/OpenTelemetry.Shared/.publicApi/net46/PublicAPI.Shipped.txt
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/OpenTelemetry.Shared/.publicApi/net46/PublicAPI.Unshipped.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/OpenTelemetry.Shared/OpenTelemetry.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net452;net46;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Description>Shared project for OpenTelemetry .NET</Description>
<PackageTags>$(PackageTags);Shared</PackageTags>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...nTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Unit test project for OpenTelemetry ASP.NET instrumentation</Description>
<TargetFrameworks>net452;net46</TargetFrameworks>
<TargetFrameworks>net461</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down