Merge branch 'main' into simplify-preprocessor

open-telemetry · Oct 7, 2024 · 4c0f81d · 4c0f81d
2 parents 54922ff + 71ca622
commit 4c0f81d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/...emetry.Instrumentation.ConfluentKafka/OpenTelemetry.Instrumentation.ConfluentKafka.csproj b/...emetry.Instrumentation.ConfluentKafka/OpenTelemetry.Instrumentation.ConfluentKafka.csproj
@@ -7,7 +7,6 @@
     <PackageTags>$(PackageTags);distributed-tracing;Kafka;Confluent.Kafka</PackageTags>
     <IncludeSharedExceptionExtensionsSource>true</IncludeSharedExceptionExtensionsSource>
     <MinVerTagPrefix>Instrumentation.ConfluentKafka-</MinVerTagPrefix>
-    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <!-- Do not run Package Baseline Validation as this package has never released a stable version.

diff --git a/src/Shared/RequestDataHelper.cs b/src/Shared/RequestDataHelper.cs
@@ -3,7 +3,7 @@
 
 #nullable enable
 
-#if NET8_0_OR_GREATER
+#if NET
 using System.Collections.Frozen;
 #endif
 using System.Diagnostics;
@@ -21,7 +21,7 @@ internal sealed class RequestDataHelper
 
     private static readonly char[] SplitChars = new[] { ',' };
 
-#if NET8_0_OR_GREATER
+#if NET
     private readonly FrozenDictionary<string, string> knownHttpMethods;
 #else
     private readonly Dictionary<string, string> knownHttpMethods;
@@ -46,7 +46,7 @@ public RequestDataHelper(bool configureByHttpKnownMethodsEnvironmentalVariable)
                 ["CONNECT"] = "CONNECT",
             };
 
-#if NET8_0_OR_GREATER
+#if NET
         this.knownHttpMethods = knownMethodSet.ToFrozenDictionary(StringComparer.OrdinalIgnoreCase);
 #else
         this.knownHttpMethods = knownMethodSet;

diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj b/test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
+    <TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
   </PropertyGroup>
 

diff --git a/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj b/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
+    <TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>