Fixes #1041 - PropertiesAutowired fails when service is decorated using new syntax

src/Autofac/Core/Resolving/InstanceLookup.cs

@@ -121,6 +121,8 @@ private object Activate(IEnumerable<Parameter> parameters, out object decoratorT
             {
                 decoratorTarget = _newInstance = ComponentRegistration.Activator.ActivateInstance(this, resolveParameters);
 
+                ComponentRegistration.RaiseActivating(this, resolveParameters, ref _newInstance);
+
                 _newInstance = InstanceDecorator.TryDecorateRegistration(
                     _service,
                     ComponentRegistration,
@@ -153,7 +155,8 @@ private object Activate(IEnumerable<Parameter> parameters, out object decoratorT
                 }
             }
 
-            ComponentRegistration.RaiseActivating(this, resolveParameters, ref _newInstance);
+            if (_newInstance != decoratorTarget)
+                ComponentRegistration.RaiseActivating(this, resolveParameters, ref _newInstance);
 
             return _newInstance;
         }

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

@@ -15,6 +15,40 @@ private interface IService
         {
         }
 
+        private interface IAutoWiredService
+        {
+            bool NestedServiceIsNotNull();
+        }
+
+        private class NestedService
+        {
+        }
+
+        private class AutoWiredService : IAutoWiredService
+        {
+            public NestedService NestedService { get; set; }
+
+            public bool NestedServiceIsNotNull()
+            {
+                return NestedService != null;
+            }
+        }
+
+        private class AutoWiredServiceDecorator : IAutoWiredService
+        {
+            private readonly IAutoWiredService _original;
+
+            public AutoWiredServiceDecorator(IAutoWiredService original)
+            {
+                _original = original;
+            }
+
+            public bool NestedServiceIsNotNull()
+            {
+                return _original.NestedServiceIsNotNull();
+            }
+        }
+
         public class Foo
         {
         }
@@ -149,6 +183,36 @@ public void RegistrationTargetsTheImplementationType()
             Assert.Equal(typeof(ImplementorA), registration.Target.Activator.LimitType);
         }
 
+        [Fact]
+        public void DecorateReflectionActivatorWithPropertyInjection()
+        {
+            var builder = new ContainerBuilder();
+            builder.RegisterType<NestedService>();
+            builder.RegisterType<AutoWiredService>().As<IAutoWiredService>().PropertiesAutowired();
+            builder.RegisterDecorator<AutoWiredServiceDecorator, IAutoWiredService>();
+
+            var container = builder.Build();
+
+            var service = container.Resolve<IAutoWiredService>();
+
+            Assert.True(service.NestedServiceIsNotNull());
+        }
+
+        [Fact]
+        public void DecorateProvidedInstanceActivatorWithPropertyInjection()
+        {
+            var builder = new ContainerBuilder();
+            builder.RegisterType<NestedService>();
+            builder.RegisterInstance<IAutoWiredService>(new AutoWiredService()).PropertiesAutowired();
+            builder.RegisterDecorator<AutoWiredServiceDecorator, IAutoWiredService>();
+
+            var container = builder.Build();
+
+            var service = container.Resolve<IAutoWiredService>();
+
+            Assert.True(service.NestedServiceIsNotNull());
+        }
+
         private abstract class Decorator : IDecoratedService
         {
             protected Decorator(IDecoratedService decorated)