ConfigFileLocator cleanup

Author: arturcic

src/GitVersionCore/Configuration/ConfigFileLocator.cs

@@ -15,11 +15,6 @@ protected ConfigFileLocator(IFileSystem fileSystem, ILog log)
             Log = log;
         }
 
-        public static IConfigFileLocator GetLocator(IFileSystem fileSystem, ILog log, string filePath = null) =>
-            !string.IsNullOrEmpty(filePath)
-                ? (IConfigFileLocator) new NamedConfigFileLocator(filePath, fileSystem, log)
-                : new DefaultConfigFileLocator(fileSystem, log);
-
         public abstract bool HasConfigFileAt(string workingDirectory);
 
         public abstract string GetConfigFilePath(string workingDirectory);

src/GitVersionTask/GitVersionTasks.cs

@@ -21,6 +21,7 @@ public static class GitVersionTasks
         private static readonly ILog log;
         private static readonly IEnvironment environment;
         private static readonly IFileSystem fileSystem;
+        private static readonly IConfigFileLocator configFileLocator;
 
         static GitVersionTasks()
         {
@@ -122,7 +123,12 @@ private static bool ExecuteGitVersionTask<T>(T task, Action<T> action)
         }
 
         private static bool GetVersionVariables(GitVersionTaskBase task, out VersionVariables versionVariables)
-            => new ExecuteCore(fileSystem, environment, log, ConfigFileLocator.GetLocator(fileSystem, log, task.ConfigFilePath))
+            => new ExecuteCore(fileSystem, environment, log, GetLocator(task.ConfigFilePath))
                 .TryGetVersion(task.SolutionDirectory, out versionVariables, task.NoFetch, new Authentication());
+
+        private static IConfigFileLocator GetLocator(string filePath = null) =>
+            !string.IsNullOrEmpty(filePath)
+                ? (IConfigFileLocator) new NamedConfigFileLocator(filePath, fileSystem, log)
+                : new DefaultConfigFileLocator(fileSystem, log);
     }
 }