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

[AOT] Added net7.0 to the TargetFrameworks to all projects (except for OTLP Exporter) under src folder. #4370

Closed
wants to merge 27 commits into from
Closed

[AOT] Added net7.0 to the TargetFrameworks to all projects (except for OTLP Exporter) under src folder. #4370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3b06e84
add 7.0 to all projects under src folder
Yun-Ting Apr 5, 2023
2add466
Merge branch 'main' into yunl/addNet7
Yun-Ting Apr 7, 2023
351d630
api_
Yun-Ting Apr 10, 2023
8cea997
Merge branch 'main' into yunl/addNet7
Yun-Ting Apr 10, 2023
c6d1885
remove OTLP
Yun-Ting Apr 10, 2023
2111136
suppress RS0026 in OpenTelemetry.Api
Yun-Ting Apr 10, 2023
e027778
add #nullable enable in OpenTelemetry.Api.ProviderBuilderExtensions
Yun-Ting Apr 10, 2023
dca397a
codeAnalysis 3.3.4
Yun-Ting Apr 11, 2023
1a9b85b
fix api
Yun-Ting Apr 11, 2023
b10fe18
nullable
Yun-Ting Apr 11, 2023
13e6535
!? for opentelemetry proj
Yun-Ting Apr 11, 2023
7de15ae
manually merge
Yun-Ting Apr 11, 2023
d14f165
sorted
Yun-Ting Apr 11, 2023
a120c37
more nullable updates
Yun-Ting Apr 11, 2023
5061b5b
remove net7 from otlp.grpc and oltop.logs
Yun-Ting Apr 11, 2023
6321563
Merge branch 'main' into yunl/addNet7
Yun-Ting Apr 11, 2023
ccb67d8
update to suppress in file
Yun-Ting Apr 11, 2023
22dc93a
spelling
Yun-Ting Apr 11, 2023
47e0872
rollback codeAnalysis version
Yun-Ting Apr 11, 2023
13ef208
Merge branch 'main' into yunl/addNet7
Yun-Ting Apr 11, 2023
c844b33
catch no previous stable version
Yun-Ting Apr 11, 2023
78660a6
update
Yun-Ting Apr 12, 2023
2972923
revert
Yun-Ting Apr 12, 2023
e041508
merge PR4385
Yun-Ting Apr 12, 2023
1899221
remove unused flag
Yun-Ting Apr 12, 2023
1b8ffaf
Merge branch 'main' into yunl/addNet7
Yun-Ting Apr 12, 2023
316ae45
disable RunApiCompat for core project when targeting net7.0
Yun-Ting Apr 12, 2023
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
Empty file added src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/net7.0/PublicAPI.Shipped.txt
View file
Open in desktop
Empty file.
17 changes: 17 additions & 0 deletions src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/net7.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#nullable enable
OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions
OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions
OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions
OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions
static OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder) -> OpenTelemetry.Metrics.MeterProviderBuilder!
static OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, System.Func<System.IServiceProvider!, OpenTelemetry.Metrics.MeterProvider!, T!>! instrumentationFactory) -> OpenTelemetry.Metrics.MeterProviderBuilder!
static OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, System.Func<System.IServiceProvider!, T!>! instrumentationFactory) -> OpenTelemetry.Metrics.MeterProviderBuilder!
static OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, T! instrumentation) -> OpenTelemetry.Metrics.MeterProviderBuilder!
static OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.ConfigureServices(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection!>! configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
static OpenTelemetry.Metrics.OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions.ConfigureOpenTelemetryMeterProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<System.IServiceProvider!, OpenTelemetry.Metrics.MeterProviderBuilder!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
static OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder) -> OpenTelemetry.Trace.TracerProviderBuilder!
static OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder, System.Func<System.IServiceProvider!, OpenTelemetry.Trace.TracerProvider!, T!>! instrumentationFactory) -> OpenTelemetry.Trace.TracerProviderBuilder!
static OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder, System.Func<System.IServiceProvider!, T!>! instrumentationFactory) -> OpenTelemetry.Trace.TracerProviderBuilder!
static OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder, T! instrumentation) -> OpenTelemetry.Trace.TracerProviderBuilder!
static OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.ConfigureServices(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder, System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection!>! configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
static OpenTelemetry.Trace.OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions.ConfigureOpenTelemetryTracerProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<System.IServiceProvider!, OpenTelemetry.Trace.TracerProviderBuilder!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
6 changes: 5 additions & 1 deletion ...elemetry.Api.ProviderBuilderExtensions/OpenTelemetry.Api.ProviderBuilderExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

<PropertyGroup>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks>net7.0;netstandard2.0;net462</TargetFrameworks>
<Description>Contains extensions to register OpenTelemetry in applications using Microsoft.Extensions.DependencyInjection</Description>
<RootNamespace>OpenTelemetry</RootNamespace>
<MinVerTagPrefix>core-</MinVerTagPrefix>
<AnalysisLevel>latest-all</AnalysisLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
<RunApiCompat>false</RunApiCompat>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Api\OpenTelemetry.Api.csproj" />
</ItemGroup>
Expand Down
Empty file added src/OpenTelemetry.Api/.publicApi/net7.0/PublicAPI.Shipped.txt
View file
Open in desktop
Empty file.
Loading