From 00af7817fdba22b2a5948e574c6769098003f682 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cithomas@microsoft.com>
Date: Fri, 11 Mar 2022 09:01:04 -0800
Subject: [PATCH] Add net6.0 target to grpc instrumentation tests (#3013)

---
 CONTRIBUTING.md                                               | 2 +-
 examples/Console/TestLogs.cs                                  | 2 +-
 .../GrpcTests.server.cs                                       | 4 ++++
 .../OpenTelemetry.Instrumentation.Grpc.Tests.csproj           | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7abfd76dc..2a34f8ad2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,7 +44,7 @@ You can contribute to this project from a Windows, macOS or Linux machine.
 On all platforms, the minimum requirements are:
 
 * Git client and command line tools.
-* .NET Core 6.0+
+* .NET 6.0+
 
 ### Linux or MacOS
 
diff --git a/examples/Console/TestLogs.cs b/examples/Console/TestLogs.cs
index 195fe41fe..15aa157ee 100644
--- a/examples/Console/TestLogs.cs
+++ b/examples/Console/TestLogs.cs
@@ -49,7 +49,7 @@ namespace Examples.Console
                          *
                          *     dotnet run logs --useExporter otlp
                          *
-                         * The OpenTelemetry Collector will output all received metrics to the stdout of its terminal.
+                         * The OpenTelemetry Collector will output all received logs to the stdout of its terminal.
                          *
                          */
 
diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs
index a0c23d72f..8a55806f2 100644
--- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs
+++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs
@@ -112,7 +112,11 @@ namespace OpenTelemetry.Instrumentation.Grpc.Tests
             Assert.StartsWith("grpc-dotnet", activity.GetTagValue(SemanticConventions.AttributeHttpUserAgent) as string);
         }
 
+#if NET6_0_OR_GREATER
+        [Theory(Skip = "Skipping for .NET 6 and higher due to bug #3023")]
+#else
         [Theory]
+#endif
         [InlineData(null)]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj
index 7a5ab83ad..5ed27ef60 100644
--- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Unit test project for OpenTelemetry Grpc for .NET instrumentation</Description>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>