fix: ServiceInterceptor AllowMultiple not respected due to .Distinct()

AspectCore-Framework.slnx

@@ -0,0 +1,58 @@
+<Solution>
+  <Folder Name="/benchmark/">
+    <Project Path="benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj" />
+    <Project Path="benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj" />
+  </Folder>
+  <Folder Name="/items/">
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="build.cake" />
+    <File Path="build.ps1" />
+    <File Path="LICENSE" />
+    <File Path="NuGet.config" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/items/build/">
+    <File Path="build/aspectcore.snk" />
+    <File Path="build/common.props" />
+    <File Path="build/index.cake" />
+    <File Path="build/sign.props" />
+    <File Path="build/util.cake" />
+    <File Path="build/version.cake" />
+    <File Path="build/version.props" />
+  </Folder>
+  <Folder Name="/sample/">
+    <Project Path="sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj" />
+    <Project Path="sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj" />
+  </Folder>
+  <Folder Name="/src/" />
+  <Folder Name="/src/core/">
+    <Project Path="src/AspectCore.Abstractions/AspectCore.Abstractions.csproj" />
+    <Project Path="src/AspectCore.Core/AspectCore.Core.csproj" />
+  </Folder>
+  <Folder Name="/src/extensions/">
+    <Project Path="src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj" />
+    <Project Path="src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj" />
+    <Project Path="src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj" />
+    <Project Path="src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj" />
+    <Project Path="src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj" />
+    <Project Path="src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj" />
+    <Project Path="src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj" />
+  </Folder>
+  <Folder Name="/src/extras/">
+    <Project Path="src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj" />
+    <Project Path="src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj" />
+    <Project Path="src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj" />
+    <Project Path="src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj" />
+    <Project Path="tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj" />
+    <Project Path="tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj" />
+    <Project Path="tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj" />
+    <Project Path="tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj" />
+    <Project Path="tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj" />
+    <Project Path="tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj" />
+    <Project Path="tests/AspectCore.Tests/AspectCore.Tests.csproj" />
+  </Folder>
+</Solution>

build/common.props

@@ -14,5 +14,7 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
+    <!-- 10.0 is the latest stable version of C# that is supported by the net6.0, which is the lowest target framework for this project -->
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 </Project>

src/AspectCore.Core/AspectCore.Core.csproj

@@ -2,6 +2,7 @@
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
     <Description>The implementation of the AspectCore framework.</Description>
+    <RootNamespace>AspectCore</RootNamespace>
     <AssemblyTitle>AspectCore.Core</AssemblyTitle>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>AspectCore.Core</AssemblyName>

src/AspectCore.Core/DependencyInjection/EnumerableServiceDefinition.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace AspectCore.DependencyInjection
+{
+    internal class EnumerableServiceDefinition : ServiceDefinition
+    {
+        public IEnumerable<ServiceDefinition> ServiceDefinitions { get; }
+
+        public Type ElementType { get; }
+
+        public EnumerableServiceDefinition(Type serviceType, Type elementType, IEnumerable<ServiceDefinition> serviceDefinitions) : base(serviceType, Lifetime.Transient)
+        {
+            ElementType = elementType;
+            ServiceDefinitions = serviceDefinitions;
+        }
+    }
+
+    internal class ManyEnumerableServiceDefinition : EnumerableServiceDefinition
+    {
+        public ManyEnumerableServiceDefinition(Type serviceType, Type elementType, IEnumerable<ServiceDefinition> serviceDefinitions) : base(serviceType, elementType, serviceDefinitions)
+        {
+        }
+    }
+}

src/AspectCore.Core/DependencyInjection/ServiceCallSiteResolver.cs

@@ -56,19 +56,19 @@ private Func<ServiceResolver, object> ResolveInternal(ServiceDefinition service)
                     return delegateServiceDefinition.ImplementationDelegate;
                 case TypeServiceDefinition typeServiceDefinition:
                     return ResolveTypeService(typeServiceDefinition);
-                case ManyEnumerableServiceDefintion manyEnumerableServiceDefinition:
+                case ManyEnumerableServiceDefinition manyEnumerableServiceDefinition:
                     return ResolveManyEnumerableService(manyEnumerableServiceDefinition);
