Configure Serilog logging infrastructure and update DI setup

Co-authored-by: arturcic <[email protected]>

Author: Copilot

global.json

@@ -5,7 +5,6 @@
     "src"
   ],
   "sdk": {
-    "version": "9.0.306",
-    "rollForward": "latestFeature"
+    "version": "10.0.100"
   }
 }

src/GitVersion.App/CliHost.cs

@@ -1,35 +1,64 @@
+using System.IO.Abstractions;
+using GitVersion;
 using GitVersion.Agents;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
+using GitVersion.Logging;
 using GitVersion.Output;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Serilog;
 
 namespace GitVersion;
 
 internal static class CliHost
 {
     internal static HostApplicationBuilder CreateCliHostBuilder(string[] args)
     {
+        // Parse arguments early to configure logging
+        var tempServices = new ServiceCollection();
+        tempServices.AddSingleton<IArgumentParser, ArgumentParser>();
+        var tempProvider = tempServices.BuildServiceProvider();
+        var argumentParser = tempProvider.GetRequiredService<IArgumentParser>();
+        var arguments = argumentParser.ParseArguments(args);
+        var gitVersionOptions = arguments.ToOptions();
+
         var builder = Host.CreateApplicationBuilder(args);
 
+        // Configure Serilog based on parsed arguments
+        ConfigureSerilog(builder, gitVersionOptions);
+
         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(sp => Options.Create(gitVersionOptions));
 
         builder.Services.AddSingleton<GitVersionApp>();
 
         return builder;
     }
+
+    private static void ConfigureSerilog(HostApplicationBuilder builder, GitVersionOptions options)
+    {
+        var loggerConfiguration = LoggingModule.CreateLoggerConfiguration(
+            options.Verbosity,
+            options.Output.Contains(OutputType.BuildServer) || options.LogFilePath == "console",
+            options.LogFilePath != null && options.LogFilePath != "console" ? options.LogFilePath : null,
+            new FileSystem()
+        );
+
+        Serilog.Log.Logger = loggerConfiguration.CreateLogger();
+
+        builder.Services.AddLogging(loggingBuilder =>
+        {
+            loggingBuilder.ClearProviders();
+            loggingBuilder.AddSerilog(Serilog.Log.Logger, dispose: true);
+        });
+    }
 }

src/GitVersion.Core/GitVersionCommonModule.cs

@@ -9,7 +9,6 @@ public class GitVersionCommonModule : IGitVersionModule
 {
     public void RegisterTypes(IServiceCollection services)
     {
-        services.AddSingleton<ILog, Log>();
         services.AddSingleton<IFileSystem, FileSystem>();
         services.AddSingleton<IEnvironment, Environment>();
         services.AddSingleton<IConsole, ConsoleAdapter>();

src/GitVersion.Core/Logging/LoggingModule.cs

@@ -9,10 +9,9 @@
 
 namespace GitVersion.Logging;
 
-public class LoggingModule
+public static class LoggingModule
 {
-    public static IServiceCollection AddLogging(
-        IServiceCollection services,
+    public static LoggerConfiguration CreateLoggerConfiguration(
         Verbosity verbosity = Verbosity.Normal,
         bool addConsole = false,
         string? logFilePath = null,
@@ -32,12 +31,24 @@ public static IServiceCollection AddLogging(
             loggerConfiguration = AddFileLogger(loggerConfiguration, fileSystem, logFilePath, verbosity);
         }
 
-        Log.Logger = loggerConfiguration.CreateLogger();
+        return loggerConfiguration;
+    }
+
+    public static IServiceCollection AddLogging(
+        IServiceCollection services,
+        Verbosity verbosity = Verbosity.Normal,
+        bool addConsole = false,
+        string? logFilePath = null,
+        IFileSystem? fileSystem = null)
+    {
+        var loggerConfiguration = CreateLoggerConfiguration(verbosity, addConsole, logFilePath, fileSystem);
+
+        Serilog.Log.Logger = loggerConfiguration.CreateLogger();
 
         services.AddLogging(builder =>
         {
             builder.ClearProviders();
-            builder.AddSerilog(Log.Logger, dispose: true);
+            builder.AddSerilog(Serilog.Log.Logger, dispose: true);
             builder.SetMinimumLevel(MapVerbosityToMicrosoftLogLevel(verbosity));
         });
 

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -1 +1,7 @@
 #nullable enable
+GitVersion.Logging.LoggerExtensions
+static GitVersion.Logging.LoggerExtensions.IndentLog(this Microsoft.Extensions.Logging.ILogger! logger, string! operationDescription) -> System.IDisposable!
+static GitVersion.Logging.LoggerExtensions.Separator(this Microsoft.Extensions.Logging.ILogger! logger) -> void
+GitVersion.Logging.LoggingModule
+static GitVersion.Logging.LoggingModule.AddLogging(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, GitVersion.Logging.Verbosity verbosity = GitVersion.Logging.Verbosity.Normal, bool addConsole = false, string? logFilePath = null, System.IO.Abstractions.IFileSystem? fileSystem = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static GitVersion.Logging.LoggingModule.CreateLoggerConfiguration(GitVersion.Logging.Verbosity verbosity = GitVersion.Logging.Verbosity.Normal, bool addConsole = false, string? logFilePath = null, System.IO.Abstractions.IFileSystem? fileSystem = null) -> Serilog.LoggerConfiguration!