Remove net5.0 from Zipkin and replace with net6.0 (#3222)

* Remove net5.0 from Zipkin and replace with net6.0 * Public api
open-telemetry · Apr 22, 2022 · e35216a · e35216a
1 parent 11699a3
commit e35216a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/...n/.publicApi/net5.0/PublicAPI.Shipped.txt → ...n/.publicApi/net6.0/PublicAPI.Shipped.txt b/...n/.publicApi/net5.0/PublicAPI.Shipped.txt → ...n/.publicApi/net6.0/PublicAPI.Shipped.txt
diff --git a/....publicApi/net5.0/PublicAPI.Unshipped.txt → ....publicApi/net6.0/PublicAPI.Unshipped.txt b/....publicApi/net5.0/PublicAPI.Unshipped.txt → ....publicApi/net6.0/PublicAPI.Unshipped.txt
diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+* Removes net5.0 target and replaced with net6.0
+  as .NET 5.0 is going out of support.
+  The package keeps netstandard2.0 target, so it
+  can still be used with .NET5.0 apps.
+  ([#3147](https://github.com/open-telemetry/opentelemetry-dotnet/issues/3147))
+
 ## 1.3.0-beta.1
 
 Released 2022-Apr-15

diff --git a/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj b/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>net5.0;netstandard2.0;net462;</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.0;net462;</TargetFrameworks>
     <Description>Zipkin exporter for OpenTelemetry .NET</Description>
     <PackageTags>$(PackageTags);Zipkin;distributed-tracing</PackageTags>
     <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'">
+  <!--Do not run ApiCompat for net462/net6.0 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/net6.0 version.-->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net6.0'">
     <RunApiCompat>false</RunApiCompat>
   </PropertyGroup>
 

diff --git a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs
@@ -77,7 +77,7 @@ public override ExportResult Export(in Batch<Activity> batch)
                     Content = new JsonContent(this, batch),
                 };
 
-#if NET5_0_OR_GREATER
+#if NET6_0_OR_GREATER
                 using var response = this.httpClient.Send(request, CancellationToken.None);
 #else
                 using var response = this.httpClient.SendAsync(request, CancellationToken.None).GetAwaiter().GetResult();
@@ -206,7 +206,7 @@ public JsonContent(ZipkinExporter exporter, in Batch<Activity> batch)
                 this.Headers.ContentType = JsonHeader;
             }
 
-#if NET5_0_OR_GREATER
+#if NET6_0_OR_GREATER
             protected override void SerializeToStream(Stream stream, TransportContext context, CancellationToken cancellationToken)
             {
                 this.SerializeToStreamInternal(stream);

diff --git a/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj b/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Unit test project for Zipkin Exporter 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>net6.0;netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>