Fixed #88

Author: ENikS

src/ObjectBuilder/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs

@@ -169,7 +169,8 @@ private IEnumerable<Expression> CreateNewBuildupSequence(DynamicBuildPlanGenerat
             yield return Expression.Call(null,
                                         SetCurrentOperationToInvokingConstructorMethod,
                                         Expression.Constant(signature),
-                                        buildContext.ContextParameter);
+                                        buildContext.ContextParameter,
+                                        Expression.Constant(selectedConstructor.Constructor.DeclaringType));
 
             yield return Expression.Assign(
                             buildContext.GetExistingObjectExpression(),
@@ -194,7 +195,8 @@ private IEnumerable<Expression> BuildConstructionParameterExpressions(DynamicBui
                                                 SetCurrentOperationToResolvingParameterMethod,
                                                 Expression.Constant(constructionParameters[i].Name, typeof(string)),
                                                 Expression.Constant(constructorSignature),
-                                                buildContext.ContextParameter));
+                                                buildContext.ContextParameter,
+                                                Expression.Constant(selectedConstructor.Constructor.DeclaringType)));
                 i++;
             }
         }
@@ -258,19 +260,17 @@ private static void GuardTypeIsNonPrimitive(IBuilderContext context)
         /// <summary>
         /// A helper method used by the generated IL to store the current operation in the build context.
         /// </summary>
-        public static void SetCurrentOperationToResolvingParameter(string parameterName, string constructorSignature, IBuilderContext context)
+        public static void SetCurrentOperationToResolvingParameter(string parameterName, string constructorSignature, IBuilderContext context, Type type)
         {
-            (context ?? throw new ArgumentNullException(nameof(context))).CurrentOperation = new ConstructorArgumentResolveOperation(
-                context.BuildKey.Type, constructorSignature, parameterName);
+            context.CurrentOperation = new ConstructorArgumentResolveOperation(type, constructorSignature, parameterName);
         }
 
         /// <summary>
         /// A helper method used by the generated IL to store the current operation in the build context.
         /// </summary>
-        public static void SetCurrentOperationToInvokingConstructor(string constructorSignature, IBuilderContext context)
+        public static void SetCurrentOperationToInvokingConstructor(string constructorSignature, IBuilderContext context, Type type)
         {
-            (context ?? throw new ArgumentNullException(nameof(context))).CurrentOperation = new InvokingConstructorOperation(
-                context.BuildKey.Type, constructorSignature);
+            context.CurrentOperation = new InvokingConstructorOperation(type, constructorSignature);
         }
 
         /// <summary>

tests/Unity.Tests/Issues/GitHub.cs

@@ -11,21 +11,41 @@ namespace Unity.Tests.Issues
     [TestClass]
     public class GitHubIssues
     {
-        public interface IFoo { }
+        public interface IFoo
+        {
+            string View { get; }
+        }
 
         public class Foo : IFoo
         {
-            public Foo(string view) { }
+            public string View { get; }
+
+            public Foo(string view)
+            {
+                View = view;
+            }
         }
 
         [TestMethod]
         public void unitycontainer_container_88()
         {
+            var str1 = "s1";
+            var str2 = "s2";
+
             var ioc = new UnityContainer();
             ioc.RegisterType<IFoo, Foo>(new HierarchicalLifetimeManager());
 
-            var value1 = ioc.CreateChildContainer().Resolve<IFoo>(new Resolution.ParameterOverride("view", "qq").OnType<Foo>());
-            var value2 = ioc.CreateChildContainer().Resolve<IFoo>(new Resolution.ParameterOverride("view", "qq").OnType<Foo>());
+            var ch1 = ioc.CreateChildContainer();
+            var ch2 = ioc.CreateChildContainer();
+
+            var value1 = ch1.Resolve<IFoo>(new Resolution.ParameterOverride("view", str1).OnType<Foo>());
+            var value2 = ch2.Resolve<IFoo>(new Resolution.ParameterOverride("view", str2).OnType<Foo>());
+
+            Assert.IsNotNull(value1);
+            Assert.IsNotNull(value2);
+
+            Assert.AreEqual(value1.View, str1);
+            Assert.AreEqual(value2.View, str2);
         }
 
         [TestMethod]