feat: implement dependency injection using Microsoft.Extensions.DependencyInjection

src/Directory.Packages.props

@@ -4,6 +4,7 @@
     <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
     <PackageVersion Include="LaunchDarkly.EventSource" Version="5.2.1" />
     <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
     <PackageVersion Include="MSTest" Version="3.11.0" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
@@ -46,4 +47,4 @@
     <PackageVersion Include="Spectre.Console.Testing" Version="0.51.1" />
     <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.0.16" />
   </ItemGroup>
-</Project>
+</Project>

src/Stryker.Abstractions/packages.lock.json

@@ -130,15 +130,6 @@
           "System.Configuration.ConfigurationManager": "8.0.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -298,6 +289,16 @@
           "Microsoft.CodeAnalysis.Common": "[4.0.0]"
         }
       },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "CentralTransitive",
+        "requested": "[9.0.9, )",
+        "resolved": "6.0.0",
+        "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+        }
+      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[9.0.9, )",

src/Stryker.CLI/Stryker.CLI.UnitTest/FileConfigReaderTests.cs

@@ -1,10 +1,15 @@
 using System.IO;
+using System.IO.Abstractions;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Shouldly;
+using Spectre.Console;
 using Stryker.Abstractions;
 using Stryker.Abstractions.Options;
+using Stryker.CLI.Clients;
+using Stryker.CLI.Logging;
+using Stryker.Configuration;
 using Stryker.Core;
 using Stryker.Core.Initialisation;
 
@@ -29,8 +34,8 @@ public void WithNoArgumentsAndNoConfigFile_ShouldStartStrykerWithConfigOptions()
         var currentDirectory = Directory.GetCurrentDirectory();
         Directory.SetCurrentDirectory($"..{Path.DirectorySeparatorChar}");
         var runResults = new StrykerRunResult(options, 0.3);
-        mock.Setup(x => x.RunMutationTest(It.IsAny<StrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>())).Returns(runResults).Verifiable();
-        var target = new StrykerCli(mock.Object);
+        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>())).Returns(runResults).Verifiable();
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
 
         target.Run(new string[] { });
 
