Simplify DI

Author: CodeCasterNL

docs/index.md

@@ -82,22 +82,24 @@ public class MyCoolBackgroundService : WindowsServiceBackgroundService
 {
     public MyCoolBackgroundService(
         ILogger<MyFaultyWindowsServiceBackgroundService> logger,
-        IHostLifetime hostLifetime,
-        IHostApplicationLifetime applicationLifetime
+        IHostLifetime hostLifetime
     )
-        : base(logger, hostLifetime, applicationLifetime)
+        : base(logger, hostLifetime)
     {
     }
 
     // This still runs your long-running background job
-    protected override Task TryExecuteAsync(CancellationToken stoppingToken)
+    protected override async Task TryExecuteAsync(CancellationToken stoppingToken)
     {
         // Do your continuous or periodic background work.
         await SomeLongRunningTaskAsync();
 
         // We're done, let the service stop.
         ServiceLifetime.ExitCode = 0;
-        ApplicationLifetime.StopApplication();
+
+        // This kills the process about immediately, you can also inject `IHostApplication` 
+        // and call StopAsync() on that.
+        await ServiceLifetime.StopAsync();
     }
 
     // This one tells you when we're shutting down or resuming from semi-hibernation

src/CodeCaster.WindowsServiceExtensions/Service/WindowsServiceBackgroundService.cs

@@ -24,26 +24,18 @@ public abstract class WindowsServiceBackgroundService : BackgroundService, IWind
         /// </summary>
         protected readonly ILogger<IHostedService> Logger;
 
+#pragma warning disable CS0419, CS1574 // Ambiguous reference in cref attribute
         /// <summary>
-        /// To interact with the Service Control Manager.
+        /// To interact with the Service Control Manager. <c>null</c> when <see cref="WindowsServiceLifetimeHostBuilderExtensionsAdapter.UseWindowsServiceExtensions"/> wasn't called. 
         /// </summary>
+#pragma warning restore CS0419, CS1574 // Ambiguous reference in cref attribute
         protected readonly ExtendedWindowsServiceLifetime? ServiceLifetime;
 
-        /// <summary>
-        /// To ask nicely to stop the host when cancellation is requested. We're just a BackgroundService, returning from ExecuteAsync() won't stop the host application. Better us than Windows.
-        /// </summary>
-        protected readonly IHostApplicationLifetime ApplicationLifetime;
-
         /// <inheritdoc />
-        protected WindowsServiceBackgroundService(
-            ILogger<IHostedService> logger,
-            IHostLifetime hostLifetime,
-            IHostApplicationLifetime applicationLifetime
-        )
+        protected WindowsServiceBackgroundService(ILogger<IHostedService> logger, IHostLifetime hostLifetime)
         {
             Logger = logger;
             ServiceLifetime = hostLifetime as ExtendedWindowsServiceLifetime;
-            ApplicationLifetime = applicationLifetime;
         }
 
         /// <summary>
@@ -75,7 +67,7 @@ protected sealed override async Task ExecuteAsync(CancellationToken stoppingToke
             {
                 Logger.LogDebug("Setting process exit code to {exitCode}", ErrorInvalidData);
 
-                // The host will shut down with code 0 if we don't do this.
+                // The .NET host will shut down with code 0 if we don't do this.
                 Environment.ExitCode = ErrorInvalidData;
 
 #pragma warning disable CA1416 // Validate platform compatibility - we are a Windows Service.

test/TestServiceThatThrows/Program.cs

@@ -120,19 +120,20 @@ public class MyFaultyWindowsServiceBackgroundService : WindowsServiceBackgroundS
     {
         public MyFaultyWindowsServiceBackgroundService(
             ILogger<MyFaultyWindowsServiceBackgroundService> logger,
-            IHostLifetime hostLifetime,
-            IHostApplicationLifetime applicationLifetime
+            IHostLifetime hostLifetime
         )
-            : base(logger, hostLifetime, applicationLifetime)
+            : base(logger, hostLifetime)
         {
         }
 
         protected override async Task TryExecuteAsync(CancellationToken stoppingToken)
         {
             Logger.LogInformation("Sleeping, then throwing");
-            
-            // Fake doing at least some work...
-            await Task.Delay(1000, stoppingToken);
+
+            // Fake doing at least a second's work to not throw immediately...
+            int secondsToWait = Debugger.IsAttached ? 1 : 31;
+
+            await Task.Delay(secondsToWait * 1000, stoppingToken);
 
             // This will now stop the host application.
             throw new InvalidOperationException("This service is not supposed to start");