Consolidate NetCore Projects Together

MassTransit · Jun 22, 2019 · 809e5f8 · 809e5f8
1 parent c4261bc
commit 809e5f8
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 248 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
 # Sample MassTransit Quartz Scheduler
 
-This sample contains three examples:
+This sample contains two projects:
 
 1. Net461 using TopShelf
-2. NetCore Win Svc (for still deploying on a Windows Server)
-3. NetCore (linux, windows, mac...)
+2. NetCore (linux, windows, mac...), it uses [System.ServiceProcess.ServiceController](https://www.nuget.org/packages/System.ServiceProcess.ServiceController) which allows the process to be installed on windows as a service (using sc.exe)
 
 The persistence mechanism used in this example is SQLServer, however Quartz.net supports [all of these](https://github.com/quartznet/quartznet/tree/master/database/tables).
 

diff --git a/src/NetCore/NetCore.csproj b/src/NetCore/NetCore.csproj
@@ -20,6 +20,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
     <PackageReference Include="Quartz.Serialization.Json" Version="3.0.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NetCore/Program.cs b/src/NetCore/Program.cs
@@ -10,6 +10,8 @@
 using Quartz;
 using Quartz.Impl;
 using System;
+using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace NetCore
@@ -18,9 +20,18 @@ class Program
     {
         static async Task Main(string[] args)
         {
+            var isService = !(Debugger.IsAttached || args.Contains("--console"));
+
             var builder = CreateHostBuilder(args);
 
-            await builder.RunConsoleAsync();
+            if (isService)
+            {
+                await builder.RunAsServiceAsync();
+            }
+            else
+            {
+                await builder.RunConsoleAsync();
+            }
         }
 
         static IHostBuilder CreateHostBuilder(string[] args) =>

diff --git a/src/NetCoreWinSvc/ServiceBaseLifetime.cs → src/NetCore/ServiceBaseLifetime.cs b/src/NetCoreWinSvc/ServiceBaseLifetime.cs → src/NetCore/ServiceBaseLifetime.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace NetCoreWinSvc
+namespace NetCore
 {
     public class ServiceBaseLifetime : ServiceBase, IHostLifetime
     {

diff --git a/...nSvc/ServiceBaseLifetimeHostExtensions.cs → ...Core/ServiceBaseLifetimeHostExtensions.cs b/...nSvc/ServiceBaseLifetimeHostExtensions.cs → ...Core/ServiceBaseLifetimeHostExtensions.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace NetCoreWinSvc
+namespace NetCore
 {
     public static class ServiceBaseLifetimeHostExtensions
     {

diff --git a/src/NetCoreWinSvc/AppConfig.cs b/src/NetCoreWinSvc/AppConfig.cs
diff --git a/src/NetCoreWinSvc/MassTransitConsoleHostedService.cs b/src/NetCoreWinSvc/MassTransitConsoleHostedService.cs
diff --git a/src/NetCoreWinSvc/NetCoreWinSvc.csproj b/src/NetCoreWinSvc/NetCoreWinSvc.csproj
diff --git a/src/NetCoreWinSvc/Program.cs b/src/NetCoreWinSvc/Program.cs
diff --git a/src/NetCoreWinSvc/appsettings.json b/src/NetCoreWinSvc/appsettings.json
diff --git a/src/NetCoreWinSvc/quartz.config b/src/NetCoreWinSvc/quartz.config
diff --git a/src/Sample-Quartz.sln b/src/Sample-Quartz.sln
@@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.329
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore", "NetCore\NetCore.csproj", "{E0E94665-623A-4CA2-99AD-D9103E17C63F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore", "NetCore\NetCore.csproj", "{E0E94665-623A-4CA2-99AD-D9103E17C63F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCoreWinSvc", "NetCoreWinSvc\NetCoreWinSvc.csproj", "{B1A033D3-4D4F-4A1E-8BE7-BFF5675E2650}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net461TopShelf", "Net461TopShelf\Net461TopShelf.csproj", "{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net461TopShelf", "Net461TopShelf\Net461TopShelf.csproj", "{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,10 +17,6 @@ Global
 		{E0E94665-623A-4CA2-99AD-D9103E17C63F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0E94665-623A-4CA2-99AD-D9103E17C63F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0E94665-623A-4CA2-99AD-D9103E17C63F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1A033D3-4D4F-4A1E-8BE7-BFF5675E2650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1A033D3-4D4F-4A1E-8BE7-BFF5675E2650}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1A033D3-4D4F-4A1E-8BE7-BFF5675E2650}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1A033D3-4D4F-4A1E-8BE7-BFF5675E2650}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}.Release|Any CPU.ActiveCfg = Release|Any CPU