Merge pull request #1 from ENikS/master

Updating references to Abstractions.3.0.0 and Container.5.5.0

Author: ENikS

package.props

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <UnityAbstractionsVersion>2.4.*</UnityAbstractionsVersion>
-    <UnityContainerVersion>5.4.*</UnityContainerVersion>
+    <UnityAbstractionsVersion>3.*</UnityAbstractionsVersion>
+    <UnityContainerVersion>5.*</UnityContainerVersion>
     <UnityInterceptionVersion>5.*</UnityInterceptionVersion>
     <UnityConfigurationVersion>5.*</UnityConfigurationVersion>
   </PropertyGroup>

tests/TestSupport/MockBuilderContext.cs

@@ -89,12 +89,14 @@ public object Existing
 
         public IUnityContainer Container { get; set; }
 
+        public IBuilderContext ParentContext => throw new NotImplementedException();
+
         public void AddResolverOverrides(IEnumerable<ResolverOverride> newOverrides)
         {
             resolverOverrides.AddRange(newOverrides);
         }
 
-        public IDependencyResolverPolicy GetOverriddenResolver(Type dependencyType)
+        public IResolverPolicy GetOverriddenResolver(Type dependencyType)
         {
             return resolverOverrides.GetResolver(this, dependencyType);
         }
@@ -127,17 +129,15 @@ public object NewBuildUp(INamedType newBuildKey)
             return clone.Strategies.ExecuteBuildUp(clone);
         }
 
-        /// <summary>
-        /// A convenience method to do a new buildup operation on an existing context. This
-        /// overload allows you to specify extra policies which will be in effect for the duration
-        /// of the build.
-        /// </summary>
-        /// <param name="newBuildKey">Key defining what to build up.</param>
-        /// <param name="childCustomizationBlock">A delegate that takes a <see cref="IBuilderContext"/>. This
-        /// is invoked with the new child context before the build up process starts. This gives callers
-        /// the opportunity to customize the context for the build process.</param>
-        /// <returns>Created object.</returns>
-        public object NewBuildUp(INamedType newBuildKey, Action<IBuilderContext> childCustomizationBlock)
+        public object ExecuteBuildUp(NamedTypeBuildKey buildKey, object existing)
+        {
+            this.BuildKey = buildKey;
+            this.Existing = existing;
+
+            return Strategies.ExecuteBuildUp(this);
+        }
+
+        public object NewBuildUp(Type type, string name, Action<IBuilderContext> childCustomizationBlock = null)
         {
             var newContext = new MockBuilderContext
             {
@@ -146,7 +146,7 @@ public object NewBuildUp(INamedType newBuildKey, Action<IBuilderContext> childCu
                 policies = new PolicyList(persistentPolicies),
                 lifetime = lifetime,
                 originalBuildKey = buildKey,
-                buildKey = newBuildKey,
+                buildKey = new NamedTypeBuildKey(type, name),
                 existing = null
             };
             newContext.resolverOverrides.Add(resolverOverrides);
@@ -155,13 +155,5 @@ public object NewBuildUp(INamedType newBuildKey, Action<IBuilderContext> childCu
 
             return strategies.ExecuteBuildUp(newContext);
         }
-
-        public object ExecuteBuildUp(NamedTypeBuildKey buildKey, object existing)
-        {
-            this.BuildKey = buildKey;
-            this.Existing = existing;
-
-            return Strategies.ExecuteBuildUp(this);
-        }
     }
 }