src/agent/NetworkResurrector.Agent/Program.cs

@@ -6,8 +6,6 @@ using NetworkResurrector.Agent.Extensions;
 using NetworkResurrector.Agent.Extensions.Serilog;
 using Serilog;
 using System;
-using System.Diagnostics;
-using System.Linq;
 
 namespace NetworkResurrector.Agent
 {
@@ -15,24 +13,7 @@ namespace NetworkResurrector.Agent
     {
         public static void Main(string[] args)
         {
-            var isConsole = Debugger.IsAttached || args.Contains("--console");
+            var builder = WebApplication.CreateBuilder(args);
-
-            WebApplicationBuilder builder;
-            if (isConsole)
-            {
-                builder = WebApplication.CreateBuilder(args);
-            }
-            else
-            {
-                var webApplicationOptions = new WebApplicationOptions()
-                {
-                    ContentRootPath = AppContext.BaseDirectory,
-                    Args = args,
-                    ApplicationName = Process.GetCurrentProcess().ProcessName
-                };
-                builder = WebApplication.CreateBuilder(webApplicationOptions);
-                builder.Host.UseWindowsService();
-            }
 
             builder.Host.UseSerilog((_, lc) =>
             {
@@ -46,6 +27,10 @@ namespace NetworkResurrector.Agent
 
             builder.Services.ConfigureServices(builder.Configuration);
 
+            var useWindowsService = builder.Configuration.GetValue<bool>("Host:UseWindowsService");
+            if (useWindowsService)
+                builder.Host.UseWindowsService();
+
             var app = builder.Build();
             app.Configure(builder.Configuration);
 

src/agent/NetworkResurrector.Agent/Properties/PublishProfiles/FolderProfile.pubxml

@@ -2,7 +2,7 @@
 <!--
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
-<Project>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <DeleteExistingFiles>false</DeleteExistingFiles>
     <ExcludeApp_Data>false</ExcludeApp_Data>
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+    <PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>

src/agent/NetworkResurrector.Agent/appsettings.json

@@ -3,6 +3,9 @@
   "ConnectionStrings": {
     "DatabaseConnection": "Server=#########;Database=#########;User Id=#########;Password=#########;MultipleActiveResultSets=true"
   },
+  "Host": {
+    "UseWindowsService": true
+  },
   "Serilog": {
     "MinimumLevel": {
       "Default": "Information",

src/server/NetworkResurrector.Server/Program.cs

@@ -5,8 +5,6 @@ using Microsoft.Extensions.Hosting;
 using NetworkResurrector.Server.Extensions;
 using Serilog;
 using System;
-using System.Diagnostics;
-using System.Linq;
 
 namespace NetworkResurrector.Server
 {
@@ -14,24 +12,7 @@ namespace NetworkResurrector.Server
     {
         public static void Main(string[] args)
         {
-            var isConsole = Debugger.IsAttached || args.Contains("--console");
+            var builder = WebApplication.CreateBuilder(args);
-
-            WebApplicationBuilder builder;
-            if (isConsole)
-            {
-                builder = WebApplication.CreateBuilder(args);
-            }
-            else
-            {
-                var webApplicationOptions = new WebApplicationOptions()
-                {
-                    ContentRootPath = AppContext.BaseDirectory,
-                    Args = args,
-                    ApplicationName = Process.GetCurrentProcess().ProcessName
-                };
-                builder = WebApplication.CreateBuilder(webApplicationOptions);
-                builder.Host.UseWindowsService();
-            }
 
             builder.Host.UseSerilog((_, lc) =>
             {
@@ -43,6 +24,11 @@ namespace NetworkResurrector.Server
             });
 
             builder.Services.ConfigureServices(builder.Configuration);
+
+            var useWindowsService = builder.Configuration.GetValue<bool>("Host:UseWindowsService");
+            if (useWindowsService)
+                builder.Host.UseWindowsService();
+
             var app = builder.Build();
             app.Configure();
 

src/server/NetworkResurrector.Server/Properties/PublishProfiles/FolderProfile.pubxml

@@ -2,7 +2,7 @@
 <!--
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
-<Project>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <DeleteExistingFiles>false</DeleteExistingFiles>
     <ExcludeApp_Data>false</ExcludeApp_Data>
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+    <PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>

src/server/NetworkResurrector.Server/appsettings.json

@@ -3,6 +3,9 @@
   "ConnectionStrings": {
     "DatabaseConnection": "Server=#########;Database=#########;User Id=#########;Password=#########;MultipleActiveResultSets=true"
   },
+  "Host": {
+    "UseWindowsService": false
+  },
   "Serilog": {
     "MinimumLevel": {
       "Default": "Information",