Register types in each module

Author: arturcic

src/GitVersionCore/CoreModule.cs

@@ -0,0 +1,16 @@
+using Microsoft.Extensions.DependencyInjection;
+using GitVersion.Common;
+using GitVersion.Logging;
+
+namespace GitVersion
+{
+    public class CoreModule : IModule
+    {
+        public void RegisterTypes(IServiceCollection services)
+        {
+            services.AddSingleton<IFileSystem, FileSystem>();
+            services.AddSingleton<IEnvironment, Environment>();
+            services.AddSingleton<ILog, Log>();
+        }
+    }
+}

src/GitVersionCore/Extensions/ServiceCollectionExtensions.cs

@@ -0,0 +1,12 @@
+namespace GitVersion.Extensions
+{
+    using Microsoft.Extensions.DependencyInjection;
+
+    public static class ServiceCollectionExtensions
+    {
+        public static void AddModule(this IServiceCollection serviceCollection, IModule module)
+        {
+            module.RegisterTypes(serviceCollection);
+        }
+    }
+}

src/GitVersionCore/GitVersionCore.csproj

@@ -17,6 +17,7 @@
     <ItemGroup>
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
         <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All"></PackageReference>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     </ItemGroup>
 

src/GitVersionCore/IModule.cs

@@ -0,0 +1,9 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GitVersion
+{
+    public interface IModule
+    {
+        void RegisterTypes(IServiceCollection services);
+    }
+}

src/GitVersionExe/GitVersionApp.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using GitVersion.Logging;
 
 namespace GitVersion
 {
@@ -12,11 +13,13 @@ internal class GitVersionApp : IHostedService
         private readonly IGitVersionRunner gitVersionRunner;
         private readonly Arguments arguments;
 
-        public GitVersionApp(IHostApplicationLifetime applicationLifetime, IGitVersionRunner gitVersionRunner, IOptions<Arguments> options)
+        public GitVersionApp(IHostApplicationLifetime applicationLifetime, IGitVersionRunner gitVersionRunner, ILog log, IOptions<Arguments> options)
         {
             this.arguments = options.Value;
             this.applicationLifetime = applicationLifetime;
             this.gitVersionRunner = gitVersionRunner;
+
+            log.Verbosity = arguments.Verbosity;
         }
         public Task StartAsync(CancellationToken cancellationToken)
         {

src/GitVersionExe/Module.cs

@@ -0,0 +1,35 @@
+using System;
+using GitVersion.Common;
+using GitVersion.Configuration;
+using GitVersion.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace GitVersion
+{
+    public class Module : IModule
+    {
+        public void RegisterTypes(IServiceCollection services)
+        {
+            services.AddSingleton<IArgumentParser, ArgumentParser>();
+            services.AddSingleton<IHelpWriter, HelpWriter>();
+            services.AddSingleton<IVersionWriter, VersionWriter>();
+            services.AddSingleton<IGitVersionRunner, GitVersionRunner>();
+
+            services.AddSingleton(GetConfigFileLocator);
+        }
+
+        private static IConfigFileLocator GetConfigFileLocator(IServiceProvider sp)
+        {
+            var fileSystem = sp.GetService<IFileSystem>();
+            var log = sp.GetService<ILog>();
+            var arguments = sp.GetService<IOptions<Arguments>>();
+
+            var configFileLocator = string.IsNullOrWhiteSpace(arguments.Value.ConfigFile)
+                ? (IConfigFileLocator) new DefaultConfigFileLocator(fileSystem, log)
+                : new NamedConfigFileLocator(arguments.Value.ConfigFile, fileSystem, log);
+
+            return configFileLocator;
+        }
+    }
+}

src/GitVersionExe/Program.cs

@@ -1,13 +1,9 @@
-using System;
 using System.Threading.Tasks;
-using GitVersion.Common;
-using GitVersion.Configuration;
-using GitVersion.Logging;
+using GitVersion.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using Environment = GitVersion.Common.Environment;
 
 namespace GitVersion
 {
@@ -26,46 +22,13 @@ private static IHostBuilder CreateHostBuilder(string[] args) =>
                 })
                 .ConfigureServices((hostContext, services) =>
                 {
-                    services.AddSingleton<IArgumentParser, ArgumentParser>();
-                    services.AddSingleton<IFileSystem, FileSystem>();
-                    services.AddSingleton<IEnvironment, Environment>();
-                    services.AddSingleton<IHelpWriter, HelpWriter>();
-                    services.AddSingleton<IVersionWriter, VersionWriter>();
-                    services.AddSingleton<IGitVersionRunner, GitVersionRunner>();
+                    services.AddModule(new CoreModule());
+                    services.AddModule(new Module());
 
-                    services.AddSingleton(GetLog);
-                    services.AddSingleton(GetConfigFileLocator);
-                    services.AddSingleton(sp => GetArguments(sp, args));
+                    services.AddSingleton(sp => Options.Create(sp.GetService<IArgumentParser>().ParseArguments(args)));
 
                     services.AddHostedService<GitVersionApp>();
                 })
                 .UseConsoleLifetime();
-
-        private static ILog GetLog(IServiceProvider sp)
-        {
-            var arguments = sp.GetService<IOptions<Arguments>>();
-            return new Log { Verbosity = arguments.Value.Verbosity };
-        }
-
-        private static IOptions<Arguments> GetArguments(IServiceProvider sp, string[] args)
-        {
-            var argumentParser = sp.GetService<IArgumentParser>();
-            var arguments = argumentParser.ParseArguments(args);
-
-            return Options.Create(arguments);
-        }
-
-        private static IConfigFileLocator GetConfigFileLocator(IServiceProvider sp)
-        {
-            var fileSystem = sp.GetService<IFileSystem>();
-            var log = sp.GetService<ILog>();
-            var arguments = sp.GetService<IOptions<Arguments>>();
-
-            var configFileLocator = string.IsNullOrWhiteSpace(arguments.Value.ConfigFile)
-                ? (IConfigFileLocator) new DefaultConfigFileLocator(fileSystem, log)
-                : new NamedConfigFileLocator(arguments.Value.ConfigFile, fileSystem, log);
-
-            return configFileLocator;
-        }
     }
 }