Fix calculation of version when using worktrees (#2165)

Author: ermshiperete

src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs

@@ -29,7 +29,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
 
             var options = Options.Create(new GitVersionOptions
             {
-                WorkingDirectory = repository.GetRepositoryDirectory(),
+                WorkingDirectory = repository.Info.WorkingDirectory,
                 ConfigInfo = { OverrideConfig = configuration },
                 RepositoryInfo =
                 {

src/GitVersionCore/Core/GitPreparer.cs

@@ -88,7 +88,8 @@ private void CleanupDuplicateOrigin()
         {
             var remoteToKeep = DefaultRemoteName;
 
-            using var repo = new Repository(options.Value.DotGitDirectory);
+            var isDynamicRepo = !string.IsNullOrWhiteSpace(options.Value.DynamicGitRepositoryPath);
+            using var repo = new Repository(isDynamicRepo ? options.Value.DotGitDirectory : options.Value.ProjectRootDirectory);
 
             // check that we have a remote that matches defaultRemoteName if not take the first remote
             if (!repo.Network.Remotes.Any(remote => remote.Name.Equals(DefaultRemoteName, StringComparison.InvariantCultureIgnoreCase)))

src/GitVersionCore/Core/GitRepository.cs

@@ -11,13 +11,17 @@ public class GitRepository : IGitRepository
         private IRepository repositoryInstance => repositoryLazy.Value;
 
         public GitRepository(IOptions<GitVersionOptions> options)
-            : this(() => options.Value.DotGitDirectory)
+            : this(() =>
+            {
+                var isDynamicRepo = !string.IsNullOrWhiteSpace(options.Value.DynamicGitRepositoryPath);
+                return isDynamicRepo ? options.Value.DotGitDirectory : options.Value.ProjectRootDirectory;
+            })
         {
         }
 
-        public GitRepository(Func<string> getDotGitDirectory)
+        public GitRepository(Func<string> getGitRootDirectory)
         {
-            repositoryLazy = new Lazy<IRepository>(() => new Repository(getDotGitDirectory()));
+            repositoryLazy = new Lazy<IRepository>(() => new Repository(getGitRootDirectory()));
             Commands = new GitRepositoryCommands(repositoryLazy);
         }
 

src/GitVersionCore/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs

@@ -141,7 +141,8 @@ private List<string> CalculateDirectoryContents(string root)
 
         private string GetRepositorySnapshotHash()
         {
-            using var repo = new Repository(options.Value.DotGitDirectory);
+            var isDynamicRepo = !string.IsNullOrWhiteSpace(options.Value.DynamicGitRepositoryPath);
+            using var repo = new Repository(isDynamicRepo ? options.Value.DotGitDirectory : options.Value.ProjectRootDirectory);
 
             var head = repo.Head;
             if (head.Tip == null)