open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

introduce net461 target for OpenTelemetry logging component (#1351)

This commit is contained in:
Reiley Yang 2020-10-15 09:59:03 -07:00 committed by GitHub
parent 30112154ff
commit 263f4ccf14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/Directory.Build.props
View File

@ -3,7 +3,10 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<!-- https://dotnet.microsoft.com/download/dotnet-core -->
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<!-- https://dotnet.microsoft.com/download/dotnet-framework -->
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461;net462;net47;net471;net472;net48</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Label="Package versions used in this folder">

2
src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs
View File

@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
#if NETSTANDARD2_0
#if NET461 || NETSTANDARD2_0
using System;
using OpenTelemetry;
using OpenTelemetry.Exporter;

2
src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452;net46;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net452;net46;net461;netstandard2.0</TargetFrameworks>
<Description>In-memory exporter for OpenTelemetry .NET</Description>
<PackageTags>$(PackageTags)</PackageTags>
</PropertyGroup>

2
src/OpenTelemetry/Logs/LogRecord.cs
View File

@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
#if NETSTANDARD2_0
#if NET461 || NETSTANDARD2_0
using System;
using System.Diagnostics;
using Microsoft.Extensions.Logging;

2
src/OpenTelemetry/Logs/OpenTelemetryLogger.cs
View File

@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
#if NETSTANDARD2_0
#if NET461 || NETSTANDARD2_0
using System;
using System.Runtime.InteropServices;
using System.Threading;

2
src/OpenTelemetry/Logs/OpenTelemetryLoggerOptions.cs
View File

@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
#if NETSTANDARD2_0
#if NET461 || NETSTANDARD2_0
using System;
using System.Collections.Generic;
using Microsoft.Extensions.Logging;

2
src/OpenTelemetry/Logs/OpenTelemetryLoggerProvider.cs
View File

@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
#if NETSTANDARD2_0
#if NET461 || NETSTANDARD2_0
using System;
using System.Collections.Generic;
using Microsoft.Extensions.Logging;

2
src/OpenTelemetry/Logs/OpenTelemetryLoggingExtensions.cs
View File

@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
#if NETSTANDARD2_0
#if NET461 || NETSTANDARD2_0
using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;

7
src/OpenTelemetry/OpenTelemetry.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452;net46;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net452;net46;net461;netstandard2.0</TargetFrameworks>
<Description>OpenTelemetry .NET SDK</Description>
<!--
TODO: Disable this exception, and actually do document all public API.
@ -18,6 +18,11 @@
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPkgVer)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPkgVer)" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPkgVer)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPkgVer)" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPkgVer)" />