cleanup compilation constants

src/CookieCrumble/src/CookieCrumble/Extensions/WriterExtensions.cs

@@ -10,39 +10,9 @@ public static class WriterExtensions
     public static void Append(this IBufferWriter<byte> snapshot, string value)
         => Append(snapshot, value.AsSpan());
 
-#if NET5_0_OR_GREATER
     public static void Append(this IBufferWriter<byte> snapshot, ReadOnlySpan<char> value)
-#else
-    public static unsafe void Append(this IBufferWriter<byte> snapshot, ReadOnlySpan<char> value)
-#endif
     {
-#if NET5_0_OR_GREATER
         _utf8.GetBytes(value, snapshot);
-#else
-        var length = _utf8.GetByteCount(value);
-        byte[]? buffer = null;
-        var span = length <= 256
-            ? stackalloc byte[length]
-            : buffer = ArrayPool<byte>.Shared.Rent(length);
-        int written;
-
-        fixed (byte* bptr = span)
-        {
-            fixed (char* cprt = value)
-            {
-                written = _utf8.GetBytes(cprt, value.Length, bptr, length);
-            }
-        }
-
-        var snapshotSpan = snapshot.GetSpan(written);
-        span[..written].CopyTo(snapshotSpan);
-        snapshot.Advance(written);
-
-        if (buffer is not null)
-        {
-            ArrayPool<byte>.Shared.Return(buffer);
-        }
-#endif
     }
 
     public static void AppendLine(this IBufferWriter<byte> snapshot)

src/CookieCrumble/src/CookieCrumble/TestEnvironment.cs

@@ -5,17 +5,7 @@ namespace CookieCrumble;
 /// </summary>
 public static class TestEnvironment
 {
-#if NETCOREAPP3_1
-    /// <summary>
-    /// The target framework identifier.
-    /// </summary>
-    public const string TargetFramework = "NETCOREAPP3_1";
-#elif NET5_0
-    /// <summary>
-    /// The target framework identifier.
-    /// </summary>
-    public const string TargetFramework = "NET5_0";
-#elif NET6_0
+#if NET6_0
     /// <summary>
     /// The target framework identifier.
     /// </summary>

src/HotChocolate/AspNetCore/src/AspNetCore/Extensions/HttpResponseExtensions.cs

@@ -12,11 +12,7 @@ internal static class HttpResponseExtensions
     private const string _contentDepositionValue = "attachment; filename=\"{0}\"";
     private static readonly JsonSerializerOptions _serializerOptions = new()
     {
-#if NETCOREAPP3_1
-        IgnoreNullValues = true,
-#else
         DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-#endif
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase
     };
 

src/HotChocolate/AspNetCore/src/AspNetCore/HeaderUtilities.cs

@@ -167,9 +167,7 @@ public AcceptHeaderResult(string headerValue)
 
         public IQueryResult? ErrorResult { get; }
 
-#if NET5_0_OR_GREATER
         [MemberNotNullWhen(true, nameof(ErrorResult))]
-#endif
         public bool HasError { get; }
     }
 }

src/HotChocolate/AspNetCore/src/AspNetCore/HttpGetMiddleware.cs

@@ -97,11 +97,7 @@ private async Task HandleRequestAsync(HttpContext context)
             acceptMediaTypes = HeaderUtilities.GraphQLResponseContentTypes;
             statusCode = HttpStatusCode.BadRequest;
 
-#if NET5_0_OR_GREATER
             var errors = headerResult.ErrorResult.Errors!;
-#else
-            var errors = headerResult.ErrorResult!.Errors!;
-#endif
             result = headerResult.ErrorResult;
             _diagnosticEvents.HttpRequestError(context, errors[0]);
             goto HANDLE_RESULT;
@@ -169,23 +165,23 @@ private async Task HandleRequestAsync(HttpContext context)
             {
                 var flags = options.AllowedGetOperations;
                 var newRequestFlags = GraphQLRequestFlags.None;
-                
+
                 if ((flags & AllowedGetOperations.Query) == AllowedGetOperations.Query)
                 {
                     newRequestFlags |= AllowQuery;
                 }
-                
+
                 if ((flags & AllowedGetOperations.Mutation) == AllowedGetOperations.Mutation)
                 {
                     newRequestFlags |= AllowMutation;
                 }
-                
+
                 if ((flags & AllowedGetOperations.Subscription) == AllowedGetOperations.Subscription &&
                     (requestFlags & AllowSubscription) == AllowSubscription)
                 {
                     newRequestFlags |= AllowSubscription;
                 }
-                
+
                 if((requestFlags & AllowStreams) == AllowStreams)
                 {
                     newRequestFlags |= AllowStreams;
@@ -260,4 +256,4 @@ await WriteResultAsync(
             }
         }
     }
-}
+}

src/HotChocolate/AspNetCore/src/AspNetCore/HttpPostMiddlewareBase.cs

@@ -81,11 +81,7 @@ protected async Task HandleRequestAsync(HttpContext context)
             acceptMediaTypes = HeaderUtilities.GraphQLResponseContentTypes;
             statusCode = HttpStatusCode.BadRequest;
 
