Remove net452 and net46 from the in-memory exporter project (#2144)
This commit is contained in:
parent
17ed3f368f
commit
64b967a49b
|
|
@ -9,6 +9,9 @@ please check the latest changes
|
|||
|
||||
## Unreleased
|
||||
|
||||
* Removes support for .NET Framework 4.5.2 and 4.6. The minimum .NET Framework version
|
||||
supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))
|
||||
|
||||
## 1.1.0
|
||||
|
||||
Released 2021-Jul-12
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
// limitations under the License.
|
||||
// </copyright>
|
||||
|
||||
#if NET461 || NETSTANDARD2_0
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using OpenTelemetry.Exporter;
|
||||
|
|
@ -39,4 +38,3 @@ namespace OpenTelemetry.Logs
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net452;net46;net461</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<Description>In-memory exporter for OpenTelemetry .NET</Description>
|
||||
<PackageTags>$(PackageTags)</PackageTags>
|
||||
<MinVerTagPrefix>core-</MinVerTagPrefix>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
// limitations under the License.
|
||||
// </copyright>
|
||||
|
||||
#if !NET452 && !NET46
|
||||
#if !NET461
|
||||
#if NETCOREAPP2_1
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<Description>Unit test project for OpenTelemetry</Description>
|
||||
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net46;net452</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn),CS0618</NoWarn>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' != 'net452' And '$(TargetFramework)' != 'net46' And '$(TargetFramework)' != 'netcoreapp2.1'">
|
||||
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPkgVer)" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue