Refactoring

unitycontainer · Oct 8, 2017 · 0ad3498 · 0ad3498
1 parent 48d007b
commit 0ad3498
Show file tree

Hide file tree

Showing 54 changed files with 61 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 {
     /// <summary>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...s/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs b/...s/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 {