From 473bc5eb3457a29f9827ce784df6194f79b8c7bb Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Fri, 16 Jul 2021 22:00:00 +0200 Subject: [PATCH 1/5] Remove net452 and net46 from the in-memory exporter project --- .../.publicApi/net452/PublicAPI.Unshipped.txt | 0 .../.publicApi/net46/PublicAPI.Unshipped.txt | 0 src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md | 3 +++ .../InMemoryExporterLoggingExtensions.cs | 2 -- .../OpenTelemetry.Exporter.InMemory.csproj | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 src/OpenTelemetry.Exporter.InMemory/.publicApi/net452/PublicAPI.Unshipped.txt delete mode 100644 src/OpenTelemetry.Exporter.InMemory/.publicApi/net46/PublicAPI.Unshipped.txt 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 e69de29bb2d..00000000000 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 e69de29bb2d..00000000000 diff --git a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md index 22c1d1daaf8..9bb817a4c1f 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 dce3414126f..c500949d602 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 @@ public static OpenTelemetryLoggerOptions AddInMemoryExporter(this OpenTelemetryL } } } -#endif diff --git a/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj b/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj index 896a0108ed8..8eb494b7f2a 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- From 412c6e278e6e8aa834097e09e8606b5c551aad43 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Fri, 16 Jul 2021 22:31:03 +0200 Subject: [PATCH 2/5] Update src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md Co-authored-by: Reiley Yang --- src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md index 9bb817a4c1f..8066a05a685 100644 --- a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md @@ -10,7 +10,7 @@ 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) + supported is .NET 4.6.1. ([2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138)) ## 1.1.0 From aefc4b9f8a7841afcb078d9fe8b4761023f62a10 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Fri, 16 Jul 2021 22:57:11 +0200 Subject: [PATCH 3/5] Improve markdown --- src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md index 8066a05a685..d6739e1fcb4 100644 --- a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md @@ -10,7 +10,7 @@ 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)) + supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138)) ## 1.1.0 From ec3f8323312957e23eca324a2959e53375f7dc3a Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Fri, 16 Jul 2021 23:45:16 +0200 Subject: [PATCH 4/5] Remove not supported targets from test project Now that InMemory is also not supporting those.. --- test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj index 4bce77a0f41..7a790bf34e3 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 @@ - + From 10930d90dc31b894eac538dbb915ef6978a38e6f Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Sat, 17 Jul 2021 12:46:59 +0200 Subject: [PATCH 5/5] Adapt framework on test --- test/OpenTelemetry.Tests/Logs/LogRecordTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs b/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs index 6b108e8b780..3e733bc37b8 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