Fixes singleton scope

Author: ENikS

src/Builder/Context/BuilderContext.cs

@@ -152,13 +152,18 @@ public object Resolve(Type type, string name, InternalRegistration registration)
             unsafe
             {
                 var thisContext = this;
+                var containerRegistration = registration as ContainerRegistration;
+                var container = registration.Get(typeof(LifetimeManager)) is ContainerControlledLifetimeManager manager
+                              ? ((UnityContainer)manager.Scope).LifetimeContainer
+                              : Lifetime;
+
                 var context = new BuilderContext
                 {
-                    Lifetime = Lifetime,
+                    Lifetime = container,
                     Registration = registration,
                     RegistrationType = type,
                     Name = name,
-                    Type = registration is ContainerRegistration containerRegistration ? containerRegistration.Type : type,
+                    Type = null != containerRegistration ? containerRegistration.Type : type,
                     ExecutePlan = ExecutePlan,
                     ResolvePlan = ResolvePlan,
                     List = List,

src/UnityContainer.IUnityContainer.cs

@@ -44,6 +44,7 @@ IUnityContainer IUnityContainer.RegisterType(Type typeFrom, Type typeTo, string
                 // Create registration and add to appropriate storage
                 var container = manager is SingletonLifetimeManager ? _root : this;
                 var registration = new ContainerRegistration(_validators, typeTo, manager, injectionMembers);
+                if (manager is ContainerControlledLifetimeManager lifeteime) lifeteime.Scope = container;
 
                 // Add or replace existing 
                 var previous = container.Register(registeredType, name, registration);
@@ -125,6 +126,7 @@ IUnityContainer IUnityContainer.RegisterInstance(Type type, string name, object
                 // Create registration and add to appropriate storage
                 var container = manager is SingletonLifetimeManager ? _root : this;
                 var registration = new ContainerRegistration(null, mappedToType, manager);
+                if (manager is ContainerControlledLifetimeManager lifeteime) lifeteime.Scope = container;
 
                 // Add or replace existing 
                 var previous = container.Register(typeFrom, name, registration);
@@ -185,6 +187,7 @@ public IUnityContainer RegisterFactory(Type type, string name, Func<IUnityContai
 #pragma warning restore CS0618
             var injectionMembers = new InjectionMember[] { injectionFactory };
             var registration = new ContainerRegistration(_validators, type, manager, injectionMembers);
+            if (manager is ContainerControlledLifetimeManager lifeteime) lifeteime.Scope = container;
 
             // Add or replace existing 
             var previous = container.Register(type, name, registration);
@@ -234,21 +237,24 @@ object IUnityContainer.Resolve(Type type, string name, params ResolverOverride[]
             if (null == type) throw new ArgumentNullException(nameof(type));
 
             var registration = (InternalRegistration)GetRegistration(type, name);
+            var container = registration.Get(typeof(LifetimeManager)) is ContainerControlledLifetimeManager manager
+                          ? (UnityContainer)manager.Scope 
+                          : this;
+
             var context = new BuilderContext
             {
                 List = new PolicyList(),
-                Lifetime = LifetimeContainer,
+                Lifetime = container.LifetimeContainer,
                 Overrides = null != overrides && 0 == overrides.Length ? null : overrides,
                 Registration = registration,
                 RegistrationType = type,
                 Name = name,
                 ExecutePlan = ContextExecutePlan,
                 ResolvePlan = ContextResolvePlan,
-                Type = registration is ContainerRegistration containerRegistration
-                                     ? containerRegistration.Type : type,
+                Type = registration is ContainerRegistration containerRegistration ? containerRegistration.Type : type,
             };
 
-            return ExecutePlan(ref context);
+            return container.ExecutePlan(ref context);
         }
 
         #endregion
@@ -266,10 +272,14 @@ object IUnityContainer.BuildUp(Type type, object existing, string name, params R
             if (null != existing && null != TypeValidator) TypeValidator(type, existing.GetType());
 
             var registration = (InternalRegistration)GetRegistration(type, name);
+            var container = registration.Get(typeof(LifetimeManager)) is ContainerControlledLifetimeManager manager
+                          ? (UnityContainer)manager.Scope
+                          : this;
+
             var context = new BuilderContext
             {
                 List = new PolicyList(),
-                Lifetime = LifetimeContainer,
+                Lifetime = container.LifetimeContainer,
                 Existing = existing,
                 Overrides = null != overrides && 0 == overrides.Length ? null : overrides,
                 Registration = registration,

src/UnityContainer.Registration.cs

@@ -316,6 +316,7 @@ private IRegistry<string, IPolicySet> Get(Type type)
 
         #region Registration manipulation
 
+        // Register new and return overridden registration
         private IPolicySet AddOrUpdate(Type type, string name, InternalRegistration registration)
         {
             var collisions = 0;
@@ -422,11 +423,13 @@ private IPolicySet GetOrAdd(Type type, string name)
             }
         }
 
+        // Return generic registration or create from factory if not registered
         private IPolicySet GetOrAddGeneric(Type type, string name, Type definition)
         {
             var collisions = 0;
             int hashCode;
             int targetBucket;
+            var factory = false;
 
             if (null != _parent)
             {
@@ -440,10 +443,14 @@ private IPolicySet GetOrAddGeneric(Type type, string name, Type definition)
                         continue;
                     }
 
-                    if (null != candidate.Value?[name]) break;
-
-                    return _parent._getGenericRegistration(type, name, definition);
+                    if (null != candidate.Value?[name])
+                    {
+                        factory = true;
+                        break;
+                    }
                 }
+
+                if (!factory) return _parent._getGenericRegistration(type, name, definition);
             }
 
             hashCode = (type?.GetHashCode() ?? 0) & 0x7FFFFFFF;
@@ -489,8 +496,6 @@ private IPolicySet GetOrAddGeneric(Type type, string name, Type definition)
                 _registrations.Buckets[targetBucket] = _registrations.Count++;
                 return registration;
             }
-
-
         }
 
         private IPolicySet Get(Type type, string name)