@@ -57,12 +62,12 @@ public void WithJsonConfigFile_ShouldStartStrykerWithConfigFileOptions(string ar
         var runResults = new StrykerRunResult(options, 0.3);
 
         var mock = new Mock<IStrykerRunner>(MockBehavior.Strict);
-        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
-            .Callback<IStrykerInputs, ILoggerFactory, IProjectOrchestrator>((c, l, p) => actualInputs = c)
+        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
+            .Callback<IStrykerInputs>(c => actualInputs = c)
             .Returns(runResults)
             .Verifiable();
 
-        var target = new StrykerCli(mock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
 
         target.Run(new string[] { argName, "filled-stryker-config.json" });
 
@@ -104,12 +109,12 @@ public void WithYamlConfigFile_ShouldStartStrykerWithConfigFileOptions()
         var runResults = new StrykerRunResult(options, 0.3);
 
         var mock = new Mock<IStrykerRunner>(MockBehavior.Strict);
-        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
-            .Callback<IStrykerInputs, ILoggerFactory, IProjectOrchestrator>((c, l, p) => actualInputs = c)
+        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
+            .Callback<IStrykerInputs>(c => actualInputs = c)
             .Returns(runResults)
             .Verifiable();
 
-        var target = new StrykerCli(mock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
 
         target.Run(new string[] { "-f", "filled-stryker-config.yaml" });
 

src/Stryker.CLI/Stryker.CLI.UnitTest/StrykerCLIInitCommandTests.cs

@@ -26,7 +26,7 @@ public class StrykerCLIInitCommandTests
 
     public StrykerCLIInitCommandTests()
     {
-        _target = new StrykerCli(_strykerRunnerMock.Object, null, _loggingInitializerMock.Object, _nugetClientMock.Object, _consoleMock, _fileSystemMock);
+        _target = new StrykerCli(_strykerRunnerMock.Object, new ConfigBuilder(), _loggingInitializerMock.Object, _nugetClientMock.Object, _consoleMock, _fileSystemMock);
     }
 
     [TestMethod]

src/Stryker.CLI/Stryker.CLI.UnitTest/StrykerCLITests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO.Abstractions;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,6 +9,7 @@
 using NuGet.Versioning;
 using Serilog.Events;
 using Shouldly;
+using Spectre.Console;
 using Spectre.Console.Testing;
 using Stryker.Abstractions;
 using Stryker.Abstractions.Options;
@@ -35,20 +37,23 @@ public StrykerCLITests()
     {
         _options = new StrykerOptions() { Thresholds = new Thresholds { Break = 0 } };
         _runResults = new StrykerRunResult(_options, 0.3);
-        _strykerRunnerMock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
-            .Callback<IStrykerInputs, ILoggerFactory, IProjectOrchestrator>((c, l, p) => _inputs = c)
+        _strykerRunnerMock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
+            .Callback<IStrykerInputs>(c => _inputs = c)
             .Returns(_runResults)
             .Verifiable();
         _nugetClientMock.Setup(x => x.GetLatestVersionAsync()).Returns(Task.FromResult(new SemanticVersion(10, 0, 0)));
-        _target = new StrykerCli(_strykerRunnerMock.Object, null, _loggingInitializerMock.Object, _nugetClientMock.Object);
+        var configBuilder = new ConfigBuilder();
+        var consoleMock = new Mock<IAnsiConsole>();
+        var fileSystemMock = new Mock<IFileSystem>();
+        _target = new StrykerCli(_strykerRunnerMock.Object, configBuilder, _loggingInitializerMock.Object, _nugetClientMock.Object, consoleMock.Object, fileSystemMock.Object);
     }
 
     [TestMethod]
     public void ShouldDisplayInfoOnHelp()
     {
         var mock = new Mock<IStrykerRunner>(MockBehavior.Strict);
         var console = new TestConsole().EmitAnsiSequences().Width(160);
-        var target = new StrykerCli(mock.Object, console:console);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), console, Mock.Of<IFileSystem>());
 
         target.Run(new string[] { "--help" });
 
@@ -68,12 +73,12 @@ public void ShouldDisplayLogo()
         var strykerRunnerMock = new Mock<IStrykerRunner>(MockBehavior.Strict);
         var strykerRunResult = new StrykerRunResult(_options, 0.3);
 
-        strykerRunnerMock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
+        strykerRunnerMock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
             .Returns(strykerRunResult)
             .Verifiable();
 
         var console = new TestConsole().EmitAnsiSequences().Width(160);
-        var target = new StrykerCli(strykerRunnerMock.Object, null, _loggingInitializerMock.Object, _nugetClientMock.Object, console);
+        var target = new StrykerCli(strykerRunnerMock.Object, new ConfigBuilder(), _loggingInitializerMock.Object, _nugetClientMock.Object, console, Mock.Of<IFileSystem>());
 
         target.Run(Array.Empty<string>());
 
@@ -121,12 +126,11 @@ public void OnMutationScoreBelowThresholdBreak_ShouldReturn_ExitCodeBreakThresho
         };
         var strykerRunResult = new StrykerRunResult(options, 0.3);
 
-            mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
-                .Callback<IStrykerInputs, ILoggerFactory, IProjectOrchestrator>((c, l, p) => Utilities.Logging.ApplicationLogging.LoggerFactory = l)
+            mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
                 .Returns(strykerRunResult)
                 .Verifiable();
 
-        var target = new StrykerCli(mock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
         var result = target.Run(new string[] { });
 
         mock.Verify();
@@ -146,11 +150,11 @@ public void OnMutationScoreEqualToNullAndThresholdBreakEqualTo0_ShouldReturnExit
             }
         };
         var strykerRunResult = new StrykerRunResult(options, double.NaN);
-        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
+        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
             .Returns(strykerRunResult)
             .Verifiable();
 
-        var target = new StrykerCli(mock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
         var result = target.Run(new string[] { });
 
         mock.Verify();
@@ -170,11 +174,11 @@ public void OnMutationScoreEqualToNullAndThresholdBreakAbove0_ShouldReturnExitCo
             }
         };
         var strykerRunResult = new StrykerRunResult(options, double.NaN);
-        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
+        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
             .Returns(strykerRunResult)
             .Verifiable();
 
-        var target = new StrykerCli(mock.Object, null, _loggingInitializerMock.Object, _nugetClientMock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), _loggingInitializerMock.Object, _nugetClientMock.Object, Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
         var result = target.Run(new string[] { });
 
         mock.Verify();
@@ -195,9 +199,9 @@ public void OnMutationScoreAboveThresholdBreak_ShouldReturnExitCode0()
         };
         var strykerRunResult = new StrykerRunResult(options, 0.1);
 
