Merge pull request #763 from JakeGinnivan/FixedConfigDiscovery

Fixed issue where config is no longer discovered

Author: JakeGinnivan

GitVersionConfig.yaml

@@ -1,2 +1,2 @@
 assembly-versioning-scheme: MajorMinorPatch
-next-version: 3.1.0
+next-version: 3.4.0

src/GitVersionCore.Tests/GitPreparerTests.cs

@@ -136,12 +136,17 @@ public void PicksAnotherDirectoryNameWhenDynamicRepoFolderTaken()
     [Test]
     public void WorksCorrectlyWithLocalRepository()
     {
-        var tempDir = Path.GetTempPath();
-        var gitPreparer = new GitPreparer(null, null, null, false, tempDir);
-        var dynamicRepositoryPath = gitPreparer.GetDotGitDirectory();
-
-        dynamicRepositoryPath.ShouldBe(null);
-        gitPreparer.IsDynamicGitRepository.ShouldBe(false);
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            var targetPath = Path.Combine(fixture.RepositoryPath, "tools\\gitversion\\");
+            Directory.CreateDirectory(targetPath);
+            var gitPreparer = new GitPreparer(null, null, null, false, targetPath);
+            var dotGitDirectory = gitPreparer.GetDotGitDirectory();
+            var projectRoot = gitPreparer.GetProjectRootDirectory();
+
+            dotGitDirectory.ShouldBe(Path.Combine(fixture.RepositoryPath, ".git"));
+            projectRoot.ShouldBe(fixture.RepositoryPath);
+        }
     }
 
     [Test]

src/GitVersionCore/GitPreparer.cs

@@ -20,7 +20,7 @@ public GitPreparer(string targetUrl, string dynamicRepositoryLocation, Authentic
             this.dynamicRepositoryLocation = dynamicRepositoryLocation;
             this.authentication = authentication;
             this.noFetch = noFetch;
-            this.targetPath = targetPath;
+            this.targetPath = targetPath.TrimEnd('/', '\\');
         }
 
         public bool IsDynamicGitRepository
@@ -89,24 +89,21 @@ static bool GitRepoHasMatchingRemote(string possiblePath, string targetUrl)
         public string GetDotGitDirectory()
         {
             if (IsDynamicGitRepository)
-            {
                 return DynamicGitRepositoryPath;
-            }
 
-            return Repository.Discover(targetPath);
+            var dotGitDirectory = Repository.Discover(targetPath).TrimEnd('/', '\\');
+            if (string.IsNullOrEmpty(dotGitDirectory))
+                throw new DirectoryNotFoundException("Can't find the .git directory in " + targetPath);
+
+            return dotGitDirectory;
         }
 
         public string GetProjectRootDirectory()
         {
             if (IsDynamicGitRepository)
                 return targetPath;
 
-            var gitDir = Repository.Discover(targetPath);
-
-            if (string.IsNullOrEmpty(gitDir))
-                throw new DirectoryNotFoundException("Can't find the .git directory in " + targetPath);
-
-            return Directory.GetParent(gitDir).FullName;
+            return Directory.GetParent(GetDotGitDirectory()).FullName;
         }
 
         static string CreateDynamicRepository(string targetPath, Authentication authentication, string repositoryUrl, string targetBranch, bool noFetch)