Updating references to Abstractions.3.0.0 and Container.5.5.0

Author: ENikS

package.props

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <UnityAbstractionsVersion>2.*</UnityAbstractionsVersion>
+    <UnityAbstractionsVersion>3.*</UnityAbstractionsVersion>
     <UnityContainerVersion>5.*</UnityContainerVersion>
   </PropertyGroup>
 

src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs

@@ -23,7 +23,8 @@ public class InstanceInterceptionStrategy : BuilderStrategy
         /// phase and executes in reverse order from the PreBuildUp calls.
         /// </summary>
         /// <param name="context">Context of the build operation.</param>
-        public override void PostBuildUp(IBuilderContext context)
+        /// <param name="pre"></param>
+        public override void PostBuildUp(IBuilderContext context, object pre = null)
         {
             // If it's already been intercepted, don't do it again.
             if ((context ?? throw new ArgumentNullException(nameof(context))).Existing is IInterceptingProxy)

src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs

@@ -29,25 +29,25 @@ public class TypeInterceptionStrategy : BuilderStrategy
         /// <remarks>In this class, PreBuildUp is responsible for figuring out if the
         /// class is proxyable, and if so, replacing it with a proxy class.</remarks>
         /// <param name="context">Context of the build operation.</param>
-        public override void PreBuildUp(IBuilderContext context)
+        public override object PreBuildUp(IBuilderContext context)
         {
             if ((context ?? throw new ArgumentNullException(nameof(context))).Existing != null)
             {
-                return;
+                return null;
             }
 
             Type typeToBuild = context.BuildKey.Type;
 
             var interceptionPolicy = FindInterceptionPolicy<ITypeInterceptionPolicy>(context);
             if (interceptionPolicy == null)
             {
-                return;
+                return null;
             }
 
             var interceptor = interceptionPolicy.GetInterceptor(context);
             if (!interceptor.CanIntercept(typeToBuild))
             {
-                return;
+                return null;
             }
 
             var interceptionBehaviorsPolicy = FindInterceptionPolicy<IInterceptionBehaviorsPolicy>(context);
@@ -80,6 +80,8 @@ public override void PreBuildUp(IBuilderContext context)
                 interceptor.CreateProxyType(typeToBuild, allAdditionalInterfaces);
 
             DerivedTypeConstructorSelectorPolicy.SetPolicyForInterceptingType(context, interceptingType);
+
+            return null;
         }
 
         /// <summary>
@@ -90,7 +92,8 @@ public override void PreBuildUp(IBuilderContext context)
         /// <remarks>In this class, PostBuildUp checks to see if the object was proxyable,
         /// and if it was, wires up the handlers.</remarks>
         /// <param name="context">Context of the build operation.</param>
-        public override void PostBuildUp(IBuilderContext context)
+        /// <param name="pre"></param>
+        public override void PostBuildUp(IBuilderContext context, object pre = null)
         {
             IInterceptingProxy proxy = 
                 (context ?? throw new ArgumentNullException(nameof(context))).Existing as IInterceptingProxy;
@@ -163,7 +166,7 @@ private static SelectedConstructor FindNewConstructor(SelectedConstructor origin
 
                 SelectedConstructor newConstructor = new SelectedConstructor(newConstructorInfo);
 
-                foreach (IDependencyResolverPolicy resolver in originalConstructor.GetParameterResolvers())
+                foreach (IResolverPolicy resolver in originalConstructor.GetParameterResolvers())
                 {
                     newConstructor.AddParameterResolver(resolver);
                 }

tests/TestSupport/MockBuilderContext.cs

@@ -96,7 +96,7 @@ public void AddResolverOverrides(IEnumerable<ResolverOverride> newOverrides)
             resolverOverrides.AddRange(newOverrides);
         }
 
-        public IDependencyResolverPolicy GetOverriddenResolver(Type dependencyType)
+        public IResolverPolicy GetOverriddenResolver(Type dependencyType)
         {
             return resolverOverrides.GetResolver(this, dependencyType);
         }