Update style to match analyzers.

Author: tillig

bench/Autofac.Extensions.DependencyInjection.Bench/Autofac.Extensions.DependencyInjection.Bench.csproj

@@ -6,8 +6,6 @@
     <GenerateProgramFile>false</GenerateProgramFile>
     <PlatformTarget>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</PlatformTarget>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyOriginatorKeyFile>../../Autofac.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <CodeAnalysisRuleSet>../../build/Test.ruleset</CodeAnalysisRuleSet>

bench/projects/Bench.AutofacApiServer/BenchProject.AutofacApiServer.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
@@ -12,16 +11,13 @@
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-
   <ItemGroup>
     <AdditionalFiles Include="..\..\..\build\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
-
 </Project>

src/Autofac.Extensions.DependencyInjection/AutofacChildLifetimeScopeConfigurationAdapter.cs

@@ -10,6 +10,11 @@ public class AutofacChildLifetimeScopeConfigurationAdapter
 {
     private readonly List<Action<ContainerBuilder>> _configurationActions = new();
 
+    /// <summary>
+    /// Gets the list of configuration actions to be executed on the <see cref="ContainerBuilder"/> for the child <see cref="ILifetimeScope"/>.
+    /// </summary>
+    public IReadOnlyList<Action<ContainerBuilder>> ConfigurationActions => _configurationActions;
+
     /// <summary>
     /// Adds a configuration action that will be executed when the child <see cref="ILifetimeScope"/> is created.
     /// </summary>
@@ -24,9 +29,4 @@ public void Add(Action<ContainerBuilder> configurationAction)
 
         _configurationActions.Add(configurationAction);
     }
-
-    /// <summary>
-    /// Gets the list of configuration actions to be executed on the <see cref="ContainerBuilder"/> for the child <see cref="ILifetimeScope"/>.
-    /// </summary>
-    public IReadOnlyList<Action<ContainerBuilder>> ConfigurationActions => _configurationActions;
 }

src/Autofac.Extensions.DependencyInjection/AutofacChildLifetimeScopeServiceProviderFactory.cs

@@ -10,9 +10,9 @@ namespace Autofac.Extensions.DependencyInjection;
 /// </summary>
 public class AutofacChildLifetimeScopeServiceProviderFactory : IServiceProviderFactory<AutofacChildLifetimeScopeConfigurationAdapter>
 {
+    private static readonly Action<ContainerBuilder> FallbackConfigurationAction = builder => { };
     private readonly Action<ContainerBuilder> _containerConfigurationAction;
     private readonly ILifetimeScope _rootLifetimeScope;
-    private static readonly Action<ContainerBuilder> FallbackConfigurationAction = builder => { };
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AutofacChildLifetimeScopeServiceProviderFactory"/> class.

src/Autofac.Extensions.DependencyInjection/AutofacServiceProvider.cs

@@ -29,6 +29,11 @@ public AutofacServiceProvider(ILifetimeScope lifetimeScope)
         _lifetimeScope = lifetimeScope;
     }
 
+    /// <summary>
+    /// Gets the underlying instance of <see cref="ILifetimeScope" />.
+    /// </summary>
+    public ILifetimeScope LifetimeScope => _lifetimeScope;
+
     /// <summary>
     /// Gets the service object of the specified type.
     /// </summary>
@@ -158,30 +163,6 @@ public bool IsKeyedService(Type serviceType, object? serviceKey)
         return _lifetimeScope.ResolveOptional(serviceType);
     }
 
-    /// <summary>
-    /// Gets the underlying instance of <see cref="ILifetimeScope" />.
-    /// </summary>
-    public ILifetimeScope LifetimeScope => _lifetimeScope;
-
-    /// <summary>
-    /// Releases unmanaged and - optionally - managed resources.
-    /// </summary>
-    /// <param name="disposing">
-    /// <see langword="true" /> to release both managed and unmanaged resources;
-    /// <see langword="false" /> to release only unmanaged resources.
-    /// </param>
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!_disposed)
-        {
-            _disposed = true;
-            if (disposing)
-            {
-                _lifetimeScope.Dispose();
-            }
-        }
-    }
-
     /// <summary>
     /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
     /// </summary>
@@ -194,6 +175,7 @@ public void Dispose()
     /// <summary>
     /// Performs a dispose operation asynchronously.
     /// </summary>
+    /// <returns>A task to await disposal.</returns>
     public async ValueTask DisposeAsync()
     {
         if (!_disposed)
@@ -203,4 +185,23 @@ public async ValueTask DisposeAsync()
             GC.SuppressFinalize(this);
         }
     }
