Moved Lifetime managers into Abstractions

src/ContainerIntegration/AdditionalInterface.cs

@@ -6,6 +6,7 @@ using Microsoft.Practices.ObjectBuilder2;
 using Unity.Interception.Properties;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/DefaultInterceptionBehavior.cs

@@ -3,6 +3,7 @@
 using System;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/DefaultInterceptor.cs

@@ -4,6 +4,8 @@ using System;
 using Microsoft.Practices.ObjectBuilder2;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Policy;
+using Unity.Registration;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/InterceptionBehavior.cs

@@ -3,6 +3,7 @@
 using System;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/InterceptionBehaviorBase.cs

@@ -4,6 +4,8 @@ using System;
 using Microsoft.Practices.ObjectBuilder2;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Lifetime;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/InterceptionMember.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 
 using Unity;
+using Unity.Registration;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/Interceptor.cs

@@ -4,6 +4,7 @@ using System;
 using Microsoft.Practices.ObjectBuilder2;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs

@@ -2,6 +2,7 @@
 
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs

@@ -3,6 +3,7 @@
 using System;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs

@@ -2,6 +2,7 @@
 
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Text;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs

@@ -4,6 +4,8 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs

@@ -3,6 +3,7 @@
 using Microsoft.Practices.ObjectBuilder2;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs

@@ -4,6 +4,7 @@ using System;
 using Microsoft.Practices.ObjectBuilder2;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Builder;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs

@@ -7,6 +7,8 @@ using System.Reflection;
 using Microsoft.Practices.ObjectBuilder2;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Builder;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/ContainerIntegration/PolicyDefinition.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Practices.Unity.Utility;
 using Unity;
+using Unity.Lifetime;
+using Unity.Registration;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Text;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
+using Unity.Policy;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension
 {

tests/ConvenienceConfigurationFixture.cs

@@ -7,6 +7,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest;
 using Microsoft.Practices.Unity.TestSupport;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension.Tests
 {

tests/EventInterceptionFixture.cs

@@ -7,6 +7,7 @@ using System.Text;
 using Microsoft.Practices.Unity.TestSupport;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension.Tests
 {

tests/InterceptionFixture.Desktop.cs

@@ -8,6 +8,7 @@ using System.Text;
 using Microsoft.Practices.Unity.TestSupport;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension.Tests
 {

tests/InterceptionFixture.cs

@@ -4,6 +4,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest;
 using Microsoft.Practices.Unity.TestSupport;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension.Tests
 {

tests/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs

@@ -7,6 +7,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest;
 using Microsoft.Practices.Unity.TestSupport;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.InterfaceInterception
 {

tests/TestSupport/MockBuilderContext.cs

@@ -4,6 +4,12 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Builder;
+using Unity.Exceptions;
+using Unity.Lifetime;
+using Unity.Policy;
+using Unity.Resolve;
+using Unity.Strategy;
 
 namespace Microsoft.Practices.Unity.TestSupport
 {

tests/TestSupport/RegistrationsToAssertOn.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.TestSupport
 {

tests/TestSupport/SessionLifetimeManager.cs

@@ -6,6 +6,7 @@ using System.ComponentModel;
 using System.Globalization;
 using Microsoft.Practices.ObjectBuilder2;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.TestSupport
 {

tests/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs

@@ -5,6 +5,7 @@ using System.ComponentModel;
 using Microsoft.Practices.Unity.TestSupport;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
+using Unity.Lifetime;
 
 namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterception
 {