[3.0] Switch back to MSDI

Directory.Packages.props

@@ -17,12 +17,13 @@
     <!-- Silk.NET.Core -->
     <PackageVersion Include="Fody" Version="6.9.3" PrivateAssets="all" />
     <PackageVersion Include="InlineIL.Fody" Version="1.10.2" PrivateAssets="all" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" />
+    <PackageVersion
+      Include="Microsoft.CodeAnalysis.PublicApiAnalyzers"
+      Version="5.0.0-1.25277.114"
+    />
     <!-- Analyzers -->
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
     <!-- SilkTouch -->
-    <PackageVersion Include="Autofac" Version="9.3.4" />
-    <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="11.0.2" />
     <PackageVersion Include="ClangSharp.PInvokeGenerator" Version="22.1.8" />
     <PackageVersion Include="CSharpier.Core" Version="1.3.0" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
@@ -34,11 +35,17 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
+    <PackageVersion
+      Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
+      Version="10.0.9"
+    />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
+    <PackageVersion
+      Include="Microsoft.VisualStudio.Setup.Configuration.Interop"
+      Version="3.14.2075"
+    />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.9" />
     <PackageVersion Include="System.IO.Hashing" Version="10.0.9" />

sources/SilkTouch/SilkTouch/Silk.NET.SilkTouch.csproj

@@ -6,8 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" />
     <PackageReference Include="ClangSharp.PInvokeGenerator" />
     <PackageReference Include="CSharpier.Core" />
     <PackageReference Include="Humanizer.Core" />

sources/SilkTouch/SilkTouch/SilkTouchHost.cs

@@ -4,16 +4,13 @@
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.Diagnostics.CodeAnalysis;
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
 using Microsoft.Build.Locator;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Console;
 using Silk.NET.SilkTouch.Caching;
 using Silk.NET.SilkTouch.Clang;
 using Silk.NET.SilkTouch.Mods;
-using Silk.NET.SilkTouch.Mods.Bakery;
 using Silk.NET.SilkTouch.Sources;
 
 namespace Silk.NET.SilkTouch;
@@ -102,10 +99,10 @@ public async Task RunAsync(string[] args)
                 // Register MSBuild
                 MSBuildLocator.RegisterDefaults();
 
-                // Build container
-                var builder = new ContainerBuilder();
-                Configure(builder, ctx);
-                await using ILifetimeScope container = builder.Build();
+                // Build service provider
+                var services = new ServiceCollection();
+                Configure(services, ctx);
+                await using var provider = services.BuildServiceProvider();
 
                 var jobKeysToRun = new HashSet<string>(
                     ctx.ParseResult.GetValueForOption(OnlyOption) ?? [],
@@ -127,7 +124,7 @@ public async Task RunAsync(string[] args)
                     return jobKeysToRun.Count == 0 || jobKeysToRun.Contains(job.Key);
                 });
 
