diff --git a/src/ContainerIntegration/AdditionalInterface.cs b/src/ContainerIntegration/AdditionalInterface.cs index 7d4a0e5..df3379c 100644 --- a/src/ContainerIntegration/AdditionalInterface.cs +++ b/src/ContainerIntegration/AdditionalInterface.cs @@ -5,6 +5,7 @@ using Microsoft.Practices.ObjectBuilder2; using Unity.Interception.Properties; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/DefaultInterceptionBehavior.cs b/src/ContainerIntegration/DefaultInterceptionBehavior.cs index 37da02a..322c57a 100644 --- a/src/ContainerIntegration/DefaultInterceptionBehavior.cs +++ b/src/ContainerIntegration/DefaultInterceptionBehavior.cs @@ -2,6 +2,7 @@ using System; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/DefaultInterceptor.cs b/src/ContainerIntegration/DefaultInterceptor.cs index 49a6513..9b45382 100644 --- a/src/ContainerIntegration/DefaultInterceptor.cs +++ b/src/ContainerIntegration/DefaultInterceptor.cs @@ -3,6 +3,7 @@ using System; using Microsoft.Practices.ObjectBuilder2; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/Interception.cs b/src/ContainerIntegration/Interception.cs index 7197c5d..127d91d 100644 --- a/src/ContainerIntegration/Interception.cs +++ b/src/ContainerIntegration/Interception.cs @@ -5,6 +5,8 @@ using Microsoft.Practices.ObjectBuilder2; using Unity.Interception.Properties; using Microsoft.Practices.Unity.ObjectBuilder; +using Unity; +using Unity.Extension; using Guard = Microsoft.Practices.Unity.Utility.Guard; namespace Microsoft.Practices.Unity.InterceptionExtension diff --git a/src/ContainerIntegration/InterceptionBehavior.cs b/src/ContainerIntegration/InterceptionBehavior.cs index e821932..efc5059 100644 --- a/src/ContainerIntegration/InterceptionBehavior.cs +++ b/src/ContainerIntegration/InterceptionBehavior.cs @@ -2,6 +2,7 @@ using System; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/InterceptionBehaviorBase.cs b/src/ContainerIntegration/InterceptionBehaviorBase.cs index 8180250..c9680a3 100644 --- a/src/ContainerIntegration/InterceptionBehaviorBase.cs +++ b/src/ContainerIntegration/InterceptionBehaviorBase.cs @@ -3,6 +3,7 @@ using System; using Microsoft.Practices.ObjectBuilder2; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/InterceptionMember.cs b/src/ContainerIntegration/InterceptionMember.cs index 8759c0a..2806011 100644 --- a/src/ContainerIntegration/InterceptionMember.cs +++ b/src/ContainerIntegration/InterceptionMember.cs @@ -1,5 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. +using Unity; + namespace Microsoft.Practices.Unity.InterceptionExtension { /// diff --git a/src/ContainerIntegration/Interceptor.cs b/src/ContainerIntegration/Interceptor.cs index 989254f..f2df0eb 100644 --- a/src/ContainerIntegration/Interceptor.cs +++ b/src/ContainerIntegration/Interceptor.cs @@ -3,6 +3,7 @@ using System; using Microsoft.Practices.ObjectBuilder2; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs b/src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs index 4800b3b..9bdcf65 100644 --- a/src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs b/src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs index 44a07d8..dbca542 100644 --- a/src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs b/src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs index 919efa9..222b058 100644 --- a/src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs @@ -2,6 +2,7 @@ using System; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs b/src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs index c4db007..25d2b08 100644 --- a/src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs b/src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs index 007ea29..a694db1 100644 --- a/src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs b/src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs index 515903d..a1510f4 100644 --- a/src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs b/src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs index 64edc3c..bb1f4d2 100644 --- a/src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs b/src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs index 6d84d30..a13b75f 100644 --- a/src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs +++ b/src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs b/src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs index 05c702f..e3acd7c 100644 --- a/src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs b/src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs index 969b407..0b38ef4 100644 --- a/src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs @@ -2,6 +2,7 @@ using Microsoft.Practices.ObjectBuilder2; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs b/src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs index 2aa8e9e..99c7c99 100644 --- a/src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs +++ b/src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs @@ -3,6 +3,7 @@ using System; using Microsoft.Practices.ObjectBuilder2; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs b/src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs index 646b5d8..cdb07fd 100644 --- a/src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs +++ b/src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs @@ -6,6 +6,7 @@ using System.Reflection; using Microsoft.Practices.ObjectBuilder2; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/ContainerIntegration/PolicyDefinition.cs b/src/ContainerIntegration/PolicyDefinition.cs index 0e61ac9..a3bacc7 100644 --- a/src/ContainerIntegration/PolicyDefinition.cs +++ b/src/ContainerIntegration/PolicyDefinition.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs b/src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs index 03c7f5c..ce9b844 100644 --- a/src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs +++ b/src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/PolicyInjection/Policies/AttributeDrivenPolicy.cs b/src/PolicyInjection/Policies/AttributeDrivenPolicy.cs index 16b87a9..cfa7edc 100644 --- a/src/PolicyInjection/Policies/AttributeDrivenPolicy.cs +++ b/src/PolicyInjection/Policies/AttributeDrivenPolicy.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/PolicyInjection/Policies/HandlerAttribute.cs b/src/PolicyInjection/Policies/HandlerAttribute.cs index 8191899..439539a 100644 --- a/src/PolicyInjection/Policies/HandlerAttribute.cs +++ b/src/PolicyInjection/Policies/HandlerAttribute.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Globalization; using System.Reflection; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/PolicyInjection/Policies/InjectionPolicy.cs b/src/PolicyInjection/Policies/InjectionPolicy.cs index 1dbf8d1..649d01d 100644 --- a/src/PolicyInjection/Policies/InjectionPolicy.cs +++ b/src/PolicyInjection/Policies/InjectionPolicy.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Reflection; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/PolicyInjection/Policies/PolicySet.cs b/src/PolicyInjection/Policies/PolicySet.cs index 10947ca..a2d993c 100644 --- a/src/PolicyInjection/Policies/PolicySet.cs +++ b/src/PolicyInjection/Policies/PolicySet.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Reflection; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/PolicyInjection/Policies/RuleDrivenPolicy.cs b/src/PolicyInjection/Policies/RuleDrivenPolicy.cs index 1e6af73..d3a1603 100644 --- a/src/PolicyInjection/Policies/RuleDrivenPolicy.cs +++ b/src/PolicyInjection/Policies/RuleDrivenPolicy.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Reflection; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/src/PolicyInjection/PolicyInjectionBehavior.cs b/src/PolicyInjection/PolicyInjectionBehavior.cs index d33347a..b91c168 100644 --- a/src/PolicyInjection/PolicyInjectionBehavior.cs +++ b/src/PolicyInjection/PolicyInjectionBehavior.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Reflection; using Microsoft.Practices.Unity.Utility; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension { diff --git a/tests/AttributeDrivenPolicyFixture.cs b/tests/AttributeDrivenPolicyFixture.cs index 057814e..f838a81 100644 --- a/tests/AttributeDrivenPolicyFixture.cs +++ b/tests/AttributeDrivenPolicyFixture.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using Microsoft.Practices.Unity.Utility; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/CodeplexIssuesFixture.cs b/tests/CodeplexIssuesFixture.cs index 17d2c35..cb9ee14 100644 --- a/tests/CodeplexIssuesFixture.cs +++ b/tests/CodeplexIssuesFixture.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/ConvenienceConfigurationFixture.cs b/tests/ConvenienceConfigurationFixture.cs index 8eb2944..1d0a0a3 100644 --- a/tests/ConvenienceConfigurationFixture.cs +++ b/tests/ConvenienceConfigurationFixture.cs @@ -6,6 +6,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/EventInterceptionFixture.cs b/tests/EventInterceptionFixture.cs index e50b9ea..a4ae759 100644 --- a/tests/EventInterceptionFixture.cs +++ b/tests/EventInterceptionFixture.cs @@ -6,6 +6,7 @@ using System.Text; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/HandlerInvocationFixture.cs b/tests/HandlerInvocationFixture.cs index 196f911..bf236e6 100644 --- a/tests/HandlerInvocationFixture.cs +++ b/tests/HandlerInvocationFixture.cs @@ -2,6 +2,7 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/InterceptionConfigurationFixture.cs b/tests/InterceptionConfigurationFixture.cs index fef473a..a9f246c 100644 --- a/tests/InterceptionConfigurationFixture.cs +++ b/tests/InterceptionConfigurationFixture.cs @@ -3,6 +3,7 @@ using System; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/InterceptionFixture.Desktop.cs b/tests/InterceptionFixture.Desktop.cs index e1c84ea..b65d09f 100644 --- a/tests/InterceptionFixture.Desktop.cs +++ b/tests/InterceptionFixture.Desktop.cs @@ -7,6 +7,7 @@ using System.Text; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/InterceptionFixture.cs b/tests/InterceptionFixture.cs index 0a05a10..be1655e 100644 --- a/tests/InterceptionFixture.cs +++ b/tests/InterceptionFixture.cs @@ -3,6 +3,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs b/tests/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs index 545145d..33918c7 100644 --- a/tests/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs +++ b/tests/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs @@ -6,6 +6,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.InterfaceInterception { diff --git a/tests/InterfaceInterception/InterfaceInterceptorFixture.cs b/tests/InterfaceInterception/InterfaceInterceptorFixture.cs index fc50a12..9a234f3 100644 --- a/tests/InterfaceInterception/InterfaceInterceptorFixture.cs +++ b/tests/InterfaceInterception/InterfaceInterceptorFixture.cs @@ -11,6 +11,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.InterfaceInterception { diff --git a/tests/MethodSignatureFixture.cs b/tests/MethodSignatureFixture.cs index 791ed4f..629570b 100644 --- a/tests/MethodSignatureFixture.cs +++ b/tests/MethodSignatureFixture.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/ObjectsUnderTest/TestHandlerAttribute.cs b/tests/ObjectsUnderTest/TestHandlerAttribute.cs index b1e1d8d..1333744 100644 --- a/tests/ObjectsUnderTest/TestHandlerAttribute.cs +++ b/tests/ObjectsUnderTest/TestHandlerAttribute.cs @@ -1,5 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. +using Unity; + namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest { public class TestHandlerAttribute : HandlerAttribute diff --git a/tests/PipelineFixture.cs b/tests/PipelineFixture.cs index 6192076..26be83d 100644 --- a/tests/PipelineFixture.cs +++ b/tests/PipelineFixture.cs @@ -4,6 +4,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/PolicyFixture.cs b/tests/PolicyFixture.cs index 86d1343..63ffee2 100644 --- a/tests/PolicyFixture.cs +++ b/tests/PolicyFixture.cs @@ -7,6 +7,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/PolicyInjection/PolicyInjectionBehaviorFixture.cs b/tests/PolicyInjection/PolicyInjectionBehaviorFixture.cs index 0f879b9..b87bb97 100644 --- a/tests/PolicyInjection/PolicyInjectionBehaviorFixture.cs +++ b/tests/PolicyInjection/PolicyInjectionBehaviorFixture.cs @@ -2,6 +2,7 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection { diff --git a/tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs b/tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs index 1072b44..8664fe9 100644 --- a/tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs +++ b/tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs @@ -2,6 +2,7 @@ using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection { diff --git a/tests/PolicyInjection/VirtualMethodOverrideFixture.cs b/tests/PolicyInjection/VirtualMethodOverrideFixture.cs index edb6b6c..f6b3ff4 100644 --- a/tests/PolicyInjection/VirtualMethodOverrideFixture.cs +++ b/tests/PolicyInjection/VirtualMethodOverrideFixture.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection { diff --git a/tests/PolicySetFixture.cs b/tests/PolicySetFixture.cs index 4dc03b9..c040bb4 100644 --- a/tests/PolicySetFixture.cs +++ b/tests/PolicySetFixture.cs @@ -5,6 +5,7 @@ using System.Reflection; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests { diff --git a/tests/TestSupport/ExtensibilityTestExtension.cs b/tests/TestSupport/ExtensibilityTestExtension.cs index c944f7f..c424b05 100644 --- a/tests/TestSupport/ExtensibilityTestExtension.cs +++ b/tests/TestSupport/ExtensibilityTestExtension.cs @@ -1,5 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. +using Unity.Extension; + namespace Microsoft.Practices.Unity.TestSupport { public interface IConfigOne : IUnityContainerExtensionConfigurator diff --git a/tests/TestSupport/GlobalCountCallHandler.cs b/tests/TestSupport/GlobalCountCallHandler.cs index d2d9ce8..22fe81b 100644 --- a/tests/TestSupport/GlobalCountCallHandler.cs +++ b/tests/TestSupport/GlobalCountCallHandler.cs @@ -4,6 +4,7 @@ using System.Collections.Specialized; using Microsoft.Practices.Unity.InterceptionExtension; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.TestSupport { diff --git a/tests/TestSupport/MockBuilderContext.cs b/tests/TestSupport/MockBuilderContext.cs index 6648e11..802c2dd 100644 --- a/tests/TestSupport/MockBuilderContext.cs +++ b/tests/TestSupport/MockBuilderContext.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.TestSupport { @@ -78,6 +79,8 @@ public object Existing public IBuilderContext ChildContext { get; set; } + public IUnityContainer Container { get; set; } + public void AddResolverOverrides(IEnumerable newOverrides) { resolverOverrides.AddRange(newOverrides); diff --git a/tests/TestSupport/MockContainerExtension.cs b/tests/TestSupport/MockContainerExtension.cs index 11a1dd9..83cd4e3 100644 --- a/tests/TestSupport/MockContainerExtension.cs +++ b/tests/TestSupport/MockContainerExtension.cs @@ -1,5 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. +using Unity.Extension; + namespace Microsoft.Practices.Unity.TestSupport { public class MockContainerExtension : UnityContainerExtension, IMockConfiguration diff --git a/tests/TestSupport/RegistrationsToAssertOn.cs b/tests/TestSupport/RegistrationsToAssertOn.cs index 099ba2f..94fb0f8 100644 --- a/tests/TestSupport/RegistrationsToAssertOn.cs +++ b/tests/TestSupport/RegistrationsToAssertOn.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.TestSupport { diff --git a/tests/TestSupport/SessionLifetimeManager.cs b/tests/TestSupport/SessionLifetimeManager.cs index 22e2d20..609dc89 100644 --- a/tests/TestSupport/SessionLifetimeManager.cs +++ b/tests/TestSupport/SessionLifetimeManager.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using System.Globalization; using Microsoft.Practices.ObjectBuilder2; +using Unity; namespace Microsoft.Practices.Unity.TestSupport { diff --git a/tests/TransparentProxyInterception/IntegrationFixture.cs b/tests/TransparentProxyInterception/IntegrationFixture.cs index 2a20f7f..47e81a7 100644 --- a/tests/TransparentProxyInterception/IntegrationFixture.cs +++ b/tests/TransparentProxyInterception/IntegrationFixture.cs @@ -2,6 +2,7 @@ using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.TransparentProxyInterception { diff --git a/tests/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs b/tests/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs index 57bea25..bf0b76d 100644 --- a/tests/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs +++ b/tests/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using Microsoft.Practices.Unity.TestSupport; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Unity; namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterception {