ActivatorUtilities.CreateFactory created breaking change from version…

… 4.2.2 to 5.0.1 khellang#235

src/Scrutor/DecorationStrategy.cs

@@ -1,5 +1,5 @@
-using System;
 using Microsoft.Extensions.DependencyInjection;
+using System;
 
 namespace Scrutor;
 
@@ -30,11 +30,10 @@ internal static DecorationStrategy WithFactory(Type serviceType, string? service
 
     protected static Func<IServiceProvider, object?, object> TypeDecorator(Type serviceType, string serviceKey, Type decoratorType)
     {
-        var factory = ActivatorUtilities.CreateFactory(decoratorType, new[] { serviceType });
         return (serviceProvider, _) =>
         {
             var instanceToDecorate = serviceProvider.GetRequiredKeyedService(serviceType, serviceKey);
-            return factory(serviceProvider, new object[] { instanceToDecorate });
+            return ActivatorUtilities.CreateInstance(serviceProvider, decoratorType, instanceToDecorate);
         };
     }
 

test/Scrutor.Tests/DecorationTests.cs

@@ -1,8 +1,8 @@
-using System;
+using Microsoft.Extensions.DependencyInjection;
+using System;
 using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
-using Xunit;
 using System.Linq;
+using Xunit;
 
 namespace Scrutor.Tests;
 
@@ -236,6 +236,23 @@ public void Issue148_Decorate_IsAbleToDecorateConcreateTypes()
         Assert.NotNull(inner.Dependency);
     }
 
+    [Fact]
+    public void Issue235_Decorate_IsAbleToDecorateClassesThatTheirConstructorDoesNotContainTheDecoratedTypeDirectly()
+    {
+        var provider = ConfigureProvider(services =>
+        {
+            services.AddScoped<Decorated>()
+                    .AddScoped<IDecoratedService>(x => x.GetRequiredService<Decorated>())
+                    .Decorate<IDecoratedService, Decorator3>();
+        });
+
+        using (var scope = provider.CreateScope())
+        {
+            var result = scope.ServiceProvider.GetService<IDecoratedService>();
+            Assert.NotNull(result);
+        }
+    }
+
     #region Individual functions tests
 
     [Fact]
@@ -470,6 +487,16 @@ public Decorator2(DecoratedService decoratedService)
         public DecoratedService Inner { get; }
     }
 
+    public class Decorator3 : IDecoratedService
+    {
+        public Decorator3(Decorated inner)
+        {
+            Inner = inner ?? throw new ArgumentNullException(nameof(inner));
+        }
+
+        public Decorated Inner { get; }
+    }
+
     public interface IService { }
 
     private class SomeRandomService : IService { }