-                var logger = container.Resolve<ILogger<SilkTouchHost>>();
+                var logger = provider.GetRequiredService<ILogger<SilkTouchHost>>();
                 try
                 {
                     await Parallel.ForEachAsync(
@@ -141,8 +138,11 @@ await Parallel.ForEachAsync(
                             using var job = new SilkTouchJob(
                                 jobKvp.Key,
                                 jobKvp.Value.Config,
-                                container,
-                                builder => jobKvp.Value.Configure.Invoke(builder.SilkTouch())
+                                services =>
+                                {
+                                    ConfigureForward(provider, services);
+                                    jobKvp.Value.Configure.Invoke(services.SilkTouch());
+                                }
                             );
 
                             await job.RunAsync(ct);
@@ -173,11 +173,12 @@ private static void Exit(int exitCode) =>
         Environment.Exit(exitCode);
 
     /// <summary>
-    /// Dependencies defined here will be shared by all jobs.
+    /// Dependencies defined here are only accessible to the host.
+    /// Make them available to the jobs by using <see cref="ConfigureForward"/>.
     /// </summary>
-    private void Configure(ContainerBuilder builder, InvocationContext ctx)
+    private void Configure(IServiceCollection services, InvocationContext ctx)
     {
-        var services = new ServiceCollection()
+        services
             .AddLogging(builder =>
             {
                 builder.AddSimpleConsole(opts =>
@@ -193,8 +194,6 @@ private void Configure(ContainerBuilder builder, InvocationContext ctx)
             })
             .AddOptions();
 
-        builder.Populate(services);
-
         {
             // Create config
             var config = new SilkTouchHostConfiguration()
@@ -210,53 +209,45 @@ private void Configure(ContainerBuilder builder, InvocationContext ctx)
                 );
             }
 
-            builder.RegisterInstance(config).SingleInstance();
-
-            builder
-                .RegisterType<MSBuildModContextFactory>()
-                .As<IModContextFactory>()
-                .SingleInstance();
-
-            builder.RegisterType<ResponseFileHandler>().SingleInstance();
-
-            builder
-                .RegisterType<DefaultBakeStrategy>()
-                .AsSelf()
-                .AsImplementedInterfaces()
-                .SingleInstance();
-
-            builder.RegisterType<FileSystemCacheProvider>().As<ICacheProvider>().SingleInstance();
-
-            builder.RegisterType<GitInputSource>().As<IInputSource>().SingleInstance();
+            services.AddSingleton(config);
 
-            builder.RegisterType<NuGetInputSource>().As<IInputSource>().SingleInstance();
-
-            builder.RegisterType<UriBasedInputResolver>().As<IInputResolver>().SingleInstance();
+            services.AddSingleton<IModContextFactory, MSBuildModContextFactory>();
+            services.AddSingleton<ICacheProvider, FileSystemCacheProvider>();
+            services.AddSingleton<IInputSource, GitInputSource>();
+            services.AddSingleton<IInputSource, NuGetInputSource>();
+            services.AddSingleton<IInputResolver, UriBasedInputResolver>();
 
             if (OperatingSystem.IsWindows())
             {
-                builder
-                    .RegisterType<WindowsStdIncludeResolver>()
-                    .As<IStdIncludeResolver>()
-                    .SingleInstance();
+                services.AddSingleton<IStdIncludeResolver, WindowsStdIncludeResolver>();
             }
             else if (OperatingSystem.IsMacOS())
             {
-                builder
-                    .RegisterType<MacOSStdIncludeResolver>()
-                    .As<IStdIncludeResolver>()
-                    .SingleInstance();
+                services.AddSingleton<IStdIncludeResolver, MacOSStdIncludeResolver>();
             }
             else
             {
-                builder
-                    .RegisterType<UnixStdIncludeResolver>()
-                    .As<IStdIncludeResolver>()
-                    .SingleInstance();
+                services.AddSingleton<IStdIncludeResolver, UnixStdIncludeResolver>();
             }
         }
     }
 
+    /// <summary>
+    /// Dependencies defined here will be available to jobs.
+    /// </summary>
+    private void ConfigureForward(IServiceProvider host, IServiceCollection services)
+    {
+        // Prefer to match the registration order above
+        services.AddSingleton(host.GetRequiredService<ILoggerFactory>());
+        services.AddSingleton(typeof(ILogger<>), typeof(Logger<>));
+
+        services.AddSingleton(host.GetRequiredService<SilkTouchHostConfiguration>());
+        services.AddSingleton(host.GetRequiredService<IModContextFactory>());
+        services.AddSingleton(host.GetRequiredService<ICacheProvider>());
+        services.AddSingleton(host.GetRequiredService<IInputResolver>());
+        services.AddSingleton(host.GetRequiredService<IStdIncludeResolver>());
+    }
+
     private record JobDefinition(
         SilkTouchConfiguration Config,
         Action<SilkTouchRegistrationExtensions.SilkTouchRegistrationContext> Configure

sources/SilkTouch/SilkTouch/SilkTouchJob.cs

@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
-using Autofac;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Silk.NET.SilkTouch.Clang;
 using Silk.NET.SilkTouch.Mods;
+using Silk.NET.SilkTouch.Mods.Bakery;
 using Silk.NET.SilkTouch.Mods.Transformation;
 using Silk.NET.SilkTouch.Sources;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
@@ -16,7 +18,7 @@ namespace Silk.NET.SilkTouch;
 /// </summary>
 internal class SilkTouchJob : IDisposable
 {
-    private readonly ILifetimeScope _container;
+    private readonly ServiceProvider _provider;
 
     private readonly ILogger<SilkTouchJob> _logger;
     private readonly IInputResolver _inputResolver;
@@ -43,36 +45,37 @@ internal class SilkTouchJob : IDisposable
     /// </summary>
     /// <param name="key">The job key.</param>
     /// <param name="config">The job config.</param>
-    /// <param name="parentContainer">The parent container. Should be the one from the <see cref="SilkTouchHost"/>.</param>
     /// <param name="configure">
-    /// The action that configures the dependency container used by this job.
+    /// The action that configures the services used by this job.
     /// You'll want to register SilkTouch mods during this action. See <see cref="SilkTouchRegistrationExtensions"/>.
     /// </param>
     public SilkTouchJob(
         string key,
         SilkTouchConfiguration config,
-        ILifetimeScope parentContainer,
-        Action<ContainerBuilder> configure
+        Action<IServiceCollection> configure
     )
     {
         Key = key;
         Config = config;
 
-        _logger = parentContainer.Resolve<ILogger<SilkTouchJob>>();
-        _inputResolver = parentContainer.Resolve<IInputResolver>();
-        _container = parentContainer.BeginLifetimeScope(builder =>
+        var services = new ServiceCollection();
         {
             // Register default dependencies
-            builder.RegisterType<DocumentFactory>().SingleInstance();
-            builder.RegisterType<FunctionTransformer>().SingleInstance();
+            services.AddSingleton<DocumentFactory>();
+            services.AddSingleton<FunctionTransformer>();
+            services.AddSingleton<ResponseFileHandler>();
+            services.AddSingleton<IBakeStrategy, DefaultBakeStrategy>();
 
             // Register user defined dependencies
-            configure.Invoke(builder);
-        });
+            configure.Invoke(services);
+        }
 
-        _modContextFactory = _container.Resolve<IModContextFactory>();
-        _documentFactory = _container.Resolve<DocumentFactory>();
-        Mods = _container.Resolve<IMod[]>();
+        _provider = services.BuildServiceProvider();
+        _logger = _provider.GetRequiredService<ILogger<SilkTouchJob>>();
+        _inputResolver = _provider.GetRequiredService<IInputResolver>();
+        _modContextFactory = _provider.GetRequiredService<IModContextFactory>();
+        _documentFactory = _provider.GetRequiredService<DocumentFactory>();
+        Mods = _provider.GetRequiredService<IEnumerable<IMod>>().ToArray();
     }
 
     /// <summary>
@@ -175,5 +178,5 @@ await File.ReadAllTextAsync(Config.DefaultLicenseHeader, ct)
     }
 
     /// <inheritdoc />
-    public void Dispose() => _container.Dispose();
+    public void Dispose() => _provider.Dispose();
 }