+
+    /// <summary>
+    /// Releases unmanaged and - optionally - managed resources.
+    /// </summary>
+    /// <param name="disposing">
+    /// <see langword="true" /> to release both managed and unmanaged resources;
+    /// <see langword="false" /> to release only unmanaged resources.
+    /// </param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_disposed)
+        {
+            _disposed = true;
+            if (disposing)
+            {
+                _lifetimeScope.Dispose();
+            }
+        }
+    }
 }

src/Autofac.Extensions.DependencyInjection/AutofacServiceScope.cs

@@ -11,8 +11,8 @@ namespace Autofac.Extensions.DependencyInjection;
 /// <seealso cref="IServiceScope" />
 internal class AutofacServiceScope : IServiceScope, IAsyncDisposable
 {
-    private bool _disposed;
     private readonly AutofacServiceProvider _serviceProvider;
+    private bool _disposed;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AutofacServiceScope"/> class.
@@ -48,6 +48,16 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
+    /// <inheritdoc/>
+    public async ValueTask DisposeAsync()
+    {
+        if (!_disposed)
+        {
+            _disposed = true;
+            await _serviceProvider.DisposeAsync().ConfigureAwait(false);
+        }
+    }
+
     /// <summary>
     /// Releases unmanaged and - optionally - managed resources.
     /// </summary>
@@ -66,14 +76,4 @@ protected virtual void Dispose(bool disposing)
             }
         }
     }
-
-    /// <inheritdoc/>
-    public async ValueTask DisposeAsync()
-    {
-        if (!_disposed)
-        {
-            _disposed = true;
-            await _serviceProvider.DisposeAsync().ConfigureAwait(false);
-        }
-    }
 }

src/Autofac.Extensions.DependencyInjection/KeyedServiceMiddleware.cs

@@ -17,26 +17,16 @@ internal class KeyedServiceMiddleware : IResolveMiddleware
     // for injection into a constructor. This is similar to the
     // Autofac [KeyFilter] attribute.
     private static readonly Parameter FromKeyedServicesParameter = new ResolvedParameter(
-            (p, c) =>
-            {
-                var filter = p.GetCustomAttributes<FromKeyedServicesAttribute>(true).FirstOrDefault();
-                return filter is not null && filter.CanResolveParameter(p, c);
-            },
-            (p, c) =>
-            {
-                var filter = p.GetCustomAttributes<FromKeyedServicesAttribute>(true).First();
-                return filter.ResolveParameter(p, c);
-            });
-
-    /// <summary>
-    /// Gets a single instance of this middleware that does not add the keyed services parameter.
-    /// </summary>
-    public static KeyedServiceMiddleware InstanceWithoutFromKeyedServicesParameter { get; } = new(addFromKeyedServiceParameter: false);
-
-    /// <summary>
-    /// Gets a single instance of this middleware that adds the keyed services parameter.
-    /// </summary>
-    public static KeyedServiceMiddleware InstanceWithFromKeyedServicesParameter { get; } = new(addFromKeyedServiceParameter: true);
+        (p, c) =>
+        {
+            var filter = p.GetCustomAttributes<FromKeyedServicesAttribute>(true).FirstOrDefault();
+            return filter is not null && filter.CanResolveParameter(p, c);
+        },
+        (p, c) =>
+        {
+            var filter = p.GetCustomAttributes<FromKeyedServicesAttribute>(true).First();
+            return filter.ResolveParameter(p, c);
+        });
 
     private readonly bool _addFromKeyedServiceParameter;
 
@@ -49,6 +39,16 @@ public KeyedServiceMiddleware(bool addFromKeyedServiceParameter)
         _addFromKeyedServiceParameter = addFromKeyedServiceParameter;
     }
 
+    /// <summary>
+    /// Gets a single instance of this middleware that does not add the keyed services parameter.
+    /// </summary>
+    public static KeyedServiceMiddleware InstanceWithoutFromKeyedServicesParameter { get; } = new(addFromKeyedServiceParameter: false);
+
+    /// <summary>
+    /// Gets a single instance of this middleware that adds the keyed services parameter.
+    /// </summary>
+    public static KeyedServiceMiddleware InstanceWithFromKeyedServicesParameter { get; } = new(addFromKeyedServiceParameter: true);
+
     /// <inheritdoc />
     public PipelinePhase Phase => PipelinePhase.Activation;