Last renames and comments (for now)

autofac · May 20, 2020 · e76a8d3 · e76a8d3
1 parent 014445c
commit e76a8d3
Show file tree

Hide file tree

Showing 67 changed files with 1,704 additions and 599 deletions.
diff --git a/src/Autofac/Autofac.csproj b/src/Autofac/Autofac.csproj
@@ -8,7 +8,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);CS1591;IDE0008</NoWarn>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Autofac</AssemblyName>
     <AssemblyOriginatorKeyFile>../../Autofac.snk</AssemblyOriginatorKeyFile>
@@ -40,6 +40,11 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
     <NoWarn>$(NoWarn);8600;8601;8602;8603;8604</NoWarn>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Core\Pipeline\**" />
+    <EmbeddedResource Remove="Core\Pipeline\**" />
+    <None Remove="Core\Pipeline\**" />
+  </ItemGroup>
 
   <ItemGroup>
     <None Include="..\..\build\icon.png" Pack="true" PackagePath="\" />
@@ -49,7 +54,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" Condition="Exists('$(MSBuildThisFileDirectory)../../.git')">
@@ -129,6 +134,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>ContainerResources.resx</DependentUpon>
     </Compile>
+    <Compile Update="Core\Diagnostics\TracerMessages.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>TracerMessages.resx</DependentUpon>
+    </Compile>
     <Compile Update="Core\Lifetime\LifetimeScopeResources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -154,16 +164,21 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>ServiceRegistrationInfoResources.resx</DependentUpon>
     </Compile>
-    <Compile Update="Core\Resolving\CircularDependencyDetectorResources.Designer.cs">
+    <Compile Update="Core\Resolving\Middleware\CircularDependencyDetectorMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>CircularDependencyDetectorResources.resx</DependentUpon>
+      <DependentUpon>CircularDependencyDetectorMessages.resx</DependentUpon>
     </Compile>
     <Compile Update="Core\Resolving\ComponentActivationResources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>ComponentActivationResources.resx</DependentUpon>
     </Compile>
+    <Compile Update="Core\Resolving\Middleware\MiddlewareMessages.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MiddlewareMessages.resx</DependentUpon>
+    </Compile>
     <Compile Update="Core\Resolving\Pipeline\ResolvePipelineBuilderMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -335,6 +350,10 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ContainerResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="Core\Diagnostics\TracerMessages.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>TracerMessages.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Update="Core\Lifetime\LifetimeScopeResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>LifetimeScopeResources.Designer.cs</LastGenOutput>
@@ -355,14 +374,18 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ServiceRegistrationInfoResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Update="Core\Resolving\CircularDependencyDetectorResources.resx">
+    <EmbeddedResource Update="Core\Resolving\Middleware\CircularDependencyDetectorMessages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>CircularDependencyDetectorResources.Designer.cs</LastGenOutput>
+      <LastGenOutput>CircularDependencyDetectorMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Update="Core\Resolving\ComponentActivationResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ComponentActivationResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="Core\Resolving\Middleware\MiddlewareMessages.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>MiddlewareMessages.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Update="Core\Resolving\Pipeline\ResolvePipelineBuilderMessages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ResolvePipelineBuilderMessages.Designer.cs</LastGenOutput>
@@ -460,8 +483,4 @@
       <LastGenOutput>ReflectionExtensionsResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Core\Pipeline\" />
-  </ItemGroup>
 </Project>
diff --git a/src/Autofac/Core/Activators/Delegate/DelegateActivator.cs b/src/Autofac/Core/Activators/Delegate/DelegateActivator.cs
@@ -48,13 +48,14 @@ public class DelegateActivator : InstanceActivator, IInstanceActivator
         public DelegateActivator(Type limitType, Func<IComponentContext, IEnumerable<Parameter>, object> activationFunction)
             : base(limitType)
         {
-            if (activationFunction == null) throw new ArgumentNullException(nameof(activationFunction));
-
-            _activationFunction = activationFunction;
+            _activationFunction = activationFunction ?? throw new ArgumentNullException(nameof(activationFunction));
         }
 