-#if NET5_0_OR_GREATER
             var errors = headerResult.ErrorResult.Errors!;
-#else
-            var errors = headerResult.ErrorResult!.Errors!;
-#endif
             result = headerResult.ErrorResult;
             DiagnosticEvents.HttpRequestError(context, errors[0]);
             goto HANDLE_RESULT;

src/HotChocolate/AspNetCore/src/AspNetCore/Serialization/DefaultHttpResponseFormatter.cs

@@ -49,7 +49,7 @@ public DefaultHttpResponseFormatter(
             {
                 Json = new JsonResultFormatterOptions
                 {
-                    Indented = indented, 
+                    Indented = indented,
                     Encoder = encoder
                 }
             })
@@ -171,11 +171,7 @@ public async ValueTask FormatAsync(
                 result.ContextData.TryGetValue(CacheControlHeaderValue, out var value) &&
                 value is string cacheControlHeaderValue)
             {
-#if NET6_0_OR_GREATER
                 response.Headers.CacheControl = cacheControlHeaderValue;
-#else
-                response.Headers[HttpHeaderKeys.CacheControl] = cacheControlHeaderValue;
-#endif
             }
 
             OnWriteResponseHeaders(queryResult, format, response.Headers);
@@ -189,13 +185,7 @@ public async ValueTask FormatAsync(
 
             response.ContentType = format.ContentType;
             response.StatusCode = statusCode;
-
-#if NET6_0_OR_GREATER
             response.Headers.CacheControl = HttpHeaderValues.NoCache;
-#else
-            response.Headers[HttpHeaderKeys.CacheControl] = HttpHeaderValues.NoCache;
-#endif
-
             OnWriteResponseHeaders(responseStream, format, response.Headers);
 
             await response.Body.FlushAsync(cancellationToken);

src/HotChocolate/AspNetCore/src/AspNetCore/Subscriptions/Protocols/JsonOperationMessage.cs

@@ -15,17 +15,7 @@ protected JsonOperationMessage(string typeName, JsonElement? payload = null)
     {
     }
 
-#if NET6_0_OR_GREATER
     /// <inheritdoc />
     public T? As<T>() where T : class
         => Payload?.Deserialize<T>(SerializerOptions);
-#else
-    /// <inheritdoc />
-    public T? As<T>() where T : class
-    {
-        return Payload is null
-            ? null
-            : JsonSerializer.Deserialize<T>(Payload.Value.GetRawText(), SerializerOptions);
-    }
-#endif
 }

src/HotChocolate/AspNetCore/src/AspNetCore/Subscriptions/Protocols/MessageUtilities.cs

@@ -1,13 +1,6 @@
-#if NET6_0_OR_GREATER
 using System.Text.Json;
 using HotChocolate.AspNetCore.Subscriptions.Protocols.GraphQLOverWebSocket;
 using HotChocolate.Utilities;
-#else
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using HotChocolate.AspNetCore.Subscriptions.Protocols.GraphQLOverWebSocket;
-using HotChocolate.Utilities;
-#endif
 
 namespace HotChocolate.AspNetCore.Subscriptions.Protocols;
 
@@ -16,20 +9,8 @@ internal static class MessageUtilities
     public static JsonWriterOptions WriterOptions { get; } =
         new() { Indented = false };
 
-#if NET6_0_OR_GREATER
     public static JsonSerializerOptions SerializerOptions { get; } =
         new(JsonSerializerDefaults.Web);
-#else
-    public static JsonSerializerOptions SerializerOptions { get; } =
-        new()
-        {
-            PropertyNameCaseInsensitive = true,
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            #if NET6_0_OR_GREATER
-            NumberHandling = JsonNumberHandling.AllowReadingFromString
-            #endif
-        };
-#endif
 
     public static void SerializeMessage(
         ArrayWriter arrayWriter,

src/HotChocolate/Core/src/Abstractions/Execution/OrderedDictionary.cs

@@ -50,7 +50,7 @@ private OrderedDictionary(OrderedDictionary<TKey, TValue> source)
         _map = new Dictionary<TKey, TValue>(source._map);
     }
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
     public bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value)
         => _map.TryGetValue(key, out value);
 #else

src/HotChocolate/Core/src/Abstractions/Utilities/NameUtils.cs

@@ -25,7 +25,7 @@ public static class NameUtils
     /// </returns>
     public static string EnsureGraphQLName(
         this string? name,
-        #if NETCOREAPP3_1_OR_GREATER
+        #if NET6_0_OR_GREATER
         [CallerArgumentExpression("name")]
         #endif
         string argumentName = "name")

src/HotChocolate/Core/src/Execution/Processing/WorkScheduler.Pause.cs

