improves command registration in IoC container

Ensures correct command registration in the IoC container by including the namespace when the command type namespace differs from the main command namespace.
Also, adjust the tests to reflect this change.

Author: arturcic

new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs

@@ -11,31 +11,6 @@ namespace GitVersion.Cli.Generator.Tests;
 
 public class SystemCommandlineGeneratorTests
 {
-    /*language=cs*/
-    private const string TestCommandSourceCode =
-$$"""
-using {{Content.InfrastructureNamespaceName}};
-using Microsoft.Extensions.Logging;
-
-namespace {{Content.CommandNamespaceName}};
-
-public record TestCommandSettings
-{
-    [Option("--output-file", "The output file")]
-    public required string OutputFile { get; init; }
-}
-
-[CommandAttribute("test", "Test description.")]
-public class TestCommand(ILogger logger): ICommand<TestCommandSettings>
-{
-    public Task<int> InvokeAsync(TestCommandSettings settings, CancellationToken cancellationToken = default)
-    {
-        return Task.FromResult(0);
-    }
-}
-
-""";
-
     /*language=cs*/
     private const string GlobalUsingsCode =
 """
@@ -147,6 +122,41 @@ private void AddCommand(ICommandImpl command, IDictionary<string, ICommandImpl>
         }
     }
 }
+""";
+
+    /*language=cs*/
+    private const string TestCommandSourceCode =
+$$"""
+using {{Content.InfrastructureNamespaceName}};
+using Microsoft.Extensions.Logging;
+
+namespace {{Content.CommandNamespaceName}};
+
+[CommandAttribute("test", "Test description.")]
+public class TestCommand(ILogger logger): ICommand<TestCommandSettings>
+{
+  public Task<int> InvokeAsync(TestCommandSettings settings, CancellationToken cancellationToken = default)
+  {
+      return Task.FromResult(0);
+  }
+}
+
+""";
+
+    /*language=cs*/
+    private const string TestCommandSettingsSourceCode =
+$$"""
+using {{Content.InfrastructureNamespaceName}};
+using Microsoft.Extensions.Logging;
+
+namespace {{Content.CommandNamespaceName}};
+
+public record TestCommandSettings
+{
+  [Option("--output-file", "The output file")]
+  public required string OutputFile { get; init; }
+}
+
 """;
 
     [Test]
@@ -160,7 +170,8 @@ public async Task ValidateGeneratedCommandImplementation()
                 Sources =
                 {
                     (generatorType, "GlobalUsings.cs", GlobalUsingsCode),
-                    (generatorType, "TestCommand.cs", TestCommandSourceCode)
+                    (generatorType, "TestCommand.cs", TestCommandSourceCode),
+                    (generatorType, "TestCommandSettings.cs", TestCommandSettingsSourceCode)
                 },
                 GeneratedSources =
                 {

new-cli/GitVersion.Cli.Generator/Content.cs

@@ -27,8 +27,6 @@ public static class Content
 using System.CommandLine.Binding;
 
 using {{Model.CommandTypeNamespace}};
-{{- if Model.SettingsTypeNamespace != Model.CommandTypeNamespace }}
-using {{Model.SettingsTypeNamespace}};{{ end }}
 
 namespace {{GeneratedNamespaceName}};
 
@@ -66,7 +64,7 @@ public class {{Model.CommandTypeName}}Impl : Command, ICommandImpl
 
         Task<int> Run(ParseResult parseResult, CancellationToken cancellationToken)
         {
-            var settings = new {{Model.SettingsTypeName}}
+            var settings = new {{ if Model.SettingsTypeNamespace != Model.CommandTypeNamespace }}{{Model.SettingsTypeNamespace}}.{{ end }}{{Model.SettingsTypeName}}
             {
                 {{~ for $prop in $settingsProperties ~}}
                 {{$prop.Name}} = parseResult.GetValue({{$prop.Name}}Option){{ if $prop.Required }}!{{ end}},
@@ -129,7 +127,7 @@ public void RegisterTypes(IServiceCollection services)
         {{- $commands = Model | array.sort "CommandTypeName" }}
         services.AddSingleton<RootCommandImpl>();
         {{~ for $command in $commands ~}}
-        services.AddSingleton<{{$command.CommandTypeName}}>();
+        services.AddSingleton<{{ if $command.CommandTypeNamespace != CommandNamespaceName }}{{$command.CommandTypeNamespace}}.{{ end }}{{$command.CommandTypeName}}>();
         services.AddSingleton<ICommandImpl, {{$command.CommandTypeName}}Impl>();
         {{~ end ~}}
     }

new-cli/GitVersion.Cli/TestCommand.cs

@@ -1,4 +1,6 @@
-namespace GitVersion;
+using GitVersion.Commands.Test.Settings;
+
+namespace GitVersion.Commands.Test;
 
 [Command("test", "Test command.")]
 public class TestCommand : ICommand<TestCommandSettings>
@@ -9,9 +11,3 @@ public Task<int> InvokeAsync(TestCommandSettings settings, CancellationToken can
         return Task.FromResult(0);
     }
 }
-
-public record TestCommandSettings : GitVersionSettings
-{
-    [Option("--input-file", "The input version file")]
-    public required string InputFile { get; init; }
-}

new-cli/GitVersion.Cli/TestCommandSettings.cs

@@ -0,0 +1,7 @@
+namespace GitVersion.Commands.Test.Settings;
+
+public record TestCommandSettings : GitVersionSettings
+{
+    [Option("--input-file", "The input version file")]
+    public required string InputFile { get; init; }
+}