SampleApp.WindowsServiceHosted launch/registrations refactoring

Author: i4004

src/SampleApps/SampleApp.WindowsServiceHosted/Program.cs

@@ -17,22 +17,21 @@ private static void Main(string[] args)
 
 			Args = args;
 
-			InitializeContainer();
+			DIContainer.Current.RegisterAll().Verify();
 
-			if (new BasicServiceHandler<WebApplicationStartup>().Start(args))
-				return;
+			using var handler = new BasicServiceHandler<WebApplicationStartup>();
 
-			using (var scope = DIContainer.Current.BeginLifetimeScope())
-				scope.Resolver.Resolve<WebApplicationStartup>().Run();
-
-			Console.ReadLine();
+			if (!handler.Start(args))
+				RunAsAConsoleApplication();
 		}
 
-		private static void InitializeContainer()
+		private static void RunAsAConsoleApplication()
 		{
-			IocRegistrations.Register();
+			using var scope = DIContainer.Current.BeginLifetimeScope();
 
-			DIContainer.Current.Verify();
+			scope.Resolver.Resolve<WebApplicationStartup>().Run();
+
+			Console.ReadLine();
 		}
 	}
 }

src/SampleApps/SampleApp.WindowsServiceHosted/SampleApp.WindowsServiceHosted.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462</TargetFrameworks>
+		<LangVersion>8.0</LangVersion>
 		<Authors>Alexander Krylkov</Authors>
 		<Product>Simplify</Product>
 		<Description>Simplify.Web as windows service sample app</Description>

src/SampleApps/SampleApp.WindowsServiceHosted/Setup/IocRegistrations.cs

@@ -3,14 +3,15 @@
 
 namespace SampleApp.WindowsServiceHosted.Setup
 {
-	public class IocRegistrations
+	public static class IocRegistrations
 	{
-		public static void Register()
+		public static IDIContainerProvider RegisterAll(this IDIContainerProvider container)
 		{
-			DIContainer.Current.Register<WebApplicationStartup>();
-
 			// Manual Simplify.Web bootstrapper registration
-			DIContainer.Current.RegisterSimplifyWeb();
+			container.RegisterSimplifyWeb()
+				.Register<WebApplicationStartup>();
+
+			return container;
 		}
 	}
 }