cleanup a great many #if

Author: mgravell

src/RESPite/Buffers/CycleBuffer.cs

@@ -727,7 +727,7 @@ public void Write(in ReadOnlySequence<byte> value)
     {
         if (value.IsSingleSegment)
         {
-#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
+#if NET
             Write(value.FirstSpan);
 #else
             Write(value.First.Span);
@@ -742,7 +742,7 @@ static void WriteMultiSegment(ref CycleBuffer @this, in ReadOnlySequence<byte> v
         {
             foreach (var segment in value)
             {
-#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
+#if NET
                 @this.Write(value.FirstSpan);
 #else
                 @this.Write(value.First.Span);

src/RESPite/Internal/Raw.cs

@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-#if NETCOREAPP3_0_OR_GREATER
+#if NET
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -95,7 +95,7 @@ public static uint Create32(ReadOnlySpan<byte> bytes, int length)
     public static uint ArrayPrefix_9_4 = Create32("*9\r\n"u8, 4);
     public static ulong ArrayPrefix_10_5 = Create64("*10\r\n"u8, 5);
 
-#if NETCOREAPP3_0_OR_GREATER
+#if NET
     private static uint FirstAndLast(char first, char last)
     {
         Debug.Assert(first < 128 && last < 128, "ASCII please");

src/RESPite/Messages/RespFrameScanner.cs

@@ -125,7 +125,7 @@ public OperationStatus TryRead(ref RespScanState state, in ReadOnlySequence<byte
     {
         if (!_pubsub & state.TotalBytes == 0 & data.IsSingleSegment)
         {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET
             var status = TryFastRead(data.FirstSpan, ref state);
 #else
             var status = TryFastRead(data.First.Span, ref state);
@@ -154,7 +154,7 @@ public OperationStatus TryRead(ref RespScanState state, ReadOnlySpan<byte> data)
     {
         if (!_pubsub & state.TotalBytes == 0)
         {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET
             var status = TryFastRead(data, ref state);
 #else
             var status = TryFastRead(data, ref state);

src/RESPite/Messages/RespReader.AggregateEnumerator.cs

@@ -47,7 +47,7 @@ public AggregateEnumerator(scoped in RespReader reader)
         /// <inheritdoc cref="IEnumerator{T}.Current"/>
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
 #if DEBUG
-#if NET6_0 || NET8_0
+#if NET8_0 // strictly net8; net10 and our polyfill have .Message
         [Experimental("SERDBG")]
 #else
         [Experimental("SERDBG", Message = $"Prefer {nameof(Value)}")]

src/RESPite/Messages/RespReader.cs

@@ -8,7 +8,7 @@
 using System.Text;
 using RESPite.Internal;
 
-#if NETCOREAPP3_0_OR_GREATER
+#if NET
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -797,7 +797,7 @@ internal readonly ReadOnlySpan<byte> Buffer(Span<byte> target)
             return simple;
         }
 
-#if NET6_0_OR_GREATER
+#if NET
         return BufferSlow(ref Unsafe.NullRef<byte[]>(), target, usePool: false);
 #else
         byte[] pooled = [];
@@ -1019,7 +1019,7 @@ private void MovePastCurrent()
 
     /// <inheritdoc cref="RespReader"/>
     public RespReader(scoped in ReadOnlySequence<byte> value)
-#if NETCOREAPP3_0_OR_GREATER
+#if NET
         : this(value.FirstSpan)
 #else
         : this(value.First.Span)
@@ -1046,7 +1046,7 @@ public unsafe bool TryReadNext()
     {
         MovePastCurrent();
 
-#if NETCOREAPP3_0_OR_GREATER
+#if NET
         // check what we have available; don't worry about zero/fetching the next segment; this is only
         // for SIMD lookup, and zero would only apply when data ends exactly on segment boundaries, which
         // is incredible niche
@@ -1883,7 +1883,7 @@ public readonly bool ReadBoolean()
     /// <typeparam name="T">The type of enum being parsed.</typeparam>
     public readonly T ReadEnum<T>(T unknownValue = default) where T : struct, Enum
     {
-#if NET6_0_OR_GREATER
+#if NET
         return ParseChars(static (chars, state) => Enum.TryParse(chars, true, out T value) ? value : state, unknownValue);
 #else
         return Enum.TryParse(ReadString(), true, out T value) ? value : unknownValue;

src/RESPite/Shared/AsciiHash.cs

@@ -199,7 +199,7 @@ internal static long ToUC(long hashCS)
 
         // Something looks possibly lower-case; we can't just mask it off,
         // because there are other non-alpha characters in that range.
-#if NET || NETSTANDARD2_1_OR_GREATER
+#if NET
         ToUpper(MemoryMarshal.CreateSpan(ref Unsafe.As<long, byte>(ref hashCS), sizeof(long)));
         return hashCS;
 #else

src/RESPite/Shared/FrameworkShims.Encoding.cs

@@ -1,4 +1,4 @@
-#if !(NETCOREAPP || NETSTANDARD2_1_OR_GREATER)
+#if !NET
 // ReSharper disable once CheckNamespace
 namespace System.Text
 {

src/RESPite/Shared/FrameworkShims.Stream.cs

@@ -1,7 +1,7 @@
 using System.Buffers;
 using System.Runtime.InteropServices;
 
-#if !(NETCOREAPP || NETSTANDARD2_1_OR_GREATER)
+#if !NET
 // ReSharper disable once CheckNamespace
 namespace System.IO
 {

src/RESPite/Shared/NullableHacks.cs

@@ -8,7 +8,7 @@
 
 namespace System.Diagnostics.CodeAnalysis
 {
-#if NETSTANDARD2_0 ||  NETCOREAPP2_0 ||  NETCOREAPP2_1 ||  NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
+#if !NET
     /// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
     internal sealed class AllowNullAttribute : Attribute { }
@@ -85,9 +85,7 @@ internal sealed class DoesNotReturnIfAttribute : Attribute
         /// <summary>Gets the condition parameter value.</summary>
         public bool ParameterValue { get; }
     }
-#endif
 
-#if NETSTANDARD2_0 ||  NETCOREAPP2_0 ||  NETCOREAPP2_1 ||  NETCOREAPP2_2 || NETCOREAPP3_0 || NETCOREAPP3_1 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
     /// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values.</summary>
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
     internal sealed class MemberNotNullAttribute : Attribute

src/StackExchange.Redis/ChannelMessageQueue.cs

@@ -4,10 +4,6 @@
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
-#if NETCOREAPP3_1
-using System.Diagnostics;
-using System.Reflection;
-#endif
 
 namespace StackExchange.Redis;
 
@@ -76,31 +72,12 @@ public ValueTask<ChannelMessage> ReadAsync(CancellationToken cancellationToken =
     /// <param name="count">The (approximate) count of items in the Channel.</param>
     public bool TryGetCount(out int count)
     {
-        // This is specific to netcoreapp3.1, because full framework was out of band and the new prop is present
-#if NETCOREAPP3_1
-        // get this using the reflection
-        try
-        {
-            var prop =
-                _queue.GetType().GetProperty("ItemsCountForDebugger", BindingFlags.Instance | BindingFlags.NonPublic);
-            if (prop is not null)
-            {
-                count = (int)prop.GetValue(_queue)!;
-                return true;
-            }
-        }
-        catch (Exception ex)
-        {
-            Debug.WriteLine(ex.Message); // but ignore
-        }
-#else
         var reader = _queue.Reader;
         if (reader.CanCount)
         {
             count = reader.Count;
             return true;
         }
-#endif
 
         count = 0;
         return false;
@@ -334,7 +311,7 @@ internal async Task UnsubscribeAsyncImpl(Exception? error = null, CommandFlags f
     public Task UnsubscribeAsync(CommandFlags flags = CommandFlags.None) => UnsubscribeAsyncImpl(null, flags);
 
     /// <inheritdoc cref="IAsyncEnumerable{ChannelMessage}.GetAsyncEnumerator(CancellationToken)"/>
-#if NETCOREAPP3_0_OR_GREATER
+#if NET
     public IAsyncEnumerator<ChannelMessage> GetAsyncEnumerator(CancellationToken cancellationToken = default)
         // ReSharper disable once MethodSupportsCancellation - provided in GetAsyncEnumerator
         => _queue.Reader.ReadAllAsync().GetAsyncEnumerator(cancellationToken);