Remove net461 support from API and SDK (#3191)

open-telemetry · Apr 15, 2022 · 24a3bf4 · 24a3bf4
1 parent 503d2b0
commit 24a3bf4
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 11 deletions.
diff --git 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
@@ -7,7 +7,7 @@
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
     <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <!-- https://dotnet.microsoft.com/download/dotnet-framework -->
-    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461;net462;net47;net471;net472;net48</TargetFrameworks>
+    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462;net47;net471;net472;net48</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Package versions used in this folder">

diff --git a/...i/.publicApi/net461/PublicAPI.Shipped.txt → ...i/.publicApi/net462/PublicAPI.Shipped.txt b/...i/.publicApi/net461/PublicAPI.Shipped.txt → ...i/.publicApi/net462/PublicAPI.Shipped.txt
diff --git a/....publicApi/net461/PublicAPI.Unshipped.txt → ....publicApi/net462/PublicAPI.Unshipped.txt b/....publicApi/net461/PublicAPI.Unshipped.txt → ....publicApi/net462/PublicAPI.Unshipped.txt
diff --git 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
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>OpenTelemetry .NET API</Description>
     <RootNamespace>OpenTelemetry</RootNamespace>
 
     <NoWarn>$(NoWarn),CS0618</NoWarn>
     <MinVerTagPrefix>core-</MinVerTagPrefix>
   </PropertyGroup>
 
-  <!--Do not run ApiCompat for net461 as this is newly added. There is no existing contract for net461 against which we could compare the implementation.
-  Remove this property once we have released a stable net461 version.-->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+  <!--Do not run ApiCompat for net462 as this is newly added. There is no existing contract for net462 against which we could compare the implementation.
+  Remove this property once we have released a stable net462 version.-->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
     <RunApiCompat>false</RunApiCompat>
   </PropertyGroup>
 

diff --git a/...y/.publicApi/net461/PublicAPI.Shipped.txt → ...y/.publicApi/net462/PublicAPI.Shipped.txt b/...y/.publicApi/net461/PublicAPI.Shipped.txt → ...y/.publicApi/net462/PublicAPI.Shipped.txt
diff --git a/....publicApi/net461/PublicAPI.Unshipped.txt → ....publicApi/net462/PublicAPI.Unshipped.txt b/....publicApi/net461/PublicAPI.Unshipped.txt → ....publicApi/net462/PublicAPI.Unshipped.txt
diff --git 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
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>OpenTelemetry .NET SDK</Description>
     <!--
     TODO: Disable this exception, and actually do document all public API.
@@ -10,6 +10,12 @@
     <MinVerTagPrefix>core-</MinVerTagPrefix>
   </PropertyGroup>
 
+  <!--Do not run ApiCompat for net462 as this is newly added. There is no existing contract for net462 against which we could compare the implementation.
+  Remove this property once we have released a stable net462 version.-->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+    <RunApiCompat>false</RunApiCompat>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePkgVer)" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPkgVer)" />

diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Unit test project for OpenTelemetry</Description>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
     <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
-    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
+    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
     <NoWarn>$(NoWarn),CS0618</NoWarn>
   </PropertyGroup>