Releasing v5.6.0

Author: ENikS

package.props

@@ -1,12 +1,12 @@
 <Project>
 
   <PropertyGroup>
-    <Version>6.0.0</Version>
+    <Version>5.6.0</Version>
     <PackageReleaseNotes>This package is distributed as .NET Standard 1.0, .NET 4.0, 4.5, 4.7 package.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup>
-    <UnityAbstractionsVersion>3.*</UnityAbstractionsVersion>
+    <UnityAbstractionsVersion>3.2.*</UnityAbstractionsVersion>
   </PropertyGroup>
 
 </Project>

src/Container/Lifetime/ContainerLifetimeManager.cs

@@ -1,5 +1,4 @@
-using Unity.Builder;
-using Unity.Lifetime;
+using Unity.Lifetime;
 
 namespace Unity.Container.Lifetime
 {
@@ -13,25 +12,9 @@ namespace Unity.Container.Lifetime
     /// </remarks>
     internal class ContainerLifetimeManager : LifetimeManager
     {
-        private object _value;
-
         public override object GetValue(ILifetimeContainer container = null)
         {
-            return _value;
-        }
-
-        public override void SetValue(object newValue, ILifetimeContainer container = null)
-        {
-            _value = newValue;
-        }
-
-        public override void RemoveValue(ILifetimeContainer container = null)
-        {
-        }
-
-        public object Resolve(IBuilderContext _)
-        {
-            return _value;
+            return container.Container;
         }
 
         protected override LifetimeManager OnCreateLifetimeManager()

src/Container/Lifetime/LifetimeContainer.cs

@@ -20,6 +20,18 @@ public class LifetimeContainer : ILifetimeContainer
     {
         private readonly List<object> _items = new List<object>();
 
+        public LifetimeContainer(IUnityContainer parent = null)
+        {
+            Container = parent;
+        }
+
+        /// <summary>
+        /// The IUnityContainer this container is associated with.
+        /// </summary>
+        /// <value>The <see cref="IUnityContainer"/> object.</value>
+        public IUnityContainer Container { get; }
+
+
         /// <summary>
         /// Gets the number of references in the lifetime container
         /// </summary>

src/UnityContainer.Implementation.cs

@@ -72,10 +72,10 @@ private UnityContainer(UnityContainer parent)
             _buildPlanStrategies = new StagedStrategyChain<IBuilderStrategy, BuilderStage>(_parent?._buildPlanStrategies);
 
             // Lifetime
-            _lifetimeContainer = new LifetimeContainer { _strategies, _buildPlanStrategies };
+            _lifetimeContainer = new LifetimeContainer(this) { _strategies, _buildPlanStrategies };
 
             // Default Policies
-            if (null == _parent) InitializeStrategies();
+            if (null == _parent) InitializeRootContainer();
             _defaultPolicies = parent?._defaultPolicies ?? GetDefaultPolicies();
             this[null, null] = _defaultPolicies;
 
@@ -86,17 +86,14 @@ private UnityContainer(UnityContainer parent)
             // Caches
             OnStrategiesChanged(this, null);
             _strategies.Invalidated += OnStrategiesChanged;
-
-            // Register this instance
-            RegisterInstance(typeof(IUnityContainer), null, this, new ContainerLifetimeManager());
         }
 
         #endregion
 
 
         #region Defaults
 
-        protected void InitializeStrategies()
+        protected void InitializeRootContainer()
         {
             // Main strategy chain
             _strategies.Add(new BuildKeyMappingStrategy(), UnityBuildStage.TypeMapping);
@@ -119,6 +116,8 @@ protected void InitializeStrategies()
             this[typeof(IEnumerable<>), string.Empty, typeof(IBuildPlanCreatorPolicy)] = 
                 new DelegateBasedBuildPlanCreatorPolicy(typeof(UnityContainer).GetTypeInfo().GetDeclaredMethod(nameof(ResolveEnumerable)),
                                                         context => context.BuildKey.Type.GetTypeInfo().GenericTypeArguments.First());
+            // Register this instance
+            RegisterInstance(typeof(IUnityContainer), null, this, new ContainerLifetimeManager());
         }
 
 

src/UnityContainer.Public.cs

@@ -87,7 +87,7 @@ public IUnityContainer RemoveAllExtensions()
             ((IPolicyList)_context).ClearAll();
 
             if (null == _parent)
-                InitializeStrategies();
+                InitializeRootContainer();
 
             return this;
         }

src/UnityContainer.Registration.cs

@@ -9,7 +9,6 @@
 using Unity.Policy;
 using Unity.Registration;
 using Unity.Storage;
-using Unity.Strategy;
 
 namespace Unity
 {