Surround AddWindowsService() with a check to validate it's running as a service

Author: mauroservienti

src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs

@@ -10,6 +10,7 @@ namespace ServiceControl.Audit;
 using Microsoft.AspNetCore.HttpLogging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting.WindowsServices;
 using Microsoft.Extensions.Logging;
 using Monitoring;
 using NLog.Extensions.Logging;
@@ -100,7 +101,12 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
             services.AddHostedService<AuditIngestion>();
         }
 
-        builder.Services.AddWindowsService();
+        if (WindowsServiceHelpers.IsWindowsService())
+        {
+            // The if is added for clarity, internally AddWindowsService has a similar logic
+            builder.Services.AddWindowsService();
+            //TODO register our own lifecycle that replaces the WindowsService default one
+        }
     }
 
     public static void AddServiceControlAuditInstallers(this IHostApplicationBuilder builder, Settings settings)

src/ServiceControl.Audit/Infrastructure/Hosting/Commands/MaintenanceModeCommand.cs

@@ -2,6 +2,7 @@
 {
     using System.Threading.Tasks;
     using Microsoft.Extensions.Hosting;
+    using Microsoft.Extensions.Hosting.WindowsServices;
     using Persistence;
     using Settings;
 
@@ -17,7 +18,12 @@ public override async Task Execute(HostArguments args, Settings settings)
             var hostBuilder = Host.CreateApplicationBuilder();
             hostBuilder.Services.AddPersistence(persistenceSettings, persistenceConfiguration);
 
-            hostBuilder.Services.AddWindowsService();
+            if (WindowsServiceHelpers.IsWindowsService())
+            {
+                // The if is added for clarity, internally AddWindowsService has a similar logic
+                hostBuilder.Services.AddWindowsService();
+                //TODO register our own lifecycle that replaces the WindowsService default one
+            }
 
             var host = hostBuilder.Build();
             await host.RunAsync();

src/ServiceControl.Monitoring/HostApplicationBuilderExtensions.cs

@@ -13,6 +13,7 @@ namespace ServiceControl.Monitoring;
 using Microsoft.AspNetCore.HttpLogging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting.WindowsServices;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using NServiceBus;
@@ -41,7 +42,12 @@ public static void AddServiceControlMonitoring(this IHostApplicationBuilder host
 
         services.Configure<HostOptions>(options => options.ShutdownTimeout = settings.ShutdownTimeout);
 
-        services.AddWindowsService();
+        if (WindowsServiceHelpers.IsWindowsService())
+        {
+            // The if is added for clarity, internally AddWindowsService has a similar logic
+            services.AddWindowsService();
+            //TODO register our own lifecycle that replaces the WindowsService default one
+        }
 
         services.AddSingleton(settings);
         services.AddSingleton<EndpointRegistry>();

src/ServiceControl/HostApplicationBuilderExtensions.cs

@@ -17,6 +17,7 @@ namespace Particular.ServiceControl
     using Microsoft.AspNetCore.HttpLogging;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Hosting;
+    using Microsoft.Extensions.Hosting.WindowsServices;
     using Microsoft.Extensions.Logging;
     using NLog.Extensions.Logging;
     using NServiceBus;
@@ -95,7 +96,12 @@ public static void AddServiceControl(this IHostApplicationBuilder hostBuilder, S
                 hostBuilder.AddInternalCustomChecks();
             }
 
-            hostBuilder.Services.AddWindowsService();
+            if (WindowsServiceHelpers.IsWindowsService())
+            {
+                // The if is added for clarity, internally AddWindowsService has a similar logic
+                hostBuilder.Services.AddWindowsService();
+                //TODO register our own lifecycle that replaces the WindowsService default one
+            }
 
             hostBuilder.AddServiceControlComponents(settings, transportCustomization, ServiceControlMainInstance.Components);
         }

src/ServiceControl/Hosting/Commands/MaintenanceModeCommand.cs

@@ -2,6 +2,7 @@
 {
     using System.Threading.Tasks;
     using Microsoft.Extensions.Hosting;
+    using Microsoft.Extensions.Hosting.WindowsServices;
     using Particular.ServiceControl.Hosting;
     using Persistence;
     using ServiceBus.Management.Infrastructure.Settings;
@@ -13,7 +14,12 @@ public override async Task Execute(HostArguments args, Settings settings)
             var hostBuilder = Host.CreateApplicationBuilder();
             hostBuilder.Services.AddPersistence(settings, maintenanceMode: true);
 
-            hostBuilder.Services.AddWindowsService();
+            if (WindowsServiceHelpers.IsWindowsService())
+            {
+                // The if is added for clarity, internally AddWindowsService has a similar logic
+                hostBuilder.Services.AddWindowsService();
+                //TODO register our own lifecycle that replaces the WindowsService default one
+            }
 
             var host = hostBuilder.Build();
             await host.RunAsync();