select config file from working directory first and only then use project root directory

Author: sergiorykov

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -12,6 +12,19 @@ public class ConfigurationProvider
     {
         internal const string DefaultTagPrefix = "[vV]";
 
+        public static Config Provide(GitPreparer gitPreparer, IFileSystem fileSystem, bool applyDefaults = true, Config overrideConfig = null)
+        {
+            var workingDirectory = gitPreparer.WorkingDirectory;
+            var projectRootDirectory = gitPreparer.GetProjectRootDirectory();
+
+            if (HasConfigFileAt(workingDirectory, fileSystem))
+            {
+                return Provide(workingDirectory, fileSystem, applyDefaults, overrideConfig);
+            }
+
+            return Provide(projectRootDirectory, fileSystem, applyDefaults, overrideConfig);
+        }
+
         public static Config Provide(string workingDirectory, IFileSystem fileSystem, bool applyDefaults = true, Config overrideConfig = null)
         {
             var readConfig = ReadConfig(workingDirectory, fileSystem);
@@ -140,9 +153,9 @@ static Config ReadConfig(string workingDirectory, IFileSystem fileSystem)
             return new Config();
         }
 
-        public static string GetEffectiveConfigAsString(string gitDirectory, IFileSystem fileSystem)
+        public static string GetEffectiveConfigAsString(string workingDirectory, IFileSystem fileSystem)
         {
-            var config = Provide(gitDirectory, fileSystem);
+            var config = Provide(workingDirectory, fileSystem);
             var stringBuilder = new StringBuilder();
             using (var stream = new StringWriter(stringBuilder))
             {
@@ -180,7 +193,7 @@ public static void Verify(GitPreparer gitPreparer, IFileSystem fileSystem)
         public static readonly string DefaultConfigFileName = "GitVersion.yml";
         public static readonly string ObsoleteConfigFileName = "GitVersionConfig.yaml";
 
-        static string GetConfigFilePath(string workingDirectory, IFileSystem fileSystem)
+        public static string GetConfigFilePath(string workingDirectory, IFileSystem fileSystem)
         {
             var ymlPath = Path.Combine(workingDirectory, DefaultConfigFileName);
             if (fileSystem.Exists(ymlPath))
@@ -197,6 +210,23 @@ static string GetConfigFilePath(string workingDirectory, IFileSystem fileSystem)
             return ymlPath;
         }
 
+        public static bool HasConfigFileAt(string workingDirectory, IFileSystem fileSystem)
+        {
+            var defaultConfigFilePath = Path.Combine(workingDirectory, DefaultConfigFileName);
+            if (fileSystem.Exists(defaultConfigFilePath))
+            {
+                return true;
+            }
+
+            var deprecatedConfigFilePath = Path.Combine(workingDirectory, ObsoleteConfigFileName);
+            if (fileSystem.Exists(deprecatedConfigFilePath))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         static bool WarnAboutObsoleteConfigFile(string workingDirectory, IFileSystem fileSystem)
         {
             var deprecatedConfigFilePath = Path.Combine(workingDirectory, ObsoleteConfigFileName);

src/GitVersionCore/ExecuteCore.cs

@@ -103,7 +103,7 @@ static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch
         VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot, IBuildServer buildServer, Config overrideConfig = null)
         {
             var versionFinder = new GitVersionFinder();
-           var configuration = ConfigurationProvider.Provide(projectRoot, fileSystem, overrideConfig: overrideConfig);
+           var configuration = ConfigurationProvider.Provide(gitPreparer, fileSystem, overrideConfig: overrideConfig);
 
             var gitVersionContext = new GitVersionContext(repo, configuration, commitId : commitId);
             var semanticVersion = versionFinder.FindVersion(gitVersionContext);