-        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>())).Returns(strykerRunResult).Verifiable();
+        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>())).Returns(strykerRunResult).Verifiable();
 
-        var target = new StrykerCli(mock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
         var result = target.Run(new string[] { });
 
         mock.Verify();
@@ -212,7 +216,7 @@ public void OnMutationScoreAboveThresholdBreak_ShouldReturnExitCode0()
     public void ShouldNotStartStryker_WithHelpArgument(string argName)
     {
         var mock = new Mock<IStrykerRunner>(MockBehavior.Strict);
-        var target = new StrykerCli(mock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), Mock.Of<ILoggingInitializer>(), Mock.Of<IStrykerNugetFeedClient>(), Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
 
         target.Run(new string[] { argName });
 
@@ -223,11 +227,11 @@ public void ShouldNotStartStryker_WithHelpArgument(string argName)
     public void ShouldThrow_OnException()
     {
         var mock = new Mock<IStrykerRunner>(MockBehavior.Strict);
-        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>(), It.IsAny<ILoggerFactory>(), It.IsAny<IProjectOrchestrator>()))
+        mock.Setup(x => x.RunMutationTest(It.IsAny<IStrykerInputs>()))
             .Throws(new Exception("Initial testrun failed"))
             .Verifiable();
 
-        var target = new StrykerCli(mock.Object, null, _loggingInitializerMock.Object, _nugetClientMock.Object);
+        var target = new StrykerCli(mock.Object, new ConfigBuilder(), _loggingInitializerMock.Object, _nugetClientMock.Object, Mock.Of<IAnsiConsole>(), Mock.Of<IFileSystem>());
         Should.Throw<Exception>(() => target.Run(new string[] { }));
     }
 

src/Stryker.CLI/Stryker.CLI.UnitTest/packages.lock.json

@@ -212,14 +212,6 @@
           "Microsoft.Extensions.Configuration.Abstractions": "6.0.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "Transitive",
-        "resolved": "9.0.9",
-        "contentHash": "zQV2WOSP+3z1EuK91ULxfGgo2Y75bTRnmJHp08+w/YXAyekZutX/qCd88/HOMNh35MDW9mJJJxPpMPS+1Rww8A==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.9"
-        }
-      },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
         "resolved": "9.0.9",
@@ -869,6 +861,7 @@
         "type": "Project",
         "dependencies": {
           "McMaster.Extensions.CommandLineUtils": "[4.1.1, )",
+          "Microsoft.Extensions.DependencyInjection": "[9.0.9, )",
           "NuGet.Protocol": "[6.14.0, )",
           "YamlDotNet": "[16.3.0, )",
           "stryker": "[4.8.1, )"
@@ -884,6 +877,7 @@
           "LibGit2Sharp": "[0.31.0, )",
           "Microsoft.CodeAnalysis.CSharp": "[4.14.0, )",
           "Microsoft.CodeAnalysis.Common": "[4.14.0, )",
+          "Microsoft.Extensions.DependencyInjection": "[9.0.9, )",
           "Microsoft.Extensions.Logging": "[9.0.9, )",
           "Microsoft.TestPlatform": "[17.14.1, )",
           "Microsoft.TestPlatform.ObjectModel": "[17.14.1, )",
@@ -898,13 +892,13 @@
           "Serilog.Sinks.Console": "[6.0.0, )",
           "ShellProgressBar": "[5.2.0, )",
           "Spectre.Console": "[0.51.1, )",
-          "Stryker.Abstractions": "[4.8.1, )",
-          "Stryker.Configuration": "[4.8.1, )",
-          "Stryker.DataCollector": "[4.8.1, )",
+          "Stryker.Abstractions": "[1.0.0, )",
+          "Stryker.Configuration": "[1.0.0, )",
+          "Stryker.DataCollector": "[1.0.0, )",
           "Stryker.Regex.Parser": "[1.0.0, )",
-          "Stryker.RegexMutators": "[4.8.1, )",
-          "Stryker.TestRunner.VsTest": "[4.8.1, )",
-          "Stryker.Utilities": "[4.8.1, )",
+          "Stryker.RegexMutators": "[1.0.0, )",
+          "Stryker.TestRunner.VsTest": "[1.0.0, )",
+          "Stryker.Utilities": "[1.0.0, )",
           "TestableIO.System.IO.Abstractions.Wrappers": "[22.0.16, )"
         }
       },
