Merge pull request #1 from autofac/develop

fetch from original

Author: RaymondHuy

README.md

@@ -1,4 +1,9 @@
-![Autofac](https://autofac.org/img/carousel-logo.png)
+<p align="center">
+  <img src="https://autofac.org/img/autofac_web-banner_character.svg" width="250">
+</p>
+<p align="center">
+  <img src="https://autofac.org/img/autofac_logo-type.svg" height="100">
+</p>
 
 Autofac is an [IoC container](http://martinfowler.com/articles/injection.html) for Microsoft .NET. It manages the dependencies between classes so that **applications stay easy to change as they grow** in size and complexity. This is achieved by treating regular .NET classes as *[components](https://autofac.readthedocs.io/en/latest/glossary.html)*.
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.9.2.{build}
+version: 4.9.3.{build}
 
 configuration: Release
 

src/Autofac/Autofac.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Autofac is an IoC container for Microsoft .NET. It manages the dependencies between classes so that applications stay easy to change as they grow in size and complexity.</Description>
-    <VersionPrefix>4.9.2</VersionPrefix>
+    <VersionPrefix>4.9.3</VersionPrefix>
     <TargetFrameworks>netstandard2.0;netstandard1.1;net45</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/Autofac/Core/IComponentRegistration.cs

@@ -76,9 +76,8 @@ public interface IComponentRegistration : IDisposable
         IComponentRegistration Target { get; }
 
         /// <summary>
-        /// Fired when a new instance is required. The instance can be
-        /// provided in order to skip the regular activator, by setting the Instance property in
-        /// the provided event arguments.
+        /// Fired when a new instance is required, prior to activation.
+        /// Can be used to provide Autofac with additional parameters, used during activation.
         /// </summary>
         event EventHandler<PreparingEventArgs> Preparing;
 

src/Autofac/Core/Registration/ComponentRegistration.cs

@@ -143,9 +143,8 @@ public ComponentRegistration(
         public IDictionary<string, object> Metadata { get; }
 
         /// <summary>
-        /// Fired when a new instance is required. The instance can be
-        /// provided in order to skip the regular activator, by setting the Instance property in
-        /// the provided event arguments.
+        /// Fired when a new instance is required, prior to activation.
+        /// Can be used to provide Autofac with additional parameters, used during activation.
         /// </summary>
         public event EventHandler<PreparingEventArgs> Preparing;
 

src/Autofac/Features/Decorators/InstanceDecorator.cs

@@ -40,8 +40,8 @@ internal static object TryDecorateRegistration(
         {
             var instanceType = instance.GetType();
 
-            // Issue #965: Do not apply the decorator if already applied, or if the registration is for an adapter.
-            if (registration.IsAdapting() || registration.Activator.LimitType != instanceType) return instance;
+            // Issue #965: Do not apply the decorator if the registration is for an adapter.
+            if (registration.IsAdapting()) return instance;
 
             var decoratorRegistrations = context.ComponentRegistry.DecoratorsFor(registration);
 

test/Autofac.Specification.Test/Features/DecoratorTests.cs

@@ -524,7 +524,7 @@ public void DecoratorRegisteredAsLambdaCanBeResolved()
             Assert.IsType<ImplementorA>(instance.Decorated);
         }
 
-        [Fact(Skip = "Issue #999")]
+        [Fact]
         public void DecoratorRegisteredOnLambdaWithCast()
         {
             // Issue #999: The cast in the lambda to IDecoratedService