+        /// <inheritdoc/>
         public void ConfigurePipeline(IComponentRegistryServices componentRegistryServices, IResolvePipelineBuilder pipelineBuilder)
         {
+            if (pipelineBuilder is null) throw new ArgumentNullException(nameof(pipelineBuilder));
+
             pipelineBuilder.Use(this.DisplayName(), PipelinePhase.Activation, MiddlewareInsertionMode.EndOfPhase, (ctxt, next) =>
             {
                 ctxt.Instance = ActivateInstance(ctxt, ctxt.Parameters);
@@ -64,15 +65,11 @@ public void ConfigurePipeline(IComponentRegistryServices componentRegistryServic
         }
 
         /// <summary>
-        /// Activate an instance in the provided context.
+        /// Invokes the delegate and returns the instance.
         /// </summary>
         /// <param name="context">Context in which to activate instances.</param>
         /// <param name="parameters">Parameters to the instance.</param>
         /// <returns>The activated instance.</returns>
-        /// <remarks>
-        /// The context parameter here should probably be ILifetimeScope in order to reveal Disposer,
-        /// but will wait until implementing a concrete use case to make the decision.
-        /// </remarks>
         private object ActivateInstance(IComponentContext context, IEnumerable<Parameter> parameters)
         {
             if (context == null) throw new ArgumentNullException(nameof(context));

diff --git a/src/Autofac/Core/Activators/ProvidedInstance/ProvidedInstanceActivator.cs b/src/Autofac/Core/Activators/ProvidedInstance/ProvidedInstanceActivator.cs
@@ -49,16 +49,19 @@ public ProvidedInstanceActivator(object instance)
             _instance = instance;
         }
 
-        /// <summary>
-        /// Activate an instance in the provided context.
-        /// </summary>
-        /// <param name="context">Context in which to activate instances.</param>
-        /// <param name="parameters">Parameters to the instance.</param>
-        /// <returns>The activated instance.</returns>
-        /// <remarks>
-        /// The context parameter here should probably be ILifetimeScope in order to reveal Disposer,
-        /// but will wait until implementing a concrete use case to make the decision.
-        /// </remarks>
+        /// <inheritdoc/>
+        public void ConfigurePipeline(IComponentRegistryServices componentRegistryServices, IResolvePipelineBuilder pipelineBuilder)
+        {
+            if (pipelineBuilder is null) throw new ArgumentNullException(nameof(pipelineBuilder));
+
+            pipelineBuilder.Use(this.DisplayName(), PipelinePhase.Activation, MiddlewareInsertionMode.EndOfPhase, (ctxt, next) =>
+            {
+                ctxt.Instance = GetInstance();
+
+                next(ctxt);
+            });
+        }
+
         private object GetInstance()
         {
             CheckNotDisposed();
@@ -71,16 +74,6 @@ private object GetInstance()
             return _instance;
         }
 
-        public void ConfigurePipeline(IComponentRegistryServices componentRegistryServices, IResolvePipelineBuilder pipelineBuilder)
-        {
-            pipelineBuilder.Use(this.DisplayName(), PipelinePhase.Activation, MiddlewareInsertionMode.EndOfPhase, (ctxt, next) =>
-            {
-                ctxt.Instance = GetInstance();
-
-                next(ctxt);
-            });
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether the activator disposes the instance that it holds.
         /// Necessary because otherwise instances that are never resolved will never be
@@ -97,8 +90,10 @@ protected override void Dispose(bool disposing)
             // Only dispose of the instance here if it wasn't activated. If it was activated,
             // then either the owning lifetime scope will dispose of it automatically
             // (see InstanceLookup.Activate) or an OnRelease handler will take care of it.
-            if (disposing && DisposeInstance && _instance is IDisposable && !_activated)
-                ((IDisposable)_instance).Dispose();
+            if (disposing && DisposeInstance && _instance is IDisposable disposable && !_activated)
+            {
+                disposable.Dispose();
+            }
 
             base.Dispose(disposing);
         }

diff --git a/src/Autofac/Core/Activators/Reflection/ReflectionActivator.cs b/src/Autofac/Core/Activators/Reflection/ReflectionActivator.cs
@@ -45,7 +45,6 @@ public class ReflectionActivator : InstanceActivator, IInstanceActivator
         private readonly Parameter[] _configuredProperties;
         private readonly Parameter[] _defaultParameters;
         private ConstructorInfo[]? _availableConstructors;
-        private readonly object _availableConstructorsLock = new object();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ReflectionActivator"/> class.
@@ -85,18 +84,19 @@ public class ReflectionActivator : InstanceActivator, IInstanceActivator
         /// </summary>
         public IConstructorSelector ConstructorSelector { get; }
 
+        /// <inheritdoc/>
         public void ConfigurePipeline(IComponentRegistryServices componentRegistryServices, IResolvePipelineBuilder pipelineBuilder)
         {
-            // Lazy instantiate available constructor list so the constructor
-            // finder can be changed during AsSelf() registration. AsSelf() creates
-            // a temporary activator just long enough to get the LimitType.
-            if (_availableConstructors == null)
-            {
-                _availableConstructors = ConstructorFinder.FindConstructors(_implementationType);
-            }
+            if (componentRegistryServices is null) throw new ArgumentNullException(nameof(componentRegistryServices));
+            if (pipelineBuilder is null) throw new ArgumentNullException(nameof(pipelineBuilder));
+
+            // Locate the possible constructors at container build time.
+            _availableConstructors = ConstructorFinder.FindConstructors(_implementationType);
 
             if (_availableConstructors.Length == 0)
+            {
                 throw new NoConstructorsFoundException(_implementationType, string.Format(CultureInfo.CurrentCulture, ReflectionActivatorResources.NoConstructorsAvailable, _implementationType, ConstructorFinder));
+            }
 
             pipelineBuilder.Use(this.ToString(), PipelinePhase.Activation, MiddlewareInsertionMode.EndOfPhase, (ctxt, next) =>
             {

diff --git a/src/Autofac/Core/Container.cs b/src/Autofac/Core/Container.cs
@@ -24,12 +24,10 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Autofac.Core.Diagnostics;
 using Autofac.Core.Lifetime;
-using Autofac.Core.Registration;
 using Autofac.Core.Resolving;
 using Autofac.Util;
 
@@ -101,9 +99,10 @@ public ILifetimeScope BeginLifetimeScope(object tag, Action<ContainerBuilder> co
             return _rootLifetimeScope.BeginLifetimeScope(tag, configurationAction);
         }
 
-        public void TraceWith(IResolvePipelineTracer tracer)
+        /// <inheritdoc/>
+        public void AttachTrace(IResolvePipelineTracer tracer)
         {
-            _rootLifetimeScope.TraceWith(tracer);
+            _rootLifetimeScope.AttachTrace(tracer);
         }
 
         /// <summary>
@@ -172,11 +171,12 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
+        /// <inheritdoc/>
         protected override async ValueTask DisposeAsync(bool disposing)
         {
             if (disposing)
             {
-                await _rootLifetimeScope.DisposeAsync();
+                await _rootLifetimeScope.DisposeAsync().ConfigureAwait(false);
 
                 // Registries are not likely to have async tasks to dispose of,
                 // so we will leave it as a straight dispose.