refactors program initialization

Replaces old `Program` class with a new `CliHost` implementation for building the application. Removes unnecessary code and simplifies service configuration and application setup.

Author: arturcic

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -55,14 +55,18 @@ public Task<ExecutionResults> Run(string arg)
 
     public async Task<ExecutionResults> Run(params string[] args)
     {
-        // Create the application and override registrations.
-        var program = new Program(builder => Overrides.ForEach(action => action(builder)));
-
         if (!this.workingDirectory.IsNullOrWhiteSpace())
         {
             args = ["-targetpath", this.workingDirectory, .. args];
         }
-        await program.RunAsync(args);
+
+        var builder = CliHost.CreateCliHostBuilder(args);
+
+        Overrides.ForEach(action => action(builder.Services));
+
+        var host = builder.Build();
+        var app = host.Services.GetRequiredService<GitVersionApp>();
+        await app.RunAsync(CancellationToken.None);
 
         return new(SysEnv.ExitCode, this.output.Value, this.logger.Value);
     }

src/GitVersion.App/CliHost.cs

@@ -0,0 +1,35 @@
+using GitVersion.Agents;
+using GitVersion.Configuration;
+using GitVersion.Extensions;
+using GitVersion.Output;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+
+namespace GitVersion;
+
+internal static class CliHost
+{
+    internal static HostApplicationBuilder CreateCliHostBuilder(string[] args)
+    {
+        var builder = Host.CreateApplicationBuilder(args);
+
+        builder.Services.AddModule(new GitVersionCoreModule());
+        builder.Services.AddModule(new GitVersionLibGit2SharpModule());
+        builder.Services.AddModule(new GitVersionBuildAgentsModule());
+        builder.Services.AddModule(new GitVersionConfigurationModule());
+        builder.Services.AddModule(new GitVersionOutputModule());
+        builder.Services.AddModule(new GitVersionAppModule());
+
+        builder.Services.AddSingleton(sp =>
+        {
+            var arguments = sp.GetRequiredService<IArgumentParser>().ParseArguments(args);
+            var gitVersionOptions = arguments.ToOptions();
+            return Options.Create(gitVersionOptions);
+        });
+
+        builder.Services.AddSingleton<GitVersionApp>();
+
+        return builder;
+    }
+}

src/GitVersion.App/GitVersionApp.cs

@@ -5,15 +5,18 @@
 
 namespace GitVersion;
 
-internal class GitVersionApp(ILog log, IHostApplicationLifetime applicationLifetime, IGitVersionExecutor gitVersionExecutor, IOptions<GitVersionOptions> options)
-    : IHostedService
+internal class GitVersionApp(
+    ILog log,
+    IHostApplicationLifetime applicationLifetime,
+    IGitVersionExecutor gitVersionExecutor,
+    IOptions<GitVersionOptions> options)
 {
     private readonly ILog log = log.NotNull();
     private readonly IHostApplicationLifetime applicationLifetime = applicationLifetime.NotNull();
     private readonly IGitVersionExecutor gitVersionExecutor = gitVersionExecutor.NotNull();
     private readonly IOptions<GitVersionOptions> options = options.NotNull();
 
-    public Task StartAsync(CancellationToken cancellationToken)
+    public Task RunAsync(CancellationToken _)
     {
         try
         {
@@ -30,6 +33,4 @@ public Task StartAsync(CancellationToken cancellationToken)
         this.applicationLifetime.StopApplication();
         return Task.CompletedTask;
     }
-
-    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 }

src/GitVersion.App/Program.cs

@@ -1,45 +1,16 @@
-using GitVersion.Agents;
-using GitVersion.Configuration;
-using GitVersion.Extensions;
-using GitVersion.Output;
-using Microsoft.Extensions.Configuration;
+using GitVersion;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 
-namespace GitVersion;
+var builder = CliHost.CreateCliHostBuilder(args);
 
-internal class Program
-{
-    private readonly Action<IServiceCollection>? overrides;
-
-    internal Program(Action<IServiceCollection>? overrides = null) => this.overrides = overrides;
-
-    private static async Task Main(string[] args) => await new Program().RunAsync(args);
+var host = builder.Build();
+var app = host.Services.GetRequiredService<GitVersionApp>();
 
-    internal Task RunAsync(string[] args) => CreateHostBuilder(args).Build().RunAsync();
-
-    private IHostBuilder CreateHostBuilder(string[] args) =>
-        new HostBuilder()
-            .ConfigureAppConfiguration((_, configApp) => configApp.AddCommandLine(args))
-            .ConfigureServices((_, services) =>
-            {
-                services.AddModule(new GitVersionCoreModule());
-                services.AddModule(new GitVersionLibGit2SharpModule());
-                services.AddModule(new GitVersionBuildAgentsModule());
-                services.AddModule(new GitVersionConfigurationModule());
-                services.AddModule(new GitVersionOutputModule());
-                services.AddModule(new GitVersionAppModule());
-
-                services.AddSingleton(sp =>
-                {
-                    var arguments = sp.GetRequiredService<IArgumentParser>().ParseArguments(args);
-                    var gitVersionOptions = arguments.ToOptions();
-                    return Options.Create(gitVersionOptions);
-                });
+var cts = new CancellationTokenSource();
+Console.CancelKeyPress += (_, _) =>
+{
+    cts.Cancel();
+    cts.Dispose();
+};
 
-                this.overrides?.Invoke(services);
-                services.AddHostedService<GitVersionApp>();
-            })
-            .UseConsoleLifetime();
-}
+await app.RunAsync(cts.Token).ConfigureAwait(false);