Remove net461 from console inmemory exporters, asp.net (#3193)

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

Hide file tree

Showing 20 changed files with 28 additions and 14 deletions.
diff --git a/...e/.publicApi/net461/PublicAPI.Shipped.txt → ...e/.publicApi/net462/PublicAPI.Shipped.txt b/...e/.publicApi/net461/PublicAPI.Shipped.txt → ...e/.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.Exporter.Console/CHANGELOG.md b/src/OpenTelemetry.Exporter.Console/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.Exporter.Console/OpenTelemetry.Exporter.Console.csproj b/src/OpenTelemetry.Exporter.Console/OpenTelemetry.Exporter.Console.csproj
@@ -2,7 +2,7 @@
 
   <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>Console exporter for OpenTelemetry .NET</Description>
     <PackageTags>$(PackageTags);Console;distributed-tracing</PackageTags>
     <MinVerTagPrefix>core-</MinVerTagPrefix>
@@ -12,6 +12,12 @@
     <NoWarn>$(NoWarn),1591</NoWarn>
   </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>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
   </ItemGroup>

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.Exporter.InMemory/CHANGELOG.md b/src/OpenTelemetry.Exporter.InMemory/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-rc5
 
 Released 2022-Apr-12

diff --git a/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj b/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj
@@ -2,7 +2,7 @@
 
   <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>In-memory exporter for OpenTelemetry .NET</Description>
     <PackageTags>$(PackageTags)</PackageTags>
     <MinVerTagPrefix>core-</MinVerTagPrefix>

diff --git a/...e/.publicApi/net461/PublicAPI.Shipped.txt → ...e/.publicApi/net462/PublicAPI.Shipped.txt b/...e/.publicApi/net461/PublicAPI.Shipped.txt → ...e/.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.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/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.0.0-rc9.2
 
 Released 2022-Apr-12

diff --git a/...spNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj b/...spNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.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>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <Description>A module that instruments incoming request with System.Diagnostics.Activity and notifies listeners with DiagnosticsSource.</Description>
     <PackageTags>$(PackageTags);distributed-tracing;AspNet;MVC;WebAPI</PackageTags>
   </PropertyGroup>

diff --git a/...t/.publicApi/net461/PublicAPI.Shipped.txt → ...t/.publicApi/net462/PublicAPI.Shipped.txt b/...t/.publicApi/net461/PublicAPI.Shipped.txt → ...t/.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.Instrumentation.AspNet/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNet/CHANGELOG.md
@@ -7,6 +7,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.0.0-rc9.2
 
 Released 2022-Apr-12

diff --git a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.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>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <Description>ASP.NET instrumentation for OpenTelemetry .NET</Description>
     <PackageTags>$(PackageTags);distributed-tracing;AspNet;MVC;WebAPI</PackageTags>
     <IncludeInstrumentationHelpers>true</IncludeInstrumentationHelpers>

diff --git a/...tryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj b/...tryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Unit test project for ASP.NET HttpModule</Description>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...nTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj b/...nTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Unit test project for OpenTelemetry ASP.NET instrumentation</Description>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/OpenTelemetry.Tests/Logs/LoggerFactoryAndResourceBuilderTests.cs b/test/OpenTelemetry.Tests/Logs/LoggerFactoryAndResourceBuilderTests.cs
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // </copyright>
-#if !NET461
 
 using System;
 using System.Collections.Generic;
@@ -79,4 +78,3 @@ private static void VerifyResourceBuilder(
         }
     }
 }
-#endif
diff --git a/test/OpenTelemetry.Tests/Logs/LoggerOptionsTest.cs b/test/OpenTelemetry.Tests/Logs/LoggerOptionsTest.cs
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // </copyright>
-#if !NET461
 
 using Xunit;
 
@@ -51,4 +50,3 @@ public void VerifyOptionsCannotBeChangedAfterInit(bool initialValue)
         }
     }
 }
-#endif