Merge pull request #574 from dotnet/fix573

Produce absolute path per api doc when reading version file
dotnet · Mar 29, 2021 · 8411716 · 8411716
2 parents d7059f7 + 88be817
commit 8411716
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/NerdBank.GitVersioning.Tests/VersionFileTests.cs b/src/NerdBank.GitVersioning.Tests/VersionFileTests.cs
@@ -597,6 +597,15 @@ VersionOptions GetOption(string path)
         }
     }
 
+    [Fact]
+    public void GetVersion_ProducesAbsolutePath()
+    {
+        this.InitializeSourceControl();
+        this.WriteVersionFile();
+        Assert.NotNull(this.Context.VersionFile.GetVersion(out string actualDirectory));
+        Assert.True(Path.IsPathRooted(actualDirectory));
+    }
+
     private void AssertPathHasVersion(string committish, string absolutePath, VersionOptions expected)
     {
         var actual = this.GetVersionOptions(absolutePath, committish);

diff --git a/src/NerdBank.GitVersioning/LibGit2/LibGit2VersionFile.cs b/src/NerdBank.GitVersioning/LibGit2/LibGit2VersionFile.cs
@@ -59,7 +59,8 @@ internal LibGit2VersionFile(LibGit2Context context)
 
                     if (result is object)
                     {
-                        actualDirectory = searchDirectory;
+                        IBelongToARepository commitAsRepoMember = commit;
+                        actualDirectory = Path.Combine(commitAsRepoMember.Repository.Info.WorkingDirectory, searchDirectory);
                         return result;
                     }
                 }
@@ -125,7 +126,8 @@ internal LibGit2VersionFile(LibGit2Context context)
                     }
                     else if (result is object)
                     {
-                        actualDirectory = searchDirectory;
+                        IBelongToARepository commitAsRepoMember = commit;
+                        actualDirectory = Path.Combine(commitAsRepoMember.Repository.Info.WorkingDirectory, searchDirectory);
                         return result;
                     }
                 }

diff --git a/src/NerdBank.GitVersioning/Managed/ManagedVersionFile.cs b/src/NerdBank.GitVersioning/Managed/ManagedVersionFile.cs
@@ -85,7 +85,7 @@ public ManagedVersionFile(GitContext context)
                     if (result is object)
                     {
                         finalResult = result;
-                        actualDirectory = searchDirectory;
+                        actualDirectory = Path.Combine(this.Context.WorkingTreePath, searchDirectory);
                     }
                 }
 
@@ -158,7 +158,7 @@ public ManagedVersionFile(GitContext context)
 
                     if (result is object)
                     {
-                        actualDirectory = searchDirectory;
+                        actualDirectory = Path.Combine(this.Context.WorkingTreePath, searchDirectory);
                         finalResult = result;
                     }
                 }