Add Microsoft.Extensions.DependencyInjection

Author: arturcic

src/GitVersionExe/GitVersionExe.csproj

@@ -27,6 +27,10 @@
         <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
     </ItemGroup>

…c/GitVersionExe/GitVersionApplication.cs src/GitVersionExe/GitVersionRunner.cssrc/GitVersionExe/GitVersionApplication.cs renamed to src/GitVersionExe/GitVersionRunner.cs src/GitVersionExe/GitVersionApplication.cs renamed to src/GitVersionExe/GitVersionRunner.cs

@@ -10,7 +10,7 @@
 
 namespace GitVersion
 {
-    public class GitVersionApplication : IGitVersionApplication
+    public class GitVersionRunner : IGitVersionRunner
     {
         private readonly IFileSystem fileSystem;
         private readonly IEnvironment environment;
@@ -19,15 +19,14 @@ public class GitVersionApplication : IGitVersionApplication
         private readonly IHelpWriter helpWriter;
         private readonly IVersionWriter versionWriter;
 
-        public GitVersionApplication(IFileSystem fileSystem, IEnvironment environment, ILog log, IConfigFileLocator configFileLocator)
+        public GitVersionRunner(IFileSystem fileSystem, IEnvironment environment, ILog log, IConfigFileLocator configFileLocator, IVersionWriter versionWriter, IHelpWriter helpWriter)
         {
             this.fileSystem = fileSystem;
             this.environment = environment;
             this.log = log;
             this.configFileLocator = configFileLocator;
-
-            versionWriter = new VersionWriter();
-            helpWriter = new HelpWriter(versionWriter);
+            this.versionWriter = versionWriter;
+            this.helpWriter = helpWriter;
         }
 
         public int Run(Arguments arguments)

…/GitVersionExe/IGitVersionApplication.cs src/GitVersionExe/IGitVersionRunner.cssrc/GitVersionExe/IGitVersionApplication.cs renamed to src/GitVersionExe/IGitVersionRunner.cs src/GitVersionExe/IGitVersionApplication.cs renamed to src/GitVersionExe/IGitVersionRunner.cs

@@ -1,6 +1,6 @@
 namespace GitVersion
 {
-    public interface IGitVersionApplication
+    public interface IGitVersionRunner
     {
         int Run(Arguments arguments);
     }

src/GitVersionExe/Program.cs

@@ -3,6 +3,7 @@
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Logging;
+using Microsoft.Extensions.DependencyInjection;
 using Console = System.Console;
 using Environment = GitVersion.Common.Environment;
 
@@ -17,24 +18,19 @@ private static void Main(string[] args)
             var exitCode = 1;
             if (arguments != null)
             {
-                var fileSystem = new FileSystem();
-                var environment = new Environment();
+                var services = ConfigureServices(arguments);
 
-                try
+                using (var serviceProvider = services.BuildServiceProvider())
                 {
-                    var log = new Log { Verbosity = arguments.Verbosity };
-
-                    var configFileLocator = string.IsNullOrWhiteSpace(arguments.ConfigFile)
-                        ? (IConfigFileLocator) new DefaultConfigFileLocator(fileSystem, log)
-                        : new NamedConfigFileLocator(arguments.ConfigFile, fileSystem, log);
-
-                    var app = new GitVersionApplication(fileSystem, environment, log, configFileLocator);
-
-                    exitCode = app.Run(arguments);
-                }
-                catch (Exception exception)
-                {
-                    Console.Error.WriteLine(exception.Message);
+                    try
+                    {
+                        var app = serviceProvider.GetService<IGitVersionRunner>();
+                        exitCode = app.Run(arguments);
+                    }
+                    catch (Exception exception)
+                    {
+                        Console.Error.WriteLine(exception.Message);
+                    }
                 }
             }
 
@@ -46,6 +42,33 @@ private static void Main(string[] args)
             System.Environment.Exit(exitCode);
         }
 
+        private static IServiceCollection ConfigureServices(Arguments arguments)
+        {
+            var services = new ServiceCollection();
+
+            services.AddSingleton<IFileSystem, FileSystem>();
+            services.AddSingleton<IEnvironment, Environment>();
+            services.AddSingleton<IHelpWriter, HelpWriter>();
+            services.AddSingleton<IVersionWriter, VersionWriter>();
+            services.AddSingleton<ILog>(new Log { Verbosity = arguments.Verbosity });
+            services.AddSingleton(sp => ConfigFileLocator(sp, arguments));
+            services.AddSingleton<IGitVersionRunner, GitVersionRunner>();
+
+            return services;
+        }
+
+        private static IConfigFileLocator ConfigFileLocator(IServiceProvider sp, Arguments arguments)
+        {
+            var fileSystem = sp.GetService<IFileSystem>();
+            var log = sp.GetService<ILog>();
+
+            var configFileLocator = string.IsNullOrWhiteSpace(arguments.ConfigFile)
+                ? (IConfigFileLocator) new DefaultConfigFileLocator(fileSystem, log)
+                : new NamedConfigFileLocator(arguments.ConfigFile, fileSystem, log);
+
+            return configFileLocator;
+        }
+
         private static Arguments ParseArguments(string[] args)
         {
             var argumentParser = new ArgumentParser();