Fix infinite loop

src/Microsoft.Sbom.Extensions.DependencyInjection/ServiceCollectionExtensions.cs

@@ -8,7 +8,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Sbom.Api;
 using Microsoft.Sbom.Api.Config;
-using Microsoft.Sbom.Api.Config.Extensions;
 using Microsoft.Sbom.Api.Converters;
 using Microsoft.Sbom.Api.Convertors;
 using Microsoft.Sbom.Api.Entities.Output;
@@ -46,38 +45,11 @@ namespace Microsoft.Sbom.Extensions.DependencyInjection;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddSbomConfiguration(this IServiceCollection services, InputConfiguration inputConfiguration, LogEventLevel logLevel = LogEventLevel.Information)
-    {
-        ArgumentNullException.ThrowIfNull(inputConfiguration);
-        services
-            .AddSingleton(_ =>
-            {
-                inputConfiguration.ToConfiguration();
-                return inputConfiguration;
-            })
-            .AddSbomTool();
-        return services;
-    }
-
-    public static IServiceCollection AddSbomTool(this IServiceCollection services, ILogger? logger = null)
+    public static IServiceCollection AddSbomTool(this IServiceCollection services)
     {
         services
             .AddSingleton<IConfiguration, Configuration>()
-            .AddSingleton(x =>
-            {
-                if (logger != null)
-                {
-                    return logger;
-                }
-                else
-                {
-                    var level = x.GetService<InputConfiguration>()?.Verbosity?.Value ?? LogEventLevel.Information;
-                    var defaultLogger = CreateDefaultLogger(level);
-                    Log.Logger = defaultLogger;
-                    return defaultLogger;
-                }
-            })
-            .AddTransient(x => FileSystemUtilsProvider.CreateInstance(x.GetRequiredService<ILogger>()))
+            .AddTransient(x => FileSystemUtilsProvider.CreateInstance(CreateDefaultLogger()))
             .AddTransient<IWorkflow<SbomParserBasedValidationWorkflow>, SbomParserBasedValidationWorkflow>()
             .AddTransient<IWorkflow<SbomGenerationWorkflow>, SbomGenerationWorkflow>()
             .AddTransient<IWorkflow<SbomRedactionWorkflow>, SbomRedactionWorkflow>()
@@ -210,7 +182,7 @@ public static IServiceCollection ConfigureLoggingProviders(this IServiceCollecti
         return services;
     }
 
-    private static ILogger CreateDefaultLogger(LogEventLevel logLevel = LogEventLevel.Information)
+    public static ILogger CreateDefaultLogger(LogEventLevel logLevel = LogEventLevel.Information)
     {
         return new RemapComponentDetectionErrorsToWarningsLogger(
             new LoggerConfiguration()

src/Microsoft.Sbom.Targets/GenerateSbomTask.cs

@@ -63,7 +63,8 @@ public override bool Execute()
                services
                .AddSingleton<IConfiguration, Configuration>()
                .AddSingleton(runtimeConfiguration)
-               .AddSbomTool(msbuildLogger)
+               .AddSingleton<Serilog.ILogger>(msbuildLogger)
+               .AddSbomTool()
                /* Manually adding some dependencies since `AddSbomTool()` does not add them when
                 * running the MSBuild Task from another project.
                 */

src/Microsoft.Sbom.Targets/MSBuildLogger.cs

@@ -29,7 +29,7 @@ public MSBuildLogger(TaskLoggingHelper loggingHelperToWrap)
     public void Write(LogEvent logEvent)
     {
         var logLevel = logEvent.Level;
-        if (logLevel is LogEventLevel.Warning && logEvent.Properties["SourceContext"].ToString().StartsWith("Microsoft.ComponentDetection.Detectors", StringComparison.Ordinal))
+        if (logLevel is LogEventLevel.Warning && logEvent.Properties["SourceContext"].ToString().StartsWith("Microsoft.ComponentDetection", StringComparison.Ordinal))
         {
             // Component Detection fires a lot of warnings, translate these to Information
             logLevel = LogEventLevel.Information;

src/Microsoft.Sbom.Tool/Program.cs

@@ -76,7 +76,13 @@ await Host.CreateDefaultBuilder(args)
                             inputConfiguration.ToConfiguration();
                             return inputConfiguration;
                         })
-
+                        .AddSingleton(x =>
+                        {
+                            var level = x.GetService<Common.Config.InputConfiguration>()?.Verbosity?.Value ?? Serilog.Events.LogEventLevel.Information;
+                            var defaultLogger = Extensions.DependencyInjection.ServiceCollectionExtensions.CreateDefaultLogger(level);
+                            Serilog.Log.Logger = defaultLogger;
+                            return defaultLogger;
+                        })
                         .AddSbomTool();
                 })
                 .RunConsoleAsync(x => x.SuppressStatusMessages = true);