@@ -927,8 +921,8 @@
           "Microsoft.CodeAnalysis.CSharp": "[4.14.0, )",
           "Microsoft.CodeAnalysis.Common": "[4.14.0, )",
           "Serilog": "[4.3.0, )",
-          "Stryker.Abstractions": "[4.8.1, )",
-          "Stryker.Utilities": "[4.8.1, )"
+          "Stryker.Abstractions": "[1.0.0, )",
+          "Stryker.Utilities": "[1.0.0, )"
         }
       },
       "stryker.datacollector": {
@@ -948,7 +942,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.TestPlatform.ObjectModel": "[17.14.1, )",
-          "Stryker.Abstractions": "[4.8.1, )"
+          "Stryker.Abstractions": "[1.0.0, )"
         }
       },
       "stryker.testrunner.vstest": {
@@ -959,10 +953,10 @@
           "Microsoft.TestPlatform.ObjectModel": "[17.14.1, )",
           "Microsoft.TestPlatform.Portable": "[17.14.1, )",
           "Microsoft.TestPlatform.TranslationLayer": "[17.14.1, )",
-          "Stryker.Abstractions": "[4.8.1, )",
-          "Stryker.DataCollector": "[4.8.1, )",
-          "Stryker.TestRunner": "[4.8.1, )",
-          "Stryker.Utilities": "[4.8.1, )",
+          "Stryker.Abstractions": "[1.0.0, )",
+          "Stryker.DataCollector": "[1.0.0, )",
+          "Stryker.TestRunner": "[1.0.0, )",
+          "Stryker.Utilities": "[1.0.0, )",
           "TestableIO.System.IO.Abstractions.Wrappers": "[22.0.16, )"
         }
       },
@@ -975,7 +969,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[9.0.9, )",
           "Mono.Cecil": "[0.11.6, )",
           "ResXResourceReader.NetStandard": "[1.3.0, )",
-          "Stryker.Abstractions": "[4.8.1, )"
+          "Stryker.Abstractions": "[1.0.0, )"
         }
       },
       "Azure.Storage.Files.Shares": {
@@ -1066,6 +1060,15 @@
           "Microsoft.CodeAnalysis.Common": "[4.0.0]"
         }
       },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "CentralTransitive",
+        "requested": "[9.0.9, )",
+        "resolved": "9.0.9",
+        "contentHash": "zQV2WOSP+3z1EuK91ULxfGgo2Y75bTRnmJHp08+w/YXAyekZutX/qCd88/HOMNh35MDW9mJJJxPpMPS+1Rww8A==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.9"
+        }
+      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[9.0.9, )",

src/Stryker.CLI/Stryker.CLI/Infrastructure/ServiceCollectionExtensions.cs

@@ -0,0 +1,24 @@
+using System.IO.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console;
+using Stryker.CLI.Clients;
+using Stryker.CLI.Logging;
+using Stryker.Configuration;
+
+namespace Stryker.CLI;
+
+public static class ServiceCollectionExtensions
+{
+    public static IServiceCollection AddStrykerCli(this IServiceCollection services)
+    {
+        // CLI services
+        services.AddTransient<StrykerCli>();
+        services.AddSingleton<IConfigBuilder, ConfigBuilder>();
+        services.AddSingleton<ILoggingInitializer, LoggingInitializer>();
+        services.AddSingleton<IStrykerNugetFeedClient, StrykerNugetFeedClient>();
+        services.AddSingleton<IAnsiConsole>(AnsiConsole.Console);
+        services.AddSingleton<IFileSystem, FileSystem>();
+
+        return services;
+    }
+}

src/Stryker.CLI/Stryker.CLI/Logging/ApplicationLogging.cs

@@ -22,6 +22,10 @@ public static void ConfigureLogger(LogEventLevel logLevel, bool logToFile, bool
             LoggerFactory.AddFile(Path.Combine(outputPath, "logs", "log-{Date}.txt"), traceToFile ? MSLogLevel.Trace : MSLogLevel.Debug);
         }
 
+        // Set the Utilities ApplicationLogging factory to the same instance
+        // This ensures that code in Stryker.Options and other projects can access the configured logger
+        Stryker.Utilities.Logging.ApplicationLogging.LoggerFactory = LoggerFactory;
+
         // When stryker log level is debug or trace, set LibGit2Sharp loglevel
         if (logLevel >= LogEventLevel.Information) return; // LibGit2Sharp does not handle LogEventLevel.None properly.