Merge branch 'master' of https://github.com/unitycontainer/container into v5.x

Author: ENikS

src/Strategies/LifetimeStrategy.cs

@@ -65,7 +65,7 @@ public override void PreBuildUp(ref BuilderContext context)
                 context.RequiresRecovery = recoveryPolicy;
 
             var existing = policy.GetValue(context.Lifetime);
-            if (existing != null)
+            if (LifetimeManager.NoValue != existing)
             {
                 context.Existing = existing;
                 context.BuildComplete = true;

src/UnityContainer.IUnityContainer.cs

@@ -114,7 +114,7 @@ IUnityContainer IUnityContainer.RegisterInstance(Type type, string name, object
             try
             {
                 // Validate input
-                if (null == instance) throw new ArgumentNullException(nameof(instance));
+                if (null == typeFrom) throw new InvalidOperationException($"At least one of Type arguments '{nameof(type)}' or '{nameof(instance)}' must be not 'null'");
 
                 if (null == lifetimeManager) lifetimeManager = new ContainerControlledLifetimeManager();
                 if (((LifetimeManager)lifetimeManager).InUse) throw new InvalidOperationException(LifetimeManagerInUse);

src/UnityContainer.Resolution.cs

@@ -440,7 +440,7 @@ object GetPerResolveValue(IntPtr parent, Type registrationType, string name)
 
                     var lifetimeManager = (LifetimeManager)parentRef.Get(typeof(LifetimeManager));
                     var result = lifetimeManager?.GetValue();
-                    if (null != result) return result;
+                    if (LifetimeManager.NoValue != result) return result;
 
                     throw new InvalidOperationException($"Circular reference for Type: {parentRef.Type}, Name: {parentRef.Name}",
                             new CircularDependencyException());

tests/Unity.Tests/Container/ContainerControlledLifetimeThreadingFixture.cs

@@ -14,7 +14,7 @@ namespace Unity.Tests.v5.Container
     public class ContainerControlledLifetimeThreadingFixture
     {
         [TestMethod]
-        public void ContainerControlledLifetimeReturnsSameInstanceFromMultipleThreads()
+        public void SameInstanceFromMultipleThreads()
         {
             IUnityContainer container = new UnityContainer();
             container.AddExtension(new SpyExtension(new DelayStrategy(), UnityBuildStage.Lifetime));
@@ -23,12 +23,12 @@ public void ContainerControlledLifetimeReturnsSameInstanceFromMultipleThreads()
             object result1 = null;
             object result2 = null;
 
-            Thread thread1 = new Thread(delegate()
+            Thread thread1 = new Thread(delegate ()
             {
                 result1 = container.Resolve<object>();
             });
 
-            Thread thread2 = new Thread(delegate()
+            Thread thread2 = new Thread(delegate ()
             {
                 result2 = container.Resolve<object>();
             });
@@ -46,6 +46,7 @@ public void ContainerControlledLifetimeReturnsSameInstanceFromMultipleThreads()
             Assert.AreSame(result1, result2);
         }
 
+
         [TestMethod]
         public void ContainerControlledLifetimeDoesNotLeaveHangingLockIfBuildThrowsException()
         {