Merge

README.md

@@ -496,6 +496,17 @@ This is because `Newtonsoft.Json` is the default serializer for ASP.NET Core 2.1
 rather `System.Text.Json`.  When using `GraphQL.NewtonsoftJson`, you will need to call
 `AddNewtonsoftJson()` rather than `AddSystemTextJson()` while configuring GraphQL.NET.
 
+<details><summary>Microsoft support policy</summary><p>
+
+Please note that .NET Core 2.1 is currently out of support by Microsoft.
+.NET Framework 4.8 is supported, and ASP.NET Core 2.1 is supported when run on
+.NET Framework 4.8.  Please see these links for more information:
+
+- https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-framework
+- https://dotnet.microsoft.com/en-us/platform/support/policy/aspnetcore-2.1
+
+</p></details>
+
 ## Advanced configuration
 
 For more advanced configurations, see the overloads and configuration options

Tests.props

@@ -12,7 +12,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />

src/Transports.AspNetCore/GraphQLHttpMiddleware.cs

@@ -483,7 +483,7 @@ protected virtual string SelectResponseContentType(HttpContext context)
             }
         }
 
-        return CONTENTTYPE_GRAPHQLRESPONSEJSON;
+        return _options.ResponseContentType;
     }
 
     /// <summary>

src/Transports.AspNetCore/GraphQLHttpMiddlewareOptions.cs

@@ -93,4 +93,9 @@ public class GraphQLHttpMiddlewareOptions : IAuthorizationOptions
     /// Returns an options class for WebSocket connections.
     /// </summary>
     public GraphQLWebSocketOptions WebSockets { get; set; } = new();
+
+    /// <summary>
+    /// The Content-Type to use for GraphQL responses
+    /// </summary>
+    public string ResponseContentType { get; set; } = GraphQLHttpMiddleware.CONTENTTYPE_GRAPHQLRESPONSEJSON;
 }

tests/ApiApprovalTests/net5+netcoreapp31/GraphQL.Server.Transports.AspNetCore.approved.txt

@@ -109,6 +109,7 @@ namespace GraphQL.Server.Transports.AspNetCore
         public bool ReadExtensionsFromQueryString { get; set; }
         public bool ReadQueryStringOnPost { get; set; }
         public bool ReadVariablesFromQueryString { get; set; }
+        public string ResponseContentType { get; set; }
         public bool ValidationErrorsReturnBadRequest { get; set; }
         public GraphQL.Server.Transports.AspNetCore.WebSockets.GraphQLWebSocketOptions WebSockets { get; set; }
     }

tests/ApiApprovalTests/netcoreapp21+netstandard20/GraphQL.Server.Transports.AspNetCore.approved.txt

@@ -116,6 +116,7 @@ namespace GraphQL.Server.Transports.AspNetCore
         public bool ReadExtensionsFromQueryString { get; set; }
         public bool ReadQueryStringOnPost { get; set; }
         public bool ReadVariablesFromQueryString { get; set; }
+        public string ResponseContentType { get; set; }
         public bool ValidationErrorsReturnBadRequest { get; set; }
         public GraphQL.Server.Transports.AspNetCore.WebSockets.GraphQLWebSocketOptions WebSockets { get; set; }
     }

tests/Transports.AspNetCore.Tests/TestServerExtensions.cs

@@ -15,7 +15,7 @@ public static async Task<string> ExecutePost(this TestServer server, string url,
     {
         var client = server.CreateClient();
         var data = System.Text.Json.JsonSerializer.Serialize(new { query = query, variables = variables });
-        var content = new StringContent(data, Encoding.UTF8, "application/json");
+        using var content = new StringContent(data, Encoding.UTF8, "application/json");
         using var response = await client.PostAsync(url, content);
         response.EnsureSuccessStatusCode();
         var str = await response.Content.ReadAsStringAsync();