cleanup preprocessor directives (#695)

bitfaster · web-flow · commit 1bafa48aa050 · 2025-06-30T14:17:18.000-07:00
diff --git a/BitFaster.Caching.Benchmarks/DrainBenchmarks.cs b/BitFaster.Caching.Benchmarks/DrainBenchmarks.cs
@@ -187,7 +187,7 @@ public void Add()
         public void DrainArray()
         {
             Add();
-#if NETCOREAPP3_1_OR_GREATER
+#if NET
             buffer.DrainTo(output.AsSpan());
 #else
             buffer.DrainTo(new ArraySegment<string>(output));
diff --git a/BitFaster.Caching.Benchmarks/Lfu/CmSketchFlat.cs b/BitFaster.Caching.Benchmarks/Lfu/CmSketchFlat.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -53,7 +53,7 @@ public CmSketchFlat(long maximumSize, IEqualityComparer<T> comparer)
         /// <returns>The estimated frequency of the value.</returns>
         public int EstimateFrequency(T value)
         {
-#if !NETCOREAPP3_1_OR_GREATER
+#if !NET
             return EstimateFrequencyStd(value);
 #else
 
@@ -76,7 +76,7 @@ public int EstimateFrequency(T value)
         /// <param name="value">The value.</param>
         public void Increment(T value)
         {
-#if !NETCOREAPP3_1_OR_GREATER
+#if !NET
             IncrementStd(value);
 #else
 
@@ -207,7 +207,7 @@ private int Spread(int x)
             return (int)((y >> 16) ^ y);
         }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET
         private unsafe int EstimateFrequencyAvx(T value)
         {
             int hash = Spread(comparer.GetHashCode(value));
diff --git a/BitFaster.Caching.Benchmarks/Lfu/CmSketchNoPin.cs b/BitFaster.Caching.Benchmarks/Lfu/CmSketchNoPin.cs
@@ -57,7 +57,7 @@ public CmSketchNoPin(long maximumSize, IEqualityComparer<T> comparer)
         /// <returns>The estimated frequency of the value.</returns>
         public int EstimateFrequency(T value)
         {
-#if NET48
+#if NETFRAMEWORK
             return EstimateFrequencyStd(value);
 #else
 
@@ -86,7 +86,7 @@ public int EstimateFrequency(T value)
         /// <param name="value">The value.</param>
         public void Increment(T value)
         {
-#if NET48
+#if NETFRAMEWORK
             IncrementStd(value);
 #else
 
diff --git a/BitFaster.Caching.UnitTests/CacheEventsTests.cs b/BitFaster.Caching.UnitTests/CacheEventsTests.cs
@@ -4,8 +4,8 @@
 
 namespace BitFaster.Caching.UnitTests
 {
-// backcompat: remove 
-#if NETCOREAPP3_1_OR_GREATER
+    // backcompat: remove 
+#if NET
     public class CacheEventsTests
     {
         [Fact]
diff --git a/BitFaster.Caching.UnitTests/CacheMetricsTests.cs b/BitFaster.Caching.UnitTests/CacheMetricsTests.cs
@@ -5,8 +5,8 @@
 
 namespace BitFaster.Caching.UnitTests
 {
-// backcompat: remove 
-#if NETCOREAPP3_1_OR_GREATER
+    // backcompat: remove 
+#if NET
     public class CacheMetricsTests
     {
         [Fact]
diff --git a/BitFaster.Caching.UnitTests/Intrinsics.cs b/BitFaster.Caching.UnitTests/Intrinsics.cs
@@ -13,7 +13,7 @@ public static class Intrinsics
     {
         public static void SkipAvxIfNotSupported<I>()
         {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET
     #if NET6_0_OR_GREATER
             // when we are trying to test Avx2/Arm64, skip the test if it's not supported
             Skip.If(typeof(I) == typeof(DetectIsa) && !(Avx2.IsSupported || AdvSimd.Arm64.IsSupported));
diff --git a/BitFaster.Caching.UnitTests/Lru/TLruTickCount64PolicyTests .cs b/BitFaster.Caching.UnitTests/Lru/TLruTickCount64PolicyTests .cs
@@ -1,4 +1,4 @@
-﻿#if NETCOREAPP3_1_OR_GREATER
+﻿#if NET
 
 using FluentAssertions;
 using BitFaster.Caching.Lru;
diff --git a/BitFaster.Caching.UnitTests/Lru/TelemetryPolicyTests.cs b/BitFaster.Caching.UnitTests/Lru/TelemetryPolicyTests.cs
@@ -148,7 +148,7 @@ public void WhenEventSourceIsSetItemUpdatedEventUsesSource()
         }
 
 // backcompat: remove 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET
         [Fact]
         public void WhenInterfaceDefaultItemUpdatedRegisteredNoOp()
         {
diff --git a/BitFaster.Caching.UnitTests/Lru/TlruStopwatchPolicyTests.cs b/BitFaster.Caching.UnitTests/Lru/TlruStopwatchPolicyTests.cs
@@ -9,7 +9,7 @@
 namespace BitFaster.Caching.UnitTests.Lru
 {
 // backcompat: remove conditional compile
-#if !NETCOREAPP3_1_OR_GREATER
+#if !NET
     public class TlruStopwatchPolicyTests
     {
         private readonly TLruLongTicksPolicy<int, int> policy = new TLruLongTicksPolicy<int, int>(TimeSpan.FromSeconds(10));

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public void Add()`
`187`	`187`	`public void DrainArray()`
`188`	`188`	`{`
`189`	`189`	`Add();`
`190`		`-#if NETCOREAPP3_1_OR_GREATER`
	`190`	`+#if NET`
`191`	`191`	`buffer.DrainTo(output.AsSpan());`
`192`	`192`	`#else`
`193`	`193`	`buffer.DrainTo(new ArraySegment<string>(output));`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace BitFaster.Caching.UnitTests`
`6`	`6`	`{`
`7`		`-// backcompat: remove`
`8`		`-#if NETCOREAPP3_1_OR_GREATER`
	`7`	`+ // backcompat: remove`
	`8`	`+#if NET`
`9`	`9`	`public class CacheEventsTests`
`10`	`10`	`{`
`11`	`11`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`
`6`	`6`	`namespace BitFaster.Caching.UnitTests`
`7`	`7`	`{`
`8`		`-// backcompat: remove`
`9`		`-#if NETCOREAPP3_1_OR_GREATER`
	`8`	`+ // backcompat: remove`
	`9`	`+#if NET`
`10`	`10`	`public class CacheMetricsTests`
`11`	`11`	`{`
`12`	`12`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static class Intrinsics`
`13`	`13`	`{`
`14`	`14`	`public static void SkipAvxIfNotSupported<I>()`
`15`	`15`	`{`
`16`		`-#if NETCOREAPP3_1_OR_GREATER`
	`16`	`+#if NET`
`17`	`17`	`#if NET6_0_OR_GREATER`
`18`	`18`	`// when we are trying to test Avx2/Arm64, skip the test if it's not supported`
`19`	`19`	`Skip.If(typeof(I) == typeof(DetectIsa) && !(Avx2.IsSupported \|\| AdvSimd.Arm64.IsSupported));`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NETCOREAPP3_1_OR_GREATER`
	`1`	`+#if NET`
`2`	`2`
`3`	`3`	`using FluentAssertions;`
`4`	`4`	`using BitFaster.Caching.Lru;`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public void WhenEventSourceIsSetItemUpdatedEventUsesSource()`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`// backcompat: remove`
`151`		`-#if NETCOREAPP3_1_OR_GREATER`
	`151`	`+#if NET`
`152`	`152`	`[Fact]`
`153`	`153`	`public void WhenInterfaceDefaultItemUpdatedRegisteredNoOp()`
`154`	`154`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace BitFaster.Caching.UnitTests.Lru`
`10`	`10`	`{`
`11`	`11`	`// backcompat: remove conditional compile`
`12`		`-#if !NETCOREAPP3_1_OR_GREATER`
	`12`	`+#if !NET`
`13`	`13`	`public class TlruStopwatchPolicyTests`
`14`	`14`	`{`
`15`	`15`	`private readonly TLruLongTicksPolicy<int, int> policy = new TLruLongTicksPolicy<int, int>(TimeSpan.FromSeconds(10));`