GitTools#4125 - fix version and help run options to not depend on .gi…

…t directory
arturcic · Jul 26, 2024 · 81ef8cd · 81ef8cd
1 parent 5687fea
commit 81ef8cd
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 10 deletions.
diff --git a/src/.run/cli (help).run.xml b/src/.run/cli (help).run.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="cli (help)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net8.0/gitversion" />
+    <option name="PROGRAM_PARAMETERS" value="-help" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../work" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.App/GitVersion.App.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net8.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
diff --git a/src/.run/cli (version).run.xml b/src/.run/cli (version).run.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="cli (version)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net8.0/gitversion" />
+    <option name="PROGRAM_PARAMETERS" value="-version" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../work" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.App/GitVersion.App.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net8.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
diff --git a/src/GitVersion.App/GitVersionExecutor.cs b/src/GitVersion.App/GitVersionExecutor.cs
@@ -16,6 +16,7 @@ internal class GitVersionExecutor(
     IGitVersionOutputTool gitVersionOutputTool,
     IVersionWriter versionWriter,
     IHelpWriter helpWriter,
+    IGitRepository repository,
     IGitRepositoryInfo repositoryInfo)
     : IGitVersionExecutor
 {
@@ -29,6 +30,8 @@ internal class GitVersionExecutor(
     private readonly IGitVersionOutputTool gitVersionOutputTool = gitVersionOutputTool.NotNull();
     private readonly IVersionWriter versionWriter = versionWriter.NotNull();
     private readonly IHelpWriter helpWriter = helpWriter.NotNull();
+
+    private readonly IGitRepository repository = repository.NotNull();
     private readonly IGitRepositoryInfo repositoryInfo = repositoryInfo.NotNull();
 
     public int Execute(GitVersionOptions gitVersionOptions)
@@ -49,6 +52,7 @@ public int Execute(GitVersionOptions gitVersionOptions)
 
     private int RunGitVersionTool(GitVersionOptions gitVersionOptions)
     {
+        this.repository.DiscoverRepository(this.repositoryInfo.GitRootPath);
         var mutexName = this.repositoryInfo.DotGitDirectory?.Replace(Path.DirectorySeparatorChar.ToString(), "") ?? string.Empty;
         using var mutex = new Mutex(true, $@"Global\gitversion{mutexName}", out var acquired);
 

diff --git a/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs b/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs
@@ -1,5 +1,4 @@
 using GitVersion.Git;
-using GitVersion.Logging;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion;
@@ -8,15 +7,7 @@ public class GitVersionLibGit2SharpModule : IGitVersionModule
 {
     public void RegisterTypes(IServiceCollection services)
     {
-        services.AddSingleton<IGitRepository>(sp =>
-        {
-            var repositoryInfo = sp.GetRequiredService<IGitRepositoryInfo>();
-            var log = sp.GetRequiredService<ILog>();
-            IGitRepository gitRepository = new GitRepository(log);
-            gitRepository.DiscoverRepository(repositoryInfo.GitRootPath);
-            return gitRepository;
-        });
-
+        services.AddSingleton<IGitRepository, GitRepository>();
         services.AddSingleton<IMutatingGitRepository>(sp => (IMutatingGitRepository)sp.GetRequiredService<IGitRepository>());
         services.AddSingleton<IGitRepositoryInfo, GitRepositoryInfo>();
     }