-                case EnumerableServiceDefintion enumerableServiceDefinition:
+                case EnumerableServiceDefinition enumerableServiceDefinition:
                     return ResolveEnumerableService(enumerableServiceDefinition);
                 default:
                     return resolver => null;
             }
         }
 
-        private Func<ServiceResolver, object> ResolveManyEnumerableService(ManyEnumerableServiceDefintion manyEnumerableServiceDefintion)
+        private Func<ServiceResolver, object> ResolveManyEnumerableService(ManyEnumerableServiceDefinition manyEnumerableServiceDefinition)
         {
-            var elementDefinitions = manyEnumerableServiceDefintion.ServiceDefinitions.ToArray();
-            var elementType = manyEnumerableServiceDefintion.ElementType;
+            var elementDefinitions = manyEnumerableServiceDefinition.ServiceDefinitions.ToArray();
+            var elementType = manyEnumerableServiceDefinition.ElementType;
             return resolver =>
             {
                 var length = elementDefinitions.Length;
@@ -82,10 +82,10 @@ private Func<ServiceResolver, object> ResolveManyEnumerableService(ManyEnumerabl
             };
         }
 
-        private Func<ServiceResolver, object> ResolveEnumerableService(EnumerableServiceDefintion enumerableServiceDefintion)
+        private Func<ServiceResolver, object> ResolveEnumerableService(EnumerableServiceDefinition enumerableServiceDefinition)
         {
-            var elementDefinitions = enumerableServiceDefintion.ServiceDefinitions.ToArray();
-            var elementType = enumerableServiceDefintion.ElementType;
+            var elementDefinitions = enumerableServiceDefinition.ServiceDefinitions.ToArray();
+            var elementType = enumerableServiceDefinition.ElementType;
             return resolver =>
             {
                 var length = elementDefinitions.Length;

src/AspectCore.Core/DependencyInjection/ServiceTable.cs

@@ -116,7 +116,7 @@ private ServiceDefinition FindEnumerable(Type serviceType)
             }
             var elementType = serviceType.GetTypeInfo().GetGenericArguments()[0];
             var elements = FindEnumerableElements(serviceType);
-            var enumerableServiceDefinition = new EnumerableServiceDefintion(serviceType, elementType, elements);
+            var enumerableServiceDefinition = new EnumerableServiceDefinition(serviceType, elementType, elements);
             _linkedServiceDefinitions[serviceType] = new LinkedList<ServiceDefinition>(new ServiceDefinition[] { enumerableServiceDefinition });
             return enumerableServiceDefinition;
         }
@@ -129,7 +129,7 @@ private ServiceDefinition FindManyEnumerable(Type serviceType)
             }
             var elementType = serviceType.GetTypeInfo().GetGenericArguments()[0];
             var elements = FindEnumerableElements(serviceType);
-            var enumerableServiceDefinition = new ManyEnumerableServiceDefintion(serviceType, elementType, elements);
+            var enumerableServiceDefinition = new ManyEnumerableServiceDefinition(serviceType, elementType, elements);
             _linkedServiceDefinitions[serviceType] = new LinkedList<ServiceDefinition>(new ServiceDefinition[] { enumerableServiceDefinition });
             return enumerableServiceDefinition;
         }

src/AspectCore.Core/DynamicProxy/Extensions/ProxyGeneratorExtensions.cs

@@ -29,7 +29,7 @@ public static TService CreateClassProxy<TService, TImplementation>(this IProxyGe
         {
             if (proxyGenerator == null)
             {
-                throw new ArgumentNullException(nameof(ProxyTypeGenerator));
+                throw new ArgumentNullException(nameof(proxyGenerator));
             }
             return (TService)proxyGenerator.CreateClassProxy(typeof(TService), typeof(TImplementation), args ?? ArrayUtils.Empty<object>());
         }

src/AspectCore.Core/DynamicProxy/InterceptorCollector.cs

@@ -60,7 +60,7 @@ public IEnumerable<IInterceptor> Collect(MethodInfo serviceMethod, MethodInfo im
                return HandleInjector(CollectFromService(serviceMethod).
                     Concat(CollectFromAdditionalSelector(serviceMethod, implementationMethod)).
                     HandleSort().
-                    HandleMultiple()).Distinct().ToArray();
+                    HandleMultiple()).ToArray();
             });
         }