Remove IHostApplicationLifetime from ASP.Net Core 2.1

README.md

@@ -598,13 +598,7 @@ and [this](http://www.breachattack.com/#howitworks) for more details.
 You may choose to use the .NET Core 2.1 runtime or a .NET Framework runtime.
 This library has been tested with .NET Core 2.1 and .NET Framework 4.8.
 
-One additional requirement is that you must add this code in your `Startup.cs` file:
-
-```csharp
-services.AddHostApplicationLifetime();
-```
-
-You will also need to reference a serializer package such as `GraphQL.NewtonsoftJson`
+You will need to reference a serializer package such as `GraphQL.NewtonsoftJson`
 or `GraphQL.SystemTextJson`, as `GraphQL.SystemTextJson` is not included in this case.
 
 Besides that requirement, all features are supported in exactly the same manner as

src/GraphQL.AspNetCore3/Compatibility/HostApplicationLifetime.cs

@@ -2,47 +2,17 @@ namespace GraphQL.AspNetCore3;
 
 #if NETSTANDARD2_0 || NETCOREAPP2_1
 
-/// <summary>
-/// Provides a signal when the application is shutting down.
-/// </summary>
-public interface IHostApplicationLifetime
-{
-    /// <inheritdoc cref="IHostApplicationLifetime"/>
-    CancellationToken ApplicationStopping { get; }
-}
-
-/// <inheritdoc cref="IHostApplicationLifetime"/>
-public class HostApplicationLifetime : IHostApplicationLifetime, IHostedService
-{
-    private readonly CancellationTokenSource _cts = new();
-
-    /// <inheritdoc/>
-    public CancellationToken ApplicationStopping => _cts.Token;
-
-    /// <inheritdoc/>
-    public Task StartAsync(CancellationToken cancellationToken)
-        => Task.CompletedTask;
-
-    /// <inheritdoc/>
-    public Task StopAsync(CancellationToken cancellationToken)
-    {
-        _cts.Cancel();
-        return Task.CompletedTask;
-    }
-}
-
 /// <summary>
 /// Extension methods for <see cref="IServiceCollection"/>.
 /// </summary>
 public static partial class ServiceCollectionExtensions
 {
     /// <summary>
-    /// Registers <see cref="IHostApplicationLifetime"/> within the dependency injection framework.
+    /// Performs no operation.
     /// </summary>
+    [Obsolete("This method has no functionality and will be removed in future versions of this library.")]
     public static void AddHostApplicationLifetime(this IServiceCollection services)
     {
-        services.AddSingleton<IHostApplicationLifetime, HostApplicationLifetime>();
-        services.AddSingleton<IHostedService>(provider => (HostApplicationLifetime)provider.GetRequiredService<IHostApplicationLifetime>());
     }
 }
 

src/GraphQL.AspNetCore3/GraphQLHttpMiddleware.cs

@@ -5,6 +5,9 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
+#if NETSTANDARD2_0 || NETCOREAPP2_1
+using IHostApplicationLifetime = Microsoft.Extensions.Hosting.IApplicationLifetime;
+#endif
 
 namespace GraphQL.AspNetCore3;
 

src/Samples/Net48Sample/Startup.cs

@@ -25,7 +25,6 @@ public void ConfigureServices(IServiceCollection services)
                 .WithMutation<Chat.Schema.Mutation>()
                 .WithSubscription<Chat.Schema.Subscription>())
             .AddNewtonsoftJson());
-        services.AddHostApplicationLifetime();
     }
 
     // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/Tests/AuthorizationTests.cs

@@ -728,9 +728,6 @@ public async Task EndToEnd(bool authenticated)
                 .AddAuthorizationRule());
             services.AddAuthentication();
             services.AddAuthorization();
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();

src/Tests/BuilderMethodTests.cs

@@ -15,9 +15,6 @@ public BuilderMethodTests()
                     .WithSubscription<Chat.Schema.Subscription>())
                 .AddSchema<Schema2>()
                 .AddSystemTextJson());
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
     }
 

src/Tests/ChatTests.cs

@@ -22,9 +22,6 @@ private IWebHostBuilder ConfigureBuilder()
                     .WithMutation<Chat.Schema.Mutation>()
                     .WithSubscription<Chat.Schema.Subscription>())
                 .AddSystemTextJson());
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();

src/Tests/JwtBearer/JwtWebSocketAuthenticationServiceTests.cs

@@ -255,9 +255,6 @@ private TestServer CreateTestServer(bool defaultScheme = true, bool customScheme
                     .AddSystemTextJson()
                     .AddJwtBearerAuthentication()
                 );
