diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ee3bef7e5fd..fc40a1d9148 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,13 +51,13 @@ On all platforms, the minimum requirements are: * Visual Studio 2022+ for Mac or Visual Studio Code Mono might be required by your IDE but is not required by this project. This is -because unit tests targeting .NET Framework (i.e: `net461`) are disabled outside +because unit tests targeting .NET Framework (i.e: `net462`) are disabled outside of Windows. ### Windows * Visual Studio 2022+ or Visual Studio Code -* .NET Framework 4.6.1+ +* .NET Framework 4.6.2+ ### Public API diff --git a/docs/Directory.Build.props b/docs/Directory.Build.props index 5a700adb8d3..3b32735d1c2 100644 --- a/docs/Directory.Build.props +++ b/docs/Directory.Build.props @@ -7,7 +7,7 @@ net6.0;net5.0;netcoreapp3.1 - $(TargetFrameworks);net461;net462;net47;net471;net472;net48 + $(TargetFrameworks);net462;net47;net471;net472;net48 diff --git a/src/OpenTelemetry.Api/.publicApi/net461/PublicAPI.Shipped.txt b/src/OpenTelemetry.Api/.publicApi/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/OpenTelemetry.Api/.publicApi/net461/PublicAPI.Shipped.txt rename to src/OpenTelemetry.Api/.publicApi/net462/PublicAPI.Shipped.txt diff --git a/src/OpenTelemetry.Api/.publicApi/net461/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Api/.publicApi/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/OpenTelemetry.Api/.publicApi/net461/PublicAPI.Unshipped.txt rename to src/OpenTelemetry.Api/.publicApi/net462/PublicAPI.Unshipped.txt diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md index 605a692505d..3ebfd901002 100644 --- a/src/OpenTelemetry.Api/CHANGELOG.md +++ b/src/OpenTelemetry.Api/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Removes .NET Framework 4.6.1. The minimum .NET Framework + version supported is .NET 4.6.2. ([#3190](https://github.com/open-telemetry/opentelemetry-dotnet/issues/3190)) + ## 1.2.0 Released 2022-Apr-15 diff --git a/src/OpenTelemetry.Api/OpenTelemetry.Api.csproj b/src/OpenTelemetry.Api/OpenTelemetry.Api.csproj index fb15d70d761..82869c95ab9 100644 --- a/src/OpenTelemetry.Api/OpenTelemetry.Api.csproj +++ b/src/OpenTelemetry.Api/OpenTelemetry.Api.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net461 + netstandard2.0;net462 OpenTelemetry .NET API OpenTelemetry @@ -9,9 +9,9 @@ core- - - + + false diff --git a/src/OpenTelemetry/.publicApi/net461/PublicAPI.Shipped.txt b/src/OpenTelemetry/.publicApi/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/OpenTelemetry/.publicApi/net461/PublicAPI.Shipped.txt rename to src/OpenTelemetry/.publicApi/net462/PublicAPI.Shipped.txt diff --git a/src/OpenTelemetry/.publicApi/net461/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/OpenTelemetry/.publicApi/net461/PublicAPI.Unshipped.txt rename to src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md index 6ead54d59e6..a39d4db9111 100644 --- a/src/OpenTelemetry/CHANGELOG.md +++ b/src/OpenTelemetry/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Removes .NET Framework 4.6.1. The minimum .NET Framework + version supported is .NET 4.6.2. ([#3190](https://github.com/open-telemetry/opentelemetry-dotnet/issues/3190)) + ## 1.2.0 Released 2022-Apr-15 diff --git a/src/OpenTelemetry/OpenTelemetry.csproj b/src/OpenTelemetry/OpenTelemetry.csproj index a3a0dfebb98..a247eba4f37 100644 --- a/src/OpenTelemetry/OpenTelemetry.csproj +++ b/src/OpenTelemetry/OpenTelemetry.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;net461 + netstandard2.0;net462 OpenTelemetry .NET SDK + + false + + diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj index 6f911632451..531466ed928 100644 --- a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj +++ b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj @@ -1,9 +1,9 @@ - + Unit test project for OpenTelemetry net6.0;net5.0;netcoreapp3.1 - $(TargetFrameworks);net461 + $(TargetFrameworks);net462 $(NoWarn),CS0618