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));
-        }
     }
 }

src/GitVersionCore/GitVersionCoreModule.cs

@@ -1,13 +1,12 @@
-using GitVersion.BuildServers;
 using GitVersion.Cache;
 using Microsoft.Extensions.DependencyInjection;
 using GitVersion.Configuration;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.Configuration.Init;
 using GitVersion.Extensions;
+using GitVersion.BuildServers;
 
 namespace GitVersion
 {
@@ -37,37 +36,9 @@ public void RegisterTypes(IServiceCollection services)
 
             services.AddSingleton(sp => sp.GetService<IConfigFileLocatorFactory>().Create());
 
-            RegisterBuildServers(services);
-
-            RegisterVersionStrategies(services);
-
+            services.AddModule(new BuildServerModule());
             services.AddModule(new GitVersionInitModule());
-        }
-
-        private static void RegisterBuildServers(IServiceCollection services)
-        {
-            services.AddSingleton<IBuildServer, ContinuaCi>();
-            services.AddSingleton<IBuildServer, TeamCity>();
-            services.AddSingleton<IBuildServer, AppVeyor>();
-            services.AddSingleton<IBuildServer, MyGet>();
-            services.AddSingleton<IBuildServer, Jenkins>();
-            services.AddSingleton<IBuildServer, GitLabCi>();
-            services.AddSingleton<IBuildServer, AzurePipelines>();
-            services.AddSingleton<IBuildServer, TravisCi>();
-            services.AddSingleton<IBuildServer, EnvRun>();
-            services.AddSingleton<IBuildServer, Drone>();
-            services.AddSingleton<IBuildServer, CodeBuild>();
-            services.AddSingleton<IBuildServer, GitHubActions>();
-        }
-
-        private static void RegisterVersionStrategies(IServiceCollection services)
-        {
-            services.AddSingleton<IVersionStrategy, FallbackVersionStrategy>();
-            services.AddSingleton<IVersionStrategy, ConfigNextVersionVersionStrategy>();
-            services.AddSingleton<IVersionStrategy, TaggedCommitVersionStrategy>();
-            services.AddSingleton<IVersionStrategy, MergeMessageVersionStrategy>();
-            services.AddSingleton<IVersionStrategy, VersionInBranchNameVersionStrategy>();
-            services.AddSingleton<IVersionStrategy, TrackReleaseBranchesVersionStrategy>();
+            services.AddModule(new VersionStrategyModule());
         }
     }
 }

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.Logging;
 
 namespace GitVersion.VersionCalculation

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs

@@ -1,6 +1,6 @@
 using LibGit2Sharp;
 
-namespace GitVersion.VersionCalculation.BaseVersionCalculators
+namespace GitVersion.VersionCalculation
 {
     public class BaseVersion
     {

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/BuildServerModule.cs

@@ -0,0 +1,18 @@
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GitVersion.VersionCalculation
+{
+    public class VersionStrategyModule : GitVersionModule
+    {
+        public override void RegisterTypes(IServiceCollection services)
+        {
+            var versionStrategies = FindAllDerivedTypes<IVersionStrategy>(Assembly.GetAssembly(GetType()));
+
+            foreach (var versionStrategy in versionStrategies)
+            {
+                services.AddSingleton(typeof(IVersionStrategy), versionStrategy);
+            }
+        }
+    }
+}

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace GitVersion.VersionCalculation.BaseVersionCalculators
+namespace GitVersion.VersionCalculation
 {
     /// <summary>
     /// Version is from NextVersion (the configuration value), unless the current commit is tagged.

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs

@@ -3,7 +3,7 @@
 using GitVersion.Exceptions;
 using LibGit2Sharp;
 
-namespace GitVersion.VersionCalculation.BaseVersionCalculators
+namespace GitVersion.VersionCalculation
 {
     /// <summary>
     /// Version is 0.1.0.

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs

@@ -7,7 +7,7 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 
-namespace GitVersion.VersionCalculation.BaseVersionCalculators
+namespace GitVersion.VersionCalculation
 {
     /// <summary>
     /// Version is extracted from older commits's merge messages.

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs

@@ -5,7 +5,7 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 
-namespace GitVersion.VersionCalculation.BaseVersionCalculators
+namespace GitVersion.VersionCalculation
 {
     /// <summary>
     /// Version is extracted from all tags on the branch which are valid, and not newer than the current commit.

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs

@@ -5,7 +5,7 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 
-namespace GitVersion.VersionCalculation.BaseVersionCalculators
+namespace GitVersion.VersionCalculation
 {
     /// <summary>
     /// Active only when the branch is marked as IsDevelop.

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs

@@ -4,7 +4,7 @@
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 
-namespace GitVersion.VersionCalculation.BaseVersionCalculators
+namespace GitVersion.VersionCalculation
 {
     /// <summary>
     /// Version is extracted from the name of the branch.

src/GitVersionCore/VersionCalculation/IBaseVersionCalculator.cs

@@ -1,5 +1,3 @@
-using GitVersion.VersionCalculation.BaseVersionCalculators;
-
 namespace GitVersion.VersionCalculation
 {
     public interface IBaseVersionCalculator

src/GitVersionCore/VersionCalculation/IMainlineVersionCalculator.cs

@@ -1,5 +1,3 @@
-using GitVersion.VersionCalculation.BaseVersionCalculators;
-
 namespace GitVersion.VersionCalculation
 {
     public interface IMainlineVersionCalculator

src/GitVersionCore/VersionCalculation/IVersionStrategy.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 
 namespace GitVersion.VersionCalculation
 {

src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 using LibGit2Sharp;
 using GitVersion.Configuration;
 using GitVersion.Extensions;

src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs

@@ -1,4 +1,3 @@
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using LibGit2Sharp;
 using System;
 using System.Collections.Generic;

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -2,8 +2,6 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.VersioningModes;
 using GitVersion.Configuration;
 using GitVersion.Exceptions;

src/GitVersionCore/VersionFilters/IVersionFilter.cs

@@ -1,4 +1,4 @@
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 
 namespace GitVersion.VersionFilters
 {

src/GitVersionCore/VersionFilters/MinDateVersionFilter.cs

@@ -1,5 +1,5 @@
 using System;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 using GitVersion.Extensions;
 
 namespace GitVersion.VersionFilters

src/GitVersionCore/VersionFilters/ShaVersionFilter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 
 namespace GitVersion.VersionFilters
 {