@@ -59,7 +59,7 @@ public void TryContinue()
 
             if (continuation is not null)
             {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
                 ThreadPool.QueueUserWorkItem(c => c(), continuation, true);
 #else
                 ThreadPool.QueueUserWorkItem(_ => continuation());

src/HotChocolate/Core/src/Execution/Serialization/EventStreamResultFormatter.cs

@@ -108,7 +108,7 @@ private static async Task SendKeepAliveMessagesAsync(
                 // we do not need try-finally here because we dispose the semaphore in the parent
                 // method.
                 await synchronization.WaitAsync(ct);
-                
+
                 await WriteKeepAliveAndFlush(outputStream, ct);
 
                 synchronization.Release();
@@ -162,7 +162,7 @@ private async ValueTask WriteNextMessageAsync(
         Stream outputStream,
         CancellationToken ct)
     {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
         await outputStream.WriteAsync(_eventField, ct).ConfigureAwait(false);
         await outputStream.WriteAsync(_nextEvent, ct).ConfigureAwait(false);
         await outputStream.WriteAsync(_newLine, ct).ConfigureAwait(false);
@@ -175,7 +175,7 @@ private async ValueTask WriteNextMessageAsync(
         using var bufferWriter = new ArrayWriter();
         FormatPayload(bufferWriter, result);
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
         await outputStream.WriteAsync(_dataField, ct).ConfigureAwait(false);
         await outputStream.WriteAsync(bufferWriter.GetWrittenMemory(), ct).ConfigureAwait(false);
         await outputStream.WriteAsync(_newLine, ct).ConfigureAwait(false);
@@ -195,7 +195,7 @@ private void FormatPayload(ArrayWriter bufferWriter, IQueryResult result)
 
     private static async ValueTask WriteCompleteMessage(Stream outputStream, CancellationToken ct)
     {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
         await outputStream.WriteAsync(_eventField, ct).ConfigureAwait(false);
         await outputStream.WriteAsync(_completeEvent, ct).ConfigureAwait(false);
         await outputStream.WriteAsync(_newLine, ct).ConfigureAwait(false);
@@ -210,7 +210,7 @@ private static async ValueTask WriteNewLineAndFlushAsync(
         Stream outputStream,
         CancellationToken ct)
     {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
         await outputStream.WriteAsync(_newLine, ct).ConfigureAwait(false);
 #else
         await outputStream.WriteAsync(_newLine, 0, _newLine.Length, ct).ConfigureAwait(false);
@@ -222,7 +222,7 @@ private static async ValueTask WriteKeepAliveAndFlush(
         Stream outputStream,
         CancellationToken ct)
     {
-#if NETCOREAPP3_1_OR_GREATER
+#if NET6_0_OR_GREATER
         await outputStream.WriteAsync(_keepAlive, ct).ConfigureAwait(false);
 #else
         await outputStream.WriteAsync(_keepAlive, 0, _keepAlive.Length, ct).ConfigureAwait(false);

src/HotChocolate/Core/test/Types.Tests/Types/Descriptors/Conventions/DefaultTypeInspectorTests.cs

@@ -807,9 +807,7 @@ public ref string ByRefReturn()
         public async void GetAsyncVoid() { }
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
 
-#if !NETCOREAPP2_1
         public string RefStruct(ReadOnlySpan<byte> bytes) => "";
-#endif
 
         public Action Action { get; }
 

src/HotChocolate/Core/test/Types.Tests/Types/EnumTypeTests.cs

@@ -291,14 +291,8 @@ void Action() => SchemaBuilder.New()
             .Create();
 
         // assert
-#if NETCOREAPP2_1
-            Assert.Throws<SchemaException>(Action)
-                .Errors.Single().Message.MatchSnapshot(
-                    new SnapshotNameExtension("NETCOREAPP2_1"));
-#else
         Assert.Throws<SchemaException>(Action)
             .Errors.Single().Message.MatchSnapshot();
-#endif
     }
 
     [Fact]

src/HotChocolate/Core/test/Types.Tests/Types/InputObjectTypeDictionaryTests.cs

@@ -15,19 +15,11 @@ public class InputObjectTypeNonNullTests
     [Fact]
     public void Nullable_Dictionary_Is_Correctly_Detected()
     {
-#if NETCOREAPP2_1
-            SchemaBuilder.New()
-                .AddQueryType<Query>()
-                .Create()
-                .ToString()
-                .MatchSnapshot(new SnapshotNameExtension("NETCOREAPP2_1"));
-#else
         SchemaBuilder.New()
             .AddQueryType<Query>()
             .Create()
             .ToString()
             .MatchSnapshot();
-#endif
     }
 
     [Fact]

src/HotChocolate/Core/test/Types.Tests/Types/ObjectFieldExpressionTests.cs

@@ -20,17 +20,11 @@ public void Infer_Field_Types_From_Expression()
             {
                 d.Name("Query");
                 d.Field(t => t.Bar.Text);
-#if !NETCOREAPP2_1 && !NETCOREAPP3_1
                 d.Field(t => t.Bars.Select(t => t.Text)).Name("texts");
-#endif
             })
             .Create()
             .ToString()
-#if NETCOREAPP2_1 || NETCOREAPP3_1
-                .MatchSnapshot(new SnapshotNameExtension("NETCOREAPP2_1"));
-#else
             .MatchSnapshot();
-#endif
     }
 
     [Fact]