- multitons need first argument in ctor to be scope

LightweightIocContainer/IocContainer.cs

@@ -167,16 +167,9 @@ public class IocContainer : IIocContainer, IIocResolver
         if (registration is IWithParametersInternal { Parameters: { } } registrationWithParameters)
             arguments = UpdateArgumentsWithRegistrationParameters(registrationWithParameters, arguments);
 
-        List<object?>? resolveArguments = arguments?.ToList();
-        if (resolveArguments != null && registration is IMultitonRegistration multitonReg) //remove scope argument for multitions
-        {
-            object multitonScopeArgument = TryGetMultitonScopeArgument(multitonReg, resolveArguments);
-            resolveArguments.Remove(multitonScopeArgument);
-        }
-
         Type registeredType = GetType<T>(registration);
         (bool result, List<object?>? parametersToResolve, NoMatchingConstructorFoundException? exception) = 
-            TryGetTypeResolveStack(registeredType, resolveArguments, internalResolveStack);
+            TryGetTypeResolveStack(registeredType, arguments, internalResolveStack);
 
         if (registration is IMultitonRegistration multitonRegistration)
         {

Test.LightweightIocContainer/DisposeStrategyTest.cs

@@ -23,6 +23,14 @@ public class DisposeStrategyTest
         public void Dispose() => throw new Exception();
     }
     
+    private class TestMultiton : Test
+    {
+        public TestMultiton(int scope)
+        {
+            
+        }
+    }
+    
     private class TestNotDisposable
     {
         
@@ -44,7 +52,7 @@ public class DisposeStrategyTest
     public void TestValidContainerDisposeStrategyMultiton()
     {
         IocContainer iocContainer = new();
-        iocContainer.Register(r => r.AddMultiton<ITest, Test, int>().WithDisposeStrategy(DisposeStrategy.Container));
+        iocContainer.Register(r => r.AddMultiton<ITest, TestMultiton, int>().WithDisposeStrategy(DisposeStrategy.Container));
 
         iocContainer.Resolve<ITest>(1);
         
@@ -66,7 +74,7 @@ public class DisposeStrategyTest
     public void TestValidAppDisposeStrategyMultiton()
     {
         IocContainer iocContainer = new();
-        iocContainer.Register(r => r.AddMultiton<ITest, Test, int>().WithDisposeStrategy(DisposeStrategy.Application));
+        iocContainer.Register(r => r.AddMultiton<ITest, TestMultiton, int>().WithDisposeStrategy(DisposeStrategy.Application));
 
         iocContainer.Resolve<ITest>(1);
         

Test.LightweightIocContainer/FluentFactoryRegistrationTest.cs

@@ -102,6 +102,14 @@ public class FluentFactoryRegistrationTest
         public ITest Create(byte id) => throw new NotImplementedException();
     }
 
+    public class TestMultiton : ITest
+    {
+        public TestMultiton(MultitonScope scope)
+        {
+            
+        }
+    }
+        
     [UsedImplicitly]
     public interface IMultitonTestFactory
     {
@@ -290,7 +298,7 @@ public class FluentFactoryRegistrationTest
     [Test]
     public void TestResolveMultitonFromFactory()
     {
-        _iocContainer.Register(r => r.AddMultiton<ITest, Test, MultitonScope>().WithFactory<IMultitonTestFactory>());
+        _iocContainer.Register(r => r.AddMultiton<ITest, TestMultiton, MultitonScope>().WithFactory<IMultitonTestFactory>());
         
         MultitonScope scope1 = new();
         MultitonScope scope2 = new();
@@ -309,7 +317,7 @@ public class FluentFactoryRegistrationTest
     [Test]
     public void TestResolveMultitonFromFactoryClearInstances()
     {
-        _iocContainer.Register(r => r.AddMultiton<ITest, Test, MultitonScope>().WithFactory<IMultitonTestFactory>());
+        _iocContainer.Register(r => r.AddMultiton<ITest, TestMultiton, MultitonScope>().WithFactory<IMultitonTestFactory>());
         
         MultitonScope scope1 = new();
         MultitonScope scope2 = new();

Test.LightweightIocContainer/IocContainerTest.cs

@@ -27,6 +27,14 @@ public class IocContainerTest
 
     }
     
+    private class TestMultiton : ITest
+    {
+        public TestMultiton(MultitonScope multitonScope)
+        {
+            
+        }
+    }
+
     [UsedImplicitly]
     private class TestConstructor : ITest
     {
@@ -248,7 +256,7 @@ public class IocContainerTest
     [Test]
     public void TestResolveMultiton()
     {
-        _iocContainer.Register(r => r.AddMultiton<ITest, Test, MultitonScope>());
+        _iocContainer.Register(r => r.AddMultiton<ITest, TestMultiton, MultitonScope>());
 
         MultitonScope scope1 = new();
         MultitonScope scope2 = new();

Test.LightweightIocContainer/MultipleMultitonRegistrationTest.cs

@@ -26,8 +26,13 @@ public class MultipleMultitonRegistrationTest
     }
         
     [UsedImplicitly]
-    public class Test : ITest
+    private class Test : ITest
     {
+        public Test(MultitonScope scope)
+        {
+            
+        }
+        
         public int Number { get; private set; }
 
         public void DoSomething(int number) => Number = number;