-#if NET48 || NETCOREAPP2_1
-                services.AddHostApplicationLifetime();
-#endif
             })
             .Configure(app => {
                 app.UseWebSockets();

src/Tests/Middleware/AuthorizationTests.cs

@@ -6,6 +6,9 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Hosting;
+#if NET48 || NETCOREAPP2_1
+using IHostApplicationLifetime = Microsoft.Extensions.Hosting.IApplicationLifetime;
+#endif
 
 namespace Tests.Middleware;
 
@@ -46,9 +49,6 @@ private TestServer CreateServer(Action<IServiceCollection>? configureServices =
                     policyConfig.RequireRole("FailingRole");
                 });
             });
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
             configureServices?.Invoke(services);
         });
         hostBuilder.Configure(app => {
@@ -127,9 +127,6 @@ public async Task WebSocket_NotAuthorized()
             services.AddGraphQL(b => b
                 .AddAutoSchema<Chat.Schema.Query>()
                 .AddSystemTextJson());
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();

src/Tests/Middleware/BatchTests.cs

@@ -19,9 +19,6 @@ public BatchTests()
                 .AddSchema<Schema2>()
                 .AddSystemTextJson()
                 .ConfigureExecutionOptions(o => _configureExecution(o)));
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();

src/Tests/Middleware/Cors/MiddlewareTests.cs

@@ -18,9 +18,6 @@ public async Task<CorsResponse> ExecuteMiddleware(
                 .AddAutoSchema<Query>()
                 .AddSystemTextJson());
             services.AddCors();
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             if (configureCorsPolicy != null)

src/Tests/Middleware/FileUploadTests.cs

@@ -1,5 +1,8 @@
 using GraphQLParser.AST;
 using Microsoft.Extensions.Hosting;
+#if NET48 || NETCOREAPP2_1
+using IHostApplicationLifetime = Microsoft.Extensions.Hosting.IApplicationLifetime;
+#endif
 
 namespace Tests.Middleware;
 
@@ -15,9 +18,6 @@ public FileUploadTests()
             services.AddGraphQL(b => b
                 .AddSchema<MySchema>()
                 .AddSystemTextJson());
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();

src/Tests/Middleware/GetTests.cs

@@ -41,9 +41,6 @@ public GetTests()
                 });
             });
             services.AddSingleton<PersistedDocumentHandler>();
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();
@@ -142,9 +139,6 @@ public async Task NoUseWebSockets()
             services.AddGraphQL(b => b
                 .AddAutoSchema<Chat.Schema.Query>()
                 .AddSystemTextJson());
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => app.UseGraphQL());
         using var server = new TestServer(hostBuilder);

src/Tests/Middleware/MiscTests.cs

@@ -2,6 +2,9 @@
 using GraphQL.AspNetCore3.Errors;
 using GraphQL.Execution;
 using Microsoft.Extensions.Hosting;
+#if NET48 || NETCOREAPP2_1
+using IHostApplicationLifetime = Microsoft.Extensions.Hosting.IApplicationLifetime;
+#endif
 
 namespace Tests.Middleware;
 

src/Tests/Middleware/PostTests.cs

@@ -43,9 +43,6 @@ public PostTests()
                 });
             });
             services.AddSingleton<PersistedDocumentHandler>();
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();

src/Tests/Middleware/WebSocketTests.cs

@@ -1,5 +1,8 @@
 using System.Net;
 using Microsoft.Extensions.Hosting;
+#if NET48 || NETCOREAPP2_1
+using IHostApplicationLifetime = Microsoft.Extensions.Hosting.IApplicationLifetime;
+#endif
 
 namespace Tests.Middleware;
 
@@ -21,9 +24,6 @@ private void Configure(Action<GraphQLHttpMiddlewareOptions>? configureOptions =
                     .WithSubscription<Chat.Schema.Subscription>())
                 .AddSchema<Schema2>()
                 .AddSystemTextJson());
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
             configureServices(services);
         });
         hostBuilder.Configure(app => {

src/Tests/UserContextBuilderTests.cs

@@ -16,9 +16,6 @@ private void Configure(Action<IGraphQLBuilder> configureBuilder)
                 b.AddSystemTextJson();
             });
             services.AddHttpContextAccessor();
-#if NETCOREAPP2_1 || NET48
-            services.AddHostApplicationLifetime();
-#endif
         });
         hostBuilder.Configure(app => {
             app.UseWebSockets();