Refactors container registration to use IServiceCollection

arturcic · arturcic · commit 66f823f4ee57 · 2025-07-09T18:36:21.000+02:00
Migrates from a custom `IContainerRegistrar` and `IContainer` to the standard `IServiceCollection` and `ServiceProvider` from Microsoft.Extensions.DependencyInjection.
This simplifies dependency injection and improves compatibility with the .NET ecosystem.
diff --git a/new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs b/new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs
@@ -4,6 +4,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.Cli.Generator.Tests;
 
@@ -97,12 +98,13 @@ Task<int> Run(ParseResult parseResult, CancellationToken cancellationToken)
 using {{Content.DependencyInjectionNamespaceName}};
 using {{Content.CommandNamespaceName}};
 using {{Content.InfraNamespaceName}};
+using Microsoft.Extensions.DependencyInjection;
 
 namespace {{Content.GeneratedNamespaceName}};
 
 public class CommandsModule : IGitVersionModule
 {
-    public void RegisterTypes(IContainerRegistrar services)
+    public void RegisterTypes(IServiceCollection services)
     {
         services.AddSingleton<RootCommandImpl>();
         services.AddSingleton<TestCommand>();
@@ -168,6 +170,7 @@ public async Task ValidateGeneratedCommandImplementation()
                 AdditionalReferences =
                 {
                     MetadataReference.CreateFromFile(typeof(ILogger).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(IServiceCollection).Assembly.Location),
                     MetadataReference.CreateFromFile(typeof(RootCommand).Assembly.Location),
                     MetadataReference.CreateFromFile(typeof(CommandAttribute).Assembly.Location),
                 }
diff --git a/new-cli/GitVersion.Cli.Generator/Content.cs b/new-cli/GitVersion.Cli.Generator/Content.cs
@@ -118,12 +118,13 @@ private void AddCommand(ICommandImpl command, IDictionary<string, ICommandImpl>
 using {{DependencyInjectionNamespaceName}};
 using {{CommandNamespaceName}};
 using {{InfraNamespaceName}};
+using Microsoft.Extensions.DependencyInjection;
 
 namespace {{Namespace}};
 
 public class CommandsModule : IGitVersionModule
 {
-    public void RegisterTypes(IContainerRegistrar services)
+    public void RegisterTypes(IServiceCollection services)
     {
         {{- $commands = Model | array.sort "CommandTypeName" }}
         services.AddSingleton<RootCommandImpl>();
diff --git a/new-cli/GitVersion.Cli.Generator/SystemCommandlineGenerator.cs b/new-cli/GitVersion.Cli.Generator/SystemCommandlineGenerator.cs
@@ -35,7 +35,8 @@ internal override void GenerateSourceCode(SourceProductionContext context, Immut
         var rootCommandHandlerTemplate = Template.Parse(Content.RootCommandImplContent);
         var rootCommandHandlerSource = rootCommandHandlerTemplate.Render(new
         {
-            Namespace = Content.GeneratedNamespaceName, Content.InfraNamespaceName
+            Namespace = Content.GeneratedNamespaceName,
+            Content.InfraNamespaceName
         }, member => member.Name);
         context.AddSource("RootCommandImpl.g.cs", string.Join("\n", rootCommandHandlerSource));
     }
diff --git a/new-cli/GitVersion.Cli/Program.cs b/new-cli/GitVersion.Cli/Program.cs
@@ -3,6 +3,7 @@
 using GitVersion.Git;
 using GitVersion.Infrastructure;
 using GitVersion.SystemCommandline;
+using Microsoft.Extensions.DependencyInjection;
 
 var modules = new IGitVersionModule[]
 {
@@ -14,19 +15,19 @@
 var cts = new CancellationTokenSource();
 Console.CancelKeyPress += (_, _) => cts.Cancel();
 
-using var serviceProvider = RegisterModules(modules);
+await using var serviceProvider = RegisterModules(modules);
 var app = serviceProvider.GetRequiredService<IGitVersionAppRunner>();
 
 var result = await app.RunAsync(args, cts.Token).ConfigureAwait(false);
 if (!Console.IsInputRedirected) Console.ReadKey();
 return result;
 
-static IContainer RegisterModules(IEnumerable<IGitVersionModule> gitVersionModules)
+static ServiceProvider RegisterModules(IEnumerable<IGitVersionModule> gitVersionModules)
 {
-    var serviceProvider = new ContainerRegistrar()
+    var serviceProvider = new ServiceCollection()
         .RegisterModules(gitVersionModules)
-        .AddLogging()
-        .Build();
+        .RegisterLogging()
+        .BuildServiceProvider();
 
     return serviceProvider;
 }
diff --git a/new-cli/GitVersion.Cli/SystemCommandline/CliModule.cs b/new-cli/GitVersion.Cli/SystemCommandline/CliModule.cs
@@ -1,12 +1,13 @@
 using GitVersion.Extensions;
 using GitVersion.Generated;
 using GitVersion.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.SystemCommandline;
 
 public class CliModule : IGitVersionModule
 {
-    public void RegisterTypes(IContainerRegistrar services)
+    public void RegisterTypes(IServiceCollection services)
     {
         services.RegisterModule(new CommandsModule());
         services.AddSingleton<IGitVersionAppRunner, GitVersionAppRunner>();
diff --git a/new-cli/GitVersion.Cli/TestCommand.cs b/new-cli/GitVersion.Cli/TestCommand.cs
@@ -1,7 +1,7 @@
 namespace GitVersion;
 
 [Command("test", "Test command.")]
-public class TestCommand: ICommand<TestCommandSettings>
+public class TestCommand : ICommand<TestCommandSettings>
 {
     public Task<int> InvokeAsync(TestCommandSettings settings, CancellationToken cancellationToken = default)
     {
diff --git a/new-cli/GitVersion.Common/GitVersion.Common.csproj b/new-cli/GitVersion.Common/GitVersion.Common.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Polly" />
     <PackageReference Include="System.IO.Abstractions" />
   </ItemGroup>
diff --git a/new-cli/GitVersion.Common/Infrastructure/IContainer.cs b/new-cli/GitVersion.Common/Infrastructure/IContainer.cs
diff --git a/new-cli/GitVersion.Common/Infrastructure/IContainerRegistrar.cs b/new-cli/GitVersion.Common/Infrastructure/IContainerRegistrar.cs
diff --git a/new-cli/GitVersion.Common/Infrastructure/IGitVersionModule.cs b/new-cli/GitVersion.Common/Infrastructure/IGitVersionModule.cs
@@ -1,6 +1,8 @@
+using Microsoft.Extensions.DependencyInjection;
+
 namespace GitVersion.Infrastructure;
 
 public interface IGitVersionModule
 {
-    void RegisterTypes(IContainerRegistrar services);
+    void RegisterTypes(IServiceCollection services);
 }
diff --git a/new-cli/GitVersion.Core.Libgit2Sharp/LibGit2SharpCoreModule.cs b/new-cli/GitVersion.Core.Libgit2Sharp/LibGit2SharpCoreModule.cs
@@ -1,8 +1,9 @@
 using GitVersion.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.Git;
 
 public class LibGit2SharpCoreModule : IGitVersionModule
 {
-    public void RegisterTypes(IContainerRegistrar services) => services.AddSingleton<IGitRepository, GitRepository>();
+    public void RegisterTypes(IServiceCollection services) => services.AddSingleton<IGitRepository, GitRepository>();
 }
diff --git a/new-cli/GitVersion.Core.Tester/Program.cs b/new-cli/GitVersion.Core.Tester/Program.cs
@@ -2,28 +2,32 @@
 using GitVersion.Extensions;
 using GitVersion.Git;
 using GitVersion.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
 
-var assemblies = new IGitVersionModule[]
+var modules = new IGitVersionModule[]
 {
     new CoreModule(),
     new LibGit2SharpCoreModule(),
 };
 
-using var serviceProvider = RegisterModules(assemblies);
+var cts = new CancellationTokenSource();
+Console.CancelKeyPress += (_, _) => cts.Cancel();
+
+await using var serviceProvider = RegisterModules(modules);
 var app = serviceProvider.GetRequiredService<GitVersionApp>();
 var result = await app.RunAsync(args);
 
 if (!Console.IsInputRedirected) Console.ReadKey();
 
 return result;
 
-static IContainer RegisterModules(IEnumerable<IGitVersionModule> gitVersionModules)
+static ServiceProvider RegisterModules(IEnumerable<IGitVersionModule> gitVersionModules)
 {
-    var serviceProvider = new ContainerRegistrar()
+    var serviceProvider = new ServiceCollection()
         .RegisterModules(gitVersionModules)
         .AddSingleton<GitVersionApp>()
-        .AddLogging()
-        .Build();
+        .RegisterLogging()
+        .BuildServiceProvider();
 
     return serviceProvider;
 }
diff --git a/new-cli/GitVersion.Core/CoreModule.cs b/new-cli/GitVersion.Core/CoreModule.cs
@@ -1,11 +1,12 @@
 using System.IO.Abstractions;
 using GitVersion.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion;
 
 public class CoreModule : IGitVersionModule
 {
-    public void RegisterTypes(IContainerRegistrar services)
+    public void RegisterTypes(IServiceCollection services)
     {
         services.AddSingleton<IFileSystem, FileSystem>();
         services.AddSingleton<IEnvironment, Environment>();
diff --git a/new-cli/GitVersion.Core/Extensions/ContainerRegistrarExtensions.cs b/new-cli/GitVersion.Core/Extensions/ContainerRegistrarExtensions.cs
diff --git a/new-cli/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs b/new-cli/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
@@ -1,59 +1,42 @@
+using GitVersion.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog;
+using ILogger = GitVersion.Infrastructure.ILogger;
 
-namespace GitVersion.Infrastructure;
+namespace GitVersion.Extensions;
 
-public sealed class ContainerRegistrar : IContainerRegistrar
+public static class ServiceCollectionExtensions
 {
-    private readonly ServiceCollection services = [];
+    public static IServiceCollection RegisterModules(this IServiceCollection services, IEnumerable<IGitVersionModule> gitVersionModules)
+        => gitVersionModules.Aggregate(services, (current, gitVersionModule) => current.RegisterModule(gitVersionModule));
 
-    public IContainerRegistrar AddSingleton<TService, TImplementation>()
-        where TService : class
-        where TImplementation : class, TService
+    public static IServiceCollection RegisterModule(this IServiceCollection services, IGitVersionModule gitVersionModule)
     {
-        services.AddSingleton<TService, TImplementation>();
-        return this;
+        gitVersionModule.RegisterTypes(services);
+        return services;
     }
 
-    public IContainerRegistrar AddSingleton<TService>()
-        where TService : class
-        => AddSingleton<TService, TService>();
-
-    public IContainerRegistrar AddTransient<TService, TImplementation>()
-        where TService : class
-        where TImplementation : class, TService
-    {
-        services.AddTransient<TService, TImplementation>();
-        return this;
-    }
-
-    public IContainerRegistrar AddTransient<TService>()
-        where TService : class
-        => AddTransient<TService, TService>();
-
-    public IContainerRegistrar AddLogging()
+    public static IServiceCollection RegisterLogging(this IServiceCollection services)
     {
         services.AddLogging(builder =>
         {
             var logger = CreateLogger();
             builder.AddSerilog(logger, dispose: true);
         });
         services.AddSingleton<ILogger>(provider => new Logger(provider.GetRequiredService<ILogger<Logger>>()));
-        return this;
+        return services;
     }
 
-    public IContainer Build() => new Container(services.BuildServiceProvider());
-
     private static Serilog.Core.Logger CreateLogger()
     {
         var logger = new LoggerConfiguration()
-            // log level will be dynamically be controlled by our log interceptor upon running
+            // log level will dynamically be controlled by our log interceptor upon running
             .MinimumLevel.ControlledBy(LoggingEnricher.LogLevel)
             // the log enricher will add a new property with the log file path from the settings
             // that we can use to set the path dynamically
             .Enrich.With<LoggingEnricher>()
-            // serilog.sinks.map will defer the configuration of the sink to be on demand
+            // serilog.sinks.map will defer the configuration of the sink to be on demand,
             // allowing us to look at the properties set by the enricher to set the path appropriately
             .WriteTo.Console()
             .WriteTo.Map(LoggingEnricher.LogFilePathPropertyName, (logFilePath, wt) =>
diff --git a/new-cli/GitVersion.Core/Infrastructure/Container.cs b/new-cli/GitVersion.Core/Infrastructure/Container.cs

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,13 @@ private void AddCommand(ICommandImpl command, IDictionary<string, ICommandImpl>`
`118`	`118`	`using {{DependencyInjectionNamespaceName}};`
`119`	`119`	`using {{CommandNamespaceName}};`
`120`	`120`	`using {{InfraNamespaceName}};`
	`121`	`+using Microsoft.Extensions.DependencyInjection;`
`121`	`122`
`122`	`123`	`namespace {{Namespace}};`
`123`	`124`
`124`	`125`	`public class CommandsModule : IGitVersionModule`
`125`	`126`	`{`
`126`		`- public void RegisterTypes(IContainerRegistrar services)`
	`127`	`+ public void RegisterTypes(IServiceCollection services)`
`127`	`128`	`{`
`128`	`129`	`{{- $commands = Model \| array.sort "CommandTypeName" }}`
`129`	`130`	`services.AddSingleton<RootCommandImpl>();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ internal override void GenerateSourceCode(SourceProductionContext context, Immut`
`35`	`35`	`var rootCommandHandlerTemplate = Template.Parse(Content.RootCommandImplContent);`
`36`	`36`	`var rootCommandHandlerSource = rootCommandHandlerTemplate.Render(new`
`37`	`37`	`{`
`38`		`- Namespace = Content.GeneratedNamespaceName, Content.InfraNamespaceName`
	`38`	`+ Namespace = Content.GeneratedNamespaceName,`
	`39`	`+ Content.InfraNamespaceName`
`39`	`40`	`}, member => member.Name);`
`40`	`41`	`context.AddSource("RootCommandImpl.g.cs", string.Join("\n", rootCommandHandlerSource));`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`using GitVersion.Extensions;`
`2`	`2`	`using GitVersion.Generated;`
`3`	`3`	`using GitVersion.Infrastructure;`
	`4`	`+using Microsoft.Extensions.DependencyInjection;`
`4`	`5`
`5`	`6`	`namespace GitVersion.SystemCommandline;`
`6`	`7`
`7`	`8`	`public class CliModule : IGitVersionModule`
`8`	`9`	`{`
`9`		`- public void RegisterTypes(IContainerRegistrar services)`
	`10`	`+ public void RegisterTypes(IServiceCollection services)`
`10`	`11`	`{`
`11`	`12`	`services.RegisterModule(new CommandsModule());`
`12`	`13`	`services.AddSingleton<IGitVersionAppRunner, GitVersionAppRunner>();`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`namespace GitVersion;`
`2`	`2`
`3`	`3`	`[Command("test", "Test command.")]`
`4`		`-public class TestCommand: ICommand<TestCommandSettings>`
	`4`	`+public class TestCommand : ICommand<TestCommandSettings>`
`5`	`5`	`{`
`6`	`6`	`public Task<int> InvokeAsync(TestCommandSettings settings, CancellationToken cancellationToken = default)`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
	`1`	`+using Microsoft.Extensions.DependencyInjection;`
	`2`	`+`
`1`	`3`	`namespace GitVersion.Infrastructure;`
`2`	`4`
`3`	`5`	`public interface IGitVersionModule`
`4`	`6`	`{`
`5`		`- void RegisterTypes(IContainerRegistrar services);`
	`7`	`+ void RegisterTypes(IServiceCollection services);`
`6`	`8`	`}`