Merge branch 'main' into alanwest/telemetry-sdk-attributes

open-telemetry · Apr 6, 2023 · 0a3a9bb · 0a3a9bb
2 parents 65825a0 + 0004895
commit 0a3a9bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/OpenTelemetry.Api/Internal/Guard.cs b/src/OpenTelemetry.Api/Internal/Guard.cs
@@ -42,7 +42,7 @@ public CallerArgumentExpressionAttribute(string parameterName)
 }
 #endif
 
-#if !NETCOREAPP3_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
+#if !NET6_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
 namespace System.Diagnostics.CodeAnalysis
 {
     /// <summary>Specifies that an output is not <see langword="null"/> even if

diff --git a/src/OpenTelemetry/Internal/MathHelper.cs b/src/OpenTelemetry/Internal/MathHelper.cs
@@ -15,7 +15,7 @@
 // </copyright>
 
 using System.Diagnostics;
-#if NETCOREAPP3_0_OR_GREATER
+#if NET6_0_OR_GREATER
 using System.Numerics;
 #endif
 using System.Runtime.CompilerServices;
@@ -86,7 +86,7 @@ public static int LeadingZero32(int value)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static int LeadingZero64(long value)
     {
-#if NETCOREAPP3_0_OR_GREATER
+#if NET6_0_OR_GREATER
         return BitOperations.LeadingZeroCount((ulong)value);
 #else
         unchecked