cleanup

Author: arturcic

src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -4,7 +4,6 @@
 using GitVersion;
 using GitVersion.Configuration;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.VersionFilters;
 using GitVersionCore.Tests.Mocks;
 using LibGit2Sharp;

src/GitVersionCore.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using GitVersion.Configuration;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersionCore.Tests.Helpers;
 using NUnit.Framework;
 using Shouldly;

src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using GitVersion.Configuration;
 using GitVersion.Logging;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
 using GitVersionCore.Tests.Mocks;
 using LibGit2Sharp;

src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs

@@ -5,7 +5,6 @@
 using GitVersion.Configuration;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersionCore.Tests.Helpers;
 using LibGit2Sharp;
 using NUnit.Framework;

src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs

@@ -1,6 +1,5 @@
 using GitVersion;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using LibGit2Sharp;
 
 namespace GitVersionCore.Tests.VersionCalculation

src/GitVersionCore.Tests/VersionFilters/MinDateVersionFilterTests.cs

@@ -1,4 +1,4 @@
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 using GitVersion.VersionFilters;
 using NUnit.Framework;
 using Shouldly;

src/GitVersionCore.Tests/VersionFilters/ShaVersionFilterTests.cs

@@ -1,6 +1,6 @@
 using System;
 using GitVersion;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 using GitVersion.VersionFilters;
 using GitVersionCore.Tests.Helpers;
 using NUnit.Framework;

src/GitVersionCore/BuildServers/BuildServerModule.cs

@@ -0,0 +1,18 @@
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GitVersion.BuildServers
+{
+    public class BuildServerModule : GitVersionModule
+    {
+        public override void RegisterTypes(IServiceCollection services)
+        {
+            var buildServers = FindAllDerivedTypes<BuildServerBase>(Assembly.GetAssembly(GetType()));
+
+            foreach (var buildServer in buildServers)
+            {
+                services.AddSingleton(typeof(IBuildServer), buildServer);
+            }
+        }
+    }
+}

src/GitVersionCore/Common/GitVersionModule.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GitVersion
+{
+    public abstract class GitVersionModule : IGitVersionModule
+    {
+        public abstract void RegisterTypes(IServiceCollection services);
+
+        protected static IEnumerable<Type> FindAllDerivedTypes<T>(Assembly assembly)
+        {
+            var derivedType = typeof(T);
+            return assembly.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t));
+        }
+    }
+}

src/GitVersionCore/Configuration/Init/GitVersionInitModule.cs

@@ -1,15 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using GitVersion.Configuration.Init.Wizard;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.Configuration.Init
 {
-    public class GitVersionInitModule : IGitVersionModule
+    public class GitVersionInitModule : GitVersionModule
     {
-        public void RegisterTypes(IServiceCollection services)
+        public override void RegisterTypes(IServiceCollection services)
         {
             services.AddTransient<IConfigInitWizard, ConfigInitWizard>();
             services.AddTransient<IConfigInitStepFactory, ConfigInitStepFactory>();
@@ -21,11 +18,5 @@ public void RegisterTypes(IServiceCollection services)
                 services.AddTransient(step);
             }
         }
-
-        private static IEnumerable<Type> FindAllDerivedTypes<T>(Assembly assembly)
-        {
-            var derivedType = typeof(T);
-            return assembly.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t));
-        }
     }
 }