diff --git a/src/OpenTelemetry.Exporter.InMemory/.publicApi/net452/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.InMemory/.publicApi/net452/PublicAPI.Unshipped.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/OpenTelemetry.Exporter.InMemory/.publicApi/net46/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.InMemory/.publicApi/net46/PublicAPI.Unshipped.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md index 22c1d1daa..d6739e1fc 100644 --- a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md @@ -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 diff --git a/src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs b/src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs index dce341412..c500949d6 100644 --- a/src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs +++ b/src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs @@ -14,7 +14,6 @@ // limitations under the License. // -#if NET461 || NETSTANDARD2_0 using System; using System.Collections.Generic; using OpenTelemetry.Exporter; @@ -39,4 +38,3 @@ namespace OpenTelemetry.Logs } } } -#endif diff --git a/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj b/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj index 896a0108e..8eb494b7f 100644 --- a/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj +++ b/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net452;net46;net461 + netstandard2.0;net461 In-memory exporter for OpenTelemetry .NET $(PackageTags) core- diff --git a/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs b/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs index 6b108e8b7..3e733bc37 100644 --- a/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs +++ b/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs @@ -14,7 +14,7 @@ // limitations under the License. // -#if !NET452 && !NET46 +#if !NET461 #if NETCOREAPP2_1 using Microsoft.Extensions.DependencyInjection; #endif diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj index 4bce77a0f..7a790bf34 100644 --- a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj +++ b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj @@ -2,7 +2,7 @@ Unit test project for OpenTelemetry netcoreapp2.1;netcoreapp3.1;net5.0 - $(TargetFrameworks);net46;net452 + $(TargetFrameworks);net461 $(NoWarn),CS0618 @@ -16,7 +16,7 @@ - +