moved initialization to CoreModule

Author: arturcic

src/GitVersionCore/Cache/GitVersionCache.cs

@@ -60,16 +60,6 @@ public static string GetCacheDirectory(GitPreparer gitPreparer)
             return cacheDir;
         }
 
-        private string PrepareCacheDirectory(GitPreparer gitPreparer)
-        {
-            var cacheDir = GetCacheDirectory(gitPreparer);
-
-            // If the cacheDir already exists, CreateDirectory just won't do anything (it won't fail). @asbjornu
-            fileSystem.CreateDirectory(cacheDir);
-
-            return cacheDir;
-        }
-
         public VersionVariables LoadVersionVariablesFromDiskCache(GitPreparer gitPreparer, GitVersionCacheKey key)
         {
             using (log.IndentLog("Loading version variables from disk cache"))
@@ -109,6 +99,16 @@ public VersionVariables LoadVersionVariablesFromDiskCache(GitPreparer gitPrepare
             }
         }
 
+        private string PrepareCacheDirectory(GitPreparer gitPreparer)
+        {
+            var cacheDir = GetCacheDirectory(gitPreparer);
+
+            // If the cacheDir already exists, CreateDirectory just won't do anything (it won't fail). @asbjornu
+            fileSystem.CreateDirectory(cacheDir);
+
+            return cacheDir;
+        }
+
         private static string GetCacheFileName(GitVersionCacheKey key, string cacheDir)
         {
             return Path.Combine(cacheDir, string.Concat(key.Value, ".yml"));

src/GitVersionCore/CoreModule.cs

@@ -1,7 +1,11 @@
+using System;
 using GitVersion.BuildServers;
 using Microsoft.Extensions.DependencyInjection;
 using GitVersion.Common;
+using GitVersion.Configuration;
 using GitVersion.Logging;
+using Microsoft.Extensions.Options;
+using Environment = GitVersion.Common.Environment;
 
 namespace GitVersion
 {
@@ -15,6 +19,29 @@ public void RegisterTypes(IServiceCollection services)
 
             services.AddSingleton<IExecuteCore, ExecuteCore>();
 
+            services.AddSingleton<IBuildServerResolver, BuildServerResolver>();
+            services.AddSingleton(GetConfigFileLocator);
+
+            RegisterBuildServers(services);
+        }
+
+        private static IConfigFileLocator GetConfigFileLocator(IServiceProvider sp)
+        {
+            var fileSystem = sp.GetService<IFileSystem>();
+            var log = sp.GetService<ILog>();
+            var arguments = sp.GetService<IOptions<Arguments>>();
+
+            var configFile = arguments.Value.ConfigFile;
+
+            var configFileLocator = string.IsNullOrWhiteSpace(configFile)
+                ? new DefaultConfigFileLocator(fileSystem, log) as IConfigFileLocator
+                : new NamedConfigFileLocator(configFile, fileSystem, log);
+
+            return configFileLocator;
+        }
+
+        private static void RegisterBuildServers(IServiceCollection services)
+        {
             services.AddSingleton<IBuildServer, ContinuaCi>();
             services.AddSingleton<IBuildServer, TeamCity>();
             services.AddSingleton<IBuildServer, AppVeyor>();
@@ -26,8 +53,6 @@ public void RegisterTypes(IServiceCollection services)
             services.AddSingleton<IBuildServer, EnvRun>();
             services.AddSingleton<IBuildServer, Drone>();
             services.AddSingleton<IBuildServer, CodeBuild>();
-
-            services.AddSingleton<IBuildServerResolver, BuildServerResolver>();
         }
     }
 }

src/GitVersionCore/ExecuteCore.cs

@@ -33,11 +33,11 @@ public VersionVariables ExecuteGitVersion(Arguments arguments)
                 arguments.CommitId, arguments.OverrideConfig, arguments.NoCache, arguments.NoNormalize);
         }
 
-        public bool TryGetVersion(string directory, out VersionVariables versionVariables, bool noFetch, Authentication authentication)
+        public bool TryGetVersion(string directory, out VersionVariables versionVariables, bool noFetch)
         {
             try
             {
-                versionVariables = ExecuteGitVersion(null, null, authentication, null, noFetch, directory, null);
+                versionVariables = ExecuteGitVersion(null, null, null, null, noFetch, directory, null);
                 return true;
             }
             catch (Exception ex)

src/GitVersionCore/GitPreparer.cs

@@ -10,9 +10,9 @@ namespace GitVersion
     public class GitPreparer
     {
         private readonly ILog log;
-        private string dynamicRepositoryLocation;
-        private AuthenticationInfo authentication;
-        private bool noFetch;
+        private readonly string dynamicRepositoryLocation;
+        private readonly AuthenticationInfo authentication;
+        private readonly bool noFetch;
 
         private const string defaultRemoteName = "origin";
 

src/GitVersionCore/GitVersionCore.csproj

@@ -20,6 +20,7 @@
         <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="Microsoft.Extensions.Options" Version="3.0.0" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     </ItemGroup>
 

src/GitVersionCore/IExecuteCore.cs

@@ -5,6 +5,6 @@ namespace GitVersion
     public interface IExecuteCore
     {
         VersionVariables ExecuteGitVersion(Arguments arguments);
-        bool TryGetVersion(string directory, out VersionVariables versionVariables, bool noFetch, Authentication authentication);
+        bool TryGetVersion(string directory, out VersionVariables versionVariables, bool noFetch);
     }
-}
+}

src/GitVersionExe/Module.cs

@@ -1,9 +1,5 @@
-using System;
 using GitVersion.Common;
-using GitVersion.Configuration;
-using GitVersion.Logging;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion
 {
@@ -17,21 +13,6 @@ public void RegisterTypes(IServiceCollection services)
             services.AddSingleton<IGitVersionRunner, GitVersionRunner>();
 
             services.AddTransient<IExecCommand, ExecCommand>();
-
-            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/GitVersionTask/GitVersionTasks.cs

@@ -120,7 +120,7 @@ private static bool ExecuteGitVersionTask<T>(T task, Action<T> action)
 
         private static bool GetVersionVariables(GitVersionTaskBase task, out VersionVariables versionVariables)
             => new ExecuteCore(fileSystem, log, GetConfigFileLocator(task.ConfigFilePath), buildServerResolver)
-                .TryGetVersion(task.SolutionDirectory, out versionVariables, task.NoFetch, new Authentication());
+                .TryGetVersion(task.SolutionDirectory, out versionVariables, task.NoFetch);
 
         private static IConfigFileLocator GetConfigFileLocator(string filePath = null) =>
             !string.IsNullOrEmpty(filePath)