diff --git a/.gitignore b/.gitignore index bf64c277..7bb2ead9 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,13 @@ x64/ [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* +# Visual Studio 2015 cache/options directory +.vs/ + +# DNX +project.lock.json +artifacts/ + *_i.c *_p.c *_i.h @@ -130,3 +137,6 @@ $RECYCLE.BIN/ .DS_Store _NCrunch* +project.lock.json +testresults.xml +testresults.xml diff --git a/quickstarts/CS/Stoplight/Src/packages.config b/quickstarts/CS/Stoplight/Src/packages.config index e86a79cc..843c5d3a 100644 --- a/quickstarts/CS/Stoplight/Src/packages.config +++ b/quickstarts/CS/Stoplight/Src/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/source/.nuget/NuGet.Config b/source/.nuget/NuGet.Config new file mode 100644 index 00000000..67f8ea04 --- /dev/null +++ b/source/.nuget/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/source/.nuget/NuGet.targets b/source/.nuget/NuGet.targets new file mode 100644 index 00000000..3f8c37b2 --- /dev/null +++ b/source/.nuget/NuGet.targets @@ -0,0 +1,144 @@ + + + + $(MSBuildProjectDirectory)\..\ + + + false + + + false + + + true + + + false + + + + + + + + + + + $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) + + + + + $(SolutionDir).nuget + + + + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config + + + + $(MSBuildProjectDirectory)\packages.config + $(PackagesProjectConfig) + + + + + $(NuGetToolsPath)\NuGet.exe + @(PackageSource) + + "$(NuGetExePath)" + mono --runtime=v4.0.30319 "$(NuGetExePath)" + + $(TargetDir.Trim('\\')) + + -RequireConsent + -NonInteractive + + "$(SolutionDir) " + "$(SolutionDir)" + + + $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) + $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols + + + + RestorePackages; + $(BuildDependsOn); + + + + + $(BuildDependsOn); + BuildPackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/Common/GlobalAssemblyInfo.cs b/source/Common/GlobalAssemblyInfo.cs index 2ee276f9..40ce700e 100644 --- a/source/Common/GlobalAssemblyInfo.cs +++ b/source/Common/GlobalAssemblyInfo.cs @@ -22,5 +22,5 @@ [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("4.0.0.0")] -[assembly: AssemblyFileVersion("4.0.1.0")] -[assembly: AssemblyInformationalVersion("4.0.1")] +[assembly: AssemblyFileVersion("4.0.0.0")] +[assembly: AssemblyInformationalVersion("4.0.0")] diff --git a/source/NuGet/Unity.nuspec b/source/NuGet/Unity.nuspec index c1edeb6e..09c4f34b 100644 --- a/source/NuGet/Unity.nuspec +++ b/source/NuGet/Unity.nuspec @@ -14,7 +14,15 @@ © Microsoft Corporation. All rights reserved. true + + + + + + + + Unity Unity3 Unity35 EntLib EntLib6 IoC DI container dependency injection inversion control LOB WinRT Win8 Windows8 NetCore WindowsStoreApps WindowsStore WindowsPhone WindowsPhone8 wp8 Azure Xamarin MonoTouch MonoAndroid OSS diff --git a/source/Unity/Src/Attributes/DependencyAttribute.cs b/source/Src/Unity-CoreClr/Attributes/DependencyAttribute.cs similarity index 94% rename from source/Unity/Src/Attributes/DependencyAttribute.cs rename to source/Src/Unity-CoreClr/Attributes/DependencyAttribute.cs index c042f478..ffc0ee76 100644 --- a/source/Unity/Src/Attributes/DependencyAttribute.cs +++ b/source/Src/Unity-CoreClr/Attributes/DependencyAttribute.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; +using ObjectBuilder2; +using Unity.ObjectBuilder; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// This attribute is used to mark properties and parameters as targets for injection. diff --git a/source/Unity/Src/Attributes/DependencyResolutionAttribute.cs b/source/Src/Unity-CoreClr/Attributes/DependencyResolutionAttribute.cs similarity index 92% rename from source/Unity/Src/Attributes/DependencyResolutionAttribute.cs rename to source/Src/Unity-CoreClr/Attributes/DependencyResolutionAttribute.cs index 6ee96f4c..6b97b493 100644 --- a/source/Unity/Src/Attributes/DependencyResolutionAttribute.cs +++ b/source/Src/Unity-CoreClr/Attributes/DependencyResolutionAttribute.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base class for attributes that can be placed on parameters diff --git a/source/Unity/Src/Attributes/InjectionConstructorAttribute.cs b/source/Src/Unity-CoreClr/Attributes/InjectionConstructorAttribute.cs similarity index 92% rename from source/Unity/Src/Attributes/InjectionConstructorAttribute.cs rename to source/Src/Unity-CoreClr/Attributes/InjectionConstructorAttribute.cs index 2a6b2e05..b87af00c 100644 --- a/source/Unity/Src/Attributes/InjectionConstructorAttribute.cs +++ b/source/Src/Unity-CoreClr/Attributes/InjectionConstructorAttribute.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// This attribute is used to indicate which constructor to choose when diff --git a/source/Unity/Src/Attributes/InjectionMethodAttribute.cs b/source/Src/Unity-CoreClr/Attributes/InjectionMethodAttribute.cs similarity index 92% rename from source/Unity/Src/Attributes/InjectionMethodAttribute.cs rename to source/Src/Unity-CoreClr/Attributes/InjectionMethodAttribute.cs index 33f3082f..7d39879d 100644 --- a/source/Unity/Src/Attributes/InjectionMethodAttribute.cs +++ b/source/Src/Unity-CoreClr/Attributes/InjectionMethodAttribute.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// This attribute is used to mark methods that should be called when diff --git a/source/Unity/Src/Attributes/OptionalDependencyAttribute.cs b/source/Src/Unity-CoreClr/Attributes/OptionalDependencyAttribute.cs similarity index 96% rename from source/Unity/Src/Attributes/OptionalDependencyAttribute.cs rename to source/Src/Unity-CoreClr/Attributes/OptionalDependencyAttribute.cs index 90568cf9..a41afa50 100644 --- a/source/Unity/Src/Attributes/OptionalDependencyAttribute.cs +++ b/source/Src/Unity-CoreClr/Attributes/OptionalDependencyAttribute.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// An used to mark a dependency diff --git a/source/Unity/Src/CompositeResolverOverride.cs b/source/Src/Unity-CoreClr/CompositeResolverOverride.cs similarity index 97% rename from source/Unity/Src/CompositeResolverOverride.cs rename to source/Src/Unity-CoreClr/CompositeResolverOverride.cs index 2f8533dc..b95a422f 100644 --- a/source/Unity/Src/CompositeResolverOverride.cs +++ b/source/Src/Unity-CoreClr/CompositeResolverOverride.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that composites other diff --git a/source/Unity/Src/ContainerRegistration.cs b/source/Src/Unity-CoreClr/ContainerRegistration.cs similarity index 97% rename from source/Unity/Src/ContainerRegistration.cs rename to source/Src/Unity-CoreClr/ContainerRegistration.cs index 18441ead..ef479d3a 100644 --- a/source/Unity/Src/ContainerRegistration.cs +++ b/source/Src/Unity-CoreClr/ContainerRegistration.cs @@ -2,9 +2,9 @@ using System; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Class that returns information about the types registered in a container. diff --git a/source/Unity/Src/DependencyOverride.cs b/source/Src/Unity-CoreClr/DependencyOverride.cs similarity index 95% rename from source/Unity/Src/DependencyOverride.cs rename to source/Src/Unity-CoreClr/DependencyOverride.cs index 04db3e3a..e6dc8281 100644 --- a/source/Unity/Src/DependencyOverride.cs +++ b/source/Src/Unity-CoreClr/DependencyOverride.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A class that overrides diff --git a/source/Unity/Src/DependencyOverrides.cs b/source/Src/Unity-CoreClr/DependencyOverrides.cs similarity index 97% rename from source/Unity/Src/DependencyOverrides.cs rename to source/Src/Unity-CoreClr/DependencyOverrides.cs index 1921b5af..09723b81 100644 --- a/source/Unity/Src/DependencyOverrides.cs +++ b/source/Src/Unity-CoreClr/DependencyOverrides.cs @@ -3,7 +3,7 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A convenience form of that lets you diff --git a/source/Unity/Src/Extension/ChildContainerCreatedEventArgs.cs b/source/Src/Unity-CoreClr/Extension/ChildContainerCreatedEventArgs.cs similarity index 97% rename from source/Unity/Src/Extension/ChildContainerCreatedEventArgs.cs rename to source/Src/Unity-CoreClr/Extension/ChildContainerCreatedEventArgs.cs index 00883cdc..c2624279 100644 --- a/source/Unity/Src/Extension/ChildContainerCreatedEventArgs.cs +++ b/source/Src/Unity-CoreClr/Extension/ChildContainerCreatedEventArgs.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Event argument class for the event. diff --git a/source/Unity/Src/Extension/ExtensionContext.cs b/source/Src/Unity-CoreClr/Extension/ExtensionContext.cs similarity index 96% rename from source/Unity/Src/Extension/ExtensionContext.cs rename to source/Src/Unity-CoreClr/Extension/ExtensionContext.cs index 79363738..5e150a2c 100644 --- a/source/Unity/Src/Extension/ExtensionContext.cs +++ b/source/Src/Unity-CoreClr/Extension/ExtensionContext.cs @@ -2,10 +2,10 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; +using ObjectBuilder2; +using Unity.ObjectBuilder; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// The class provides the means for extension objects diff --git a/source/Unity/Src/Extension/IUnityContainerExtensionConfigurator.cs b/source/Src/Unity-CoreClr/Extension/IUnityContainerExtensionConfigurator.cs similarity index 94% rename from source/Unity/Src/Extension/IUnityContainerExtensionConfigurator.cs rename to source/Src/Unity-CoreClr/Extension/IUnityContainerExtensionConfigurator.cs index 7637bbc2..e28b6cdf 100644 --- a/source/Unity/Src/Extension/IUnityContainerExtensionConfigurator.cs +++ b/source/Src/Unity-CoreClr/Extension/IUnityContainerExtensionConfigurator.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base interface for all extension configuration interfaces. diff --git a/source/Unity/Src/Extension/NamedEventArgs.cs b/source/Src/Unity-CoreClr/Extension/NamedEventArgs.cs similarity index 96% rename from source/Unity/Src/Extension/NamedEventArgs.cs rename to source/Src/Unity-CoreClr/Extension/NamedEventArgs.cs index 15630460..a440bab9 100644 --- a/source/Unity/Src/Extension/NamedEventArgs.cs +++ b/source/Src/Unity-CoreClr/Extension/NamedEventArgs.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// An EventArgs class that holds a string Name. diff --git a/source/Unity/Src/Extension/RegisterEventArgs.cs b/source/Src/Unity-CoreClr/Extension/RegisterEventArgs.cs similarity index 98% rename from source/Unity/Src/Extension/RegisterEventArgs.cs rename to source/Src/Unity-CoreClr/Extension/RegisterEventArgs.cs index 451edffe..65780e82 100644 --- a/source/Unity/Src/Extension/RegisterEventArgs.cs +++ b/source/Src/Unity-CoreClr/Extension/RegisterEventArgs.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Event argument class for the event. diff --git a/source/Unity/Src/Extension/RegisterInstanceEventArgs.cs b/source/Src/Unity-CoreClr/Extension/RegisterInstanceEventArgs.cs similarity index 98% rename from source/Unity/Src/Extension/RegisterInstanceEventArgs.cs rename to source/Src/Unity-CoreClr/Extension/RegisterInstanceEventArgs.cs index c07430c7..2f01bc2f 100644 --- a/source/Unity/Src/Extension/RegisterInstanceEventArgs.cs +++ b/source/Src/Unity-CoreClr/Extension/RegisterInstanceEventArgs.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Event argument class for the event. diff --git a/source/Unity/Src/Extension/UnityContainerExtension.cs b/source/Src/Unity-CoreClr/Extension/UnityContainerExtension.cs similarity index 98% rename from source/Unity/Src/Extension/UnityContainerExtension.cs rename to source/Src/Unity-CoreClr/Extension/UnityContainerExtension.cs index cf93581c..aa115653 100644 --- a/source/Unity/Src/Extension/UnityContainerExtension.cs +++ b/source/Src/Unity-CoreClr/Extension/UnityContainerExtension.cs @@ -3,7 +3,7 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base class for all extension objects. diff --git a/source/Unity/Src/GlobalAssemblyInfo.cs b/source/Src/Unity-CoreClr/GlobalAssemblyInfo.cs similarity index 57% rename from source/Unity/Src/GlobalAssemblyInfo.cs rename to source/Src/Unity-CoreClr/GlobalAssemblyInfo.cs index d81d094d..17a2c7e4 100644 --- a/source/Unity/Src/GlobalAssemblyInfo.cs +++ b/source/Src/Unity-CoreClr/GlobalAssemblyInfo.cs @@ -5,8 +5,8 @@ using System.Security; [assembly: CLSCompliant(true)] -[assembly: AssemblyProduct("Microsoft Unity Application Block")] -[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyProduct("Unity Core")] +[assembly: AssemblyCompany("")] [assembly: SecurityTransparent] @@ -15,10 +15,10 @@ #else [assembly: AssemblyConfiguration("Release")] #endif -[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")] +[assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("4.0.0.0")] -[assembly: AssemblyFileVersion("4.0.1.0")] -[assembly: AssemblyInformationalVersion("4.0.1")] +[assembly: AssemblyVersion("0.0.1.0")] +[assembly: AssemblyFileVersion("0.0.1.0")] +[assembly: AssemblyInformationalVersion("0.0.1")] diff --git a/source/Unity/Src/GlobalSuppressions.cs b/source/Src/Unity-CoreClr/GlobalSuppressions.cs similarity index 75% rename from source/Unity/Src/GlobalSuppressions.cs rename to source/Src/Unity-CoreClr/GlobalSuppressions.cs index 52489a97..d5525329 100644 --- a/source/Unity/Src/GlobalSuppressions.cs +++ b/source/Src/Unity-CoreClr/GlobalSuppressions.cs @@ -3,4 +3,4 @@ using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames", Justification = "Strong name is supplied in build process.")] -[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Microsoft.Practices.Unity.StaticFactory", Justification = "As designed")] \ No newline at end of file +[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Unity.StaticFactory", Justification = "As designed")] diff --git a/source/Unity/Src/IUnityContainer.cs b/source/Src/Unity-CoreClr/IUnityContainer.cs similarity index 99% rename from source/Unity/Src/IUnityContainer.cs rename to source/Src/Unity-CoreClr/IUnityContainer.cs index 785c15d1..6a1099f7 100644 --- a/source/Unity/Src/IUnityContainer.cs +++ b/source/Src/Unity-CoreClr/IUnityContainer.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Interface defining the behavior of the Unity dependency injection container. diff --git a/source/Unity/Src/Injection/GenericParameter.cs b/source/Src/Unity-CoreClr/Injection/GenericParameter.cs similarity index 93% rename from source/Unity/Src/Injection/GenericParameter.cs rename to source/Src/Unity-CoreClr/Injection/GenericParameter.cs index 737587c6..f3f01cbb 100644 --- a/source/Unity/Src/Injection/GenericParameter.cs +++ b/source/Src/Unity-CoreClr/Injection/GenericParameter.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; +using ObjectBuilder2; +using Unity.ObjectBuilder; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that lets you specify that diff --git a/source/Unity/Src/Injection/GenericParameterBase.cs b/source/Src/Unity-CoreClr/Injection/GenericParameterBase.cs similarity index 97% rename from source/Unity/Src/Injection/GenericParameterBase.cs rename to source/Src/Unity-CoreClr/Injection/GenericParameterBase.cs index 489ed429..f3368d25 100644 --- a/source/Unity/Src/Injection/GenericParameterBase.cs +++ b/source/Src/Unity-CoreClr/Injection/GenericParameterBase.cs @@ -4,11 +4,11 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base class for subclasses that let you specify that diff --git a/source/Unity/Src/Injection/GenericResolvedArrayParameter.cs b/source/Src/Unity-CoreClr/Injection/GenericResolvedArrayParameter.cs similarity index 97% rename from source/Unity/Src/Injection/GenericResolvedArrayParameter.cs rename to source/Src/Unity-CoreClr/Injection/GenericResolvedArrayParameter.cs index fd38a324..fd645877 100644 --- a/source/Unity/Src/Injection/GenericResolvedArrayParameter.cs +++ b/source/Src/Unity-CoreClr/Injection/GenericResolvedArrayParameter.cs @@ -5,11 +5,11 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that lets you specify that diff --git a/source/Unity/Src/Injection/InjectedMembers.cs b/source/Src/Unity-CoreClr/Injection/InjectedMembers.cs similarity index 99% rename from source/Unity/Src/Injection/InjectedMembers.cs rename to source/Src/Unity-CoreClr/Injection/InjectedMembers.cs index 2bd6a65a..05fa0157 100644 --- a/source/Unity/Src/Injection/InjectedMembers.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectedMembers.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A Unity container extension that allows you to configure diff --git a/source/Unity/Src/Injection/InjectionConstructor.cs b/source/Src/Unity-CoreClr/Injection/InjectionConstructor.cs similarity index 93% rename from source/Unity/Src/Injection/InjectionConstructor.cs rename to source/Src/Unity-CoreClr/Injection/InjectionConstructor.cs index ceee28c9..1b76e989 100644 --- a/source/Unity/Src/Injection/InjectionConstructor.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectionConstructor.cs @@ -5,12 +5,12 @@ using System.Globalization; using System.Linq; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.ObjectBuilder; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A class that holds the collection of information diff --git a/source/Unity/Src/Injection/InjectionFactory.cs b/source/Src/Unity-CoreClr/Injection/InjectionFactory.cs similarity index 95% rename from source/Unity/Src/Injection/InjectionFactory.cs rename to source/Src/Unity-CoreClr/Injection/InjectionFactory.cs index e7359dea..fbaa474a 100644 --- a/source/Unity/Src/Injection/InjectionFactory.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectionFactory.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A class that lets you specify a factory method the container diff --git a/source/Unity/Src/Injection/InjectionMember.cs b/source/Src/Unity-CoreClr/Injection/InjectionMember.cs similarity index 95% rename from source/Unity/Src/Injection/InjectionMember.cs rename to source/Src/Unity-CoreClr/Injection/InjectionMember.cs index 0326bc05..1f4e8c3a 100644 --- a/source/Unity/Src/Injection/InjectionMember.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectionMember.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base class for objects that can be used to configure what diff --git a/source/Unity/Src/Injection/InjectionMethod.cs b/source/Src/Unity-CoreClr/Injection/InjectionMethod.cs similarity index 95% rename from source/Unity/Src/Injection/InjectionMethod.cs rename to source/Src/Unity-CoreClr/Injection/InjectionMethod.cs index fd1d5857..11410068 100644 --- a/source/Unity/Src/Injection/InjectionMethod.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectionMethod.cs @@ -5,12 +5,12 @@ using System.Globalization; using System.Linq; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.ObjectBuilder; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// An that configures the @@ -62,7 +62,7 @@ public override void AddPolicies(Type serviceType, Type implementationType, stri Justification = "Validation done by Guard class")] protected virtual bool MethodNameMatches(MemberInfo targetMethod, string nameToMatch) { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(targetMethod, "targetMethod"); + Unity.Utility.Guard.ArgumentNotNull(targetMethod, "targetMethod"); return targetMethod.Name == nameToMatch; } diff --git a/source/Unity/Src/Injection/InjectionParameter.cs b/source/Src/Unity-CoreClr/Injection/InjectionParameter.cs similarity index 94% rename from source/Unity/Src/Injection/InjectionParameter.cs rename to source/Src/Unity-CoreClr/Injection/InjectionParameter.cs index 9e2fc5e0..272456c2 100644 --- a/source/Unity/Src/Injection/InjectionParameter.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectionParameter.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Properties; +using ObjectBuilder2; +using Unity.ObjectBuilder; +using Unity.Properties; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A class that holds on to the given value and provides diff --git a/source/Unity/Src/Injection/InjectionParameterValue.cs b/source/Src/Unity-CoreClr/Injection/InjectionParameterValue.cs similarity index 97% rename from source/Unity/Src/Injection/InjectionParameterValue.cs rename to source/Src/Unity-CoreClr/Injection/InjectionParameterValue.cs index 8bc90d13..3c6d65f8 100644 --- a/source/Unity/Src/Injection/InjectionParameterValue.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectionParameterValue.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base type for objects that are used to configure parameters for @@ -51,7 +51,7 @@ public abstract string ParameterTypeName /// The values to build the sequence from. /// The resulting converted sequence. public static IEnumerable ToParameters(params object[] values) - { + { foreach (object value in values) { yield return ToParameter(value); diff --git a/source/Unity/Src/Injection/InjectionProperty.cs b/source/Src/Unity-CoreClr/Injection/InjectionProperty.cs similarity index 96% rename from source/Unity/Src/Injection/InjectionProperty.cs rename to source/Src/Unity-CoreClr/Injection/InjectionProperty.cs index 23c759ad..6a51aeb6 100644 --- a/source/Unity/Src/Injection/InjectionProperty.cs +++ b/source/Src/Unity-CoreClr/Injection/InjectionProperty.cs @@ -5,12 +5,12 @@ using System.Globalization; using System.Linq; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.ObjectBuilder; +using Unity.Utility; +using Unity.Properties; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// This class stores information about which properties to inject, diff --git a/source/Unity/Src/Injection/OptionalGenericParameter.cs b/source/Src/Unity-CoreClr/Injection/OptionalGenericParameter.cs similarity index 96% rename from source/Unity/Src/Injection/OptionalGenericParameter.cs rename to source/Src/Unity-CoreClr/Injection/OptionalGenericParameter.cs index 15075f9b..8c4f4f25 100644 --- a/source/Unity/Src/Injection/OptionalGenericParameter.cs +++ b/source/Src/Unity-CoreClr/Injection/OptionalGenericParameter.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that lets you specify that diff --git a/source/Unity/Src/Injection/OptionalParameter.cs b/source/Src/Unity-CoreClr/Injection/OptionalParameter.cs similarity index 96% rename from source/Unity/Src/Injection/OptionalParameter.cs rename to source/Src/Unity-CoreClr/Injection/OptionalParameter.cs index 22277823..82549ff1 100644 --- a/source/Unity/Src/Injection/OptionalParameter.cs +++ b/source/Src/Unity-CoreClr/Injection/OptionalParameter.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Reflection; using System.Text; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that can be passed to diff --git a/source/Unity/Src/Injection/ResolvedArrayParameter.cs b/source/Src/Unity-CoreClr/Injection/ResolvedArrayParameter.cs similarity index 95% rename from source/Unity/Src/Injection/ResolvedArrayParameter.cs rename to source/Src/Unity-CoreClr/Injection/ResolvedArrayParameter.cs index 93fba52d..cfaf1deb 100644 --- a/source/Unity/Src/Injection/ResolvedArrayParameter.cs +++ b/source/Src/Unity-CoreClr/Injection/ResolvedArrayParameter.cs @@ -3,12 +3,12 @@ using System; using System.Collections.Generic; using System.Globalization; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.ObjectBuilder; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A class that stores a type, and generates a diff --git a/source/Unity/Src/Injection/ResolvedParameter.cs b/source/Src/Unity-CoreClr/Injection/ResolvedParameter.cs similarity index 95% rename from source/Unity/Src/Injection/ResolvedParameter.cs rename to source/Src/Unity-CoreClr/Injection/ResolvedParameter.cs index c849944e..6eb68afc 100644 --- a/source/Unity/Src/Injection/ResolvedParameter.cs +++ b/source/Src/Unity-CoreClr/Injection/ResolvedParameter.cs @@ -2,12 +2,12 @@ using System; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Utility; -using Guard = Microsoft.Practices.Unity.Utility.Guard; +using ObjectBuilder2; +using Unity.ObjectBuilder; +using Unity.Utility; +using Guard = Unity.Utility.Guard; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A class that stores a name and type, and generates a diff --git a/source/Unity/Src/Injection/TypedInjectionValue.cs b/source/Src/Unity-CoreClr/Injection/TypedInjectionValue.cs similarity index 97% rename from source/Unity/Src/Injection/TypedInjectionValue.cs rename to source/Src/Unity-CoreClr/Injection/TypedInjectionValue.cs index 0e8f08af..72aeb204 100644 --- a/source/Unity/Src/Injection/TypedInjectionValue.cs +++ b/source/Src/Unity-CoreClr/Injection/TypedInjectionValue.cs @@ -2,9 +2,9 @@ using System; using System.Reflection; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A base class for implementing classes diff --git a/source/Unity/Src/Lifetime/ContainerControlledLifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/ContainerControlledLifetimeManager.cs similarity index 96% rename from source/Unity/Src/Lifetime/ContainerControlledLifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/ContainerControlledLifetimeManager.cs index 68822dc6..3f5eb35a 100644 --- a/source/Unity/Src/Lifetime/ContainerControlledLifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/ContainerControlledLifetimeManager.cs @@ -3,9 +3,9 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Threading; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that holds onto the instance given to it. diff --git a/source/Unity/Src/Lifetime/ExternallyControlledLifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/ExternallyControlledLifetimeManager.cs similarity index 97% rename from source/Unity/Src/Lifetime/ExternallyControlledLifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/ExternallyControlledLifetimeManager.cs index e3263f18..d52de8ff 100644 --- a/source/Unity/Src/Lifetime/ExternallyControlledLifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/ExternallyControlledLifetimeManager.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that holds a weak reference to diff --git a/source/Unity/Src/Lifetime/HierarchicalLifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/HierarchicalLifetimeManager.cs similarity index 94% rename from source/Unity/Src/Lifetime/HierarchicalLifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/HierarchicalLifetimeManager.cs index be02348b..ec97aff2 100644 --- a/source/Unity/Src/Lifetime/HierarchicalLifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/HierarchicalLifetimeManager.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A special lifetime manager which works like , diff --git a/source/Unity/Src/Lifetime/LifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/LifetimeManager.cs similarity index 95% rename from source/Unity/Src/Lifetime/LifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/LifetimeManager.cs index 9a954b75..ca55c449 100644 --- a/source/Unity/Src/Lifetime/LifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/LifetimeManager.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base class for Lifetime managers - classes that control how diff --git a/source/Unity/Src/Lifetime/LifetimeManagerFactory.cs b/source/Src/Unity-CoreClr/Lifetime/LifetimeManagerFactory.cs similarity index 95% rename from source/Unity/Src/Lifetime/LifetimeManagerFactory.cs rename to source/Src/Unity-CoreClr/Lifetime/LifetimeManagerFactory.cs index 7a88134d..44ecc59f 100644 --- a/source/Unity/Src/Lifetime/LifetimeManagerFactory.cs +++ b/source/Src/Unity-CoreClr/Lifetime/LifetimeManagerFactory.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// An implementation of that diff --git a/source/Unity/Src/Lifetime/PerResolveLifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/PerResolveLifetimeManager.cs similarity index 98% rename from source/Unity/Src/Lifetime/PerResolveLifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/PerResolveLifetimeManager.cs index 9d8f3ee0..166a73ad 100644 --- a/source/Unity/Src/Lifetime/PerResolveLifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/PerResolveLifetimeManager.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.Unity +namespace Unity { /// /// This is a custom lifetime manager that acts like , diff --git a/source/Unity/Src/Lifetime/PerThreadLifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/PerThreadLifetimeManager.cs similarity index 98% rename from source/Unity/Src/Lifetime/PerThreadLifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/PerThreadLifetimeManager.cs index 563e0d78..1cf33462 100644 --- a/source/Unity/Src/Lifetime/PerThreadLifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/PerThreadLifetimeManager.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that holds the instances given to it, diff --git a/source/Unity/Src/Lifetime/SynchronizedLifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/SynchronizedLifetimeManager.cs similarity index 98% rename from source/Unity/Src/Lifetime/SynchronizedLifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/SynchronizedLifetimeManager.cs index 23ea9112..71c05c48 100644 --- a/source/Unity/Src/Lifetime/SynchronizedLifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/SynchronizedLifetimeManager.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Threading; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base class for Lifetime managers which need to synchronize calls to diff --git a/source/Unity/Src/Lifetime/TransientLifetimeManager.cs b/source/Src/Unity-CoreClr/Lifetime/TransientLifetimeManager.cs similarity index 96% rename from source/Unity/Src/Lifetime/TransientLifetimeManager.cs rename to source/Src/Unity-CoreClr/Lifetime/TransientLifetimeManager.cs index 2f8787a0..aa4cad72 100644 --- a/source/Unity/Src/Lifetime/TransientLifetimeManager.cs +++ b/source/Src/Unity-CoreClr/Lifetime/TransientLifetimeManager.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.Unity +namespace Unity { /// /// An implementation that does nothing, diff --git a/source/Unity/Src/NamedTypesRegistry.cs b/source/Src/Unity-CoreClr/NamedTypesRegistry.cs similarity index 98% rename from source/Unity/Src/NamedTypesRegistry.cs rename to source/Src/Unity-CoreClr/NamedTypesRegistry.cs index 0afdb9f0..2078f652 100644 --- a/source/Unity/Src/NamedTypesRegistry.cs +++ b/source/Src/Unity-CoreClr/NamedTypesRegistry.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A helper class to manage the names that get registered in the container diff --git a/source/Unity/Src/ObjectBuilder/BuilderContext.cs b/source/Src/Unity-CoreClr/ObjectBuilder/BuilderContext.cs similarity index 99% rename from source/Unity/Src/ObjectBuilder/BuilderContext.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/BuilderContext.cs index f8252705..f7866a92 100644 --- a/source/Unity/Src/ObjectBuilder/BuilderContext.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/BuilderContext.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents the context in which a build-up or tear-down operation runs. diff --git a/source/Unity/Src/ObjectBuilder/Exceptions/DependencyMissingException.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Exceptions/DependencyMissingException.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Exceptions/DependencyMissingException.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Exceptions/DependencyMissingException.cs index 0794ddfb..3faf5711 100644 --- a/source/Unity/Src/ObjectBuilder/Exceptions/DependencyMissingException.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Exceptions/DependencyMissingException.cs @@ -2,9 +2,9 @@ using System; using System.Globalization; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents that a dependency could not be resolved. diff --git a/source/Unity/Src/ObjectBuilder/Exceptions/IllegalInjectionMethodException.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Exceptions/IllegalInjectionMethodException.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Exceptions/IllegalInjectionMethodException.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Exceptions/IllegalInjectionMethodException.cs index 8b162be1..3be68647 100644 --- a/source/Unity/Src/ObjectBuilder/Exceptions/IllegalInjectionMethodException.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Exceptions/IllegalInjectionMethodException.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using System.Runtime.Serialization; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// The exception thrown when injection is attempted on a method diff --git a/source/Unity/Src/ObjectBuilder/IBuilderContext.cs b/source/Src/Unity-CoreClr/ObjectBuilder/IBuilderContext.cs similarity index 98% rename from source/Unity/Src/ObjectBuilder/IBuilderContext.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/IBuilderContext.cs index b26dc4b4..16a16b15 100644 --- a/source/Unity/Src/ObjectBuilder/IBuilderContext.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/IBuilderContext.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents the context in which a build-up or tear-down operation runs. diff --git a/source/Unity/Src/ObjectBuilder/IRecoveryStack.cs b/source/Src/Unity-CoreClr/ObjectBuilder/IRecoveryStack.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/IRecoveryStack.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/IRecoveryStack.cs index 1a202f14..c87126f1 100644 --- a/source/Unity/Src/ObjectBuilder/IRecoveryStack.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/IRecoveryStack.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Data structure that stores the set of diff --git a/source/Unity/Src/ObjectBuilder/IRequiresRecovery.cs b/source/Src/Unity-CoreClr/ObjectBuilder/IRequiresRecovery.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/IRequiresRecovery.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/IRequiresRecovery.cs index 14d7cfe6..7c82a8ae 100644 --- a/source/Unity/Src/ObjectBuilder/IRequiresRecovery.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/IRequiresRecovery.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// This interface provides a hook for the builder context to diff --git a/source/Unity/Src/ObjectBuilder/Lifetime/ILifetimeContainer.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Lifetime/ILifetimeContainer.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Lifetime/ILifetimeContainer.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Lifetime/ILifetimeContainer.cs index 31a22ff7..fbf7cc14 100644 --- a/source/Unity/Src/ObjectBuilder/Lifetime/ILifetimeContainer.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Lifetime/ILifetimeContainer.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a lifetime container. diff --git a/source/Unity/Src/ObjectBuilder/Lifetime/LifetimeContainer.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Lifetime/LifetimeContainer.cs similarity index 99% rename from source/Unity/Src/ObjectBuilder/Lifetime/LifetimeContainer.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Lifetime/LifetimeContainer.cs index 21f8c937..ca9a0f07 100644 --- a/source/Unity/Src/ObjectBuilder/Lifetime/LifetimeContainer.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Lifetime/LifetimeContainer.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a lifetime container. diff --git a/source/Unity/Src/ObjectBuilder/Policies/IBuilderPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/IBuilderPolicy.cs similarity index 92% rename from source/Unity/Src/ObjectBuilder/Policies/IBuilderPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Policies/IBuilderPolicy.cs index a4629fa6..93657852 100644 --- a/source/Unity/Src/ObjectBuilder/Policies/IBuilderPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/IBuilderPolicy.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a builder policy interface. Since there are no fixed requirements diff --git a/source/Unity/Src/ObjectBuilder/Policies/IPolicyList.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/IPolicyList.cs similarity index 98% rename from source/Unity/Src/ObjectBuilder/Policies/IPolicyList.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Policies/IPolicyList.cs index 0d818cc5..9d4f3e16 100644 --- a/source/Unity/Src/ObjectBuilder/Policies/IPolicyList.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/IPolicyList.cs @@ -3,7 +3,7 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A custom collection over objects. diff --git a/source/Unity/Src/ObjectBuilder/Policies/PolicyList.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/PolicyList.cs similarity index 99% rename from source/Unity/Src/ObjectBuilder/Policies/PolicyList.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Policies/PolicyList.cs index 7157d0ec..063cf5e9 100644 --- a/source/Unity/Src/ObjectBuilder/Policies/PolicyList.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/PolicyList.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Globalization; using System.Reflection; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A custom collection wrapper over objects. diff --git a/source/Unity/Src/ObjectBuilder/Policies/PolicyListExtensions.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/PolicyListExtensions.cs similarity index 98% rename from source/Unity/Src/ObjectBuilder/Policies/PolicyListExtensions.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Policies/PolicyListExtensions.cs index c8a5e890..d13195cf 100644 --- a/source/Unity/Src/ObjectBuilder/Policies/PolicyListExtensions.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Policies/PolicyListExtensions.cs @@ -2,9 +2,9 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Extension methods on to provide convenience @@ -257,7 +257,7 @@ public static void Set(this IPolicyList policies, TPolicyInter public static void SetDefault(this IPolicyList policies, TPolicyInterface policy) where TPolicyInterface : IBuilderPolicy { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(policies, "policies"); + Unity.Utility.Guard.ArgumentNotNull(policies, "policies"); policies.SetDefault(typeof(TPolicyInterface), policy); } diff --git a/source/Unity/Src/ObjectBuilder/RecoveryStack.cs b/source/Src/Unity-CoreClr/ObjectBuilder/RecoveryStack.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/RecoveryStack.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/RecoveryStack.cs index cabfdcdd..24c4f5e6 100644 --- a/source/Unity/Src/ObjectBuilder/RecoveryStack.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/RecoveryStack.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation of . diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingPolicy.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingPolicy.cs index d227f61a..84be4190 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingPolicy.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a builder policy for mapping build keys. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingStrategy.cs similarity index 93% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingStrategy.cs index 06c17659..bba5ff15 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/BuildKeyMappingStrategy.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a strategy for mapping build keys in the build up operation. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/GenericTypeBuildKeyMappingPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/GenericTypeBuildKeyMappingPolicy.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/GenericTypeBuildKeyMappingPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/GenericTypeBuildKeyMappingPolicy.cs index e15e6cbd..6f3f2c7a 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/GenericTypeBuildKeyMappingPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/GenericTypeBuildKeyMappingPolicy.cs @@ -4,10 +4,10 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation of that can map diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/IBuildKeyMappingPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/IBuildKeyMappingPolicy.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/IBuildKeyMappingPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/IBuildKeyMappingPolicy.cs index c263422a..5903146b 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildKeyMapping/IBuildKeyMappingPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildKeyMapping/IBuildKeyMappingPolicy.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a builder policy for mapping build keys. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/BuildOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/BuildOperation.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/BuildOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/BuildOperation.cs index 75a88991..2d18b8f1 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/BuildOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/BuildOperation.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Base class for the current operation stored in the build context. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/BuildPlanStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/BuildPlanStrategy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/BuildPlanStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/BuildPlanStrategy.cs index 8cc9c068..6f112486 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/BuildPlanStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/BuildPlanStrategy.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A that will look for a build plan diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicy.cs index 595009b1..0bee2d88 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicy.cs @@ -3,9 +3,9 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Reflection; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation of that chooses diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicyBase.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicyBase.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicyBase.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicyBase.cs index 9070c822..a4c76cd1 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicyBase.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicyBase.cs @@ -6,10 +6,10 @@ using System.Globalization; using System.Linq; using System.Reflection; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Base class that provides an implementation of diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/IConstructorSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/IConstructorSelectorPolicy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/IConstructorSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/IConstructorSelectorPolicy.cs index c9ac16fe..2e08cc3d 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/IConstructorSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/IConstructorSelectorPolicy.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A that, when implemented, diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedConstructor.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedConstructor.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedConstructor.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedConstructor.cs index 6e5ce711..3ef154e4 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedConstructor.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedConstructor.cs @@ -2,7 +2,7 @@ using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Objects of this type are the return value from . diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedMemberWithParameters.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedMemberWithParameters.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedMemberWithParameters.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedMemberWithParameters.cs index d41fb318..15947b22 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedMemberWithParameters.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedMemberWithParameters.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Base class for return of selector policies that need diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/ConstructorArgumentResolveOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/ConstructorArgumentResolveOperation.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/ConstructorArgumentResolveOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/ConstructorArgumentResolveOperation.cs index 492305a6..99cf2dd9 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/ConstructorArgumentResolveOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/ConstructorArgumentResolveOperation.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// This class records the information about which constructor argument is currently diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs similarity index 99% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs index decb2998..aee436d7 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs @@ -7,11 +7,11 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using Unity; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A that emits IL to call constructors diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/InvokingConstructorOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/InvokingConstructorOperation.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/InvokingConstructorOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/InvokingConstructorOperation.cs index d55060fc..053523a8 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/InvokingConstructorOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/InvokingConstructorOperation.cs @@ -2,9 +2,9 @@ using System; using System.Globalization; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A class that records that a constructor is about to be call, and is diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicBuildPlanGenerationContext.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicBuildPlanGenerationContext.cs similarity index 99% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicBuildPlanGenerationContext.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicBuildPlanGenerationContext.cs index ffcd7f31..1fe6e11b 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicBuildPlanGenerationContext.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicBuildPlanGenerationContext.cs @@ -6,9 +6,9 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlan.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlan.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlan.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlan.cs index 7329cd73..a77b3704 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlan.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlan.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlanCreatorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlanCreatorPolicy.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlanCreatorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlanCreatorPolicy.cs index d1ec083a..8f288f73 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlanCreatorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicMethodBuildPlanCreatorPolicy.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/DynamicMethodCallStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/DynamicMethodCallStrategy.cs similarity index 98% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/DynamicMethodCallStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/DynamicMethodCallStrategy.cs index b9be6d32..42651069 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/DynamicMethodCallStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/DynamicMethodCallStrategy.cs @@ -6,10 +6,10 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A that generates IL to call diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/InvokingMethodOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/InvokingMethodOperation.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/InvokingMethodOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/InvokingMethodOperation.cs index 53ccde67..a1b7105f 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/InvokingMethodOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/InvokingMethodOperation.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; using System.Reflection; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A class that records that a constructor is about to be call, and is diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/MethodArgumentResolveOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/MethodArgumentResolveOperation.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/MethodArgumentResolveOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/MethodArgumentResolveOperation.cs index 1bdb7aa3..458b1437 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/MethodArgumentResolveOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/MethodArgumentResolveOperation.cs @@ -5,9 +5,9 @@ using System.Globalization; using System.Reflection; using System.Text; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// This class records the information about which constructor argument is currently diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/DynamicMethodPropertySetterStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/DynamicMethodPropertySetterStrategy.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/DynamicMethodPropertySetterStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/DynamicMethodPropertySetterStrategy.cs index 305ee7e2..c4f543ab 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/DynamicMethodPropertySetterStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/DynamicMethodPropertySetterStrategy.cs @@ -6,10 +6,10 @@ using System.Globalization; using System.Linq.Expressions; using System.Reflection; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A that generates IL to resolve properties diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/PropertyOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/PropertyOperation.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/PropertyOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/PropertyOperation.cs index d2da167b..ed9ef0ce 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/PropertyOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/PropertyOperation.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A base class that holds the information shared by all operations diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/ResolvingPropertyValueOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/ResolvingPropertyValueOperation.cs similarity index 92% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/ResolvingPropertyValueOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/ResolvingPropertyValueOperation.cs index 42695145..d63a745a 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/ResolvingPropertyValueOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/ResolvingPropertyValueOperation.cs @@ -2,9 +2,9 @@ using System; using System.Globalization; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// This class records the information about which property value is currently diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/SettingPropertyOperation.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/SettingPropertyOperation.cs similarity index 93% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/SettingPropertyOperation.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/SettingPropertyOperation.cs index 45a5cf50..92cd6fd2 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/SettingPropertyOperation.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Property/SettingPropertyOperation.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.Unity.Properties; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// This class records the information about which property value is currently diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Factory/DeferredResolveBuildPlanPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Factory/DeferredResolveBuildPlanPolicy.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Factory/DeferredResolveBuildPlanPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Factory/DeferredResolveBuildPlanPolicy.cs index 9177b4df..a58165b0 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Factory/DeferredResolveBuildPlanPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Factory/DeferredResolveBuildPlanPolicy.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Reflection; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Build plan for that will return a Func that will resolve the requested type diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Factory/FactoryDelegateBuildPlanPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Factory/FactoryDelegateBuildPlanPolicy.cs similarity index 88% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Factory/FactoryDelegateBuildPlanPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Factory/FactoryDelegateBuildPlanPolicy.cs index 7faced43..0e6e18fd 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Factory/FactoryDelegateBuildPlanPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Factory/FactoryDelegateBuildPlanPolicy.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.Unity; +using Unity; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { internal class FactoryDelegateBuildPlanPolicy : IBuildPlanPolicy { @@ -22,7 +22,7 @@ public FactoryDelegateBuildPlanPolicy(Func /// A that can create and return an diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/IBuildPlanPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/IBuildPlanPolicy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/IBuildPlanPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/IBuildPlanPolicy.cs index 7714aa5a..3242b1e3 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/IBuildPlanPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/IBuildPlanPolicy.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A build plan is an object that, when invoked, will create a new object diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Lazy/LazyDynamicMethodBuildPlanCreatorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Lazy/LazyDynamicMethodBuildPlanCreatorPolicy.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Lazy/LazyDynamicMethodBuildPlanCreatorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Lazy/LazyDynamicMethodBuildPlanCreatorPolicy.cs index 06059711..bbc8a79f 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Lazy/LazyDynamicMethodBuildPlanCreatorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Lazy/LazyDynamicMethodBuildPlanCreatorPolicy.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/IMethodSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/IMethodSelectorPolicy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/IMethodSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/IMethodSelectorPolicy.cs index c6738b79..a5e5840e 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/IMethodSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/IMethodSelectorPolicy.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An that will examine the given diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/MethodSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/MethodSelectorPolicy.cs similarity index 90% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/MethodSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/MethodSelectorPolicy.cs index 5db43144..a00b0324 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/MethodSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/MethodSelectorPolicy.cs @@ -3,7 +3,7 @@ using System; using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation of that selects @@ -25,7 +25,7 @@ public class MethodSelectorPolicy : MethodSelectorPolicyBase /// Base class that provides an implementation of diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/SelectedMethod.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/SelectedMethod.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/SelectedMethod.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/SelectedMethod.cs index de11e182..984eeb09 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/SelectedMethod.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Method/SelectedMethod.cs @@ -2,7 +2,7 @@ using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Objects of this type are the return value from . diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/OverriddenBuildPlanMarkerPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/OverriddenBuildPlanMarkerPolicy.cs similarity index 82% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/OverriddenBuildPlanMarkerPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/OverriddenBuildPlanMarkerPolicy.cs index df00a1db..2fd77146 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/OverriddenBuildPlanMarkerPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/OverriddenBuildPlanMarkerPolicy.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Properties; +using ObjectBuilder2; +using Unity.Properties; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { internal class OverriddenBuildPlanMarkerPolicy : IBuildPlanPolicy { diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/IPropertySelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/IPropertySelectorPolicy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/IPropertySelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/IPropertySelectorPolicy.cs index f894bf78..0fda08c8 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/IPropertySelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/IPropertySelectorPolicy.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An that returns a sequence diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorBase.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorBase.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorBase.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorBase.cs index b6476e8a..acaf35dd 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorBase.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorBase.cs @@ -5,9 +5,9 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Base class that provides an implementation of diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorPolicy.cs similarity index 90% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorPolicy.cs index 51d5ca07..5e2cad76 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/PropertySelectorPolicy.cs @@ -3,7 +3,7 @@ using System; using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation of that looks @@ -24,7 +24,7 @@ public class PropertySelectorPolicy : PropertySelectorBase Justification = "Validation done by Guard class")] protected override IDependencyResolverPolicy CreateResolver(PropertyInfo property) { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(property, "property"); + Unity.Utility.Guard.ArgumentNotNull(property, "property"); return new FixedTypeResolverPolicy(property.PropertyType); } diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/SelectedProperty.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/SelectedProperty.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/SelectedProperty.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/SelectedProperty.cs index 92722d7a..6c2acd75 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Property/SelectedProperty.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Property/SelectedProperty.cs @@ -2,7 +2,7 @@ using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Objects of this type are returned from diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/DependencyResolverTrackerPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/DependencyResolverTrackerPolicy.cs similarity index 98% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/DependencyResolverTrackerPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/DependencyResolverTrackerPolicy.cs index 234e93f0..99291fda 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/DependencyResolverTrackerPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/DependencyResolverTrackerPolicy.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Implementation of . diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/FixedTypeResolverPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/FixedTypeResolverPolicy.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/FixedTypeResolverPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/FixedTypeResolverPolicy.cs index 45859ba9..48df73df 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/FixedTypeResolverPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/FixedTypeResolverPolicy.cs @@ -2,9 +2,9 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation of that diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverPolicy.cs similarity index 93% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverPolicy.cs index 5fb019b1..11712056 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverPolicy.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A strategy that is used at build plan execution time diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverTrackerPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverTrackerPolicy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverTrackerPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverTrackerPolicy.cs index 3aa8e695..fcc241f9 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverTrackerPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuildPlan/Resolution/IDependencyResolverTrackerPolicy.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A builder policy that lets you keep track of the current diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuilderAware/BuilderAwareStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderAware/BuilderAwareStrategy.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/BuilderAware/BuilderAwareStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderAware/BuilderAwareStrategy.cs index 3c5a037b..e7ab50d0 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuilderAware/BuilderAwareStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderAware/BuilderAwareStrategy.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Implementation of which will notify an object about diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuilderAware/IBuilderAware.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderAware/IBuilderAware.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Strategies/BuilderAware/IBuilderAware.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderAware/IBuilderAware.cs index b42e264e..aafd42d2 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuilderAware/IBuilderAware.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderAware/IBuilderAware.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Implemented on a class when it wants to receive notifications diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuilderStage.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderStage.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuilderStage.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderStage.cs index dc94d1b9..cc0323ee 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuilderStage.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderStage.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Enumeration to represent the object builder stages. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/BuilderStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderStrategy.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/BuilderStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderStrategy.cs index 42cf0137..807b30f8 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/BuilderStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/BuilderStrategy.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a strategy in the chain of responsibility. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/IBuilderStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IBuilderStrategy.cs similarity index 98% rename from source/Unity/Src/ObjectBuilder/Strategies/IBuilderStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IBuilderStrategy.cs index 03543fc7..092686f2 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/IBuilderStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IBuilderStrategy.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a strategy in the chain of responsibility. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/IStagedStrategyChain.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IStagedStrategyChain.cs similarity index 93% rename from source/Unity/Src/ObjectBuilder/Strategies/IStagedStrategyChain.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IStagedStrategyChain.cs index 78a67e32..de5d8fa2 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/IStagedStrategyChain.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IStagedStrategyChain.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// This interface defines a standard method to convert any regardless diff --git a/source/Unity/Src/ObjectBuilder/Strategies/IStrategyChain.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IStrategyChain.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/IStrategyChain.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IStrategyChain.cs index d0571cc1..c4707d33 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/IStrategyChain.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/IStrategyChain.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a chain of responsibility for builder strategies. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/Lifetime/ILifetimeFactoryPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/ILifetimeFactoryPolicy.cs similarity index 94% rename from source/Unity/Src/ObjectBuilder/Strategies/Lifetime/ILifetimeFactoryPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/ILifetimeFactoryPolicy.cs index 596dd386..e45496c4 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/Lifetime/ILifetimeFactoryPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/ILifetimeFactoryPolicy.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A builder policy used to create lifetime policy instances. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/Lifetime/ILifetimePolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/ILifetimePolicy.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Strategies/Lifetime/ILifetimePolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/ILifetimePolicy.cs index 0d73e124..ed739ec9 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/Lifetime/ILifetimePolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/ILifetimePolicy.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A that controls how instances are diff --git a/source/Unity/Src/ObjectBuilder/Strategies/Lifetime/LifetimeStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/LifetimeStrategy.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Strategies/Lifetime/LifetimeStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/LifetimeStrategy.cs index 78aab7cf..6e80f7f8 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/Lifetime/LifetimeStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/Lifetime/LifetimeStrategy.cs @@ -3,10 +3,10 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Reflection; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// An implementation that uses diff --git a/source/Unity/Src/ObjectBuilder/Strategies/StagedStrategyChain.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/StagedStrategyChain.cs similarity index 99% rename from source/Unity/Src/ObjectBuilder/Strategies/StagedStrategyChain.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/StagedStrategyChain.cs index 9d44066f..32fd8a67 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/StagedStrategyChain.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/StagedStrategyChain.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Reflection; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a chain of responsibility for builder strategies partitioned by stages. diff --git a/source/Unity/Src/ObjectBuilder/Strategies/StrategyChain.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/StrategyChain.cs similarity index 95% rename from source/Unity/Src/ObjectBuilder/Strategies/StrategyChain.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Strategies/StrategyChain.cs index a5e3c10c..13c1bb25 100644 --- a/source/Unity/Src/ObjectBuilder/Strategies/StrategyChain.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Strategies/StrategyChain.cs @@ -4,9 +4,9 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Represents a chain of responsibility for builder strategies. @@ -72,7 +72,7 @@ public IStrategyChain Reverse() /// The build up object public object ExecuteBuildUp(IBuilderContext context) { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(context, "context"); + Unity.Utility.Guard.ArgumentNotNull(context, "context"); int i = 0; try @@ -111,7 +111,7 @@ public object ExecuteBuildUp(IBuilderContext context) /// Context for the teardown process. public void ExecuteTearDown(IBuilderContext context) { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(context, "context"); + Unity.Utility.Guard.ArgumentNotNull(context, "context"); int i = 0; diff --git a/source/Unity/Src/ObjectBuilder/Utility/EnumerableExtensions.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Utility/EnumerableExtensions.cs similarity index 97% rename from source/Unity/Src/ObjectBuilder/Utility/EnumerableExtensions.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Utility/EnumerableExtensions.cs index edfd5319..17204fcc 100644 --- a/source/Unity/Src/ObjectBuilder/Utility/EnumerableExtensions.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Utility/EnumerableExtensions.cs @@ -5,9 +5,9 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// The almost inevitable collection of extra helper methods on diff --git a/source/Unity/Src/ObjectBuilder/Utility/NamedTypeBuildKey.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Utility/NamedTypeBuildKey.cs similarity index 98% rename from source/Unity/Src/ObjectBuilder/Utility/NamedTypeBuildKey.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Utility/NamedTypeBuildKey.cs index d35e4502..e6baee8c 100644 --- a/source/Unity/Src/ObjectBuilder/Utility/NamedTypeBuildKey.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Utility/NamedTypeBuildKey.cs @@ -3,9 +3,9 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// Build key used to combine a type object with a string name. Used by diff --git a/source/Unity/Src/ObjectBuilder/Utility/Sequence.cs b/source/Src/Unity-CoreClr/ObjectBuilder/Utility/Sequence.cs similarity index 96% rename from source/Unity/Src/ObjectBuilder/Utility/Sequence.cs rename to source/Src/Unity-CoreClr/ObjectBuilder/Utility/Sequence.cs index bdbe870c..43146f87 100644 --- a/source/Unity/Src/ObjectBuilder/Utility/Sequence.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilder/Utility/Sequence.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.Practices.Unity.Utility; +using Unity.Utility; -namespace Microsoft.Practices.ObjectBuilder2 +namespace ObjectBuilder2 { /// /// A series of helper methods to deal with sequences - diff --git a/source/Unity/Src/ObjectBuilderCustomization/ArrayResolutionStrategy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/ArrayResolutionStrategy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilderCustomization/ArrayResolutionStrategy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/ArrayResolutionStrategy.cs index 2c592b03..d653829d 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/ArrayResolutionStrategy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/ArrayResolutionStrategy.cs @@ -4,10 +4,10 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Guard = Microsoft.Practices.Unity.Utility.Guard; +using ObjectBuilder2; +using Guard = Unity.Utility.Guard; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// This strategy implements the logic that will call container.ResolveAll diff --git a/source/Unity/Src/ObjectBuilderCustomization/DefaultUnityConstructorSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityConstructorSelectorPolicy.cs similarity index 93% rename from source/Unity/Src/ObjectBuilderCustomization/DefaultUnityConstructorSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityConstructorSelectorPolicy.cs index aa875c37..ef25a475 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/DefaultUnityConstructorSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityConstructorSelectorPolicy.cs @@ -3,10 +3,10 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// An implementation of that is diff --git a/source/Unity/Src/ObjectBuilderCustomization/DefaultUnityMethodSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityMethodSelectorPolicy.cs similarity index 88% rename from source/Unity/Src/ObjectBuilderCustomization/DefaultUnityMethodSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityMethodSelectorPolicy.cs index 5df5d49c..3eb37471 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/DefaultUnityMethodSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityMethodSelectorPolicy.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// An implementation of that is aware @@ -23,7 +23,7 @@ public class DefaultUnityMethodSelectorPolicy : MethodSelectorPolicyBase() diff --git a/source/Unity/Src/ObjectBuilderCustomization/DefaultUnityPropertySelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityPropertySelectorPolicy.cs similarity index 88% rename from source/Unity/Src/ObjectBuilderCustomization/DefaultUnityPropertySelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityPropertySelectorPolicy.cs index bec61d9c..c25d692e 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/DefaultUnityPropertySelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/DefaultUnityPropertySelectorPolicy.cs @@ -3,9 +3,9 @@ using System.Diagnostics; using System.Linq; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// An implementation of that is aware of @@ -23,7 +23,7 @@ public class DefaultUnityPropertySelectorPolicy : PropertySelectorBase /// A strategy that handles Hierarchical lifetimes across a set of parent/child @@ -22,7 +22,7 @@ public class HierarchicalLifetimeStrategy : BuilderStrategy Justification = "Validation done by Guard class")] public override void PreBuildUp(IBuilderContext context) { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(context, "context"); + Unity.Utility.Guard.ArgumentNotNull(context, "context"); IPolicyList lifetimePolicySource; diff --git a/source/Unity/Src/ObjectBuilderCustomization/IRegisteredNamesPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/IRegisteredNamesPolicy.cs similarity index 89% rename from source/Unity/Src/ObjectBuilderCustomization/IRegisteredNamesPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/IRegisteredNamesPolicy.cs index 926d9c8a..31c60a90 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/IRegisteredNamesPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/IRegisteredNamesPolicy.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Provides access to the names registered for a container. diff --git a/source/Unity/Src/ObjectBuilderCustomization/LiteralValueDependencyResolverPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/LiteralValueDependencyResolverPolicy.cs similarity index 92% rename from source/Unity/Src/ObjectBuilderCustomization/LiteralValueDependencyResolverPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/LiteralValueDependencyResolverPolicy.cs index 70d66fbd..1bfcd651 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/LiteralValueDependencyResolverPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/LiteralValueDependencyResolverPolicy.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// A implementation that returns diff --git a/source/Unity/Src/ObjectBuilderCustomization/NamedTypeDependencyResolverPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/NamedTypeDependencyResolverPolicy.cs similarity index 94% rename from source/Unity/Src/ObjectBuilderCustomization/NamedTypeDependencyResolverPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/NamedTypeDependencyResolverPolicy.cs index 7ac4f499..87031464 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/NamedTypeDependencyResolverPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/NamedTypeDependencyResolverPolicy.cs @@ -2,10 +2,10 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// An implementation of that stores a diff --git a/source/Unity/Src/ObjectBuilderCustomization/OptionalDependencyResolverPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/OptionalDependencyResolverPolicy.cs similarity index 94% rename from source/Unity/Src/ObjectBuilderCustomization/OptionalDependencyResolverPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/OptionalDependencyResolverPolicy.cs index a63d02fa..097eeb79 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/OptionalDependencyResolverPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/OptionalDependencyResolverPolicy.cs @@ -4,11 +4,11 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that will attempt to diff --git a/source/Unity/Src/ObjectBuilderCustomization/RegisteredNamesPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/RegisteredNamesPolicy.cs similarity index 94% rename from source/Unity/Src/ObjectBuilderCustomization/RegisteredNamesPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/RegisteredNamesPolicy.cs index eadc5973..596ba49a 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/RegisteredNamesPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/RegisteredNamesPolicy.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Practices.Unity +namespace Unity { internal class RegisteredNamesPolicy : IRegisteredNamesPolicy { diff --git a/source/Unity/Src/ObjectBuilderCustomization/ResolvedArrayWithElementsResolverPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/ResolvedArrayWithElementsResolverPolicy.cs similarity index 96% rename from source/Unity/Src/ObjectBuilderCustomization/ResolvedArrayWithElementsResolverPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/ResolvedArrayWithElementsResolverPolicy.cs index 0fe2d718..124bc9d1 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/ResolvedArrayWithElementsResolverPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/ResolvedArrayWithElementsResolverPolicy.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// An implementation of that resolves to diff --git a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedConstructorSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedConstructorSelectorPolicy.cs similarity index 91% rename from source/Unity/Src/ObjectBuilderCustomization/SpecifiedConstructorSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedConstructorSelectorPolicy.cs index f15742f4..4da85b74 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedConstructorSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedConstructorSelectorPolicy.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// An implementation of that selects @@ -47,7 +47,7 @@ public SpecifiedConstructorSelectorPolicy(ConstructorInfo ctor, InjectionParamet Justification = "Validation done by Guard class")] public SelectedConstructor SelectConstructor(IBuilderContext context, IPolicyList resolverPolicyDestination) { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(context, "context"); + Unity.Utility.Guard.ArgumentNotNull(context, "context"); SelectedConstructor result; Type typeToBuild = context.BuildKey.Type; @@ -61,7 +61,7 @@ public SelectedConstructor SelectConstructor(IBuilderContext context, IPolicyLis { Type[] closedCtorParameterTypes = ctorReflector.GetClosedParameterTypes(typeToBuild.GenericTypeArguments); - result = new SelectedConstructor(typeToBuild.GetConstructor(closedCtorParameterTypes)); + result = new SelectedConstructor(typeToBuild.GetConstructorInfo(closedCtorParameterTypes)); } SpecifiedMemberSelectorHelper.AddParameterResolvers(typeToBuild, resolverPolicyDestination, parameterValues, result); diff --git a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedMemberSelectorHelper.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedMemberSelectorHelper.cs similarity index 78% rename from source/Unity/Src/ObjectBuilderCustomization/SpecifiedMemberSelectorHelper.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedMemberSelectorHelper.cs index 07aa723d..887a4827 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedMemberSelectorHelper.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedMemberSelectorHelper.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// Helper class for implementing selector policies that need to @@ -24,9 +24,9 @@ public static void AddParameterResolvers(Type typeToBuild, IEnumerable parameterValues, SelectedMemberWithParameters result) { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(policies, "policies"); - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(parameterValues, "parameterValues"); - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(result, "result"); + Unity.Utility.Guard.ArgumentNotNull(policies, "policies"); + Unity.Utility.Guard.ArgumentNotNull(parameterValues, "parameterValues"); + Unity.Utility.Guard.ArgumentNotNull(result, "result"); foreach (InjectionParameterValue parameterValue in parameterValues) { diff --git a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedMethodsSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedMethodsSelectorPolicy.cs similarity index 95% rename from source/Unity/Src/ObjectBuilderCustomization/SpecifiedMethodsSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedMethodsSelectorPolicy.cs index 93f986ce..73972aea 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedMethodsSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedMethodsSelectorPolicy.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// A implementation that calls the specific diff --git a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedPropertiesSelectorPolicy.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedPropertiesSelectorPolicy.cs similarity index 94% rename from source/Unity/Src/ObjectBuilderCustomization/SpecifiedPropertiesSelectorPolicy.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedPropertiesSelectorPolicy.cs index 0299c824..7c6e0072 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/SpecifiedPropertiesSelectorPolicy.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/SpecifiedPropertiesSelectorPolicy.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity; +using Unity.Utility; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// An implementation of which returns diff --git a/source/Unity/Src/ObjectBuilderCustomization/UnityBuildStage.cs b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/UnityBuildStage.cs similarity index 96% rename from source/Unity/Src/ObjectBuilderCustomization/UnityBuildStage.cs rename to source/Src/Unity-CoreClr/ObjectBuilderCustomization/UnityBuildStage.cs index c2d29432..d24bfb15 100644 --- a/source/Unity/Src/ObjectBuilderCustomization/UnityBuildStage.cs +++ b/source/Src/Unity-CoreClr/ObjectBuilderCustomization/UnityBuildStage.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.Unity.ObjectBuilder +namespace Unity.ObjectBuilder { /// /// The build stages we use in the Unity container diff --git a/source/Unity/Src/OverrideCollection.cs b/source/Src/Unity-CoreClr/OverrideCollection.cs similarity index 97% rename from source/Unity/Src/OverrideCollection.cs rename to source/Src/Unity-CoreClr/OverrideCollection.cs index 150cc664..f5d34529 100644 --- a/source/Unity/Src/OverrideCollection.cs +++ b/source/Src/Unity-CoreClr/OverrideCollection.cs @@ -4,9 +4,9 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base helper class for creating collections of objects diff --git a/source/Unity/Src/ParameterOverride.cs b/source/Src/Unity-CoreClr/ParameterOverride.cs similarity index 94% rename from source/Unity/Src/ParameterOverride.cs rename to source/Src/Unity-CoreClr/ParameterOverride.cs index 459fc3e1..0f13e07d 100644 --- a/source/Unity/Src/ParameterOverride.cs +++ b/source/Src/Unity-CoreClr/ParameterOverride.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A class that lets you diff --git a/source/Unity/Src/ParameterOverrides.cs b/source/Src/Unity-CoreClr/ParameterOverrides.cs similarity index 97% rename from source/Unity/Src/ParameterOverrides.cs rename to source/Src/Unity-CoreClr/ParameterOverrides.cs index f6a242c1..28db8e78 100644 --- a/source/Unity/Src/ParameterOverrides.cs +++ b/source/Src/Unity-CoreClr/ParameterOverrides.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A convenience form of that lets you diff --git a/source/Unity/Src/Properties/AssemblyInfo.cs b/source/Src/Unity-CoreClr/Properties/AssemblyInfo.cs similarity index 88% rename from source/Unity/Src/Properties/AssemblyInfo.cs rename to source/Src/Unity-CoreClr/Properties/AssemblyInfo.cs index f731ffc5..b4a481a4 100644 --- a/source/Unity/Src/Properties/AssemblyInfo.cs +++ b/source/Src/Unity-CoreClr/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("Unity.Core")] +[assembly: AssemblyDescription("Unity Core")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from diff --git a/source/Unity/Src/Properties/Resources.Designer.cs b/source/Src/Unity-CoreClr/Properties/Resources.Designer.cs similarity index 66% rename from source/Unity/Src/Properties/Resources.Designer.cs rename to source/Src/Unity-CoreClr/Properties/Resources.Designer.cs index 48b1c71c..11443ce1 100644 --- a/source/Unity/Src/Properties/Resources.Designer.cs +++ b/source/Src/Unity-CoreClr/Properties/Resources.Designer.cs @@ -1,26 +1,25 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace Microsoft.Practices.Unity.Properties { +namespace Unity.Properties { using System; using System.Reflection; /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -29,18 +28,17 @@ internal class Resources { private static global::System.Globalization.CultureInfo resourceCulture; - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Practices.Unity.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Unity.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -48,8 +46,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -62,7 +60,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to The type {0} has multiple constructors of length {1}. Unable to disambiguate.. + /// Looks up a localized string similar to The type {0} has multiple constructors of length {1}. Unable to disambiguate.. /// internal static string AmbiguousInjectionConstructor { get { @@ -71,7 +69,7 @@ internal static string AmbiguousInjectionConstructor { } /// - /// Looks up a localized string similar to The provided string argument must not be empty.. + /// Looks up a localized string similar to The provided string argument must not be empty.. /// internal static string ArgumentMustNotBeEmpty { get { @@ -80,7 +78,7 @@ internal static string ArgumentMustNotBeEmpty { } /// - /// Looks up a localized string similar to The current build operation (build key {2}) failed: {3} (Strategy type {0}, index {1}). + /// Looks up a localized string similar to The current build operation (build key {2}) failed: {3} (Strategy type {0}, index {1}). /// internal static string BuildFailedException { get { @@ -89,7 +87,7 @@ internal static string BuildFailedException { } /// - /// Looks up a localized string similar to The current type, {0}, is an abstract class and cannot be constructed. Are you missing a type mapping?. + /// Looks up a localized string similar to The current type, {0}, is an abstract class and cannot be constructed. Are you missing a type mapping?. /// internal static string CannotConstructAbstractClass { get { @@ -98,7 +96,7 @@ internal static string CannotConstructAbstractClass { } /// - /// Looks up a localized string similar to The current type, {0}, is delegate and cannot be constructed. Unity only supports resolving Func<T> and Func<IEnumerable<T>> by default.. + /// Looks up a localized string similar to The current type, {0}, is delegate and cannot be constructed. Unity only supports resolving Func<T> and Func<IEnumerable<T>> by default.. /// internal static string CannotConstructDelegate { get { @@ -107,7 +105,7 @@ internal static string CannotConstructDelegate { } /// - /// Looks up a localized string similar to The current type, {0}, is an interface and cannot be constructed. Are you missing a type mapping?. + /// Looks up a localized string similar to The current type, {0}, is an interface and cannot be constructed. Are you missing a type mapping?. /// internal static string CannotConstructInterface { get { @@ -116,7 +114,7 @@ internal static string CannotConstructInterface { } /// - /// Looks up a localized string similar to Cannot extract type from build key {0}.. + /// Looks up a localized string similar to Cannot extract type from build key {0}.. /// internal static string CannotExtractTypeFromBuildKey { get { @@ -125,7 +123,7 @@ internal static string CannotExtractTypeFromBuildKey { } /// - /// Looks up a localized string similar to The method {0}.{1}({2}) is an open generic method. Open generic methods cannot be injected.. + /// Looks up a localized string similar to The method {0}.{1}({2}) is an open generic method. Open generic methods cannot be injected.. /// internal static string CannotInjectGenericMethod { get { @@ -134,7 +132,7 @@ internal static string CannotInjectGenericMethod { } /// - /// Looks up a localized string similar to The property {0} on type {1} is an indexer. Indexed properties cannot be injected.. + /// Looks up a localized string similar to The property {0} on type {1} is an indexer. Indexed properties cannot be injected.. /// internal static string CannotInjectIndexer { get { @@ -143,7 +141,7 @@ internal static string CannotInjectIndexer { } /// - /// Looks up a localized string similar to The method {1} on type {0} has an out parameter. Injection cannot be performed.. + /// Looks up a localized string similar to The method {1} on type {0} has an out parameter. Injection cannot be performed.. /// internal static string CannotInjectMethodWithOutParam { get { @@ -152,7 +150,7 @@ internal static string CannotInjectMethodWithOutParam { } /// - /// Looks up a localized string similar to The method {0}.{1}({2}) has at least one out parameter. Methods with out parameters cannot be injected.. + /// Looks up a localized string similar to The method {0}.{1}({2}) has at least one out parameter. Methods with out parameters cannot be injected.. /// internal static string CannotInjectMethodWithOutParams { get { @@ -161,7 +159,7 @@ internal static string CannotInjectMethodWithOutParams { } /// - /// Looks up a localized string similar to The method {0}.{1}({2}) has at least one ref parameter.Methods with ref parameters cannot be injected.. + /// Looks up a localized string similar to The method {0}.{1}({2}) has at least one ref parameter.Methods with ref parameters cannot be injected.. /// internal static string CannotInjectMethodWithRefParams { get { @@ -170,7 +168,7 @@ internal static string CannotInjectMethodWithRefParams { } /// - /// Looks up a localized string similar to The method {1} on type {0} is marked for injection, but it is an open generic method. Injection cannot be performed.. + /// Looks up a localized string similar to The method {1} on type {0} is marked for injection, but it is an open generic method. Injection cannot be performed.. /// internal static string CannotInjectOpenGenericMethod { get { @@ -179,7 +177,7 @@ internal static string CannotInjectOpenGenericMethod { } /// - /// Looks up a localized string similar to The method {0}.{1}({2}) is static. Static methods cannot be injected.. + /// Looks up a localized string similar to The method {0}.{1}({2}) is static. Static methods cannot be injected.. /// internal static string CannotInjectStaticMethod { get { @@ -188,7 +186,7 @@ internal static string CannotInjectStaticMethod { } /// - /// Looks up a localized string similar to The type {0} is an open generic type. An open generic type cannot be resolved.. + /// Looks up a localized string similar to The type {0} is an open generic type. An open generic type cannot be resolved.. /// internal static string CannotResolveOpenGenericType { get { @@ -197,7 +195,7 @@ internal static string CannotResolveOpenGenericType { } /// - /// Looks up a localized string similar to Resolving parameter "{0}" of constructor {1}. + /// Looks up a localized string similar to Resolving parameter "{0}" of constructor {1}. /// internal static string ConstructorArgumentResolveOperation { get { @@ -206,7 +204,7 @@ internal static string ConstructorArgumentResolveOperation { } /// - /// Looks up a localized string similar to The parameter {0} could not be resolved when attempting to call constructor {1}.. + /// Looks up a localized string similar to The parameter {0} could not be resolved when attempting to call constructor {1}.. /// internal static string ConstructorParameterResolutionFailed { get { @@ -215,7 +213,7 @@ internal static string ConstructorParameterResolutionFailed { } /// - /// Looks up a localized string similar to Parameter type inference does not work for null values. Indicate the parameter type explicitly using a properly configured instance of the InjectionParameter or InjectionParameter<T> classes.. + /// Looks up a localized string similar to Parameter type inference does not work for null values. Indicate the parameter type explicitly using a properly configured instance of the InjectionParameter or InjectionParameter<T> classes.. /// internal static string ExceptionNullParameterValue { get { @@ -224,7 +222,7 @@ internal static string ExceptionNullParameterValue { } /// - /// Looks up a localized string similar to Calling constructor {0}. + /// Looks up a localized string similar to Calling constructor {0}. /// internal static string InvokingConstructorOperation { get { @@ -233,7 +231,7 @@ internal static string InvokingConstructorOperation { } /// - /// Looks up a localized string similar to Calling method {0}.{1}. + /// Looks up a localized string similar to Calling method {0}.{1}. /// internal static string InvokingMethodOperation { get { @@ -242,7 +240,7 @@ internal static string InvokingMethodOperation { } /// - /// Looks up a localized string similar to An item with the given key is already present in the dictionary.. + /// Looks up a localized string similar to An item with the given key is already present in the dictionary.. /// internal static string KeyAlreadyPresent { get { @@ -251,7 +249,7 @@ internal static string KeyAlreadyPresent { } /// - /// Looks up a localized string similar to The lifetime manager is already registered. Lifetime managers cannot be reused, please create a new one.. + /// Looks up a localized string similar to The lifetime manager is already registered. Lifetime managers cannot be reused, please create a new one.. /// internal static string LifetimeManagerInUse { get { @@ -260,7 +258,7 @@ internal static string LifetimeManagerInUse { } /// - /// Looks up a localized string similar to The override marker build plan policy has been invoked. This should never happen, looks like a bug in the container.. + /// Looks up a localized string similar to The override marker build plan policy has been invoked. This should never happen, looks like a bug in the container.. /// internal static string MarkerBuildPlanInvoked { get { @@ -269,7 +267,7 @@ internal static string MarkerBuildPlanInvoked { } /// - /// Looks up a localized string similar to Resolving parameter "{0}" of method {1}.{2}. + /// Looks up a localized string similar to Resolving parameter "{0}" of method {1}.{2}. /// internal static string MethodArgumentResolveOperation { get { @@ -278,7 +276,7 @@ internal static string MethodArgumentResolveOperation { } /// - /// Looks up a localized string similar to The value for parameter "{1}" of method {0} could not be resolved. . + /// Looks up a localized string similar to The value for parameter "{1}" of method {0} could not be resolved. . /// internal static string MethodParameterResolutionFailed { get { @@ -287,7 +285,7 @@ internal static string MethodParameterResolutionFailed { } /// - /// Looks up a localized string similar to Could not resolve dependency for build key {0}.. + /// Looks up a localized string similar to Could not resolve dependency for build key {0}.. /// internal static string MissingDependency { get { @@ -296,7 +294,7 @@ internal static string MissingDependency { } /// - /// Looks up a localized string similar to The type {0} has multiple constructors marked with the InjectionConstructor attribute. Unable to disambiguate.. + /// Looks up a localized string similar to The type {0} has multiple constructors marked with the InjectionConstructor attribute. Unable to disambiguate.. /// internal static string MultipleInjectionConstructors { get { @@ -305,7 +303,7 @@ internal static string MultipleInjectionConstructors { } /// - /// Looks up a localized string similar to The supplied type {0} must be an open generic type.. + /// Looks up a localized string similar to The supplied type {0} must be an open generic type.. /// internal static string MustHaveOpenGenericType { get { @@ -314,7 +312,7 @@ internal static string MustHaveOpenGenericType { } /// - /// Looks up a localized string similar to The supplied type {0} does not have the same number of generic arguments as the target type {1}.. + /// Looks up a localized string similar to The supplied type {0} does not have the same number of generic arguments as the target type {1}.. /// internal static string MustHaveSameNumberOfGenericArguments { get { @@ -323,7 +321,7 @@ internal static string MustHaveSameNumberOfGenericArguments { } /// - /// Looks up a localized string similar to The type {0} does not have an accessible constructor.. + /// Looks up a localized string similar to The type {0} does not have an accessible constructor.. /// internal static string NoConstructorFound { get { @@ -332,7 +330,7 @@ internal static string NoConstructorFound { } /// - /// Looks up a localized string similar to The type {0} does not have a generic argument named "{1}". + /// Looks up a localized string similar to The type {0} does not have a generic argument named "{1}". /// internal static string NoMatchingGenericArgument { get { @@ -341,7 +339,7 @@ internal static string NoMatchingGenericArgument { } /// - /// Looks up a localized string similar to while resolving. + /// Looks up a localized string similar to while resolving. /// internal static string NoOperationExceptionReason { get { @@ -350,7 +348,7 @@ internal static string NoOperationExceptionReason { } /// - /// Looks up a localized string similar to The type {0} does not have a constructor that takes the parameters ({1}).. + /// Looks up a localized string similar to The type {0} does not have a constructor that takes the parameters ({1}).. /// internal static string NoSuchConstructor { get { @@ -359,7 +357,7 @@ internal static string NoSuchConstructor { } /// - /// Looks up a localized string similar to The type {0} does not have a public method named {1} that takes the parameters ({2}).. + /// Looks up a localized string similar to The type {0} does not have a public method named {1} that takes the parameters ({2}).. /// internal static string NoSuchMethod { get { @@ -368,7 +366,7 @@ internal static string NoSuchMethod { } /// - /// Looks up a localized string similar to The type {0} does not contain an instance property named {1}.. + /// Looks up a localized string similar to The type {0} does not contain an instance property named {1}.. /// internal static string NoSuchProperty { get { @@ -377,7 +375,7 @@ internal static string NoSuchProperty { } /// - /// Looks up a localized string similar to The type {0} is not a generic type, and you are attempting to inject a generic parameter named "{1}".. + /// Looks up a localized string similar to The type {0} is not a generic type, and you are attempting to inject a generic parameter named "{1}".. /// internal static string NotAGenericType { get { @@ -386,7 +384,7 @@ internal static string NotAGenericType { } /// - /// Looks up a localized string similar to The type {0} is not an array type with rank 1, and you are attempting to use a [DependencyArray] attribute on a parameter or property with this type.. + /// Looks up a localized string similar to The type {0} is not an array type with rank 1, and you are attempting to use a [DependencyArray] attribute on a parameter or property with this type.. /// internal static string NotAnArrayTypeWithRankOne { get { @@ -395,7 +393,7 @@ internal static string NotAnArrayTypeWithRankOne { } /// - /// Looks up a localized string similar to Optional dependencies must be reference types. The type {0} is a value type.. + /// Looks up a localized string similar to Optional dependencies must be reference types. The type {0} is a value type.. /// internal static string OptionalDependenciesMustBeReferenceTypes { get { @@ -404,7 +402,7 @@ internal static string OptionalDependenciesMustBeReferenceTypes { } /// - /// Looks up a localized string similar to The property {0} on type {1} is not settable.. + /// Looks up a localized string similar to The property {0} on type {1} is not settable.. /// internal static string PropertyNotSettable { get { @@ -413,7 +411,7 @@ internal static string PropertyNotSettable { } /// - /// Looks up a localized string similar to The property {0} on type {1} is of type {2}, and cannot be injected with a value of type {3}.. + /// Looks up a localized string similar to The property {0} on type {1} is of type {2}, and cannot be injected with a value of type {3}.. /// internal static string PropertyTypeMismatch { get { @@ -422,7 +420,7 @@ internal static string PropertyTypeMismatch { } /// - /// Looks up a localized string similar to The value for the property "{0}" could not be resolved.. + /// Looks up a localized string similar to The value for the property "{0}" could not be resolved.. /// internal static string PropertyValueResolutionFailed { get { @@ -431,7 +429,7 @@ internal static string PropertyValueResolutionFailed { } /// - /// Looks up a localized string similar to The provided string argument must not be empty.. + /// Looks up a localized string similar to The provided string argument must not be empty.. /// internal static string ProvidedStringArgMustNotBeEmpty { get { @@ -440,7 +438,7 @@ internal static string ProvidedStringArgMustNotBeEmpty { } /// - /// Looks up a localized string similar to Resolution of the dependency failed, type = "{0}", name = "{1}". + /// Looks up a localized string similar to Resolution of the dependency failed, type = "{0}", name = "{1}". ///Exception occurred while: {2}. ///Exception is: {3} - {4} ///----------------------------------------------- @@ -454,7 +452,7 @@ internal static string ResolutionFailed { } /// - /// Looks up a localized string similar to Resolving {0},{1}. + /// Looks up a localized string similar to Resolving {0},{1}. /// internal static string ResolutionTraceDetail { get { @@ -463,7 +461,7 @@ internal static string ResolutionTraceDetail { } /// - /// Looks up a localized string similar to Resolving {0},{1} (mapped from {2}, {3}). + /// Looks up a localized string similar to Resolving {0},{1} (mapped from {2}, {3}). /// internal static string ResolutionWithMappingTraceDetail { get { @@ -472,7 +470,7 @@ internal static string ResolutionWithMappingTraceDetail { } /// - /// Looks up a localized string similar to Resolving value for property {0}.{1}. + /// Looks up a localized string similar to Resolving value for property {0}.{1}. /// internal static string ResolvingPropertyValueOperation { get { @@ -481,7 +479,7 @@ internal static string ResolvingPropertyValueOperation { } /// - /// Looks up a localized string similar to The constructor {1} selected for type {0} has ref or out parameters. Such parameters are not supported for constructor injection.. + /// Looks up a localized string similar to The constructor {1} selected for type {0} has ref or out parameters. Such parameters are not supported for constructor injection.. /// internal static string SelectedConstructorHasRefParameters { get { @@ -490,7 +488,7 @@ internal static string SelectedConstructorHasRefParameters { } /// - /// Looks up a localized string similar to Setting value for property {0}.{1}. + /// Looks up a localized string similar to Setting value for property {0}.{1}. /// internal static string SettingPropertyOperation { get { @@ -499,7 +497,7 @@ internal static string SettingPropertyOperation { } /// - /// Looks up a localized string similar to The type {0} cannot be constructed. You must configure the container to supply this value.. + /// Looks up a localized string similar to The type {0} cannot be constructed. You must configure the container to supply this value.. /// internal static string TypeIsNotConstructable { get { @@ -508,7 +506,7 @@ internal static string TypeIsNotConstructable { } /// - /// Looks up a localized string similar to The type {1} cannot be assigned to variables of type {0}.. + /// Looks up a localized string similar to The type {1} cannot be assigned to variables of type {0}.. /// internal static string TypesAreNotAssignable { get { @@ -517,7 +515,7 @@ internal static string TypesAreNotAssignable { } /// - /// Looks up a localized string similar to <unknown>. + /// Looks up a localized string similar to <unknown>. /// internal static string UnknownType { get { diff --git a/source/Unity/Src/Properties/Resources.resx b/source/Src/Unity-CoreClr/Properties/Resources.resx similarity index 100% rename from source/Unity/Src/Properties/Resources.resx rename to source/Src/Unity-CoreClr/Properties/Resources.resx diff --git a/source/Unity/Src/PropertyOverride.cs b/source/Src/Unity-CoreClr/PropertyOverride.cs similarity index 94% rename from source/Unity/Src/PropertyOverride.cs rename to source/Src/Unity-CoreClr/PropertyOverride.cs index 0c6be138..8ebe4c8d 100644 --- a/source/Unity/Src/PropertyOverride.cs +++ b/source/Src/Unity-CoreClr/PropertyOverride.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A that lets you override diff --git a/source/Unity/Src/PropertyOverrides.cs b/source/Src/Unity-CoreClr/PropertyOverrides.cs similarity index 97% rename from source/Unity/Src/PropertyOverrides.cs rename to source/Src/Unity-CoreClr/PropertyOverrides.cs index fe9928bc..955d2819 100644 --- a/source/Unity/Src/PropertyOverrides.cs +++ b/source/Src/Unity-CoreClr/PropertyOverrides.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// A convenience form of that lets you diff --git a/source/Unity/Src/ResolutionFailedException.cs b/source/Src/Unity-CoreClr/ResolutionFailedException.cs similarity index 97% rename from source/Unity/Src/ResolutionFailedException.cs rename to source/Src/Unity-CoreClr/ResolutionFailedException.cs index f35443bf..50fa623e 100644 --- a/source/Unity/Src/ResolutionFailedException.cs +++ b/source/Src/Unity-CoreClr/ResolutionFailedException.cs @@ -5,11 +5,11 @@ using System.Globalization; using System.Reflection; using System.Text; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Properties; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// The exception thrown by the Unity container when diff --git a/source/Unity/Src/ResolverOverride.cs b/source/Src/Unity-CoreClr/ResolverOverride.cs similarity index 96% rename from source/Unity/Src/ResolverOverride.cs rename to source/Src/Unity-CoreClr/ResolverOverride.cs index fcb9f5c3..be5a1640 100644 --- a/source/Unity/Src/ResolverOverride.cs +++ b/source/Src/Unity-CoreClr/ResolverOverride.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. using System; -using Microsoft.Practices.ObjectBuilder2; +using ObjectBuilder2; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// Base class for all override objects passed in the diff --git a/source/Unity/Src/StaticFactory/IStaticFactoryConfiguration.cs b/source/Src/Unity-CoreClr/StaticFactory/IStaticFactoryConfiguration.cs similarity index 97% rename from source/Unity/Src/StaticFactory/IStaticFactoryConfiguration.cs rename to source/Src/Unity-CoreClr/StaticFactory/IStaticFactoryConfiguration.cs index 0fc05bf9..0ad4f335 100644 --- a/source/Unity/Src/StaticFactory/IStaticFactoryConfiguration.cs +++ b/source/Src/Unity-CoreClr/StaticFactory/IStaticFactoryConfiguration.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity.StaticFactory +namespace Unity.StaticFactory { /// /// Interface defining the configuration interface exposed by the diff --git a/source/Unity/Src/StaticFactory/StaticFactoryExtension.cs b/source/Src/Unity-CoreClr/StaticFactory/StaticFactoryExtension.cs similarity index 97% rename from source/Unity/Src/StaticFactory/StaticFactoryExtension.cs rename to source/Src/Unity-CoreClr/StaticFactory/StaticFactoryExtension.cs index 01859fc2..370cd8be 100644 --- a/source/Unity/Src/StaticFactory/StaticFactoryExtension.cs +++ b/source/Src/Unity-CoreClr/StaticFactory/StaticFactoryExtension.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.Practices.Unity.StaticFactory +namespace Unity.StaticFactory { /// /// A that lets you register a diff --git a/source/Unity/Src/TypeBasedOverride.cs b/source/Src/Unity-CoreClr/TypeBasedOverride.cs similarity index 96% rename from source/Unity/Src/TypeBasedOverride.cs rename to source/Src/Unity-CoreClr/TypeBasedOverride.cs index f593d0c3..824b2c5c 100644 --- a/source/Unity/Src/TypeBasedOverride.cs +++ b/source/Src/Unity-CoreClr/TypeBasedOverride.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; +using ObjectBuilder2; +using Unity.Utility; -namespace Microsoft.Practices.Unity +namespace Unity { /// /// An implementation of that diff --git a/source/Src/Unity-CoreClr/Unity-CoreClr.xproj b/source/Src/Unity-CoreClr/Unity-CoreClr.xproj new file mode 100644 index 00000000..fb08c712 --- /dev/null +++ b/source/Src/Unity-CoreClr/Unity-CoreClr.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 2864072c-44ec-4d9d-bed9-c6176148ec86 + Unity + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + True + + + \ No newline at end of file diff --git a/source/Unity/Src/Unity.csproj b/source/Src/Unity-CoreClr/Unity.CoreClr.csproj similarity index 94% rename from source/Unity/Src/Unity.csproj rename to source/Src/Unity-CoreClr/Unity.CoreClr.csproj index 603c388c..01ec6472 100644 --- a/source/Unity/Src/Unity.csproj +++ b/source/Src/Unity-CoreClr/Unity.CoreClr.csproj @@ -6,17 +6,22 @@ 9.0.30729 2.0 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - v4.5 - Profile259 + v4.0 + Profile344 Library Properties Microsoft.Practices.Unity Microsoft.Practices.Unity - 3.5 + 4.0 + false + {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} + 10.0 + ..\..\..\ + true publish\ true Disk @@ -29,11 +34,8 @@ true 0 1.0.0.%2a - false false true - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - 12.0 true @@ -231,6 +233,7 @@ Unity.licenseheader + @@ -240,12 +243,20 @@ - - ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An abstract ContainerConfiguringElement cannot be created. Please specify a concrete type. - - - An abstract ExtensionConfigurationElement object cannot be created. Please specify a concrete type. - - - An abstract InjectionMemberElement object cannot be created. Please specify a concrete type. - - - An abstract ParameterValueElement object cannot be created. Please specify a concrete type. - - - The type name or alias {0} could not be resolved. Please check your configuration file and verify this type name. - - - The dependency element for generic parameter {0} must not have an explicit type name but has '{1}'. - - - The optional dependency element for generic parameter {0} must not have an explicit type name but has '{1}'. - - - {0} {1} - - - The injection configuration for {0} has multiple values. - - - The configuration element type {0} has not been registered with the section. - - - The injection configuration for {0} is specified through both attributes and child value elements. - - - Could not load section extension type {0}. - - - The extension type {0} does not derive from SectionExtension. - - - The extension element type {0} that is being added does not derive from ContainerConfiguringElement, InjectionMemberElement, or ParameterValueElement. An extension element must derive from one of these types. - - - No valid attributes were found to construct the value for the {0}. Please check the configuration file. - - - Configuration is incorrect, the type {0} does not have a constructor that takes parameters named {1}. - - - Configuration is incorrect, the type {0} does not have a method named {1} that takes parameters named {2}. - - - The container named "{0}" is not defined in this configuration section. - - - The type {0} does not have a property named {1}. - - - The configuration is set to inject an array, but the type {0} is not an array type. - - - parameter - - - property - - - The attribute {0} must be present and non-empty. - - - The value element for {1} was specified for the generic array type {0}. Value elements are not allowed for generic array types. - - - The value element for {1} was specified for the generic parameter type {0}. Value elements are not allowed for generic parameter types. - - - The value element for {1} was specified for the generic type {0}. Value elements are not allowed for generic types. - - \ No newline at end of file diff --git a/source/Unity.Configuration/Src/PropertyElement.cs b/source/Unity.Configuration/Src/PropertyElement.cs deleted file mode 100644 index cc34de9d..00000000 --- a/source/Unity.Configuration/Src/PropertyElement.cs +++ /dev/null @@ -1,191 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Globalization; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.Configuration.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// A class representing a property configuration element. - /// - public class PropertyElement : InjectionMemberElement, IValueProvidingElement - { - private const string NamePropertyName = "name"; - private readonly ValueElementHelper valueElementHelper; - private ParameterValueElement valueElement; - - /// - /// Construct a new instance of - /// - public PropertyElement() - { - this.valueElementHelper = new ValueElementHelper(this); - } - - /// - /// Name of the property that will be set. - /// - [ConfigurationProperty(NamePropertyName, IsRequired = true)] - public string Name - { - get { return (string)base[NamePropertyName]; } - set { base[NamePropertyName] = value; } - } - - /// - /// Each element must have a unique key, which is generated by the subclasses. - /// - public override string Key - { - get { return "property:" + this.Name; } - } - - /// - /// String that will be deserialized to provide the value. - /// - public ParameterValueElement Value - { - get { return ValueElementHelper.GetValue(this.valueElement); } - set { this.valueElement = value; } - } - - ParameterValueElement IValueProvidingElement.Value - { - get { return this.valueElement; } - set { this.Value = value; } - } - - /// - /// A string describing where the value this element contains - /// is being used. For example, if setting a property Prop1, - /// this should return "property Prop1" (in english). - /// - public string DestinationName - { - get - { - return string.Format(CultureInfo.CurrentCulture, - Resources.DestinationNameFormat, - Resources.Property, this.Name); - } - } - - /// - /// Element name to use to serialize this into XML. - /// - public override string ElementName - { - get { return "property"; } - } - - /// - /// Reads XML from the configuration file. - /// - /// The that reads from the configuration file. - /// true to serialize only the collection key properties; otherwise, false. - /// The element to read is locked. - /// - or - - /// An attribute of the current node is not recognized. - /// - or - - /// The lock status of the current node cannot be determined. - /// - protected override void DeserializeElement(System.Xml.XmlReader reader, bool serializeCollectionKey) - { - base.DeserializeElement(reader, serializeCollectionKey); - this.valueElementHelper.CompleteValueElement(reader); - } - - /// - /// Gets a value indicating whether an unknown attribute is encountered during deserialization. - /// - /// - /// true when an unknown attribute is encountered while deserializing; otherwise, false. - /// - /// The name of the unrecognized attribute. - /// The value of the unrecognized attribute. - protected override bool OnDeserializeUnrecognizedAttribute(string name, string value) - { - return this.valueElementHelper.DeserializeUnrecognizedAttribute(name, value); - } - - /// - /// Gets a value indicating whether an unknown element is encountered during deserialization. - /// - /// - /// true when an unknown element is encountered while deserializing; otherwise, false. - /// - /// The name of the unknown subelement. - /// The being used for deserialization. - /// The element identified by is locked. - /// - or - - /// One or more of the element's attributes is locked. - /// - or - - /// is unrecognized, or the element has an unrecognized attribute. - /// - or - - /// The element has a Boolean attribute with an invalid value. - /// - or - - /// An attempt was made to deserialize a property more than once. - /// - or - - /// An attempt was made to deserialize a property that is not a valid member of the element. - /// - or - - /// The element cannot contain a CDATA or text element. - /// - protected override bool OnDeserializeUnrecognizedElement(string elementName, System.Xml.XmlReader reader) - { - return - this.valueElementHelper.DeserializeUnknownElement(elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Guard.ArgumentNotNull(writer, "writer"); - writer.WriteAttributeString(NamePropertyName, this.Name); - ValueElementHelper.SerializeParameterValueElement(writer, this.Value, false); - } - - /// - /// Return the set of s that are needed - /// to configure the container according to this configuration element. - /// - /// Container that is being configured. - /// Type that is being registered. - /// Type that is being mapped to. - /// Name this registration is under. - /// One or more objects that should be - /// applied to the container registration. - public override IEnumerable GetInjectionMembers(IUnityContainer container, Type fromType, Type toType, string name) - { - return new[] { new InjectionProperty(this.Name, this.Value.GetInjectionParameterValue(container, this.GetPropertyType(toType))) }; - } - - private Type GetPropertyType(Type typeContainingProperty) - { - var propertyInfo = typeContainingProperty.GetProperty(this.Name); - if (propertyInfo == null) - { - throw new InvalidOperationException( - string.Format(CultureInfo.CurrentCulture, - Resources.NoSuchProperty, - typeContainingProperty.Name, this.Name)); - } - - return propertyInfo.PropertyType; - } - } -} diff --git a/source/Unity.Configuration/Src/RegisterElement.cs b/source/Unity.Configuration/Src/RegisterElement.cs deleted file mode 100644 index 7e3e7681..00000000 --- a/source/Unity.Configuration/Src/RegisterElement.cs +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// A configuration element representing a single container type registration. - /// - public class RegisterElement : ContainerConfiguringElement - { - private const string InjectionMembersPropertyName = ""; - private const string LifetimePropertyName = "lifetime"; - private const string MapToPropertyName = "mapTo"; - private const string NamePropertyName = "name"; - private const string TypePropertyName = "type"; - - /// - /// The type that is registered. - /// - [ConfigurationProperty(TypePropertyName, IsRequired = true, IsKey = true)] - public string TypeName - { - get { return (string)base[TypePropertyName]; } - set { base[TypePropertyName] = value; } - } - - /// - /// Name registered under. - /// - [ConfigurationProperty(NamePropertyName, DefaultValue = "", IsRequired = false, IsKey = true)] - public string Name - { - get { return (string)base[NamePropertyName]; } - set { base[NamePropertyName] = value; } - } - - /// - /// Type that is mapped to. - /// - [ConfigurationProperty(MapToPropertyName, DefaultValue = "", IsRequired = false)] - public string MapToName - { - get { return (string)base[MapToPropertyName]; } - set { base[MapToPropertyName] = value; } - } - - /// - /// Lifetime manager to register for this registration. - /// - [ConfigurationProperty(LifetimePropertyName, IsRequired = false)] - public LifetimeElement Lifetime - { - get { return (LifetimeElement)base[LifetimePropertyName]; } - set { base[LifetimePropertyName] = value; } - } - - /// - /// Any injection members (constructor, properties, etc.) that are specified for - /// this registration. - /// - [ConfigurationProperty(InjectionMembersPropertyName, IsDefaultCollection = true)] - public InjectionMemberElementCollection InjectionMembers - { - get { return (InjectionMemberElementCollection)base[InjectionMembersPropertyName]; } - } - - /// - /// Apply the registrations from this element to the given container. - /// - /// Container to configure. - protected override void ConfigureContainer(IUnityContainer container) - { - Type registeringType = this.GetRegisteringType(); - Type mappedType = this.GetMappedType(); - LifetimeManager lifetime = this.Lifetime.CreateLifetimeManager(); - IEnumerable injectionMembers = - this.InjectionMembers.SelectMany(m => m.GetInjectionMembers(container, registeringType, mappedType, this.Name)); - container.RegisterType(registeringType, mappedType, this.Name, lifetime, injectionMembers.ToArray()); - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(writer, "writer"); - - writer.WriteAttributeString(TypePropertyName, this.TypeName); - writer.WriteAttributeIfNotEmpty(MapToPropertyName, this.MapToName) - .WriteAttributeIfNotEmpty(NamePropertyName, this.Name); - - if (!string.IsNullOrEmpty(this.Lifetime.TypeName)) - { - writer.WriteElement("lifetime", this.Lifetime.SerializeContent); - } - - this.SerializeInjectionMembers(writer); - } - - private Type GetRegisteringType() - { - if (!string.IsNullOrEmpty(this.MapToName)) - { - return TypeResolver.ResolveType(this.TypeName); - } - return null; - } - - private Type GetMappedType() - { - if (string.IsNullOrEmpty(this.MapToName)) - { - return TypeResolver.ResolveType(this.TypeName); - } - return TypeResolver.ResolveType(this.MapToName); - } - - private void SerializeInjectionMembers(XmlWriter writer) - { - foreach (var member in this.InjectionMembers) - { - writer.WriteElement(member.ElementName, member.SerializeContent); - } - } - } -} diff --git a/source/Unity.Configuration/Src/RegisterElementCollection.cs b/source/Unity.Configuration/Src/RegisterElementCollection.cs deleted file mode 100644 index a39a1968..00000000 --- a/source/Unity.Configuration/Src/RegisterElementCollection.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// A collection of s. - /// - [ConfigurationCollection(typeof(RegisterElement), AddItemName = "register")] - public class RegisterElementCollection : DeserializableConfigurationElementCollection - { - private static readonly UnknownElementHandlerMap UnknownElementHandlerMap - = new UnknownElementHandlerMap - { - { "type", (rec, xr) => rec.ReadUnwrappedElement(xr, rec) } - }; - - /// - /// Causes the configuration system to throw an exception. - /// - /// - /// true if the unrecognized element was deserialized successfully; otherwise, false. The default is false. - /// - /// The name of the unrecognized element. - /// An input stream that reads XML from the configuration file. - /// The element specified in is the <clear> element. - /// starts with the reserved prefix "config" or "lock". - protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader) - { - return UnknownElementHandlerMap.ProcessElement(this, elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - - /// - /// Gets the element key for a specified configuration element when overridden in a derived class. - /// - /// - /// An that acts as the key for the specified . - /// - /// The to return the key for. - protected override object GetElementKey(ConfigurationElement element) - { - var registerElement = (RegisterElement)element; - return registerElement.TypeName + ":" + registerElement.Name; - } - } -} diff --git a/source/Unity.Configuration/Src/SectionExtension.cs b/source/Unity.Configuration/Src/SectionExtension.cs deleted file mode 100644 index 32e9edd3..00000000 --- a/source/Unity.Configuration/Src/SectionExtension.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// Base class for Unity configuration section extensions. - /// Derived classes are used to add custom elements and aliases - /// into the configuration section being loaded. - /// - public abstract class SectionExtension - { - /// - /// Add the extensions to the section via the context. - /// - /// Context object that can be used to add elements and aliases. - public abstract void AddExtensions(SectionExtensionContext context); - } -} diff --git a/source/Unity.Configuration/Src/SectionExtensionContext.cs b/source/Unity.Configuration/Src/SectionExtensionContext.cs deleted file mode 100644 index 6f18dfe1..00000000 --- a/source/Unity.Configuration/Src/SectionExtensionContext.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// An object that gives the ability to add - /// elements and aliases to a configuration section. - /// - public abstract class SectionExtensionContext - { - /// - /// Add a new alias to the configuration section. This is useful - /// for those extensions that add commonly used types to configuration - /// so users don't have to alias them repeatedly. - /// - /// The alias to use. - /// Type the alias maps to. - public abstract void AddAlias(string newAlias, Type aliasedType); - - /// - /// Add a new alias to the configuration section. This is useful - /// for those extensions that add commonly used types to configuration - /// so users don't have to alias them repeatedly. - /// - /// Type the alias maps to. - /// The alias to use - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", - Justification = "TAliased is required to do the mapping between the alias and the type")] - public void AddAlias(string alias) - { - AddAlias(alias, typeof(TAliased)); - } - - /// - /// Add a new element to the configuration section schema. - /// - /// Tag name in the XML. - /// Type the tag maps to. - public abstract void AddElement(string tag, Type elementType); - - /// - /// Add a new element to the configuration section schema. - /// - /// Type the tag maps to. - /// Tag name in the XML. - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", - Justification = "TElement is required to map the tag to the element type")] - public void AddElement(string tag) - where TElement : DeserializableConfigurationElement - { - AddElement(tag, typeof(TElement)); - } - } -} diff --git a/source/Unity.Configuration/Src/SectionExtensionElement.cs b/source/Unity.Configuration/Src/SectionExtensionElement.cs deleted file mode 100644 index d13e60d1..00000000 --- a/source/Unity.Configuration/Src/SectionExtensionElement.cs +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using System.Globalization; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.Configuration.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// A configuration element used to specify which extensions to - /// add to the configuration schema. - /// - public class SectionExtensionElement : DeserializableConfigurationElement - { - private const string TypeNamePropertyName = "type"; - private const string PrefixPropertyName = "prefix"; - - private SectionExtension extensionObject; - - /// - /// Type of the section extender object that will provide new elements to the schema. - /// - [ConfigurationProperty(TypeNamePropertyName, IsRequired = true, IsKey = true)] - public string TypeName - { - get { return (string)base[TypeNamePropertyName]; } - set - { - base[TypeNamePropertyName] = value; - this.extensionObject = null; - } - } - - /// - /// Optional prefix that will be added to the element names added by this - /// section extender. If left out, no prefix will be added. - /// - [ConfigurationProperty(PrefixPropertyName, IsRequired = false)] - public string Prefix - { - get { return (string)base[PrefixPropertyName]; } - set { base[PrefixPropertyName] = value; } - } - - /// - /// The extension object represented by this element. - /// - public SectionExtension ExtensionObject - { - get - { - if (this.extensionObject == null) - { - this.extensionObject = (SectionExtension)Activator.CreateInstance(this.GetExtensionObjectType()); - } - return this.extensionObject; - } - } - - /// - /// Reads XML from the configuration file. - /// - /// The that reads from the configuration file. - /// true to serialize only the collection key properties; otherwise, false. - /// The element to read is locked. - /// - or - - /// An attribute of the current node is not recognized. - /// - or - - /// The lock status of the current node cannot be determined. - /// - protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey) - { - base.DeserializeElement(reader, serializeCollectionKey); - this.GetExtensionObjectType(); - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Guard.ArgumentNotNull(writer, "writer"); - writer.WriteAttributeString(SectionExtensionElement.TypeNamePropertyName, this.TypeName); - if (!string.IsNullOrEmpty(this.Prefix)) - { - writer.WriteAttributeString(SectionExtensionElement.PrefixPropertyName, this.Prefix); - } - } - - private void GuardIsValidExtensionType(Type extensionType) - { - if (extensionType == null) - { - throw new ConfigurationErrorsException(string.Format(CultureInfo.CurrentCulture, - Resources.ExtensionTypeNotFound, this.TypeName)); - } - - if (!typeof(SectionExtension).IsAssignableFrom(extensionType)) - { - throw new ConfigurationErrorsException(string.Format(CultureInfo.CurrentCulture, - Resources.ExtensionTypeNotValid, this.TypeName)); - } - } - - private Type GetExtensionObjectType() - { - Type extensionType = TypeResolver.ResolveType(this.TypeName); - this.GuardIsValidExtensionType(extensionType); - return extensionType; - } - } -} diff --git a/source/Unity.Configuration/Src/SectionExtensionElementCollection.cs b/source/Unity.Configuration/Src/SectionExtensionElementCollection.cs deleted file mode 100644 index 2ad3c8da..00000000 --- a/source/Unity.Configuration/Src/SectionExtensionElementCollection.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// A collection of s. - /// - [ConfigurationCollection(typeof(SectionExtensionElement))] - public class SectionExtensionElementCollection : - DeserializableConfigurationElementCollection - { - /// - /// Gets the element key for a specified configuration element when overridden in a derived class. - /// - /// - /// An that acts as the key for the specified . - /// - /// The to return the key for. - protected override object GetElementKey(ConfigurationElement element) - { - var sectionElement = (SectionExtensionElement)element; - string prefix = sectionElement.Prefix; - if (!string.IsNullOrEmpty(prefix)) - { - prefix = prefix + "."; - } - - return prefix + sectionElement.TypeName; - } - } -} diff --git a/source/Unity.Configuration/Src/Unity.Configuration.csproj b/source/Unity.Configuration/Src/Unity.Configuration.csproj deleted file mode 100644 index 88df87d6..00000000 --- a/source/Unity.Configuration/Src/Unity.Configuration.csproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE} - Library - Properties - Microsoft.Practices.Unity.Configuration - Microsoft.Practices.Unity.Configuration - v4.5 - 512 - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - true - full - false - ..\..\bin\Desktop\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\bin\Desktop\Debug\Microsoft.Practices.Unity.Configuration.xml - true - - - ..\..\Unity.ruleset - false - - - pdbonly - true - ..\..\bin\Desktop\Release\ - TRACE - prompt - 4 - ..\..\bin\Desktop\Release\Microsoft.Practices.Unity.Configuration.XML - true - true - - - ..\..\Unity.ruleset - false - - - - False - ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - - 3.5 - - - - - - - GlobalAssemblyInfo.2010.cs - - - GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - - - - - - - - - - - Unity.licenseheader - - - UnityConfiguration30.xsd - Designer - PreserveNewest - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Src/UnityConfigurationSection.cs b/source/Unity.Configuration/Src/UnityConfigurationSection.cs deleted file mode 100644 index 2425d043..00000000 --- a/source/Unity.Configuration/Src/UnityConfigurationSection.cs +++ /dev/null @@ -1,331 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using System.Globalization; -using System.Text; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.Configuration.Properties; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// A configuration section describing configuration for an . - /// - public class UnityConfigurationSection : ConfigurationSection - { - /// - /// The name of the section where unity configuration is expected to be found. - /// - public const string SectionName = "unity"; - - /// - /// XML Namespace string used for IntelliSense in this section. - /// - public const string XmlNamespace = "http://schemas.microsoft.com/practices/2010/unity"; - - private const string ContainersPropertyName = ""; - private const string TypeAliasesPropertyName = "aliases"; - private const string SectionExtensionsPropertyName = "extensions"; - private const string NamespacesPropertyName = "namespaces"; - private const string AssembliesPropertyName = "assemblies"; - private const string XmlnsPropertyName = "xmlns"; - - private static readonly UnknownElementHandlerMap UnknownElementHandlerMap - = new UnknownElementHandlerMap - { - { "typeAliases", (s, xr) => s.TypeAliases.Deserialize(xr) }, - { "containers", (s, xr) => s.Containers.Deserialize(xr) }, - { "alias", (s, xr) => s.ReadUnwrappedElement(xr, s.TypeAliases) }, - { "sectionExtension", (s, xr) => s.DeserializeSectionExtension(xr) }, - { "namespace", (s, xr) => s.ReadUnwrappedElement(xr, s.Namespaces) }, - { "assembly", (s, xr) => s.ReadUnwrappedElement(xr, s.Assemblies) } - }; - - [ThreadStatic] - private static UnityConfigurationSection currentSection; - - /// - /// The current that is being deserialized - /// or being configured from. - /// - public static UnityConfigurationSection CurrentSection - { - get { return currentSection; } - } - - /// - /// Storage for XML namespace. The namespace isn't used or validated by config, but - /// it is useful for Visual Studio XML IntelliSense to kick in. - /// - [ConfigurationProperty(XmlnsPropertyName, IsRequired = false, DefaultValue = XmlNamespace)] - public string Xmlns - { - get { return (string)base[XmlnsPropertyName]; } - set { base[XmlnsPropertyName] = value; } - } - - /// - /// The set of containers defined in this configuration section. - /// - [ConfigurationProperty(ContainersPropertyName, IsDefaultCollection = true)] - public ContainerElementCollection Containers - { - get - { - var containers = (ContainerElementCollection)base[ContainersPropertyName]; - containers.ContainingSection = this; - return containers; - } - } - - /// - /// The set of type aliases defined in this configuration file. - /// - [ConfigurationProperty(TypeAliasesPropertyName)] - public AliasElementCollection TypeAliases - { - get { return (AliasElementCollection)base[TypeAliasesPropertyName]; } - } - - /// - /// Any schema extensions that are added. - /// - [ConfigurationProperty(SectionExtensionsPropertyName)] - public SectionExtensionElementCollection SectionExtensions - { - get { return (SectionExtensionElementCollection)base[SectionExtensionsPropertyName]; } - } - - /// - /// Any namespaces added to the type search list. - /// - [ConfigurationProperty(NamespacesPropertyName)] - public NamespaceElementCollection Namespaces - { - get { return (NamespaceElementCollection)base[NamespacesPropertyName]; } - } - - /// - /// Any assemblies added to the type search list. - /// - [ConfigurationProperty(AssembliesPropertyName)] - public AssemblyElementCollection Assemblies - { - get { return (AssemblyElementCollection)base[AssembliesPropertyName]; } - } - - /// - /// Apply the configuration in the default container element to the given container. - /// - /// Container to configure. - /// The passed in . - public IUnityContainer Configure(IUnityContainer container) - { - return this.Configure(container, String.Empty); - } - - /// - /// Apply the configuration in the default container element to the given container. - /// - /// Container to configure. - /// Name of the container element to use to configure the container. - /// The passed in . - public IUnityContainer Configure(IUnityContainer container, string configuredContainerName) - { - currentSection = this; - TypeResolver.SetAliases(this); - var containerElement = GuardContainerExists(configuredContainerName, this.Containers[configuredContainerName]); - - containerElement.ConfigureContainer(container); - return container; - } - - private static ContainerElement GuardContainerExists(string configuredContainerName, ContainerElement containerElement) - { - if (containerElement == null) - { - throw new ArgumentException( - string.Format(CultureInfo.CurrentCulture, - Resources.NoSuchContainer, configuredContainerName), - "configuredContainerName"); - } - return containerElement; - } - - /// - /// Reads XML from the configuration file. - /// - /// The object, which reads from the configuration file. - /// found no elements in the configuration file. - protected override void DeserializeSection(XmlReader reader) - { - ExtensionElementMap.Clear(); - currentSection = this; - base.DeserializeSection(reader); - } - - /// - /// Gets a value indicating whether an unknown element is encountered during deserialization. - /// - /// - /// true when an unknown element is encountered while deserializing; otherwise, false. - /// - /// The name of the unknown subelement. - /// The being used for deserialization. - /// - /// The element identified by is locked. - /// - or - - /// One or more of the element's attributes is locked. - /// - or - - /// is unrecognized, or the element has an unrecognized attribute. - /// - or - - /// The element has a Boolean attribute with an invalid value. - /// - or - - /// An attempt was made to deserialize a property more than once. - /// - or - - /// An attempt was made to deserialize a property that is not a valid member of the element. - /// - or - - /// The element cannot contain a CDATA or text element. - /// - protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader) - { - return UnknownElementHandlerMap.ProcessElement(this, elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - - private void DeserializeSectionExtension(XmlReader reader) - { - TypeResolver.SetAliases(this); - var element = this.ReadUnwrappedElement(reader, this.SectionExtensions); - element.ExtensionObject.AddExtensions(new ExtensionContext(this, element.Prefix)); - } - - /// - /// Creates an XML string containing an unmerged view of the object as a single section to write to a file. - /// - /// - /// An XML string containing an unmerged view of the object. - /// - /// The instance to use as the parent when performing the un-merge. - /// The name of the section to create. - /// The instance to use when writing to a string. - protected override string SerializeSection(ConfigurationElement parentElement, string name, ConfigurationSaveMode saveMode) - { - ExtensionElementMap.Clear(); - currentSection = this; - TypeResolver.SetAliases(this); - this.InitializeSectionExtensions(); - - var sb = new StringBuilder(); - using (var writer = MakeXmlWriter(sb)) - { - writer.WriteStartElement(name, XmlNamespace); - writer.WriteAttributeString("xmlns", XmlNamespace); - this.TypeAliases.SerializeElementContents(writer, "alias"); - this.Namespaces.SerializeElementContents(writer, "namespace"); - this.Assemblies.SerializeElementContents(writer, "assembly"); - this.SectionExtensions.SerializeElementContents(writer, "sectionExtension"); - this.Containers.SerializeElementContents(writer, "container"); - writer.WriteEndElement(); - } - - return sb.ToString(); - } - - private static XmlWriter MakeXmlWriter(StringBuilder sb) - { - var settings = new XmlWriterSettings - { - Indent = true, - OmitXmlDeclaration = true, - ConformanceLevel = ConformanceLevel.Fragment - }; - - return XmlWriter.Create(sb, settings); - } - - private void InitializeSectionExtensions() - { - foreach (var extensionElement in this.SectionExtensions) - { - SectionExtension extensionObject = extensionElement.ExtensionObject; - extensionObject.AddExtensions(new ExtensionContext(this, extensionElement.Prefix, false)); - } - } - - private class ExtensionContext : SectionExtensionContext - { - private readonly UnityConfigurationSection section; - private readonly string prefix; - private readonly bool saveAliases; - - public ExtensionContext(UnityConfigurationSection section, string prefix) - : this(section, prefix, true) - { - } - - public ExtensionContext(UnityConfigurationSection section, string prefix, bool saveAliases) - { - this.section = section; - this.prefix = prefix; - this.saveAliases = saveAliases; - } - - /// - /// Add a new alias to the configuration section. This is useful - /// for those extensions that add commonly used types to configuration - /// so users don't have to alias them repeatedly. - /// - /// The alias to use. - /// Type the alias maps to. - public override void AddAlias(string newAlias, Type aliasedType) - { - if (!this.saveAliases) - { - return; - } - - string alias = newAlias; - if (!string.IsNullOrEmpty(this.prefix)) - { - alias = this.prefix + "." + alias; - } - - this.section.TypeAliases.Add(new AliasElement(alias, aliasedType)); - } - - /// - /// Add a new element to the configuration section schema. - /// - /// Tag name in the XML. - /// Type the tag maps to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void AddElement(string tag, Type elementType) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(elementType, "elementType"); - - if (typeof(ContainerConfiguringElement).IsAssignableFrom(elementType)) - { - ExtensionElementMap.AddContainerConfiguringElement(this.prefix, tag, elementType); - } - else if (typeof(InjectionMemberElement).IsAssignableFrom(elementType)) - { - ExtensionElementMap.AddInjectionMemberElement(this.prefix, tag, elementType); - } - else if (typeof(ParameterValueElement).IsAssignableFrom(elementType)) - { - ExtensionElementMap.AddParameterValueElement(this.prefix, tag, elementType); - } - else - { - throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, - Resources.InvalidExtensionElementType, - elementType.Name)); - } - } - } - } -} diff --git a/source/Unity.Configuration/Src/UnityContainerConfigurationExtensions.cs b/source/Unity.Configuration/Src/UnityContainerConfigurationExtensions.cs deleted file mode 100644 index 7b2ecdb2..00000000 --- a/source/Unity.Configuration/Src/UnityContainerConfigurationExtensions.cs +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// Extensions to to simplify - /// loading configuration into a container. - /// - public static class UnityContainerExtensions - { - /// - /// Apply configuration from the given section and named container - /// into the given container. - /// - /// Unity container to configure. - /// Configuration section with config information. - /// Named container. - /// . - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static IUnityContainer LoadConfiguration(this IUnityContainer container, - UnityConfigurationSection section, string containerName) - { - Guard.ArgumentNotNull(container, "container"); - Guard.ArgumentNotNull(section, "section"); - - section.Configure(container, containerName); - return container; - } - - /// - /// Apply configuration from the default section (named "unity" pulled out of - /// ConfigurationManager) and the named container. - /// - /// Unity container to configure. - /// Named container element in configuration. - /// . - public static IUnityContainer LoadConfiguration(this IUnityContainer container, string containerName) - { - Guard.ArgumentNotNull(container, "container"); - var section = (UnityConfigurationSection)ConfigurationManager.GetSection("unity"); - return container.LoadConfiguration(section, containerName); - } - - /// - /// Apply configuration from the default section and unnamed container element. - /// - /// Container to configure. - /// . - public static IUnityContainer LoadConfiguration(this IUnityContainer container) - { - Guard.ArgumentNotNull(container, "container"); - var section = (UnityConfigurationSection)ConfigurationManager.GetSection("unity"); - return container.LoadConfiguration(section, String.Empty); - } - - /// - /// Apply configuration from the default container in the given section. - /// - /// Unity container to configure. - /// Configuration section. - /// . - public static IUnityContainer LoadConfiguration(this IUnityContainer container, UnityConfigurationSection section) - { - Guard.ArgumentNotNull(container, "container"); - Guard.ArgumentNotNull(section, "section"); - return container.LoadConfiguration(section, String.Empty); - } - } -} diff --git a/source/Unity.Configuration/Src/ValueElement.cs b/source/Unity.Configuration/Src/ValueElement.cs deleted file mode 100644 index 247f20e5..00000000 --- a/source/Unity.Configuration/Src/ValueElement.cs +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Configuration; -using System.Globalization; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.Configuration.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.Configuration -{ - /// - /// Element that describes a constant value that will be - /// injected into the container. - /// - public class ValueElement : ParameterValueElement, IAttributeOnlyElement - { - private const string ValuePropertyName = "value"; - private const string TypeConverterTypeNamePropertyName = "typeConverter"; - - /// - /// Construct a new object. - /// - public ValueElement() - { - } - - /// - /// Construct a new object, - /// initializing properties from the contents of - /// . - /// - /// Name/value pairs which - /// contain the values to initialize properties to. - public ValueElement(IDictionary propertyValues) - { - ParameterValueElement.GuardPropertyValueIsPresent(propertyValues, "value"); - this.Value = propertyValues["value"]; - if (propertyValues.ContainsKey("typeConverter")) - { - this.TypeConverterTypeName = propertyValues["typeConverter"]; - } - } - - /// - /// Value for this element - /// - [ConfigurationProperty(ValuePropertyName)] - public string Value - { - get { return (string)base[ValuePropertyName]; } - set { base[ValuePropertyName] = value; } - } - - /// - /// - /// - [ConfigurationProperty(TypeConverterTypeNamePropertyName, IsRequired = false)] - public string TypeConverterTypeName - { - get { return (string)base[TypeConverterTypeNamePropertyName]; } - set { base[TypeConverterTypeNamePropertyName] = value; } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - void IAttributeOnlyElement.SerializeContent(XmlWriter writer) - { - this.SerializeContent(writer); - } - - /// - /// Write the contents of this element to the given . This - /// method always outputs an explicit <dependency> tag, instead of providing - /// attributes to the parent method. - /// - /// Writer to send XML content to. - public override void SerializeContent(XmlWriter writer) - { - writer.WriteAttributeIfNotEmpty(ValuePropertyName, this.Value) - .WriteAttributeIfNotEmpty(TypeConverterTypeNamePropertyName, this.TypeConverterTypeName); - } - - /// - /// Generate an object - /// that will be used to configure the container for a type registration. - /// - /// Container that is being configured. Supplied in order - /// to let custom implementations retrieve services; do not configure the container - /// directly in this method. - /// Type of the parameter to get the value for. - /// The required object. - public override InjectionParameterValue GetInjectionParameterValue(IUnityContainer container, Type parameterType) - { - this.CheckNonGeneric(parameterType); - - var converter = this.GetTypeConverter(parameterType); - return new InjectionParameter(parameterType, converter.ConvertFromInvariantString(this.Value)); - } - - private void CheckNonGeneric(Type parameterType) - { - if (parameterType.IsGenericParameter) - { - throw new InvalidOperationException( - string.Format( - CultureInfo.CurrentCulture, - Resources.ValueNotAllowedForGenericParameterType, - parameterType.Name, - this.Value)); - } - - var reflector = new ReflectionHelper(parameterType); - - if (reflector.IsOpenGeneric) - { - throw new InvalidOperationException( - string.Format( - CultureInfo.CurrentCulture, - Resources.ValueNotAllowedForOpenGenericType, - parameterType.Name, - this.Value)); - } - - if (reflector.IsGenericArray) - { - throw new InvalidOperationException( - string.Format( - CultureInfo.CurrentCulture, - Resources.ValueNotAllowedForGenericArrayType, - parameterType.Name, - this.Value)); - } - } - - private TypeConverter GetTypeConverter(Type parameterType) - { - if (!string.IsNullOrEmpty(this.TypeConverterTypeName)) - { - Type converterType = TypeResolver.ResolveType(this.TypeConverterTypeName); - return (TypeConverter)Activator.CreateInstance(converterType); - } - return TypeDescriptor.GetConverter(parameterType); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/BootstrapFixture.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/BootstrapFixture.cs deleted file mode 100644 index 4663649b..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/BootstrapFixture.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Basic bootstrapping to confirm that our "load from resources" config - /// file helper works. - /// - [TestClass] - public class BootstrapFixture - { - [TestMethod] - public void CanReadBootstrapConfig() - { - var loader = new ConfigFileLoader("Bootstrap"); - var section = loader.GetSection("appSettings"); - Assert.IsNotNull(section); - Assert.AreEqual("value", section.Settings["Test"].Value); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ArrayInjection.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ArrayInjection.config deleted file mode 100644 index 37daaee0..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ArrayInjection.config +++ /dev/null @@ -1,63 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/BasicTypeMapping.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/BasicTypeMapping.config deleted file mode 100644 index a2bff632..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/BasicTypeMapping.config +++ /dev/null @@ -1,16 +0,0 @@ - - - -
- - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Bootstrap.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Bootstrap.config deleted file mode 100644 index 6255438a..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Bootstrap.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ConfigFileLocator.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ConfigFileLocator.cs deleted file mode 100644 index cfadb344..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ConfigFileLocator.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles -{ - // A dummy class solely used to locate the resources our config files - // are stored under. - public class ConfigFileLocator - { - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ContainerExtensions.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ContainerExtensions.config deleted file mode 100644 index 6be084f7..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/ContainerExtensions.config +++ /dev/null @@ -1,30 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/EmptySection.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/EmptySection.config deleted file mode 100644 index cf9fa868..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/EmptySection.config +++ /dev/null @@ -1,8 +0,0 @@ - - - -
- - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Generics.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Generics.config deleted file mode 100644 index 9b887cee..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Generics.config +++ /dev/null @@ -1,224 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/InjectingGenerics.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/InjectingGenerics.config deleted file mode 100644 index c51dff70..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/InjectingGenerics.config +++ /dev/null @@ -1,24 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/InjectingProperties.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/InjectingProperties.config deleted file mode 100644 index 9761ae3b..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/InjectingProperties.config +++ /dev/null @@ -1,39 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Lifetimes.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Lifetimes.config deleted file mode 100644 index 8db83dc3..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/Lifetimes.config +++ /dev/null @@ -1,42 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/MethodInjection.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/MethodInjection.config deleted file mode 100644 index fd593651..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/MethodInjection.config +++ /dev/null @@ -1,71 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldAliasesSyntax.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldAliasesSyntax.config deleted file mode 100644 index 08b56b7d..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldAliasesSyntax.config +++ /dev/null @@ -1,20 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldContainersSyntax.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldContainersSyntax.config deleted file mode 100644 index 7c4b30b7..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldContainersSyntax.config +++ /dev/null @@ -1,14 +0,0 @@ - - - -
- - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldTypeMappingSyntax.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldTypeMappingSyntax.config deleted file mode 100644 index 1c92de15..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OldTypeMappingSyntax.config +++ /dev/null @@ -1,15 +0,0 @@ - - - -
- - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OptionalDependency.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OptionalDependency.config deleted file mode 100644 index ad48de0a..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/OptionalDependency.config +++ /dev/null @@ -1,29 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/RegisteringInstances.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/RegisteringInstances.config deleted file mode 100644 index de4b2024..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/RegisteringInstances.config +++ /dev/null @@ -1,18 +0,0 @@ - - - -
- - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/RegistrationWithConstructors.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/RegistrationWithConstructors.config deleted file mode 100644 index fba79cb3..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/RegistrationWithConstructors.config +++ /dev/null @@ -1,22 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SectionExtensions.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SectionExtensions.config deleted file mode 100644 index e61784cd..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SectionExtensions.config +++ /dev/null @@ -1,36 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SingleSectionMultipleNamedContainers.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SingleSectionMultipleNamedContainers.config deleted file mode 100644 index 969ba86d..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SingleSectionMultipleNamedContainers.config +++ /dev/null @@ -1,11 +0,0 @@ - - - -
- - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SingleSectionSingleContainer.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SingleSectionSingleContainer.config deleted file mode 100644 index b5aa4651..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/SingleSectionSingleContainer.config +++ /dev/null @@ -1,10 +0,0 @@ - - - -
- - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/TwoContainersAndAliases.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/TwoContainersAndAliases.config deleted file mode 100644 index 6a706442..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/TwoContainersAndAliases.config +++ /dev/null @@ -1,17 +0,0 @@ - - - -
- - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/VariousConstructors.config b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/VariousConstructors.config deleted file mode 100644 index ae392866..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/ConfigFiles/VariousConstructors.config +++ /dev/null @@ -1,86 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/Properties/AssemblyInfo.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index dedb7929..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Unity.Configuration.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Unity.Configuration.Tests")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011,2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM componenets. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("495ed8b8-041e-4c0c-abcb-39fc4749fb27")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ArrayDependencyObject.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ArrayDependencyObject.cs deleted file mode 100644 index c02b9d1b..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ArrayDependencyObject.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.TestSupport; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class ArrayDependencyObject - { - public ILogger[] Loggers { get; set; } - - public string[] Strings { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ContainerConfigElementOne.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ContainerConfigElementOne.cs deleted file mode 100644 index 76f206a1..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ContainerConfigElementOne.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class ContainerConfigElementOne : ContainerConfiguringElement - { - public static bool ConfigureWasCalled = false; - - /// - /// Apply this element's configuration to the given . - /// - /// Container to configure. - protected override void ConfigureContainer(IUnityContainer container) - { - ConfigureWasCalled = true; - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ContainerConfigElementTwo.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ContainerConfigElementTwo.cs deleted file mode 100644 index 559c9d18..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ContainerConfigElementTwo.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class ContainerConfigElementTwo : ContainerConfiguringElement - { - public static bool ConfigureWasCalled; - - /// - /// Apply this element's configuration to the given . - /// - /// Container to configure. - protected override void ConfigureContainer(IUnityContainer container) - { - ConfigureWasCalled = true; - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericArrayPropertyDependency.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericArrayPropertyDependency.cs deleted file mode 100644 index e6a54b4f..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericArrayPropertyDependency.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class GenericArrayPropertyDependency - { - public T[] Stuff { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericObjectWithConstructorDependency.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericObjectWithConstructorDependency.cs deleted file mode 100644 index c4baf790..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericObjectWithConstructorDependency.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class GenericObjectWithConstructorDependency - { - public T Value { get; private set; } - - public GenericObjectWithConstructorDependency(T value) - { - Value = value; - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericObjectWithNestedDependency.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericObjectWithNestedDependency.cs deleted file mode 100644 index ca68ca8c..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/GenericObjectWithNestedDependency.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class GenericObjectWithNestedDependency - { - public GenericObjectWithConstructorDependency Value { get; private set; } - - public GenericObjectWithNestedDependency(GenericObjectWithConstructorDependency value) - { - Value = value; - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/CompactCarItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/CompactCarItem.cs deleted file mode 100644 index cb3e0010..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/CompactCarItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - internal class CompactCarItem : IItem - { - public CompactCarItem(string name, int numberDoors) - { - this.ItemName = name; - this.NumberOfDoors = numberDoors; - } - - #region IItem Members - - public string ItemName { get; set; } - - public string ItemType - { - get { return "Compact Car"; } - } - - public ItemCategory Category - { - get { return ItemCategory.Car; } - } - - #endregion - - public int NumberOfDoors { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/DiggerItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/DiggerItem.cs deleted file mode 100644 index 30c3ab23..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/DiggerItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - internal class DiggerItem : IItem - { - public DiggerItem(string name, int bucketWidth) - { - this.ItemName = name; - this.BucketWidthInches = bucketWidth; - } - - #region IItem Members - - public string ItemName { get; set; } - - public string ItemType - { - get { return "Digger"; } - } - - public ItemCategory Category - { - get { return ItemCategory.Construction; } - } - - #endregion - - public int BucketWidthInches { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/IGenericService.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/IGenericService.cs deleted file mode 100644 index bceb329e..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/IGenericService.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - public interface IGenericService - { - string ServiceStatus { get; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/IItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/IItem.cs deleted file mode 100644 index 35d458d0..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/IItem.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - public interface IItem - { - string ItemName { get; set; } - string ItemType { get; } - ItemCategory Category { get; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/ItemCategory.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/ItemCategory.cs deleted file mode 100644 index be894186..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/ItemCategory.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - public enum ItemCategory - { - Car, - Van, - Truck, - Construction, - Agricultural, - Other - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/ItemsCollection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/ItemsCollection.cs deleted file mode 100644 index b26348ee..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/ItemsCollection.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - public class ItemsCollection - { - public IGenericService Printer; - public string CollectionName; - - public ItemsCollection(String name, IGenericService printService) - { - CollectionName = name; - Printer = printService; - } - - public ItemsCollection(String name, IGenericService printService, T[] items) - : this(name, printService) - { - this.Items = items; - } - - public ItemsCollection(String name, IGenericService printService, T[][] itemsArray) - : this(name, printService, itemsArray.Length > 0 ? itemsArray[0] : null) - { } - - public T[] Items { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/LargeTruckItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/LargeTruckItem.cs deleted file mode 100644 index ef339976..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/LargeTruckItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - internal class LargeTruckItem : IItem - { - public LargeTruckItem(string name, int numberWheels) - { - this.ItemName = name; - this.NumberOfWheels = numberWheels; - } - - #region IItem Members - - public string ItemName { get; set; } - - public string ItemType - { - get { return "Large Truck"; } - } - - public ItemCategory Category - { - get { return ItemCategory.Truck; } - } - - #endregion - - public int NumberOfWheels { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MidsizeCarItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MidsizeCarItem.cs deleted file mode 100644 index 2fc98d14..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MidsizeCarItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - internal class MidsizeCarItem : IItem - { - public MidsizeCarItem(string name, int numberCupHolders) - { - this.ItemName = name; - this.NumberOfCupHolders = numberCupHolders; - } - - #region IItem Members - - public string ItemName { get; set; } - - public string ItemType - { - get { return "Midsize Car"; } - } - - public ItemCategory Category - { - get { return ItemCategory.Car; } - } - - #endregion - - public int NumberOfCupHolders { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MidsizeVanItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MidsizeVanItem.cs deleted file mode 100644 index 24e41962..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MidsizeVanItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - internal class MidsizeVanItem : IItem - { - public MidsizeVanItem(string name, int maxCapacity) - { - this.ItemName = name; - this.MaxCapacityCubicFeet = maxCapacity; - } - - #region IItem Members - - public string ItemName { get; set; } - - public string ItemType - { - get { return "Midsize Van"; } - } - - public ItemCategory Category - { - get { return ItemCategory.Van; } - } - - #endregion - - public int MaxCapacityCubicFeet { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MyPrintService.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MyPrintService.cs deleted file mode 100644 index b20da90e..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/MyPrintService.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - public class MyPrintService : IGenericService - { - #region IMyService Members - - public string ServiceStatus - { - get { return String.Format("Available for type: {0}", typeof(T)); } - } - - #endregion - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/PickupTruckItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/PickupTruckItem.cs deleted file mode 100644 index 45c0ab65..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/PickupTruckItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - internal class PickupTruckItem : IItem - { - public PickupTruckItem(string name, int maxLoad) - { - this.ItemName = name; - this.MaxLoadPounds = maxLoad; - } - - #region IItem Members - - public string ItemName { get; set; } - - public string ItemType - { - get { return "Pickup Truck"; } - } - - public ItemCategory Category - { - get { return ItemCategory.Truck; } - } - - #endregion - - public int MaxLoadPounds { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/TractorItem.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/TractorItem.cs deleted file mode 100644 index 141596fd..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/MyGenericTypes/TractorItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes -{ - internal class TractorItem : IItem - { - public TractorItem(string name, int maxTrailerTons) - { - this.ItemName = name; - this.MaxTrailerWeightTons = maxTrailerTons; - } - - #region IItem Members - - public string ItemName { get; set; } - - public string ItemType - { - get { return "Tractor"; } - } - - public ItemCategory Category - { - get { return ItemCategory.Agricultural; } - } - - #endregion - - public int MaxTrailerWeightTons { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ObjectTakingScalars.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ObjectTakingScalars.cs deleted file mode 100644 index 3d0c8421..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ObjectTakingScalars.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class ObjectTakingScalars - { - public ObjectTakingScalars(int intValue) - { - this.IntValue = intValue; - } - - internal int IntValue { get; set; } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ObjectWithOverloads.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ObjectWithOverloads.cs deleted file mode 100644 index 3705d115..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/ObjectWithOverloads.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class ObjectWithOverloads - { - public int FirstOverloadCalls; - public int SecondOverloadCalls; - - public void CallMe(int param) - { - ++FirstOverloadCalls; - } - - public void CallMe(string param) - { - ++SecondOverloadCalls; - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/SeventeenValueElement.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/SeventeenValueElement.cs deleted file mode 100644 index fc262112..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/SeventeenValueElement.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class SeventeenValueElement : ParameterValueElement - { - /// - /// Generate an object - /// that will be used to configure the container for a type registration. - /// - /// Container that is being configured. Supplied in order - /// to let custom implementations retrieve services; do not configure the container - /// directly in this method. - /// Type of the - /// - public override InjectionParameterValue GetInjectionParameterValue(IUnityContainer container, Type parameterType) - { - return new InjectionParameter(17); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/TestInjectionMemberElement.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/TestInjectionMemberElement.cs deleted file mode 100644 index b4e4029b..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/TestInjectionMemberElement.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - public class TestInjectionMemberElement : InjectionMemberElement - { - private static int numElements = 0; - private readonly int index; - - public TestInjectionMemberElement() - { - this.index = Interlocked.Increment(ref numElements); - } - - /// - /// Each element must have a unique key, which is generated by the subclasses. - /// - public override string Key - { - get { return "TestInjectionMemberElement: " + this.index.ToString(); } - } - - /// - /// Return the set of s that are needed - /// to configure the container according to this configuration element. - /// - /// Container that is being configured. - /// Type that is being registered. - /// Type that is being mapped to. - /// Name this registration is under. - /// One or more objects that should be - /// applied to the container registration. - public override IEnumerable GetInjectionMembers(IUnityContainer container, Type fromType, Type toType, string name) - { - return Enumerable.Empty(); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/TestSectionExtension.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/TestSectionExtension.cs deleted file mode 100644 index 4b37a795..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/TestObjects/TestSectionExtension.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Configuration.Tests.TestObjects -{ - internal class TestSectionExtension : SectionExtension - { - public static int NumberOfCalls; - - public TestSectionExtension() - { - NumberOfCalls = 0; - } - - /// - /// Add the extensions to the section via the context. - /// - /// Context object that can be used to add elements and aliases. - public override void AddExtensions(SectionExtensionContext context) - { - ++NumberOfCalls; - - context.AddAlias("scalarObject"); - context.AddElement("configOne"); - context.AddElement("configTwo"); - context.AddElement("testInjectionMember"); - context.AddElement("seventeen"); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/Unity.Configuration.Tests.csproj b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/Unity.Configuration.Tests.csproj deleted file mode 100644 index 432297a3..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/Unity.Configuration.Tests.csproj +++ /dev/null @@ -1,243 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {190A49C4-CE38-4E32-ACD6-4A0B3F92DB03} - Library - Properties - Microsoft.Practices.Unity.Configuration.Tests - Unity.Configuration.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\..\Tests.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\..\Tests.ruleset - false - - - - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - {e979857e-cde5-4d36-9ae8-8fff4f75ae89} - Unity.TestSupport - - - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE} - Unity.Configuration - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - Unity.licenseheader - - - - - - \ No newline at end of file diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfigurationContainerForMethodInjection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfigurationContainerForMethodInjection.cs deleted file mode 100644 index ad24caf1..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfigurationContainerForMethodInjection.cs +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfigurationContainerForMethodInjection - /// - [TestClass] - public class When_ConfigurationContainerForMethodInjection : ContainerConfiguringFixture - { - public When_ConfigurationContainerForMethodInjection() - : base("MethodInjection", String.Empty) - { - } - - [TestMethod] - public void Then_SingleInjectionMethodIsCalledWithExpectedValues() - { - var result = Container.Resolve("singleMethod"); - - Assert.AreEqual("northwind", result.ConnectionString); - Assert.IsInstanceOfType(result.Logger, typeof(MockLogger)); - } - - [TestMethod] - public void Then_MultipleInjectionMethodsCalledWithExpectedValues() - { - var result = Container.Resolve("twoMethods"); - - Assert.AreEqual("northwind", result.ConnectionString); - Assert.IsInstanceOfType(result.Logger, typeof(MockLogger)); - Assert.IsNotNull(result.MoreData); - } - - [TestMethod] - public void Then_CorrectFirstOverloadIsCalled() - { - var result = Container.Resolve("callFirstOverload"); - - Assert.AreEqual(1, result.FirstOverloadCalls); - Assert.AreEqual(0, result.SecondOverloadCalls); - } - - [TestMethod] - public void Then_CorrectSecondOverloadIsCalled() - { - var result = Container.Resolve("callSecondOverload"); - - Assert.AreEqual(0, result.FirstOverloadCalls); - Assert.AreEqual(1, result.SecondOverloadCalls); - } - - [TestMethod] - public void Then_BothOverloadsAreCalled() - { - var result = Container.Resolve("callBothOverloads"); - - Assert.AreEqual(1, result.FirstOverloadCalls); - Assert.AreEqual(1, result.SecondOverloadCalls); - } - - [TestMethod] - public void Then_FirstOverloadIsCalledTwice() - { - var result = Container.Resolve("callFirstOverloadTwice"); - - Assert.AreEqual(2, result.FirstOverloadCalls); - Assert.AreEqual(0, result.SecondOverloadCalls); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForArrayInjection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForArrayInjection.cs deleted file mode 100644 index 58b26de3..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForArrayInjection.cs +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerForArrayInjection - /// - [TestClass] - public class When_ConfiguringContainerForArrayInjection : ContainerConfiguringFixture - { - public When_ConfiguringContainerForArrayInjection() - : base("ArrayInjection", String.Empty) - { - } - - [TestMethod] - public void Then_DefaultResolutionReturnsAllRegisteredLoggers() - { - var result = Container.Resolve("defaultInjection"); - - result.Loggers.Select(l => l.GetType()).AssertContainsInAnyOrder( - typeof(SpecialLogger), typeof(MockLogger), typeof(MockLogger)); - } - - [TestMethod] - public void Then_SpecificElementsAreInjected() - { - var result = Container.Resolve("specificElements"); - - result.Loggers.Select(l => l.GetType()).AssertContainsInAnyOrder( - typeof(SpecialLogger), typeof(MockLogger)); - } - - [TestMethod] - public void Then_CanMixResolutionAndValuesInAnArray() - { - var result = Container.Resolve("mixingResolvesAndValues"); - - result.Strings.AssertContainsExactly("first", "Not the second", "third"); - } - - [TestMethod] - public void Then_CanConfigureZeroLengthArrayForInjection() - { - var result = Container.Resolve("zeroLengthArray"); - - Assert.IsNotNull(result.Strings); - Assert.AreEqual(0, result.Strings.Length); - } - - [TestMethod] - public void Then_GenericArrayPropertiesAreInjected() - { - var result = Container.Resolve>("defaultResolution"); - - result.Stuff.AssertContainsInAnyOrder("first", "second", "third"); - } - - [TestMethod] - public void Then_CanConfigureZeroLengthGenericArrayToBeInjected() - { - var result = Container.Resolve>("explicitZeroLengthArray"); - - Assert.AreEqual(0, result.Stuff.Count()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForGenericAndNonGenericTypes.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForGenericAndNonGenericTypes.cs deleted file mode 100644 index c68dab08..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForGenericAndNonGenericTypes.cs +++ /dev/null @@ -1,266 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerForGenericAndNonGenericTypes - /// - [TestClass] - public class When_ConfiguringContainerForGenericAndNonGenericTypes : ContainerConfiguringFixture - { - public When_ConfiguringContainerForGenericAndNonGenericTypes() - : base("Generics", "container1") - { - } - - [TestMethod] - public void Then_CanResolveConfiguredGenericType() - { - var result = Container.Resolve>(); - - Assert.AreEqual(8, result.Items.Length); - Assert.IsInstanceOfType(result.Printer, typeof(MyPrintService)); - } - - [TestMethod] - public void Then_CanResolveConfiguredGenericTypeWithSpecificElements() - { - var result = Container.Resolve>("OnlyThree"); - Assert.AreEqual(3, result.Items.Length); - } - - [TestMethod] - public void Then_CanConfigureGenericArrayInjectionViaAPI() - { - Container.RegisterType(typeof(ItemsCollection<>), "More", - new InjectionConstructor("MyGenericCollection", new ResolvedParameter(typeof(IGenericService<>))), - new InjectionProperty("Items", - new GenericResolvedArrayParameter("T", - new GenericParameter("T", "Xray"), - new GenericParameter("T", "Common"), - new GenericParameter("T", "Tractor")))); - - var result = Container.Resolve>("More"); - Assert.AreEqual(3, result.Items.Length); - } - - [TestMethod] - public void Then_CanResolveConfiguredResolvableOptionalGenericType() - { - var result = Container.Resolve>("optional resolvable"); - - Assert.AreEqual(1, result.Items.Length); - Assert.IsNotNull(result.Items[0]); - Assert.AreEqual("Charlie Miniature", result.Items[0].ItemName); - } - - [TestMethod] - public void Then_CanResolveConfiguredNonResolvableOptionalGenericType() - { - var result = Container.Resolve>("optional non resolvable"); - - Assert.AreEqual(1, result.Items.Length); - Assert.IsNull(result.Items[0]); - } - - [TestMethod] - public void Then_CanResolveConfiguredGenericTypeWithArrayInjectedInConstructor() - { - var result = Container.Resolve>("ThroughConstructor"); - - Assert.AreEqual(8, result.Items.Length); - Assert.IsInstanceOfType(result.Printer, typeof(MyPrintService)); - } - - [TestMethod] - public void Then_CanResolveConfiguredGenericTypeWithArrayInjectedInConstructorWithSpecificElements() - { - var result = Container.Resolve>("ThroughConstructorWithSpecificElements"); - - Assert.AreEqual(3, result.Items.Length); - } - - // [TestMethod] - // nested arrays with generics not supported by container - public void Then_CanResolveConfiguredGenericTypeWithArrayOfArraysInjectedInConstructorWithSpecificElements() - { - var result = Container.Resolve>("ArrayOfArraysThroughConstructorWithSpecificElements"); - - Assert.AreEqual(3, result.Items.Length); - } - } - - [TestClass] - public class When_ConfiguringContainerWithDependencyElementForGenericPropertyArrayWithTypeSet : ContainerConfiguringFixture - { - private InvalidOperationException exception; - - public When_ConfiguringContainerWithDependencyElementForGenericPropertyArrayWithTypeSet() - : base("Generics", "dependency with type") - { } - - protected override void Act() - { - try - { - base.Act(); - } - catch (InvalidOperationException ex) - { - this.exception = ex; - } - } - - [TestMethod] - public void ThenContainerSetupThrows() - { - Assert.IsNotNull(this.exception); - } - } - - [TestClass] - public class When_ConfiguringContainerWithParameterWithValueElement : ContainerConfiguringFixture - { - private InvalidOperationException exception; - - public When_ConfiguringContainerWithParameterWithValueElement() - : base("Generics", "property with value") - { } - - protected override void Act() - { - try - { - base.Act(); - } - catch (InvalidOperationException ex) - { - this.exception = ex; - } - } - - [TestMethod] - public void ThenContainerSetupThrows() - { - Assert.IsNotNull(this.exception); - } - } - - [TestClass] - public class When_ConfiguringContainerWithGenericArrayPropertyWithValueElement : ContainerConfiguringFixture - { - private InvalidOperationException exception; - - public When_ConfiguringContainerWithGenericArrayPropertyWithValueElement() - : base("Generics", "generic array property with value") - { } - - protected override void Act() - { - try - { - base.Act(); - } - catch (InvalidOperationException ex) - { - this.exception = ex; - } - } - - [TestMethod] - public void ThenContainerSetupThrows() - { - Assert.IsNotNull(this.exception); - } - } - - [TestClass] - public class When_ConfiguringContainerWithChainedGenericParameterWithValueElement : ContainerConfiguringFixture - { - private InvalidOperationException exception; - - public When_ConfiguringContainerWithChainedGenericParameterWithValueElement() - : base("Generics", "chained generic parameter with value") - { } - - protected override void Act() - { - try - { - base.Act(); - } - catch (InvalidOperationException ex) - { - this.exception = ex; - } - } - - [TestMethod] - public void ThenContainerSetupThrows() - { - Assert.IsNotNull(this.exception); - } - } - - [TestClass] - public class When_ConfiguringContainerWithDependencyElementForArrayWithTypeSet : ContainerConfiguringFixture - { - private InvalidOperationException exception; - - public When_ConfiguringContainerWithDependencyElementForArrayWithTypeSet() - : base("Generics", "generic array property with dependency with type") - { } - - protected override void Act() - { - try - { - base.Act(); - } - catch (InvalidOperationException ex) - { - this.exception = ex; - } - } - - [TestMethod] - public void ThenContainerSetupThrows() - { - Assert.IsNotNull(this.exception); - } - } - - [TestClass] - public class When_ConfiguringContainerWithArrayElementForChainedGenericParameter : ContainerConfiguringFixture - { - private InvalidOperationException exception; - - public When_ConfiguringContainerWithArrayElementForChainedGenericParameter() - : base("Generics", "chained generic parameter with array") - { } - - protected override void Act() - { - try - { - base.Act(); - } - catch (InvalidOperationException ex) - { - this.exception = ex; - } - } - - [TestMethod] - public void ThenContainerSetupThrows() - { - Assert.IsNotNull(this.exception); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForPropertyInjection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForPropertyInjection.cs deleted file mode 100644 index 492ed93f..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForPropertyInjection.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerForPropertyInjection - /// - [TestClass] - public class When_ConfiguringContainerForPropertyInjection : ContainerConfiguringFixture - { - public When_ConfiguringContainerForPropertyInjection() - : base("InjectingProperties", String.Empty) - { - } - - [TestMethod] - public void Then_InjectedPropertyIsResolvedAccordingToConfiguration() - { - var expected = Container.Resolve("special"); - var result = Container.Resolve("singleProperty"); - - Assert.AreSame(expected, result.Obj1); - } - - [TestMethod] - public void Then_InjectedPropertyIsResolvedAccordingToConfigurationUsingAttributes() - { - var expected = Container.Resolve("special"); - var result = Container.Resolve("twoProperties"); - - Assert.AreSame(expected, result.Obj1); - } - - [TestMethod] - public void Then_InjectedPropertyIsProperType() - { - var result = Container.Resolve("injectingDifferentType"); - - Assert.IsInstanceOfType(result.Obj1, typeof(SpecialLogger)); - } - - [TestMethod] - public void Then_MultiplePropertiesGetInjected() - { - var expected = Container.Resolve("special"); - var result = Container.Resolve("injectingDifferentType"); - - Assert.IsInstanceOfType(result.Obj1, typeof(SpecialLogger)); - Assert.AreSame(expected, result.Obj2); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForSpecificConstructors.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForSpecificConstructors.cs deleted file mode 100644 index 8fb257c8..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerForSpecificConstructors.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerForSpecificConstructors - /// - [TestClass] - public class When_ConfiguringContainerForSpecificConstructors : SectionLoadingFixture - { - public When_ConfiguringContainerForSpecificConstructors() - : base("VariousConstructors") - { - } - - private IUnityContainer container; - - protected override void Arrange() - { - base.Arrange(); - this.container = new UnityContainer(); - } - - [TestMethod] - public void Then_CanResolveMockDatabaseAndItCallsDefaultConstructor() - { - section.Configure(this.container, "defaultConstructor"); - var result = this.container.Resolve(); - Assert.IsTrue(result.DefaultConstructorCalled); - } - - [TestMethod] - public void Then_ConstructorsThatDoNotMatchThrowAnException() - { - AssertExtensions.AssertException(() => - { - section.Configure(container, "invalidConstructor"); - }); - } - - // Disable obsolete warning for this one test -#pragma warning disable 618 - [TestMethod] - public void Then_OldConfigureAPIStillWorks() - { - this.section.Containers["defaultConstructor"].Configure(this.container); - var result = this.container.Resolve(); - Assert.IsTrue(result.DefaultConstructorCalled); - } -#pragma warning restore 618 - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerToResolveGenerics.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerToResolveGenerics.cs deleted file mode 100644 index 4ec4f4b8..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerToResolveGenerics.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerToResolveGenerics - /// - [TestClass] - public class When_ConfiguringContainerToResolveGenerics : ContainerConfiguringFixture - { - public When_ConfiguringContainerToResolveGenerics() - : base("InjectingGenerics", String.Empty) - { - } - - [TestMethod] - public void Then_GenericParameterAsStringIsProperlySubstituted() - { - Container.RegisterType(typeof(GenericObjectWithConstructorDependency<>), "manual", - new InjectionConstructor(new GenericParameter("T"))); - var manualResult = Container.Resolve>("manual"); - - var resultForString = Container.Resolve>("basic"); - Assert.AreEqual(Container.Resolve(), resultForString.Value); - } - - [TestMethod] - public void Then_GenericParameterAsIntIsProperlySubstituted() - { - var resultForInt = Container.Resolve>("basic"); - Assert.AreEqual(Container.Resolve(), resultForInt.Value); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithBasicTypeMappings.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithBasicTypeMappings.cs deleted file mode 100644 index 962613dc..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithBasicTypeMappings.cs +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerWithBasicTypeMappings - /// - [TestClass] - public class When_ConfiguringContainerWithBasicTypeMappings : SectionLoadingFixture - { - public When_ConfiguringContainerWithBasicTypeMappings() - : base("BasicTypeMapping") - { - } - - private IUnityContainer container; - - protected override void Arrange() - { - base.Arrange(); - this.container = new UnityContainer(); - } - - protected override void Act() - { - this.section.Configure(this.container); - } - - [TestMethod] - public void Then_ContainerHasTwoMappingsForILogger() - { - Assert.AreEqual(2, - this.container.Registrations.Where(r => r.RegisteredType == typeof(ILogger)).Count()); - } - - [TestMethod] - public void Then_DefaultILoggerIsMappedToMockLogger() - { - Assert.AreEqual(typeof(MockLogger), - this.container.Registrations - .Where(r => r.RegisteredType == typeof(ILogger) && r.Name == null) - .Select(r => r.MappedToType) - .First()); - } - - [TestMethod] - public void Then_SpecialILoggerIsMappedToSpecialLogger() - { - Assert.AreEqual(typeof(SpecialLogger), - this.container.Registrations - .Where(r => r.RegisteredType == typeof(ILogger) && r.Name == "special") - .Select(r => r.MappedToType) - .First()); - } - - [TestMethod] - public void Then_AllRegistrationsHaveTransientLifetime() - { - Assert.IsTrue(this.container.Registrations - .Where(r => r.RegisteredType == typeof(ILogger)) - .All(r => r.LifetimeManagerType == typeof(TransientLifetimeManager))); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithConstructorsWithValues.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithConstructorsWithValues.cs deleted file mode 100644 index 88d14624..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithConstructorsWithValues.cs +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerWithConstructorsWithValues - /// - [TestClass] - public class When_ConfiguringContainerWithConstructorsWithValues : ContainerConfiguringFixture - { - public When_ConfiguringContainerWithConstructorsWithValues() - : base("VariousConstructors", "constructorWithValue") - { - } - - [TestMethod] - public void Then_ConstructorGetsProperLiteralValuePassedFromChildElement() - { - var result = Container.Resolve("withExplicitValueElement"); - - Assert.AreEqual("northwind", result.ConnectionString); - } - - [TestMethod] - public void Then_ConstructorGetsProperResolvedDependency() - { - var result = Container.Resolve("resolvedWithName"); - - Assert.AreEqual("adventureWorks", result.ConnectionString); - } - - [TestMethod] - public void Then_ConstructorGetsProperResolvedDependencyViaAttribute() - { - var result = Container.Resolve("resolvedWithNameViaAttribute"); - - Assert.AreEqual("contosoDB", result.ConnectionString); - } - - [TestMethod] - public void Then_ValuesAreProperlyConvertedWhenTypeIsNotString() - { - var result = Container.Resolve("injectInt"); - - Assert.AreEqual(17, result.IntValue); - } - - [TestMethod] - public void Then_ConstructorGetsPropertyLiteralValueFromValueAttribute() - { - var result = Container.Resolve("injectIntWithValueAttribute"); - - Assert.AreEqual(35, result.IntValue); - } - - [TestMethod] - public void Then_TypeConverterIsUsedToGenerateConstructorValue() - { - var result = Container.Resolve("injectIntWithTypeConverter"); - - Assert.AreEqual(-35, result.IntValue); - } - - [TestMethod] - public void Then_TypeConverterIsUsedToGenerateConstructorValueViaAttribute() - { - var result = Container.Resolve("injectIntWithTypeConverterAttribute"); - - Assert.AreEqual(-35, result.IntValue); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithContainerExtensions.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithContainerExtensions.cs deleted file mode 100644 index 1da200a3..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithContainerExtensions.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerWithContainerExtensions - /// - [TestClass] - public class When_ConfiguringContainerWithContainerExtensions : SectionLoadingFixture - { - public When_ConfiguringContainerWithContainerExtensions() - : base("ContainerExtensions") - { - } - - private IUnityContainer container; - - protected override void Arrange() - { - base.Arrange(); - this.container = new UnityContainer(); - } - - protected override void Act() - { - base.Act(); - this.section.Configure(this.container); - } - - [TestMethod] - public void Then_ContainerHasExtensionAdded() - { - Assert.IsNotNull(this.container.Configure()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithInstances.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithInstances.cs deleted file mode 100644 index d160e52a..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithInstances.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerWithInstances - /// - [TestClass] - public class When_ConfiguringContainerWithInstances : SectionLoadingFixture - { - public When_ConfiguringContainerWithInstances() - : base("RegisteringInstances") - { - } - - private IUnityContainer container; - - protected override void Arrange() - { - base.Arrange(); - this.container = new UnityContainer(); - } - - protected override void Act() - { - base.Act(); - this.section.Configure(this.container); - } - - [TestMethod] - public void Then_DefaultStringInstanceIsRegistered() - { - Assert.AreEqual("AdventureWorks", this.container.Resolve()); - } - - [TestMethod] - public void Then_DefaultIntInstanceIsRegistered() - { - Assert.AreEqual(42, this.container.Resolve()); - } - - [TestMethod] - public void Then_NamedIntIsRegistered() - { - Assert.AreEqual(23, this.container.Resolve("forward")); - } - - [TestMethod] - public void Then_InstanceUsingTypeConverterIsCreatedProperly() - { - Assert.AreEqual(-23, this.container.Resolve("negated")); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithLifetimes.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithLifetimes.cs deleted file mode 100644 index d84546c9..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithLifetimes.cs +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerWithLifetimes - /// - [TestClass] - public class When_ConfiguringContainerWithLifetimes : SectionLoadingFixture - { - public When_ConfiguringContainerWithLifetimes() - : base("Lifetimes") - { - } - - private IUnityContainer container; - - protected override void Arrange() - { - base.Arrange(); - this.container = new UnityContainer(); - } - - protected override void Act() - { - base.Act(); - - this.section.Configure(this.container); - } - - [TestMethod] - public void Then_BaseILoggerHasSingletonLifetime() - { - AssertRegistration(null).HasLifetime(); - } - - [TestMethod] - public void Then_MockLoggerHasExternalLifetime() - { - AssertRegistration("mock").HasLifetime(); - } - - [TestMethod] - public void Then_SessionLoggerHasSessionLifetime() - { - AssertRegistration("session").HasLifetime(); - } - - [TestMethod] - public void Then_ReverseSessionLoggerHasSessionLifetime() - { - AssertRegistration("reverseSession").HasLifetime(); - } - - [TestMethod] - public void Then_ReverseSessionLoggerLifetimeWasInitializedUsingTypeConverter() - { - AssertRegistration("reverseSession").LifetimeHasSessionKey("sdrawkcab"); - } - - [TestMethod] - public void Then_RegistrationWithoutExplicitLifetimeIsTransient() - { - AssertRegistration("transient").HasLifetime(); - } - - [TestMethod] - public void Then_RegistrationWithEmptyLifetimeTypeIsTransient() - { - AssertRegistration("explicitTransient").HasLifetime(); - } - - private RegistrationsToAssertOn AssertRegistration(string registeredName) - { - return new RegistrationsToAssertOn( - this.container.Registrations - .Where(r => r.RegisteredType == typeof(TRegisterType) && r.Name == registeredName)); - } - } - - internal static partial class RegistrationsToAssertOnExtensions - { - public static void LifetimeHasSessionKey(this RegistrationsToAssertOn r, string sessionKey) - { - Assert.IsTrue( - r.Registrations.All(reg => ((SessionLifetimeManager)reg.LifetimeManager).SessionKey == sessionKey)); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithOptionalDependencies.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithOptionalDependencies.cs deleted file mode 100644 index ad97d9f3..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithOptionalDependencies.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerWithOptionalDependencies - /// - [TestClass] - public class When_ConfiguringContainerWithOptionalDependencies : ContainerConfiguringFixture - { - public When_ConfiguringContainerWithOptionalDependencies() - : base("OptionalDependency", String.Empty) - { - } - - [TestMethod] - public void Then_RegisteredOptionalDependencyIsInjected() - { - var result = Container.Resolve("dependencyRegistered"); - Assert.IsNotNull(result.Logger); - } - - [TestMethod] - public void Then_UnregisteredOptionalDependencyIsNotInjected() - { - var result = Container.Resolve("dependencyNotRegistered"); - Assert.IsNull(result.Logger); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithSectionExtensions.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithSectionExtensions.cs deleted file mode 100644 index 98498bec..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ConfiguringContainerWithSectionExtensions.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerWithSectionExtensions - /// - [TestClass] - public class When_ConfiguringContainerWithSectionExtensions : ContainerConfiguringFixture - { - public When_ConfiguringContainerWithSectionExtensions() - : base("SectionExtensions", String.Empty) - { - } - - [TestMethod] - public void Then_ExtensionValueElementIsCalled() - { - var result = Container.Resolve(); - - Assert.AreEqual(17, result.IntValue); - } - - [TestMethod] - public void Then_PrefixedExtensionValueElementIsCalled() - { - var result = Container.Resolve("prefixedValue"); - - Assert.AreEqual(17, result.IntValue); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_DeserializingParameterElementWithMultipleInjectionValueElements.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_DeserializingParameterElementWithMultipleInjectionValueElements.cs deleted file mode 100644 index fb6e6fbb..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_DeserializingParameterElementWithMultipleInjectionValueElements.cs +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using System.IO; -using System.Xml; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - [TestClass] - public class When_DeserializingParameterElement - { - [TestMethod] - public void Then_CanDeserializeSingleInjectionValueChild() - { - var elementXml = @" - - - "; - - var reader = new XmlTextReader(new StringReader(elementXml)); - var result = reader.MoveToContent(); - var element = new ParameterElement(); - - element.Deserialize(reader); - - Assert.AreSame(typeof(ValueElement), element.Value.GetType()); - Assert.AreEqual("northwind", ((ValueElement)element.Value).Value); - } - - [TestMethod] - public void Then_DeserializingMultipleInjectionValueChildrenThrows() - { - var elementXml = @" - - - - "; - - var reader = new XmlTextReader(new StringReader(elementXml)); - var result = reader.MoveToContent(); - var element = new ParameterElement(); - - AssertExtensions.AssertException(() => - { - element.Deserialize(reader); - }); - } - - [TestMethod] - public void Then_DeserializingWithParametersAndValueChildrenThrows() - { - var elementXml = @" - - - "; - - var reader = new XmlTextReader(new StringReader(elementXml)); - var result = reader.MoveToContent(); - var element = new ParameterElement(); - AssertExtensions.AssertException(() => - { - element.Deserialize(reader); - }); - } - } - - [TestClass] - public class When_DeserializingPropertyElement - { - [TestMethod] - public void Then_CanDeserializeSingleInjectionValueChild() - { - var elementXml = @" - - - "; - - var reader = new XmlTextReader(new StringReader(elementXml)); - var result = reader.MoveToContent(); - var element = new PropertyElement(); - - element.Deserialize(reader); - - Assert.AreSame(typeof(ValueElement), element.Value.GetType()); - Assert.AreEqual("northwind", ((ValueElement)element.Value).Value); - } - - [TestMethod] - public void Then_DeserializingMultipleInjectionValueChildrenThrows() - { - var elementXml = @" - - - - "; - - var reader = new XmlTextReader(new StringReader(elementXml)); - var result = reader.MoveToContent(); - var element = new PropertyElement(); - AssertExtensions.AssertException(() => - { - element.Deserialize(reader); - }); - } - - [TestMethod] - public void Then_DeserializingWithParametersAndValueChildrenThrows() - { - var elementXml = @" - - - "; - - var reader = new XmlTextReader(new StringReader(elementXml)); - var result = reader.MoveToContent(); - var element = new PropertyElement(); - AssertExtensions.AssertException(() => - { - element.Deserialize(reader); - }); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigUsingOldContainersSyntax.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigUsingOldContainersSyntax.cs deleted file mode 100644 index 503f5e30..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigUsingOldContainersSyntax.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigUsingOldContainersSyntax - /// - [TestClass] - public class When_LoadingConfigUsingOldContainersSyntax : SectionLoadingFixture - { - public When_LoadingConfigUsingOldContainersSyntax() - : base("OldContainersSyntax") - { - } - - [TestMethod] - public void Then_SectionContainsExpectedNumberOfContainers() - { - Assert.AreEqual(2, section.Containers.Count); - } - - public void Then_ContainersArePresentInFileOrder() - { - CollectionAssertExtensions.AreEqual(new[] { String.Empty, "two" }, - section.Containers.Select(c => c.Name).ToList()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigUsingOldTypeAliasElements.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigUsingOldTypeAliasElements.cs deleted file mode 100644 index 9bce290d..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigUsingOldTypeAliasElements.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigUsingOldTypeAliasElements - /// - [TestClass] - public class When_LoadingConfigUsingOldTypeAliasElements : SectionLoadingFixture - { - public When_LoadingConfigUsingOldTypeAliasElements() - : base("OldAliasesSyntax") - { - } - - [TestMethod] - public void Then_ExpectedNumberOfAliasesArePresent() - { - Assert.AreEqual(8, section.TypeAliases.Count); - } - - [TestMethod] - public void Then_AliasesAreAvailableInExpectedOrder() - { - CollectionAssertExtensions.AreEqual( - new[] { "string", "int", "ILogger", "MockLogger", "SpecialLogger", "DependentConstructor", "TwoConstructorArgs", "MockDatabase" }, - section.TypeAliases.Select(a => a.Alias).ToList()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithInstances.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithInstances.cs deleted file mode 100644 index d107ab90..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithInstances.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigWithInstances - /// - [TestClass] - public class When_LoadingConfigWithInstances : SectionLoadingFixture - { - public When_LoadingConfigWithInstances() - : base("RegisteringInstances") - { - } - - [TestMethod] - public void Then_ContainerHasExpectedInstancesElements() - { - Assert.AreEqual(4, section.Containers.Default.Instances.Count); - } - - [TestMethod] - public void Then_InstancesHaveExpectedContents() - { - var expected = new[] - { - // Name, Value, Type, TypeConverter - new[] { String.Empty, "AdventureWorks", String.Empty, String.Empty }, - new[] { String.Empty, "42", "System.Int32", String.Empty }, - new[] { "negated", "23", "int", "negator" }, - new[] { "forward", "23", "int", String.Empty } - }; - - for (int index = 0; index < expected.Length; ++index) - { - var instance = section.Containers.Default.Instances[index]; - CollectionAssertExtensions.AreEqual(expected[index], - new string[] { instance.Name, instance.Value, instance.TypeName, instance.TypeConverterTypeName }, - string.Format("Element at index {0} does not match", index)); - } - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithLifetimes.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithLifetimes.cs deleted file mode 100644 index d253c1b9..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithLifetimes.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigWithLifetimes - /// - [TestClass] - public class When_LoadingConfigWithLifetimes : SectionLoadingFixture - { - public When_LoadingConfigWithLifetimes() - : base("Lifetimes") - { - } - - [TestMethod] - public void Then_ILoggerHasSingletonLifetime() - { - var registration = section.Containers.Default.Registrations.Where( - r => r.TypeName == "ILogger" && r.Name == string.Empty).First(); - - Assert.AreEqual("singleton", registration.Lifetime.TypeName); - } - - [TestMethod] - public void Then_TypeConverterInformationIsProperlyDeserialized() - { - var lifetime = section.Containers.Default.Registrations - .Where(r => r.TypeName == "ILogger" && r.Name == "reverseSession") - .First() - .Lifetime; - - Assert.AreEqual("session", lifetime.TypeName); - Assert.AreEqual("backwards", lifetime.Value); - Assert.AreEqual("reversed", lifetime.TypeConverterTypeName); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithMethodInjection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithMethodInjection.cs deleted file mode 100644 index 1fbb048c..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithMethodInjection.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigWithMethodInjection - /// - [TestClass] - public class When_LoadingConfigWithMethodInjection : SectionLoadingFixture - { - public When_LoadingConfigWithMethodInjection() - : base("MethodInjection") - { - } - - [TestMethod] - public void Then_FirstRegistrationHasOneMethodInjection() - { - var registration = (from reg in section.Containers.Default.Registrations - where reg.TypeName == "ObjectWithInjectionMethod" && reg.Name == "singleMethod" - select reg).First(); - - Assert.AreEqual(1, registration.InjectionMembers.Count); - var methodRegistration = (MethodElement)registration.InjectionMembers[0]; - - Assert.AreEqual("Initialize", methodRegistration.Name); - CollectionAssertExtensions.AreEqual(new string[] { "connectionString", "logger" }, - methodRegistration.Parameters.Select(p => p.Name).ToList()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithMultipleContainers.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithMultipleContainers.cs deleted file mode 100644 index 8d0b6596..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithMultipleContainers.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigWithMultipleContainers - /// - [TestClass] - public class When_LoadingConfigWithMultipleContainers : SectionLoadingFixture - { - public When_LoadingConfigWithMultipleContainers() - : base("SingleSectionMultipleNamedContainers") - { - } - - [TestMethod] - public void Then_ExpectedNumberOfContainersArePresent() - { - Assert.AreEqual(2, section.Containers.Count); - } - - [TestMethod] - public void Then_FirstContainerNameIsCorrect() - { - Assert.AreEqual("one", section.Containers[0].Name); - } - - [TestMethod] - public void Then_SecondContainerNameIsCorrect() - { - Assert.AreEqual("two", section.Containers[1].Name); - } - - [TestMethod] - public void Then_EnumeratingContainersHappensInOrderOfConfigFile() - { - CollectionAssertExtensions.AreEqual(new[] { "one", "two" }, - section.Containers.Select(c => c.Name).ToList()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithOldTypeMappingSyntax.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithOldTypeMappingSyntax.cs deleted file mode 100644 index 982d8548..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithOldTypeMappingSyntax.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigWithOldTypeMappingSyntax - /// - [TestClass] - public class When_LoadingConfigWithOldTypeMappingSyntax : SectionLoadingFixture - { - public When_LoadingConfigWithOldTypeMappingSyntax() - : base("OldTypeMappingSyntax") - { - } - - private ContainerElement container; - - protected override void Arrange() - { - base.Arrange(); - this.container = this.section.Containers.Default; - } - - [TestMethod] - public void Then_RegistrationsArePresentInContainer() - { - Assert.AreEqual(2, this.container.Registrations.Count); - } - - [TestMethod] - public void Then_TypesAreAsGivenInFile() - { - this.AssertRegistrationsAreSame(r => r.TypeName, "ILogger", "ILogger"); - } - - [TestMethod] - public void Then_MappedNamesAreAsGivenInFile() - { - this.AssertRegistrationsAreSame(r => r.Name, String.Empty, "special"); - } - - [TestMethod] - public void Then_MappedToTypesAreAsGivenInFile() - { - this.AssertRegistrationsAreSame(r => r.MapToName, "MockLogger", "SpecialLogger"); - } - - private void AssertRegistrationsAreSame(Func selector, params string[] expectedStrings) - { - CollectionAssertExtensions.AreEqual(expectedStrings, this.container.Registrations.Select(selector).ToList()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithSectionExtensions.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithSectionExtensions.cs deleted file mode 100644 index cb7b081a..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithSectionExtensions.cs +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - [TestClass] - public class When_LoadingConfigWithSectionExtensions : SectionLoadingFixture - { - public When_LoadingConfigWithSectionExtensions() - : base("SectionExtensions") - { - } - - [TestMethod] - public void Then_ExpectedNumberOfSectionExtensionArePresent() - { - Assert.AreEqual(2, section.SectionExtensions.Count); - } - - [TestMethod] - public void Then_FirstSectionExtensionIsPresent() - { - Assert.AreEqual("TestSectionExtension", section.SectionExtensions[0].TypeName); - Assert.AreEqual(String.Empty, section.SectionExtensions[0].Prefix); - } - - [TestMethod] - public void Then_SecondSectionExtensionIsPresent() - { - Assert.AreEqual("TestSectionExtension", section.SectionExtensions[1].TypeName); - Assert.AreEqual("ext2", section.SectionExtensions[1].Prefix); - } - - [TestMethod] - public void Then_TestSectionExtensionWasInvokedOnce() - { - Assert.AreEqual(1, TestSectionExtension.NumberOfCalls); - } - - [TestMethod] - public void Then_ContainerConfiguringExtensionElementsWereAdded() - { - Assert.AreEqual(typeof(ContainerConfigElementOne), - ExtensionElementMap.GetContainerConfiguringElementType("configOne")); - Assert.AreEqual(typeof(ContainerConfigElementTwo), - ExtensionElementMap.GetContainerConfiguringElementType("configTwo")); - } - - [TestMethod] - public void Then_PrefixedContainerConfiguringExtensionsWereAdded() - { - Assert.AreEqual(typeof(ContainerConfigElementOne), - ExtensionElementMap.GetContainerConfiguringElementType("ext2.configOne")); - Assert.AreEqual(typeof(ContainerConfigElementTwo), - ExtensionElementMap.GetContainerConfiguringElementType("ext2.configTwo")); - } - - [TestMethod] - public void Then_ValueElementWasAdded() - { - Assert.AreEqual(typeof(SeventeenValueElement), - ExtensionElementMap.GetParameterValueElementType("seventeen")); - } - - [TestMethod] - public void Then_UnprefixedAliasWasAdded() - { - string typeName = section.TypeAliases["scalarObject"]; - Assert.IsNotNull(typeName); - Assert.AreEqual(typeof(ObjectTakingScalars).AssemblyQualifiedName, typeName); - } - - [TestMethod] - public void Then_PrefixedAliasWasAdded() - { - string typeName = section.TypeAliases["ext2.scalarObject"]; - Assert.IsNotNull(typeName); - Assert.AreEqual(typeof(ObjectTakingScalars).AssemblyQualifiedName, typeName); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithSingleContainer.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithSingleContainer.cs deleted file mode 100644 index cc565b17..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithSingleContainer.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for SingleSectionSingleContainerFixture - /// - [TestClass] - public class When_LoadingConfigWithSingleContainer : SectionLoadingFixture - { - public When_LoadingConfigWithSingleContainer() - : base("SingleSectionSingleContainer") - { - } - - [TestMethod] - public void Then_SectionIsNotNull() - { - Assert.IsNotNull(this.section); - } - - [TestMethod] - public void Then_ContainersPropertyIsSet() - { - Assert.IsNotNull(section.Containers); - } - - [TestMethod] - public void Then_ThereIsOneContainerInSection() - { - Assert.AreEqual(1, section.Containers.Count); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithTypeMappings.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithTypeMappings.cs deleted file mode 100644 index da31558f..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigWithTypeMappings.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigWithTypeMappings - /// - [TestClass] - public class When_LoadingConfigWithTypeMappings : SectionLoadingFixture - { - public When_LoadingConfigWithTypeMappings() - : base("BasicTypeMapping") - { - } - - private ContainerElement container; - - protected override void Arrange() - { - base.Arrange(); - this.container = this.section.Containers.Default; - } - - [TestMethod] - public void Then_RegistrationsArePresentInContainer() - { - Assert.AreEqual(2, this.container.Registrations.Count); - } - - [TestMethod] - public void Then_TypesAreAsGivenInFile() - { - this.AssertRegistrationsAreSame(r => r.TypeName, "ILogger", "ILogger"); - } - - [TestMethod] - public void Then_MappedNamesAreAsGivenInFile() - { - this.AssertRegistrationsAreSame(r => r.Name, String.Empty, "special"); - } - - [TestMethod] - public void Then_MappedToTypesAreAsGivenInFile() - { - this.AssertRegistrationsAreSame(r => r.MapToName, "MockLogger", "SpecialLogger"); - } - - private void AssertRegistrationsAreSame(Func selector, params string[] expectedStrings) - { - CollectionAssertExtensions.AreEqual(expectedStrings, this.container.Registrations.Select(selector).ToList()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithArrayInjection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithArrayInjection.cs deleted file mode 100644 index 7000aa7b..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithArrayInjection.cs +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigurationWithArrayInjection - /// - [TestClass] - public class When_LoadingConfigurationWithArrayInjection : SectionLoadingFixture - { - public When_LoadingConfigurationWithArrayInjection() - : base("ArrayInjection") - { - } - - [TestMethod] - public void Then_ArrayPropertyHasArrayElementAsValue() - { - var prop = this.GetArrayPropertyElement("specificElements"); - - Assert.IsInstanceOfType(prop.Value, typeof(ArrayElement)); - } - - [TestMethod] - public void Then_ArrayPropertyHasTwoValuesThatWillBeInjected() - { - var prop = this.GetArrayPropertyElement("specificElements"); - var arrayValue = (ArrayElement)prop.Value; - - Assert.AreEqual(2, arrayValue.Values.Count); - } - - [TestMethod] - public void Then_ArrayPropertyValuesAreAllDependencies() - { - var prop = this.GetArrayPropertyElement("specificElements"); - var arrayValue = (ArrayElement)prop.Value; - - Assert.IsTrue(arrayValue.Values.All(v => v is DependencyElement)); - } - - [TestMethod] - public void Then_ArrayPropertyValuesHaveExpectedNames() - { - var prop = this.GetArrayPropertyElement("specificElements"); - var arrayValue = (ArrayElement)prop.Value; - - CollectionAssertExtensions.AreEqual(new[] { "main", "special" }, - arrayValue.Values.Cast().Select(e => e.Name).ToList()); - } - - private PropertyElement GetArrayPropertyElement(string registrationName) - { - var registration = section.Containers.Default.Registrations - .Where(r => r.TypeName == "ArrayDependencyObject" && r.Name == registrationName) - .First(); - - return registration.InjectionMembers.OfType() - .Where(pe => pe.Name == "Loggers") - .First(); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithConstructors.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithConstructors.cs deleted file mode 100644 index 8fe6bd05..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithConstructors.cs +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigurationWithConstructors - /// - [TestClass] - public class When_LoadingConfigurationWithConstructors : SectionLoadingFixture - { - public When_LoadingConfigurationWithConstructors() - : base("RegistrationWithConstructors") - { - } - - private ContainerElement container; - private RegisterElement firstRegistration; - private RegisterElement secondRegistration; - private RegisterElement thirdRegistration; - - protected override void Arrange() - { - base.Arrange(); - this.container = this.section.Containers.Default; - this.firstRegistration = this.container.Registrations[0]; - this.secondRegistration = this.container.Registrations[1]; - this.thirdRegistration = this.container.Registrations[2]; - } - - [TestMethod] - public void Then_FirstRegistrationHasOneInjectionMember() - { - Assert.AreEqual(1, this.firstRegistration.InjectionMembers.Count); - } - - [TestMethod] - public void Then_FirstRegistrationHasConstructorMember() - { - Assert.IsInstanceOfType(this.firstRegistration.InjectionMembers[0], typeof(ConstructorElement)); - } - - [TestMethod] - public void Then_FirstRegistrationConstructorHasExpectedParameters() - { - var constructorElement = (ConstructorElement)this.firstRegistration.InjectionMembers[0]; - - constructorElement.Parameters.Select(p => p.Name).AssertContainsExactly("one", "two", "three"); - } - - [TestMethod] - public void Then_SecondRegistrationHasNoInjectionMembers() - { - Assert.AreEqual(0, this.secondRegistration.InjectionMembers.Count); - } - - [TestMethod] - public void Then_ThirdRegistrationHasZeroArgConstructor() - { - Assert.AreEqual(0, - ((ConstructorElement)this.thirdRegistration.InjectionMembers[0]).Parameters.Count); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithContainerExtensions.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithContainerExtensions.cs deleted file mode 100644 index 72f3f587..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingConfigurationWithContainerExtensions.cs +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingConfigurationWithContainerExtensions - /// - [TestClass] - public class When_LoadingConfigurationWithContainerExtensions : SectionLoadingFixture - { - public When_LoadingConfigurationWithContainerExtensions() - : base("ContainerExtensions") - { - } - - private ContainerElement defaultContainer; - private ContainerElement newSchemaContainer; - - protected override void Act() - { - base.Act(); - this.defaultContainer = this.section.Containers.Default; - this.newSchemaContainer = this.section.Containers["newSchema"]; - } - - [TestMethod] - public void Then_ContainerElementContainsOneExtension() - { - Assert.AreEqual(1, this.defaultContainer.Extensions.Count); - } - - [TestMethod] - public void Then_ExtensionElementHasExpectedType() - { - Assert.AreEqual("MockContainerExtension", - this.defaultContainer.Extensions[0].TypeName); - } - - [TestMethod] - public void Then_NewSchemaContainerContainsOneExtension() - { - Assert.AreEqual(1, this.newSchemaContainer.Extensions.Count); - } - - [TestMethod] - public void Then_NewSchemaContainerExtensionElementHasExpectedType() - { - Assert.AreEqual("MockContainerExtension", - this.newSchemaContainer.Extensions[0].TypeName); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingEmptySection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingEmptySection.cs deleted file mode 100644 index 411458d7..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingEmptySection.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingEmptySection - /// - [TestClass] - public class When_LoadingEmptySection : SectionLoadingFixture - { - public When_LoadingEmptySection() - : base("EmptySection") - { - } - - [TestMethod] - public void Then_SectionIsPresent() - { - Assert.IsNotNull(this.section); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingSectionWithAliases.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingSectionWithAliases.cs deleted file mode 100644 index 169c0d47..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingSectionWithAliases.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingSectionWithAliases - /// - [TestClass] - public class When_LoadingSectionWithAliases : SectionLoadingFixture - { - public When_LoadingSectionWithAliases() - : base("TwoContainersAndAliases") - { - } - - [TestMethod] - public void Then_AliasesAreAvailableInTheSection() - { - Assert.IsNotNull(section.TypeAliases); - } - - [TestMethod] - public void Then_ExpectedNumberOfAliasesArePresent() - { - Assert.AreEqual(2, section.TypeAliases.Count); - } - - [TestMethod] - public void Then_IntIsMappedToSystemInt32() - { - Assert.AreEqual("System.Int32, mscorlib", section.TypeAliases["int"]); - } - - [TestMethod] - public void Then_StringIsMappedToSystemString() - { - Assert.AreEqual("System.String, mscorlib", section.TypeAliases["string"]); - } - - [TestMethod] - public void Then_EnumerationReturnsAliasesInOrderAsGivenInFile() - { - CollectionAssertExtensions.AreEqual(new[] { "int", "string" }, - section.TypeAliases.Select(alias => alias.Alias).ToList()); - } - - [TestMethod] - public void Then_ContainersInTheFileAreAlsoLoaded() - { - Assert.AreEqual(2, section.Containers.Count); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingSectionWithProperties.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingSectionWithProperties.cs deleted file mode 100644 index d6d59556..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_LoadingSectionWithProperties.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.Practices.Unity.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_LoadingSectionWithProperties - /// - [TestClass] - public class When_LoadingSectionWithProperties : SectionLoadingFixture - { - public When_LoadingSectionWithProperties() - : base("InjectingProperties") - { - } - - [TestMethod] - public void Then_RegistrationHasOnePropertyElement() - { - var registration = (from reg in section.Containers.Default.Registrations - where reg.TypeName == "ObjectWithTwoProperties" && reg.Name == "singleProperty" - select reg).First(); - - Assert.AreEqual(1, registration.InjectionMembers.Count); - Assert.IsInstanceOfType(registration.InjectionMembers[0], typeof(PropertyElement)); - } - - [TestMethod] - public void Then_RegistrationHasTwoPropertyElements() - { - var registration = (from reg in section.Containers.Default.Registrations - where reg.TypeName == "ObjectWithTwoProperties" && reg.Name == "twoProperties" - select reg).First(); - - Assert.AreEqual(2, registration.InjectionMembers.Count); - Assert.IsTrue(registration.InjectionMembers.All(im => im is PropertyElement)); - } - - [TestMethod] - public void Then_PropertyNamesAreProperlyDeserialized() - { - var registration = (from reg in section.Containers.Default.Registrations - where reg.TypeName == "ObjectWithTwoProperties" && reg.Name == "twoProperties" - select reg).First(); - - CollectionAssertExtensions.AreEqual(new string[] { "Obj1", "Obj2" }, - registration.InjectionMembers.OfType().Select(pe => pe.Name).ToList()); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ResolvingTypes.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ResolvingTypes.cs deleted file mode 100644 index ed3091ce..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ResolvingTypes.cs +++ /dev/null @@ -1,142 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ResolvingTypes - /// - [TestClass] - public class When_ResolvingTypes - { - private TypeResolverImpl typeResolver; - - [TestInitialize] - public void Setup() - { - var aliases = new Dictionary - { - { "dict", typeof(Dictionary<,>).AssemblyQualifiedName }, - { "ILogger", "Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" }, - { "MockLogger", "Microsoft.Practices.Unity.TestSupport.MockLogger, Unity.TestSupport" } - }; - - var namespaces = new[] { "System", "System.Collections.Generic", "Microsoft.Practices.Unity.TestSupport" }; - var assemblies = new[] { "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "Unity.TestSupport", "an invalid assembly name", "invalid, invalid" }; - - typeResolver = new TypeResolverImpl(aliases, namespaces, assemblies); - } - - [TestMethod] - public void Then_DefaultAliasesResolve() - { - var expected = new Dictionary - { - { "sbyte", typeof(sbyte) }, - { "short", typeof(short) }, - { "int", typeof(int) }, - { "integer", typeof(int) }, - { "long", typeof(long) }, - { "byte", typeof(byte) }, - { "ushort", typeof(ushort) }, - { "uint", typeof(uint) }, - { "ulong", typeof(ulong) }, - { "float", typeof(float) }, - { "single", typeof(float) }, - { "double", typeof(double) }, - { "decimal", typeof(decimal) }, - { "char", typeof(char) }, - { "bool", typeof(bool) }, - { "object", typeof(object) }, - { "string", typeof(string) }, - { "datetime", typeof(DateTime) }, - { "DateTime", typeof(DateTime) }, - { "date", typeof(DateTime) }, - { "singleton", typeof(ContainerControlledLifetimeManager) }, - { "ContainerControlledLifetimeManager", typeof(ContainerControlledLifetimeManager) }, - { "transient", typeof(TransientLifetimeManager) }, - { "TransientLifetimeManager", typeof(TransientLifetimeManager) }, - { "perthread", typeof(PerThreadLifetimeManager) }, - { "PerThreadLifetimeManager", typeof(PerThreadLifetimeManager) }, - { "external", typeof(ExternallyControlledLifetimeManager) }, - { "ExternallyControlledLifetimeManager", typeof(ExternallyControlledLifetimeManager) }, - { "hierarchical", typeof(HierarchicalLifetimeManager) }, - { "HierarchicalLifetimeManager", typeof(HierarchicalLifetimeManager) }, - { "resolve", typeof(PerResolveLifetimeManager) }, - { "perresolve", typeof(PerResolveLifetimeManager) }, - { "PerResolveLifetimeManager", typeof(PerResolveLifetimeManager) } - }; - - foreach (var kv in expected) - { - Assert.AreSame(kv.Value, typeResolver.ResolveType(kv.Key, true)); - } - } - - [TestMethod] - public void Then_ILoggerResolves() - { - Assert.AreSame(typeResolver.ResolveType("ILogger", true), typeof(ILogger)); - } - - [TestMethod] - public void Then_GuidIsFoundThroughSearch() - { - Assert.AreSame(typeResolver.ResolveType("Guid", true), typeof(Guid)); - } - - [TestMethod] - public void Then_UriIsFoundThroughSearch() - { - Assert.AreSame(typeResolver.ResolveType("Uri", true), typeof(Uri)); - } - - [TestMethod] - public void Then_OpenGenericIsResolvedThroughSearch() - { - Assert.AreSame(typeResolver.ResolveType("Dictionary`2", true), typeof(Dictionary<,>)); - } - - [TestMethod] - public void Then_OpenGenericShorthandIsResolvedThroughSearch() - { - Assert.AreSame(typeResolver.ResolveType("Dictionary[,]", true), typeof(Dictionary<,>)); - } - - [TestMethod] - public void Then_ShorthandForOpenGenericWithOneParameterWorks() - { - Assert.AreSame(typeResolver.ResolveType("List[]", true), typeof(List<>)); - } - - [TestMethod] - public void Then_ShorthandGenericIsResolved() - { - Assert.AreSame(typeResolver.ResolveType("List[int]", true), typeof(List)); - } - - [TestMethod] - public void Then_ShorthandWithMultipleParametersIsResolved() - { - Assert.AreSame(typeResolver.ResolveType("Func[int, string]", true), typeof(Func)); - } - - [TestMethod] - public void Then_ShorthandWithLeadingAliasIsResolved() - { - Assert.AreSame(typeResolver.ResolveType("dict[string, datetime]", true), - typeof(Dictionary)); - } - - [TestMethod] - public void Then_TypeThatCannotBeFoundReturnsNull() - { - Assert.IsNull(typeResolver.ResolveType("Namespace.Type, Assembly", false)); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ResolvingTypesWithoutNamespacesDefined.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ResolvingTypesWithoutNamespacesDefined.cs deleted file mode 100644 index f799e7b4..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_ResolvingTypesWithoutNamespacesDefined.cs +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - /// - /// Summary description for When_ResolvingTypesWithoutNamespacesDefined - /// - [TestClass] - public class When_ResolvingTypesWithoutNamespacesDefined - { - private TypeResolverImpl typeResolver; - - [TestInitialize] - public void Setup() - { - var aliases = new Dictionary - { - { "dict", typeof(Dictionary<,>).AssemblyQualifiedName }, - { "ILogger", "Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" }, - { "MockLogger", "Microsoft.Practices.Unity.TestSupport.MockLogger, Unity.TestSupport" } - }; - - var namespaces = new string[0]; - var assemblies = new[] { "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "Unity.TestSupport", "an invalid assembly name", "invalid, invalid" }; - - typeResolver = new TypeResolverImpl(aliases, namespaces, assemblies); - } - - [TestMethod] - public void Then_DefaultAliasesResolve() - { - var expected = new Dictionary - { - { "sbyte", typeof(sbyte) }, - { "short", typeof(short) }, - { "int", typeof(int) }, - { "integer", typeof(int) }, - { "long", typeof(long) }, - { "byte", typeof(byte) }, - { "ushort", typeof(ushort) }, - { "uint", typeof(uint) }, - { "ulong", typeof(ulong) }, - { "float", typeof(float) }, - { "single", typeof(float) }, - { "double", typeof(double) }, - { "decimal", typeof(decimal) }, - { "char", typeof(char) }, - { "bool", typeof(bool) }, - { "object", typeof(object) }, - { "string", typeof(string) }, - { "datetime", typeof(DateTime) }, - { "DateTime", typeof(DateTime) }, - { "date", typeof(DateTime) }, - { "singleton", typeof(ContainerControlledLifetimeManager) }, - { "ContainerControlledLifetimeManager", typeof(ContainerControlledLifetimeManager) }, - { "transient", typeof(TransientLifetimeManager) }, - { "TransientLifetimeManager", typeof(TransientLifetimeManager) }, - { "perthread", typeof(PerThreadLifetimeManager) }, - { "PerThreadLifetimeManager", typeof(PerThreadLifetimeManager) }, - { "external", typeof(ExternallyControlledLifetimeManager) }, - { "ExternallyControlledLifetimeManager", typeof(ExternallyControlledLifetimeManager) }, - { "hierarchical", typeof(HierarchicalLifetimeManager) }, - { "HierarchicalLifetimeManager", typeof(HierarchicalLifetimeManager) }, - { "resolve", typeof(PerResolveLifetimeManager) }, - { "perresolve", typeof(PerResolveLifetimeManager) }, - { "PerResolveLifetimeManager", typeof(PerResolveLifetimeManager) }, - }; - - foreach (var kv in expected) - { - Assert.AreSame(kv.Value, typeResolver.ResolveType(kv.Key, true)); - } - } - - [TestMethod] - public void Then_ILoggerResolves() - { - Assert.AreSame(typeResolver.ResolveType("ILogger", true), typeof(ILogger)); - } - - [TestMethod] - public void Then_ILoggerResolvesThroughSearch() - { - Assert.AreSame(typeResolver.ResolveType("Microsoft.Practices.Unity.TestSupport.ILogger", true), typeof(ILogger)); - } - - [TestMethod] - public void Then_ShorthandForOpenGenericWithOneParameterWorks() - { - Assert.AreSame(typeResolver.ResolveType("System.Collections.Generic.List[]", true), typeof(List<>)); - } - - [TestMethod] - public void Then_ShorthandGenericIsResolved() - { - Assert.AreSame(typeResolver.ResolveType("System.Collections.Generic.List[int]", true), typeof(List)); - } - - [TestMethod] - public void Then_TypeThatCannotBeFoundReturnsNull() - { - Assert.IsNull(typeResolver.ResolveType("Namespace.Type, Assembly", false)); - } - } -} diff --git a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_SavingModifiedConfigurationSection.cs b/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_SavingModifiedConfigurationSection.cs deleted file mode 100644 index 8c3c5d44..00000000 --- a/source/Unity.Configuration/Tests/Unity.Configuration.Tests/When_SavingModifiedConfigurationSection.cs +++ /dev/null @@ -1,746 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Configuration.Tests -{ - [TestClass] - public class When_SavingModifiedConfigurationSection - { - private static UnityConfigurationSection SerializeAndLoadSection(string filename, Action sectionInitializer) - { - var serializer = new ConfigSerializer(filename); - var section = new UnityConfigurationSection(); - sectionInitializer(section); - serializer.Save("unity", section); - - var loadedConfiguration = serializer.Load(); - return (UnityConfigurationSection)loadedConfiguration.GetSection("unity"); - } - - [TestMethod] - public void Then_EmptySectionCanBeSavedAndReloaded() - { - var section = SerializeAndLoadSection("EmptySection.config", - s => { }); - Assert.IsNotNull(section); - } - - [TestMethod] - public void Then_OneAddedAliasIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeAliases.config", - s => s.TypeAliases.Add(new AliasElement("mockdb", typeof(MockDatabase)))); - - Assert.AreEqual(1, loadedSection.TypeAliases.Count); - Assert.AreEqual(typeof(MockDatabase).AssemblyQualifiedName, loadedSection.TypeAliases["mockdb"]); - } - - [TestMethod] - public void Then_TwoAddedAliasesAreSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeAliases.config", s => - { - s.TypeAliases.Add(new AliasElement("mockdb", typeof(MockDatabase))); - s.TypeAliases.Add(new AliasElement("ilog", typeof(ILogger))); - }); - - Assert.AreEqual(2, loadedSection.TypeAliases.Count); - Assert.AreEqual(typeof(MockDatabase).AssemblyQualifiedName, loadedSection.TypeAliases["mockdb"]); - Assert.AreEqual(typeof(ILogger).AssemblyQualifiedName, loadedSection.TypeAliases["ilog"]); - } - - [TestMethod] - public void Then_TwoNamespacesAreSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeNamespaces.config", s => - { - s.TypeAliases.Add(new AliasElement("mockdb", typeof(MockDatabase))); - - s.Namespaces.Add(new NamespaceElement { Name = "System" }); - s.Namespaces.Add(new NamespaceElement { Name = "System.Collections" }); - }); - - loadedSection.Namespaces.Select(ns => ns.Name) - .AssertContainsExactly("System", "System.Collections"); - } - - [TestMethod] - public void Then_AssembliesAreSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeAssemblies.config", s => - { - s.TypeAliases.Add(new AliasElement("mockdb", typeof(MockDatabase))); - s.Namespaces.Add(new NamespaceElement { Name = "System" }); - - s.Assemblies.Add(new AssemblyElement { Name = typeof(int).Assembly.FullName }); - s.Assemblies.Add(new AssemblyElement { Name = typeof(XmlWriter).Assembly.FullName }); - }); - - loadedSection.Assemblies.Select(asm => asm.Name) - .AssertContainsExactly( - typeof(int).Assembly.FullName, - typeof(XmlWriter).Assembly.FullName); - } - - [TestMethod] - public void Then_SectionExtensionsAreSerialized() - { - string extensionTypeName = typeof(TestSectionExtension).AssemblyQualifiedName; - - var loadedSection = SerializeAndLoadSection("SerializeSectionExtensions.config", s => - { - s.SectionExtensions.Add(new SectionExtensionElement { TypeName = extensionTypeName }); - s.SectionExtensions.Add(new SectionExtensionElement { TypeName = extensionTypeName, Prefix = "p1" }); - }); - - loadedSection.SectionExtensions.Select(se => se.TypeName) - .AssertContainsExactly(extensionTypeName, extensionTypeName); - - loadedSection.SectionExtensions.Select(se => se.Prefix) - .AssertContainsExactly(String.Empty, "p1"); - } - - [TestMethod] - public void Then_OneContainerIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeContainers.config", s => - { - var container = new ContainerElement(); - s.Containers.Add(container); - }); - - Assert.AreEqual(1, loadedSection.Containers.Count); - } - - [TestMethod] - public void Then_TwoNamedContainersAreSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeContainers.config", s => - { - s.Containers.Add(new ContainerElement { Name = "containerOne" }); - s.Containers.Add(new ContainerElement { Name = "containerTwo" }); - }); - - loadedSection.Containers.Select(c => c.Name) - .AssertContainsExactly("containerOne", "containerTwo"); - } - - [TestMethod] - public void Then_ContainerWithExtensionsIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeContainers.config", s => - { - var containerElement = new ContainerElement(); - containerElement.Extensions.Add(new ContainerExtensionElement { TypeName = "extensionOne" }); - containerElement.Extensions.Add(new ContainerExtensionElement { TypeName = "extensionTwo" }); - s.Containers.Add(containerElement); - }); - - loadedSection.Containers.Default.Extensions.Select(ce => ce.TypeName) - .AssertContainsExactly("extensionOne", "extensionTwo"); - } - - [TestMethod] - public void Then_ContainerWithTypeMappingsIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeContainers.config", s => - { - var containerElement = new ContainerElement(); - containerElement.Registrations.Add(new RegisterElement { TypeName = "SourceOne", MapToName = "DestOne", Name = "NameOne" }); - containerElement.Registrations.Add(new RegisterElement - { - TypeName = "SourceTwo", - MapToName = "DestTwo", - Name = "NameTwo" - }); - containerElement.Registrations.Add(new RegisterElement - { - TypeName = "SourceThree", - MapToName = "DestThree" - }); - s.Containers.Add(containerElement); - }); - - loadedSection.Containers.Default.Registrations.Select(r => r.TypeName) - .AssertContainsExactly("SourceOne", "SourceTwo", "SourceThree"); - loadedSection.Containers.Default.Registrations.Select(r => r.MapToName) - .AssertContainsExactly("DestOne", "DestTwo", "DestThree"); - loadedSection.Containers.Default.Registrations.Select(r => r.Name) - .AssertContainsExactly("NameOne", "NameTwo", String.Empty); - } - - [TestMethod] - public void Then_RegistrationWithLifetimeIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeContainers.config", s => - { - var containerElement = new ContainerElement(); - - var reg1 = new RegisterElement - { - TypeName = "MyType" - }; - var reg2 = new RegisterElement - { - TypeName = "MyOtherType", - Lifetime = new LifetimeElement - { - TypeName = "SomeCustomLifetime", - Value = "input value", - TypeConverterTypeName = "CustomLifetimeConverter" - } - }; - - var reg3 = new RegisterElement - { - TypeName = "StillAnotherType", - Lifetime = new LifetimeElement - { - TypeName = "singleton" - } - }; - - containerElement.Registrations.Add(reg1); - containerElement.Registrations.Add(reg2); - containerElement.Registrations.Add(reg3); - - s.Containers.Add(containerElement); - }); - - var loadedReg0 = loadedSection.Containers.Default.Registrations[0]; - var loadedReg1 = loadedSection.Containers.Default.Registrations[1]; - var loadedReg2 = loadedSection.Containers.Default.Registrations[2]; - - Assert.IsNotNull(loadedReg0.Lifetime); - Assert.AreEqual(String.Empty, loadedReg0.Lifetime.TypeName); - - Assert.IsNotNull(loadedReg1.Lifetime); - Assert.AreEqual("SomeCustomLifetime", loadedReg1.Lifetime.TypeName); - Assert.AreEqual("input value", loadedReg1.Lifetime.Value); - Assert.AreEqual("CustomLifetimeConverter", loadedReg1.Lifetime.TypeConverterTypeName); - - Assert.IsNotNull(loadedReg2.Lifetime); - Assert.AreEqual("singleton", loadedReg2.Lifetime.TypeName); - Assert.AreEqual(String.Empty, loadedReg2.Lifetime.TypeConverterTypeName); - } - - [TestMethod] - public void Then_RegistrationWithInstancesIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeInstances.config", s => - { - var inst0 = new InstanceElement - { - TypeName = "int", - Value = "42" - }; - - var inst1 = new InstanceElement - { - TypeName = "DateTime", - Value = "today", - TypeConverterTypeName = "RelativeDateTextConverter" - }; - - var inst2 = new InstanceElement - { - TypeName = "string", - Value = "hello", - Name = "AString" - }; - - var containerElement = new ContainerElement(); - containerElement.Instances.Add(inst0); - containerElement.Instances.Add(inst1); - containerElement.Instances.Add(inst2); - - s.Containers.Add(containerElement); - }); - - var instances = loadedSection.Containers.Default.Instances; - - instances.Select(i => i.TypeName) - .AssertContainsExactly("int", "DateTime", "string"); - instances.Select(i => i.Value) - .AssertContainsExactly("42", "today", "hello"); - instances.Select(i => i.TypeConverterTypeName) - .AssertContainsExactly(String.Empty, "RelativeDateTextConverter", String.Empty); - instances.Select(i => i.Name) - .AssertContainsExactly(String.Empty, String.Empty, "AString"); - } - - [TestMethod] - public void Then_RegistrationsWithConstructorsIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeCtors.config", FillSectionWithConstructors); - - var zeroArg = loadedSection.Containers.Default.Registrations.Where(r => r.Name == "zeroArg").First(); - - Assert.AreEqual(1, zeroArg.InjectionMembers.Count); - Assert.IsInstanceOfType(zeroArg.InjectionMembers[0], typeof(ConstructorElement)); - - var oneArg = loadedSection.Containers.Default.Registrations.Where(r => r.Name == "oneArg").First(); - Assert.AreEqual(1, oneArg.InjectionMembers.Count); - Assert.IsInstanceOfType(oneArg.InjectionMembers[0], typeof(ConstructorElement)); - } - - [TestMethod] - public void Then_ConstructorParametersAreSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeCtors.config", FillSectionWithConstructors); - - var zeroArg = loadedSection.Containers.Default.Registrations.Where(r => r.Name == "zeroArg").First(); - var zeroArgCtor = (ConstructorElement)zeroArg.InjectionMembers[0]; - - Assert.AreEqual(0, zeroArgCtor.Parameters.Count); - - var oneArg = loadedSection.Containers.Default.Registrations.Where(r => r.Name == "oneArg").First(); - var oneArgCtor = (ConstructorElement)oneArg.InjectionMembers[0]; - - Assert.AreEqual(1, oneArgCtor.Parameters.Count); - Assert.AreEqual("intParam", oneArgCtor.Parameters[0].Name); - } - - [TestMethod] - public void Then_ConstructorParametrValuesAreSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializeCtors.config", FillSectionWithConstructors); - - var oneArg = loadedSection.Containers.Default.Registrations.Where(r => r.Name == "oneArg").First(); - var oneArgCtor = (ConstructorElement)oneArg.InjectionMembers[0]; - var intParamArg = oneArgCtor.Parameters[0]; - var intParamValue = intParamArg.Value as ValueElement; - - Assert.IsNotNull(intParamValue); - Assert.AreEqual(intParamValue.Value, "23"); - } - - [TestMethod] - public void Then_NamedDependencyValueIsSerialized() - { - var parameterValue = GetRoundTrippedParameter("namedDependency"); - - Assert.AreEqual("someName", parameterValue.Name); - } - - [TestMethod] - public void Then_TypedDependencyIsSerialized() - { - var parameterValue = GetRoundTrippedParameter("typedDependency"); - - Assert.AreEqual("SomeOtherType", parameterValue.TypeName); - } - - [TestMethod] - public void Then_ValueIsSerialized() - { - var parameterValue = GetRoundTrippedParameter("valueDependency"); - - Assert.AreEqual("someValue", parameterValue.Value); - } - - [TestMethod] - public void Then_ValueWithTypeConverterIsSerialized() - { - var parameterValue = GetRoundTrippedParameter("valueWithTypeConverter"); - - Assert.AreEqual("someValue", parameterValue.Value); - Assert.AreEqual("MyConverter", parameterValue.TypeConverterTypeName); - } - - [TestMethod] - public void Then_OptionalValueIsSerialized() - { - var parameterValue = GetRoundTrippedParameter("optionalValue"); - - Assert.AreEqual("dependencyKey", parameterValue.Name); - Assert.AreEqual("DependencyType", parameterValue.TypeName); - } - - [TestMethod] - public void Then_EmptyArrayValueIsSerialized() - { - var parameterValue = GetRoundTrippedParameter("emptyArrayValue"); - - Assert.AreEqual(0, parameterValue.Values.Count); - } - - [TestMethod] - public void Then_TypedArrayValueIsSerialized() - { - var parameterValue = GetRoundTrippedParameter("typedEmptyArrayValue"); - - Assert.AreEqual(0, parameterValue.Values.Count); - Assert.AreEqual("MyElementType", parameterValue.TypeName); - } - - [TestMethod] - public void Then_ArrayValueWithElementsGetsSerialized() - { - var parameterValue = GetRoundTrippedParameter("arrayWithValues"); - - Assert.AreEqual(3, parameterValue.Values.Count); - parameterValue.Values.Select(p => p.GetType()) - .AssertContainsExactly(typeof(DependencyElement), typeof(ValueElement), typeof(DependencyElement)); - - parameterValue.Values.OfType() - .Select(p => p.Name) - .AssertContainsExactly(String.Empty, "dependencyName"); - - parameterValue.Values.OfType() - .Select(p => p.Value) - .AssertContainsExactly("something"); - } - - [TestMethod] - public void Then_SimplePropertyWithDependencyIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializingProperties.config", s => - { - var prop = new PropertyElement() { Name = "MyProp" }; - var reg = new RegisterElement() - { - TypeName = "MyType" - }; - reg.InjectionMembers.Add(prop); - - var container = new ContainerElement(); - container.Registrations.Add(reg); - s.Containers.Add(container); - }); - - loadedSection.Containers[0].Registrations[0].InjectionMembers - .Cast() - .Select(p => p.Name) - .AssertContainsExactly("MyProp"); - - loadedSection.Containers[0].Registrations[0].InjectionMembers - .Cast() - .Select(p => p.Value.GetType()) - .AssertContainsExactly(typeof(DependencyElement)); - } - - [TestMethod] - public void Then_MultiplePropertiesWithVaryingValuesAreSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializingProperties.config", s => - { - var prop = new PropertyElement() { Name = "SimpleProp" }; - var prop2 = new PropertyElement - { - Name = "NamedDependencyProp", - Value = new DependencyElement - { - Name = "MyDep" - } - }; - var prop3 = new PropertyElement - { - Name = "OptionalProp", - Value = new OptionalElement - { - Name = "OptionalDep", - TypeName = "MyType" - } - }; - - var reg = new RegisterElement() - { - TypeName = "MyType" - }; - reg.InjectionMembers.Add(prop); - reg.InjectionMembers.Add(prop2); - reg.InjectionMembers.Add(prop3); - - var container = new ContainerElement(); - container.Registrations.Add(reg); - s.Containers.Add(container); - }); - - var propertyElements = loadedSection.Containers[0].Registrations[0].InjectionMembers.Cast(); - - propertyElements.Select(p => p.Name) - .AssertContainsExactly("SimpleProp", "NamedDependencyProp", "OptionalProp"); - - propertyElements.Select(p => p.Value.GetType()) - .AssertContainsExactly(typeof(DependencyElement), typeof(DependencyElement), typeof(OptionalElement)); - - Assert.AreEqual("MyDep", - ((DependencyElement)propertyElements.Where(p => p.Name == "NamedDependencyProp").First().Value).Name); - } - - [TestMethod] - public void Then_MethodsGetSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializingMethods.config", s => - { - var method0 = new MethodElement - { - Name = "NoArgsMethod" - }; - - var method1 = new MethodElement - { - Name = "OneArgMethod" - }; - - method1.Parameters.Add(new ParameterElement - { - Name = "BasicDependency" - }); - method1.Parameters.Add(new ParameterElement - { - Name = "ArrayDependency", - Value = new ArrayElement - { - TypeName = "SomeType" - } - }); - - var reg = new RegisterElement - { - TypeName = "MyType" - }; - reg.InjectionMembers.Add(method0); - reg.InjectionMembers.Add(method1); - var container = new ContainerElement(); - container.Registrations.Add(reg); - s.Containers.Add(container); - }); - - var methods = loadedSection.Containers.Default.Registrations[0].InjectionMembers.Cast(); - - methods.Select(m => m.Name) - .AssertContainsExactly("NoArgsMethod", "OneArgMethod"); - - var oneArgMethod = methods.Where(m => m.Name == "OneArgMethod").First(); - Assert.AreEqual(2, oneArgMethod.Parameters.Count); - } - - [TestMethod] - public void Then_SectionWithExtendedContainerConfiguringElementsIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializingExtensionElements.config", s => - { - var extensionElement = new ContainerConfigElementTwo(); - var container = new ContainerElement(); - container.ConfiguringElements.Add(extensionElement); - s.Containers.Add(container); - s.SectionExtensions.Add(new SectionExtensionElement - { - TypeName = typeof(TestSectionExtension).AssemblyQualifiedName, - Prefix = "pre1" - }); - }); - - loadedSection.Containers.Default.ConfiguringElements - .Select(e => e.GetType()) - .AssertContainsExactly(typeof(ContainerConfigElementTwo)); - } - - [TestMethod] - public void Then_SectionWithExtendedInjectionmemberElementsIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializingExtensionElements.config", s => - { - var registration = new RegisterElement - { - TypeName = "string" - }; - registration.InjectionMembers.Add(new TestInjectionMemberElement()); - - var container = new ContainerElement(); - container.Registrations.Add(registration); - s.Containers.Add(container); - s.SectionExtensions.Add(new SectionExtensionElement - { - TypeName = typeof(TestSectionExtension).AssemblyQualifiedName, - Prefix = "pre1" - }); - }); - - loadedSection.Containers.Default.Registrations[0].InjectionMembers - .Select(i => i.GetType()) - .AssertContainsExactly(typeof(TestInjectionMemberElement)); - } - - [TestMethod] - public void Then_SectionWithExtendedValueElementsIsSerialized() - { - var loadedSection = SerializeAndLoadSection("SerializingExtensionElements.config", s => - { - var registration = new RegisterElement - { - TypeName = "SomeType" - }; - - var prop = new PropertyElement() - { - Name = "MyProp", - Value = new SeventeenValueElement() - }; - - registration.InjectionMembers.Add(prop); - - var container = new ContainerElement(); - container.Registrations.Add(registration); - s.Containers.Add(container); - s.SectionExtensions.Add(new SectionExtensionElement - { - TypeName = typeof(TestSectionExtension).AssemblyQualifiedName, - Prefix = "pre1" - }); - }); - - loadedSection.Containers.Default.Registrations[0].InjectionMembers - .OfType() - .Select(p => p.Value.GetType()) - .AssertContainsExactly(typeof(SeventeenValueElement)); - } - - private TElement GetRoundTrippedParameter(string parameterName) - where TElement : ParameterValueElement - { - var loadedSection = SerializeAndLoadSection("ParameterValues.config", BuildConfigWithValues); - return FindParameterByName(loadedSection, parameterName); - } - - private TElement FindParameterByName(UnityConfigurationSection section, string parameterName) - where TElement : ParameterValueElement - { - var ctor = (ConstructorElement)section.Containers.Default.Registrations[0].InjectionMembers[0]; - return (TElement)ctor.Parameters.Where(p => p.Name == parameterName).First().Value; - } - - private void BuildConfigWithValues(UnityConfigurationSection s) - { - var ctorElement = new ConstructorElement(); - ctorElement.Parameters.Add(new ParameterElement - { - Name = "defaultDependency" - }); - ctorElement.Parameters.Add(new ParameterElement - { - Name = "namedDependency", - Value = new DependencyElement - { - Name = "someName" - } - }); - ctorElement.Parameters.Add(new ParameterElement() - { - Name = "typedDependency", - Value = new DependencyElement() - { - TypeName = "SomeOtherType" - } - }); - ctorElement.Parameters.Add(new ParameterElement() - { - Name = "valueDependency", - Value = new ValueElement - { - Value = "someValue" - } - }); - ctorElement.Parameters.Add(new ParameterElement() - { - Name = "valueWithTypeConverter", - Value = new ValueElement - { - Value = "someValue", - TypeConverterTypeName = "MyConverter" - } - }); - ctorElement.Parameters.Add(new ParameterElement() - { - Name = "optionalValue", - Value = new OptionalElement() - { - Name = "dependencyKey", - TypeName = "DependencyType" - } - }); - ctorElement.Parameters.Add(new ParameterElement() - { - Name = "emptyArrayValue", - Value = new ArrayElement() - }); - ctorElement.Parameters.Add(new ParameterElement() - { - Name = "typedEmptyArrayValue", - Value = new ArrayElement - { - TypeName = "MyElementType" - } - }); - var arrayWithValues = new ArrayElement(); - arrayWithValues.Values.Add(new DependencyElement()); - arrayWithValues.Values.Add(new ValueElement() - { - Value = "something" - }); - arrayWithValues.Values.Add(new DependencyElement() - { - Name = "dependencyName" - }); - ctorElement.Parameters.Add(new ParameterElement() - { - Name = "arrayWithValues", - Value = arrayWithValues - }); - - var registration = new RegisterElement - { - TypeName = "someType" - }; - registration.InjectionMembers.Add(ctorElement); - - var container = new ContainerElement(); - container.Registrations.Add(registration); - s.Containers.Add(container); - } - - private static void FillSectionWithConstructors(UnityConfigurationSection s) - { - var zeroArgCtor = new ConstructorElement(); - var intCtor = new ConstructorElement(); - intCtor.Parameters.Add(new ParameterElement - { - Name = "intParam", - Value = new ValueElement - { - Value = "23" - } - }); - - var zeroArgRegistration = new RegisterElement - { - TypeName = "SomeType", - Name = "zeroArg" - }; - - zeroArgRegistration.InjectionMembers.Add(zeroArgCtor); - - var oneArgRegistration = new RegisterElement - { - TypeName = "SomeType", - Name = "oneArg" - }; - - oneArgRegistration.InjectionMembers.Add(intCtor); - - var container = new ContainerElement(); - container.Registrations.Add(zeroArgRegistration); - container.Registrations.Add(oneArgRegistration); - s.Containers.Add(container); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/AddInterfaceElement.cs b/source/Unity.Interception.Configuration/Src/AddInterfaceElement.cs deleted file mode 100644 index 5dbcaefa..00000000 --- a/source/Unity.Interception.Configuration/Src/AddInterfaceElement.cs +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Configuration element that lets you specify additional interfaces - /// to add when this type is intercepted. - /// - public class AddInterfaceElement : InjectionMemberElement - { - private const string TypeNamePropertyName = "type"; - - /// - /// Type of interface to add. - /// - [ConfigurationProperty(TypeNamePropertyName, IsRequired = true)] - public string TypeName - { - get { return (string)base[TypeNamePropertyName]; } - set { base[TypeNamePropertyName] = value; } - } - - /// - /// Each element must have a unique key, which is generated by the subclasses. - /// - public override string Key - { - get { return "addInterface: " + this.TypeName; } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Guard.ArgumentNotNull(writer, "writer"); - writer.WriteAttributeString(TypeNamePropertyName, this.TypeName); - } - - /// - /// Return the set of s that are needed - /// to configure the container according to this configuration element. - /// - /// Container that is being configured. - /// Type that is being registered. - /// Type that is being mapped to. - /// Name this registration is under. - /// One or more objects that should be - /// applied to the container registration. - public override IEnumerable GetInjectionMembers(IUnityContainer container, Type fromType, Type toType, string name) - { - Type interfaceType = TypeResolver.ResolveType(this.TypeName); - return new[] { new AdditionalInterface(interfaceType) }; - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/CallHandlerElement.cs b/source/Unity.Interception.Configuration/Src/CallHandlerElement.cs deleted file mode 100644 index 42c2d16e..00000000 --- a/source/Unity.Interception.Configuration/Src/CallHandlerElement.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Configuration element representing a call handler. - /// - public class CallHandlerElement : PolicyChildElement - { - internal void Configure(IUnityContainer container, PolicyDefinition policyDefinition) - { - if (string.IsNullOrEmpty(this.TypeName)) - { - policyDefinition.AddCallHandler(this.Name); - } - else - { - Type handlerType = TypeResolver.ResolveType(TypeName); - IEnumerable injectionMembers = - Injection.SelectMany( - element => element.GetInjectionMembers(container, typeof(ICallHandler), handlerType, Name)); - policyDefinition.AddCallHandler(handlerType, Lifetime.CreateLifetimeManager(), - injectionMembers.ToArray()); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/CallHandlerElementCollection.cs b/source/Unity.Interception.Configuration/Src/CallHandlerElementCollection.cs deleted file mode 100644 index dda89503..00000000 --- a/source/Unity.Interception.Configuration/Src/CallHandlerElementCollection.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A collection of s for configuration. - /// - [ConfigurationCollection(typeof(CallHandlerElement))] - public class CallHandlerElementCollection : DeserializableConfigurationElementCollection - { - private static readonly UnknownElementHandlerMap UnknownElementHandlerMap - = new UnknownElementHandlerMap - { - { "callHandler", (chec, xr) => chec.ReadUnwrappedElement(xr, chec) } - }; - - /// - /// Retrieve a call handler element from the collection by name. - /// - /// Name to look up. - /// The rule, or null if not in the collection. - public new CallHandlerElement this[string name] - { - get { return (CallHandlerElement)BaseGet(name); } - } - - /// - /// Gets the element key for a specified configuration element when overridden in a derived class. - /// - /// - /// An that acts as the key for the specified . - /// - /// The to return the key for. - protected override object GetElementKey(ConfigurationElement element) - { - return ((CallHandlerElement)element).Name; - } - - /// - /// Causes the configuration system to throw an exception. - /// - /// - /// true if the unrecognized element was deserialized successfully; otherwise, false. The default is false. - /// - /// The name of the unrecognized element. - /// An input stream that reads XML from the configuration file. - /// The element specified in is the <clear> element. - /// starts with the reserved prefix "config" or "lock". - protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader) - { - return UnknownElementHandlerMap.ProcessElement(this, elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/DefaultElement.cs b/source/Unity.Interception.Configuration/Src/DefaultElement.cs deleted file mode 100644 index 7d3cc010..00000000 --- a/source/Unity.Interception.Configuration/Src/DefaultElement.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// The <default> element that appears inside an <interceptor> element. - /// - public class DefaultElement : InterceptorRegistrationElement - { - internal override string Key - { - get { return "default:" + this.TypeName; } - } - - internal override string ElementName - { - get { return "default"; } - } - - /// - /// Actually register the interceptor against this type. - /// - /// Container to configure. - /// interceptor to register. - internal override void RegisterInterceptor(IUnityContainer container, IInterceptor interceptor) - { - var typeInterceptor = interceptor as ITypeInterceptor; - if (typeInterceptor != null) - { - container.Configure().SetDefaultInterceptorFor( - this.ResolvedType, - typeInterceptor); - } - else - { - container.Configure().SetDefaultInterceptorFor( - this.ResolvedType, - (IInstanceInterceptor)interceptor); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptionBehaviorElement.cs b/source/Unity.Interception.Configuration/Src/InterceptionBehaviorElement.cs deleted file mode 100644 index 34232f3d..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptionBehaviorElement.cs +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Globalization; -using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Configuration element for specifying interception behaviors for a type. - /// - public class InterceptionBehaviorElement : InjectionMemberElement - { - private const string TypeNamePropertyName = "type"; - private const string NamePropertyName = "name"; - private const string IsDefaultForTypePropertyName = "isDefaultForType"; - - /// - /// Type of behavior to add. - /// - [ConfigurationProperty(TypeNamePropertyName)] - public string TypeName - { - get { return (string)base[TypeNamePropertyName]; } - set { base[TypeNamePropertyName] = value; } - } - - /// - /// Name of behavior to resolve. - /// - [ConfigurationProperty(NamePropertyName)] - public string Name - { - get { return (string)base[NamePropertyName]; } - set { base[NamePropertyName] = value; } - } - - /// - /// Should this behavior be configured as a default behavior for this type, or - /// specifically for this type/name pair only? - /// - [ConfigurationProperty(IsDefaultForTypePropertyName, IsRequired = false, DefaultValue = false)] - public bool IsDefaultForType - { - get { return (bool)base[IsDefaultForTypePropertyName]; } - set { base[IsDefaultForTypePropertyName] = value; } - } - - /// - /// Reads XML from the configuration file. - /// - /// The that reads from the configuration file. - /// true to serialize only the collection key properties; otherwise, false. - /// The element to read is locked. - /// - or - - /// An attribute of the current node is not recognized. - /// - or - - /// The lock status of the current node cannot be determined. - /// - protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey) - { - base.DeserializeElement(reader, serializeCollectionKey); - - this.GuardHasRequiredAttributes(); - } - - /// - /// Each element must have a unique key, which is generated by the subclasses. - /// - public override string Key - { - get - { - if (string.IsNullOrEmpty(this.TypeName)) - { - return "interceptionBehavior:IInterceptionBehavior:" + this.Name; - } - return "interceptionBehavior:" + this.TypeName + ":" + this.Name; - } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Guard.ArgumentNotNull(writer, "writer"); - writer.WriteAttributeIfNotEmpty(NamePropertyName, this.Name); - writer.WriteAttributeIfNotEmpty(TypeNamePropertyName, this.TypeName); - if (this.IsDefaultForType) - { - writer.WriteAttributeString(IsDefaultForTypePropertyName, this.IsDefaultForType.ToString()); - } - } - - /// - /// Return the set of s that are needed - /// to configure the container according to this configuration element. - /// - /// Container that is being configured. - /// Type that is being registered. - /// Type that is being mapped to. - /// Name this registration is under. - /// One or more objects that should be - /// applied to the container registration. - public override IEnumerable GetInjectionMembers(IUnityContainer container, Type fromType, Type toType, string name) - { - Type behaviorType = TypeResolver.ResolveTypeWithDefault(this.TypeName, typeof(IInterceptionBehavior)); - this.GuardBehaviorType(behaviorType); - - if (this.IsDefaultForType) - { - return new[] { new DefaultInterceptionBehavior(behaviorType, this.Name) }; - } - return new[] { new InterceptionBehavior(behaviorType, this.Name) }; - } - - private void GuardHasRequiredAttributes() - { - if (string.IsNullOrEmpty(this.TypeName) && - string.IsNullOrEmpty(this.Name)) - { - throw new ConfigurationErrorsException(Resources.MustHaveAtLeastOneBehaviorAttribute); - } - } - - private void GuardBehaviorType(Type resolvedType) - { - if (!typeof(IInterceptionBehavior).IsAssignableFrom(resolvedType)) - { - throw new InvalidOperationException( - string.Format(CultureInfo.CurrentCulture, - Resources.ExceptionResolvedTypeNotCompatible, - this.TypeName, resolvedType.FullName, typeof(IInterceptionBehavior).FullName)); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptionConfigurationExtension.cs b/source/Unity.Interception.Configuration/Src/InterceptionConfigurationExtension.cs deleted file mode 100644 index 4597c546..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptionConfigurationExtension.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Configuration; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Section extension class used to add the elements needed to configure - /// Unity interception to the configuration schema. - /// - public class InterceptionConfigurationExtension : SectionExtension - { - /// - /// Add the extensions to the section via the context. - /// - /// Context object that can be used to add elements and aliases. - [System.Security.SecuritySafeCritical] - public override void AddExtensions(SectionExtensionContext context) - { - AddAliases(context); - - AddElements(context); - } - - private static void AddElements(SectionExtensionContext context) - { - context.AddElement("interception"); - context.AddElement("interceptor"); - context.AddElement("addInterface"); - context.AddElement("interceptionBehavior"); - context.AddElement("policyInjection"); - context.AddElement("interceptors"); - } - - [System.Security.SecurityCritical] - private static void AddAliases(SectionExtensionContext context) - { - context.AddAlias("Interception"); - context.AddAlias("IMatchingRule"); - context.AddAlias("ICallHandler"); - - context.AddAlias("AssemblyMatchingRule"); - context.AddAlias("CustomAttributeMatchingRule"); - context.AddAlias("MemberNameMatchingRule"); - context.AddAlias("NamespaceMatchingRule"); - context.AddAlias("ParameterTypeMatchingRule"); - context.AddAlias("PropertyMatchingRule"); - context.AddAlias("TagAttributeMatchingRule"); - context.AddAlias("TypeMatchingRule"); - - context.AddAlias("VirtualMethodInterceptor"); - context.AddAlias("InterfaceInterceptor"); - context.AddAlias("TransparentProxyInterceptor"); - - context.AddAlias("IInterceptionBehavior"); - context.AddAlias("PolicyInjectionBehavior"); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptionElement.cs b/source/Unity.Interception.Configuration/Src/InterceptionElement.cs deleted file mode 100644 index ab647db5..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptionElement.cs +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using System.Xml; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A configuration element that contains the top-level container configuration - /// information for interception - handler policies and global interceptor definitions. - /// - public class InterceptionElement : ContainerConfiguringElement - { - private const string PoliciesPropertyName = "policies"; - - private static readonly UnknownElementHandlerMap UnknownElementHandlerMap = - new UnknownElementHandlerMap - { - { "policy", (ie, xr) => ie.ReadUnwrappedElement(xr, ie.Policies) }, - }; - - /// - /// Policies defined for this container. - /// - [ConfigurationProperty(PoliciesPropertyName)] - public PolicyElementCollection Policies - { - get { return (PolicyElementCollection)base[PoliciesPropertyName]; } - } - - /// - /// Gets a value indicating whether an unknown element is encountered during deserialization. - /// - /// - /// true when an unknown element is encountered while deserializing; otherwise, false. - /// - /// The name of the unknown subelement. - /// The being used for deserialization. - /// The element identified by is locked. - /// - or - - /// One or more of the element's attributes is locked. - /// - or - - /// is unrecognized, or the element has an unrecognized attribute. - /// - or - - /// The element has a Boolean attribute with an invalid value. - /// - or - - /// An attempt was made to deserialize a property more than once. - /// - or - - /// An attempt was made to deserialize a property that is not a valid member of the element. - /// - or - - /// The element cannot contain a CDATA or text element. - /// - protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader) - { - return UnknownElementHandlerMap.ProcessElement(this, elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - public override void SerializeContent(XmlWriter writer) - { - foreach (var policy in this.Policies) - { - writer.WriteElement("policy", policy.SerializeContent); - } - } - - /// - /// Apply this element's configuration to the given . - /// - /// Container to configure. - protected override void ConfigureContainer(IUnityContainer container) - { - this.Policies.ForEach(policy => policy.ConfigureContainer(container)); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptorElement.cs b/source/Unity.Interception.Configuration/Src/InterceptorElement.cs deleted file mode 100644 index ccdd2fea..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptorElement.cs +++ /dev/null @@ -1,135 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading; -using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Configuration element that lets you configure - /// what interceptor to use for a type. - /// - public class InterceptorElement : InjectionMemberElement - { - private const string TypeNamePropertyName = "type"; - private const string NamePropertyName = "name"; - private const string IsDefaultForTypePropertyName = "isDefaultForType"; - - private static int elementCount; - private readonly int elementNum; - - /// - /// Initialize a new . - /// - public InterceptorElement() - { - this.elementNum = Interlocked.Increment(ref elementCount); - } - - /// - /// Type name for the interceptor to apply. - /// - [ConfigurationProperty(TypeNamePropertyName)] - public string TypeName - { - get { return (string)base[TypeNamePropertyName]; } - set { base[TypeNamePropertyName] = value; } - } - - /// - /// Name to use when resolving interceptors from the container. - /// - [ConfigurationProperty(NamePropertyName, IsRequired = false)] - public string Name - { - get { return (string)base[NamePropertyName]; } - set { base[NamePropertyName] = value; } - } - - /// - /// Should this interceptor be registered as the default for the contained - /// type, or only for this particular type/name pair? - /// - [ConfigurationProperty(IsDefaultForTypePropertyName, IsRequired = false, DefaultValue = false)] - public bool IsDefaultForType - { - get { return (bool)base[IsDefaultForTypePropertyName]; } - set { base[IsDefaultForTypePropertyName] = value; } - } - - /// - /// Each element must have a unique key, which is generated by the subclasses. - /// - public override string Key - { - get { return string.Format(CultureInfo.CurrentCulture, "interceptor:{0}", this.elementNum); } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Guard.ArgumentNotNull(writer, "writer"); - writer.WriteAttributeString(TypeNamePropertyName, this.TypeName); - writer.WriteAttributeIfNotEmpty(NamePropertyName, this.Name); - if (this.IsDefaultForType) - { - writer.WriteAttributeString(IsDefaultForTypePropertyName, this.IsDefaultForType.ToString()); - } - } - - /// - /// Return the set of s that are needed - /// to configure the container according to this configuration element. - /// - /// Container that is being configured. - /// Type that is being registered. - /// Type that is being mapped to. - /// Name this registration is under. - /// One or more objects that should be - /// applied to the container registration. - public override IEnumerable GetInjectionMembers(IUnityContainer container, Type fromType, Type toType, string name) - { - Type interceptorType = this.GuardTypeIsInterceptor(TypeResolver.ResolveType(this.TypeName)); - - if (this.IsDefaultForType) - { - return new[] { new DefaultInterceptor(interceptorType, this.Name) }; - } - else - { - return new[] { new Interceptor(interceptorType, this.Name) }; - } - } - - private Type GuardTypeIsInterceptor(Type resolvedType) - { - if (!typeof(IInterceptor).IsAssignableFrom(resolvedType)) - { - throw new InvalidOperationException( - string.Format(CultureInfo.CurrentCulture, - Resources.ExceptionResolvedTypeNotCompatible, - this.TypeName, resolvedType.FullName, typeof(IInterceptor).FullName)); - } - - return resolvedType; - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptorRegistrationElement.cs b/source/Unity.Interception.Configuration/Src/InterceptorRegistrationElement.cs deleted file mode 100644 index fc6511e9..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptorRegistrationElement.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using System.Globalization; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Base class for the default and key elements that can occur - /// inside the <interceptor> element. - /// - public abstract class InterceptorRegistrationElement : DeserializableConfigurationElement - { - private const string TypeNamePropertyName = "type"; - - /// - /// Type name that this interceptor will be registered for. - /// - [ConfigurationProperty(TypeNamePropertyName, IsRequired = true, IsKey = true)] - public string TypeName - { - get { return (string)base[TypeNamePropertyName]; } - set { base[TypeNamePropertyName] = value; } - } - - internal abstract string Key - { - get; - } - - internal abstract string ElementName - { - get; - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(System.Xml.XmlWriter writer) - { - Guard.ArgumentNotNull(writer, "writer"); - writer.WriteAttributeString(TypeNamePropertyName, this.TypeName); - } - - /// - /// Actually register the interceptor against this type. - /// - /// Container to configure. - /// interceptor to register. - internal abstract void RegisterInterceptor(IUnityContainer container, IInterceptor interceptor); - - /// - /// Return the type object that is resolved from the property. - /// - /// The type object. - protected Type ResolvedType - { - get { return TypeResolver.ResolveType(this.TypeName); } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptorRegistrationElementCollection.cs b/source/Unity.Interception.Configuration/Src/InterceptorRegistrationElementCollection.cs deleted file mode 100644 index 9b703433..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptorRegistrationElementCollection.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A collection of objects as shown - /// in configuration. - /// - [ConfigurationCollection(typeof(InterceptorRegistrationElement))] - public class InterceptorRegistrationElementCollection : DeserializableConfigurationElementCollectionBase - { - /// - /// When overridden in a derived class, creates a new . - /// - /// - /// A new . - /// - protected override ConfigurationElement CreateNewElement() - { - throw new InvalidOperationException(Resources.CannotCreateInterceptorRegistrationElement); - } - - /// - /// Gets the element key for a specified configuration element when overridden in a derived class. - /// - /// - /// An that acts as the key for the specified . - /// - /// The to return the key for. - protected override object GetElementKey(ConfigurationElement element) - { - return ((InterceptorRegistrationElement)element).Key; - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptorsElement.cs b/source/Unity.Interception.Configuration/Src/InterceptorsElement.cs deleted file mode 100644 index 82c28a5b..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptorsElement.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Text; -using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Configuration element that provides a top-level element for - /// configuration interceptors for types in a container. - /// - public class InterceptorsElement : ContainerConfiguringElement - { - private const string InterceptorsPropertyName = ""; - - /// - /// The various child elements that are contained in this element. - /// - [ConfigurationProperty(InterceptorsPropertyName, IsDefaultCollection = true)] - public InterceptorsInterceptorElementCollection Interceptors - { - get { return (InterceptorsInterceptorElementCollection)base[InterceptorsPropertyName]; } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - public override void SerializeContent(XmlWriter writer) - { - foreach (var interceptorElement in this.Interceptors) - { - writer.WriteElement("interceptor", interceptorElement.SerializeContent); - } - } - - /// - /// Apply this element's configuration to the given . - /// - /// Container to configure. - protected override void ConfigureContainer(IUnityContainer container) - { - foreach (var interceptorElement in this.Interceptors) - { - interceptorElement.ConfigureContainer(container); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptorsInterceptorElement.cs b/source/Unity.Interception.Configuration/Src/InterceptorsInterceptorElement.cs deleted file mode 100644 index 94329e4c..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptorsInterceptorElement.cs +++ /dev/null @@ -1,178 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.ComponentModel; -using System.Configuration; -using System.Globalization; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Configuration element that represents the configuration for - /// a specific interceptor, as presented in the config file inside - /// the <interceptors> element. - /// - public class InterceptorsInterceptorElement : DeserializableConfigurationElement - { - private const string TypeNamePropertyName = "type"; - private const string RegistrationsPropertyName = "registrations"; - private const string ValuePropertyName = "value"; - private const string TypeConverterTypeNamePropertyName = "typeConverter"; - - private static readonly UnknownElementHandlerMap UnknownElementHandlerMap = - new UnknownElementHandlerMap - { - { "default", (iie, xr) => iie.ReadElementByType(xr, typeof(DefaultElement), iie.Registrations) }, - { "key", (iie, xr) => iie.ReadElementByType(xr, typeof(KeyElement), iie.Registrations) } - }; - - /// - /// Type of interceptor to configure. - /// - [ConfigurationProperty(TypeNamePropertyName, IsRequired = true, IsKey = true)] - public string TypeName - { - get { return (string)base[TypeNamePropertyName]; } - set { base[TypeNamePropertyName] = value; } - } - - /// - /// The types that this interceptor will be registered against. - /// - [ConfigurationProperty(RegistrationsPropertyName)] - public InterceptorRegistrationElementCollection Registrations - { - get { return (InterceptorRegistrationElementCollection)base[RegistrationsPropertyName]; } - } - - /// - /// Any value passed to the type converter. - /// - [ConfigurationProperty(ValuePropertyName, IsRequired = false)] - public string Value - { - get { return (string)base[ValuePropertyName]; } - set { base[ValuePropertyName] = value; } - } - - /// - /// Type converter to use to create the interceptor, if any. - /// - [ConfigurationProperty(TypeConverterTypeNamePropertyName, IsRequired = false)] - public string TypeConverterTypeName - { - get { return (string)base[TypeConverterTypeNamePropertyName]; } - set { base[TypeConverterTypeNamePropertyName] = value; } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(writer, "writer"); - - writer.WriteAttributeString(TypeNamePropertyName, this.TypeName); - writer.WriteAttributeIfNotEmpty(ValuePropertyName, this.Value); - writer.WriteAttributeIfNotEmpty(TypeConverterTypeNamePropertyName, this.TypeConverterTypeName); - - foreach (var registration in this.Registrations) - { - writer.WriteElement(registration.ElementName, registration.SerializeContent); - } - } - - internal void ConfigureContainer(IUnityContainer container) - { - var interceptor = this.CreateInterceptor(); - - foreach (var registration in this.Registrations) - { - registration.RegisterInterceptor(container, interceptor); - } - } - - /// - /// Gets a value indicating whether an unknown element is encountered during deserialization. - /// - /// - /// true when an unknown element is encountered while deserializing; otherwise, false. - /// - /// The name of the unknown subelement. - /// The being used for deserialization. - /// The element identified by is locked. - /// - or - - /// One or more of the element's attributes is locked. - /// - or - - /// is unrecognized, or the element has an unrecognized attribute. - /// - or - - /// The element has a Boolean attribute with an invalid value. - /// - or - - /// An attempt was made to deserialize a property more than once. - /// - or - - /// An attempt was made to deserialize a property that is not a valid member of the element. - /// - or - - /// The element cannot contain a CDATA or text element. - /// - protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader) - { - return UnknownElementHandlerMap.ProcessElement(this, elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - - private void GuardIsValidInterceptorType(Type type) - { - this.GuardTypesCompatible(type); - } - - private void GuardIsValidTypeConverterType(Type type) - { - this.GuardTypesCompatible(type); - } - - private void GuardTypesCompatible(Type type) - { - if (!typeof(TTargetType).IsAssignableFrom(type)) - { - throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, - Resources.ExceptionResolvedTypeNotCompatible, - this.TypeName, type.FullName, typeof(TTargetType).FullName)); - } - } - - private IInterceptor CreateInterceptor() - { - if (!string.IsNullOrEmpty(this.TypeConverterTypeName)) - { - return this.CreateInterceptorWithTypeConverter(); - } - return this.CreateInterceptorWithNew(); - } - - private IInterceptor CreateInterceptorWithNew() - { - Type interceptorType = TypeResolver.ResolveType(this.TypeName); - this.GuardIsValidInterceptorType(interceptorType); - - return (IInterceptor)Activator.CreateInstance(interceptorType); - } - - private IInterceptor CreateInterceptorWithTypeConverter() - { - Type converterType = TypeResolver.ResolveType(this.TypeConverterTypeName); - this.GuardIsValidTypeConverterType(converterType); - - var converter = (TypeConverter)Activator.CreateInstance(converterType); - return (IInterceptor)converter.ConvertFromInvariantString(this.Value); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/InterceptorsInterceptorElementCollection.cs b/source/Unity.Interception.Configuration/Src/InterceptorsInterceptorElementCollection.cs deleted file mode 100644 index 4ea39180..00000000 --- a/source/Unity.Interception.Configuration/Src/InterceptorsInterceptorElementCollection.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A collection of objects - /// as stored in configuration. - /// - [ConfigurationCollection(typeof(InterceptorsInterceptorElement), AddItemName = "interceptor")] - public class InterceptorsInterceptorElementCollection : - DeserializableConfigurationElementCollection - { - /// - /// Gets the element key for a specified configuration element when overridden in a derived class. - /// - /// - /// An that acts as the key for the specified . - /// - /// The to return the key for. - protected override object GetElementKey(ConfigurationElement element) - { - return ((InterceptorsInterceptorElement)element).TypeName; - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/KeyElement.cs b/source/Unity.Interception.Configuration/Src/KeyElement.cs deleted file mode 100644 index 2da2ad9e..00000000 --- a/source/Unity.Interception.Configuration/Src/KeyElement.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// The <key> element that occurs inside an <interceptor> element - /// - public class KeyElement : InterceptorRegistrationElement - { - private const string NamePropertyName = "name"; - - /// - /// Name registration should be under. To register under the default, leave blank. - /// - [ConfigurationProperty(NamePropertyName, IsRequired = false)] - public string Name - { - get { return (string)base[NamePropertyName]; } - set { base[NamePropertyName] = value; } - } - - internal override string Key - { - get { return "key:" + this.TypeName + ":" + this.Name; } - } - - internal override string ElementName - { - get { return "key"; } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - public override void SerializeContent(XmlWriter writer) - { - base.SerializeContent(writer); - writer.WriteAttributeIfNotEmpty(NamePropertyName, this.Name); - } - - /// - /// Actually register the interceptor against this type. - /// - /// Container to configure. - /// interceptor to register. - internal override void RegisterInterceptor(IUnityContainer container, IInterceptor interceptor) - { - var typeInterceptor = interceptor as ITypeInterceptor; - if (typeInterceptor != null) - { - container.Configure().SetInterceptorFor( - this.ResolvedType, this.Name, - typeInterceptor); - } - else - { - container.Configure().SetInterceptorFor( - this.ResolvedType, this.Name, - (IInstanceInterceptor)interceptor); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/MatchingRuleElement.cs b/source/Unity.Interception.Configuration/Src/MatchingRuleElement.cs deleted file mode 100644 index 2ab697bb..00000000 --- a/source/Unity.Interception.Configuration/Src/MatchingRuleElement.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A configuration element representing a matching rule. - /// - public class MatchingRuleElement : PolicyChildElement - { - internal void Configure(IUnityContainer container, PolicyDefinition policyDefinition) - { - if (string.IsNullOrEmpty(this.TypeName)) - { - policyDefinition.AddMatchingRule(this.Name); - } - else - { - Type matchingRuleType = TypeResolver.ResolveType(TypeName); - LifetimeManager lifetime = Lifetime.CreateLifetimeManager(); - IEnumerable injectionMembers = - Injection.SelectMany( - element => element.GetInjectionMembers(container, typeof(IMatchingRule), matchingRuleType, Name)); - - policyDefinition.AddMatchingRule(matchingRuleType, lifetime, injectionMembers.ToArray()); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/MatchingRuleElementCollection.cs b/source/Unity.Interception.Configuration/Src/MatchingRuleElementCollection.cs deleted file mode 100644 index 52c1c0bb..00000000 --- a/source/Unity.Interception.Configuration/Src/MatchingRuleElementCollection.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A collection of s for configuration. - /// - [ConfigurationCollection(typeof(MatchingRuleElement))] - public class MatchingRuleElementCollection : DeserializableConfigurationElementCollection - { - private static readonly UnknownElementHandlerMap UnknownElementHandlerMap - = new UnknownElementHandlerMap - { - { "matchingRule", (mrec, xr) => mrec.ReadUnwrappedElement(xr, mrec) } - }; - - /// - /// Retrieve a matching rule element from the collection by name. - /// - /// Name to look up. - /// The rule, or null if not in the collection. - public new MatchingRuleElement this[string name] - { - get { return (MatchingRuleElement)BaseGet(name); } - } - - /// - /// Gets the element key for a specified configuration element when overridden in a derived class. - /// - /// - /// An that acts as the key for the specified . - /// - /// The to return the key for. - protected override object GetElementKey(ConfigurationElement element) - { - return ((MatchingRuleElement)element).Name; - } - - /// - /// Causes the configuration system to throw an exception. - /// - /// - /// true if the unrecognized element was deserialized successfully; otherwise, false. The default is false. - /// - /// The name of the unrecognized element. - /// An input stream that reads XML from the configuration file. - /// The element specified in is the <clear> element. - /// starts with the reserved prefix "config" or "lock". - protected override bool OnDeserializeUnrecognizedElement(string elementName, System.Xml.XmlReader reader) - { - return UnknownElementHandlerMap.ProcessElement(this, elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/Migrated rules for Unity.Interception.Configuration.ruleset b/source/Unity.Interception.Configuration/Src/Migrated rules for Unity.Interception.Configuration.ruleset deleted file mode 100644 index e48e521a..00000000 --- a/source/Unity.Interception.Configuration/Src/Migrated rules for Unity.Interception.Configuration.ruleset +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/source/Unity.Interception.Configuration/Src/PolicyChildElement.cs b/source/Unity.Interception.Configuration/Src/PolicyChildElement.cs deleted file mode 100644 index 009eeadd..00000000 --- a/source/Unity.Interception.Configuration/Src/PolicyChildElement.cs +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using System.Globalization; -using System.Xml; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Base class for the two children of the Policy element: - /// MatchingRuleElement and CallHandlerElement. - /// - /// - /// - /// These configuration elements have a required "name" attribute, an optional "type" attribute, and - /// optional child elements <lifetime> and <injection> - /// - /// - /// Elements without a value for the type attribute can only have a value for the name attribute, and - /// indicate that the represented handler or rule is configured elsewhere and that a reference to - /// the given name must be added to the policy to be resolved, while elements with a value for the type - /// attribute indicate how the represented handler or rule should be built and can optionally specify - /// lifetime management and injection configuration. - /// - /// - /// This element is similar to the , except that it does not provide - /// an extension point for arbitrary configuration. - /// - /// - public abstract class PolicyChildElement : DeserializableConfigurationElement - { - private const string InjectionPropertyName = ""; - private const string LifetimePropertyName = "lifetime"; - private const string NamePropertyName = "name"; - private const string TypeNamePropertyName = "type"; - - /// - /// Name of this item - /// - [ConfigurationProperty(NamePropertyName, IsRequired = true)] - public string Name - { - get { return (string)base[NamePropertyName]; } - set { base[NamePropertyName] = value; } - } - - /// - /// Type that implements this matching rule or call handler. - /// - [ConfigurationProperty(TypeNamePropertyName, IsRequired = false)] - public string TypeName - { - get { return (string)base[TypeNamePropertyName]; } - set { base[TypeNamePropertyName] = value; } - } - - /// - /// Injection members that control how this item is created. - /// - [ConfigurationProperty(InjectionPropertyName, IsDefaultCollection = true)] - public InjectionMemberElementCollection Injection - { - get { return (InjectionMemberElementCollection)base[InjectionPropertyName]; } - } - - /// - /// Lifetime manager for this item. - /// - [ConfigurationProperty(LifetimePropertyName, IsRequired = false, DefaultValue = null)] - public LifetimeElement Lifetime - { - get { return (LifetimeElement)base[LifetimePropertyName]; } - set { base[LifetimePropertyName] = value; } - } - - /// - /// Reads XML from the configuration file. - /// - /// The that reads from the configuration file. - /// true to serialize only the collection key properties; otherwise, false. - /// The element to read is locked. - /// - or - - /// An attribute of the current node is not recognized. - /// - or - - /// The lock status of the current node cannot be determined. - /// - protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey) - { - base.DeserializeElement(reader, serializeCollectionKey); - - if (string.IsNullOrEmpty(this.TypeName) && this.LifetimeIsPresent()) - { - throw new ConfigurationErrorsException( - string.Format( - CultureInfo.CurrentCulture, - Resources.CannotHaveLifetimeWithoutTypeName, - this.Name), - reader); - } - - if (string.IsNullOrEmpty(this.TypeName) && this.Injection.Count > 0) - { - throw new ConfigurationErrorsException( - string.Format( - CultureInfo.CurrentCulture, - Resources.CannotHaveInjectionWithoutTypeName, - this.Name), - reader); - } - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(writer, "writer"); - - writer.WriteAttributeString(NamePropertyName, this.Name); - writer.WriteAttributeIfNotEmpty(TypeNamePropertyName, this.TypeName); - if (this.LifetimeIsPresent()) - { - writer.WriteElement("lifetime", this.Lifetime.SerializeContent); - } - foreach (var injectionElement in this.Injection) - { - writer.WriteElement(injectionElement.ElementName, injectionElement.SerializeContent); - } - } - - private bool LifetimeIsPresent() - { - return !string.IsNullOrEmpty(this.Lifetime.TypeName) || - !string.IsNullOrEmpty(this.Lifetime.TypeConverterTypeName) || - !string.IsNullOrEmpty(this.Lifetime.Value); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/PolicyElement.cs b/source/Unity.Interception.Configuration/Src/PolicyElement.cs deleted file mode 100644 index 77a69087..00000000 --- a/source/Unity.Interception.Configuration/Src/PolicyElement.cs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using System.Xml; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// Configuration element for building up an interception policy. - /// - public class PolicyElement : DeserializableConfigurationElement - { - private const string CallHandlersPropertyName = "callHandlers"; - private const string MatchingRulesPropertyName = "matchingRules"; - private const string NamePropertyName = "name"; - - private static readonly UnknownElementHandlerMap UnknownElementHandlerMap = - new UnknownElementHandlerMap - { - { "matchingRule", (pe, xr) => pe.ReadUnwrappedElement(xr, pe.MatchingRules) }, - { "callHandler", (pe, xr) => pe.ReadUnwrappedElement(xr, pe.CallHandlers) } - }; - - /// - /// Name of this policy. - /// - [ConfigurationProperty(NamePropertyName, IsRequired = true)] - public string Name - { - get { return (string)base[NamePropertyName]; } - set { base[NamePropertyName] = value; } - } - - /// - /// Matching rules for this policy. - /// - [ConfigurationProperty(MatchingRulesPropertyName)] - public MatchingRuleElementCollection MatchingRules - { - get { return (MatchingRuleElementCollection)base[MatchingRulesPropertyName]; } - } - - /// - /// Call handlers for this policy. - /// - [ConfigurationProperty(CallHandlersPropertyName)] - public CallHandlerElementCollection CallHandlers - { - get { return (CallHandlerElementCollection)base[CallHandlersPropertyName]; } - } - - /// - /// Gets a value indicating whether an unknown element is encountered during deserialization. - /// - /// - /// true when an unknown element is encountered while deserializing; otherwise, false. - /// - /// The name of the unknown subelement. - /// The being used for deserialization. - /// The element identified by is locked. - /// - or - - /// One or more of the element's attributes is locked. - /// - or - - /// is unrecognized, or the element has an unrecognized attribute. - /// - or - - /// The element has a Boolean attribute with an invalid value. - /// - or - - /// An attempt was made to deserialize a property more than once. - /// - or - - /// An attempt was made to deserialize a property that is not a valid member of the element. - /// - or - - /// The element cannot contain a CDATA or text element. - /// - protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader) - { - return UnknownElementHandlerMap.ProcessElement(this, elementName, reader) || - base.OnDeserializeUnrecognizedElement(elementName, reader); - } - - /// - /// Write the contents of this element to the given . - /// - /// The caller of this method has already written the start element tag before - /// calling this method, so deriving classes only need to write the element content, not - /// the start or end tags. - /// Writer to send XML content to. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void SerializeContent(XmlWriter writer) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(writer, "writer"); - - writer.WriteAttributeString(NamePropertyName, this.Name); - foreach (var matchingRuleElement in this.MatchingRules) - { - writer.WriteElement("matchingRule", matchingRuleElement.SerializeContent); - } - foreach (var callHandlerElement in this.CallHandlers) - { - writer.WriteElement("callHandler", callHandlerElement.SerializeContent); - } - } - - internal void ConfigureContainer(IUnityContainer container) - { - PolicyDefinition policyDefinition = container.Configure().AddPolicy(this.Name); - foreach (var matchingRuleElement in this.MatchingRules) - { - matchingRuleElement.Configure(container, policyDefinition); - } - - foreach (var callHandlerElement in this.CallHandlers) - { - callHandlerElement.Configure(container, policyDefinition); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/PolicyElementCollection.cs b/source/Unity.Interception.Configuration/Src/PolicyElementCollection.cs deleted file mode 100644 index f153bea1..00000000 --- a/source/Unity.Interception.Configuration/Src/PolicyElementCollection.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Configuration; -using Microsoft.Practices.Unity.Configuration.ConfigurationHelpers; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A collection of in the configuration. - /// - [ConfigurationCollection(typeof(PolicyElement))] - public class PolicyElementCollection : DeserializableConfigurationElementCollection - { - /// - /// Indexer to retrieve policy element objects by name. - /// - /// Name of policy to get. - /// The element. - public new PolicyElement this[string policyName] - { - get { return (PolicyElement)BaseGet(policyName); } - } - - /// - /// Gets the element key for a specified configuration element when overridden in a derived class. - /// - /// - /// An that acts as the key for the specified . - /// - /// The to return the key for. - protected override object GetElementKey(ConfigurationElement element) - { - return ((PolicyElement)element).Name; - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/PolicyInjectionElement.cs b/source/Unity.Interception.Configuration/Src/PolicyInjectionElement.cs deleted file mode 100644 index f2389b90..00000000 --- a/source/Unity.Interception.Configuration/Src/PolicyInjectionElement.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.Unity.Configuration; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration -{ - /// - /// A shortcut element to enable the policy injection behavior. - /// - public class PolicyInjectionElement : InjectionMemberElement - { - /// - /// Each element must have a unique key, which is generated by the subclasses. - /// - public override string Key - { - get { return "policyInjection"; } - } - - /// - /// Return the set of s that are needed - /// to configure the container according to this configuration element. - /// - /// Container that is being configured. - /// Type that is being registered. - /// Type that is being mapped to. - /// Name this registration is under. - /// One or more objects that should be - /// applied to the container registration. - public override IEnumerable GetInjectionMembers(IUnityContainer container, Type fromType, - Type toType, string name) - { - var behaviorElement = new InterceptionBehaviorElement - { - TypeName = typeof(PolicyInjectionBehavior).AssemblyQualifiedName - }; - - return behaviorElement.GetInjectionMembers(container, fromType, toType, name); - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/Properties/AssemblyInfo.cs b/source/Unity.Interception.Configuration/Src/Properties/AssemblyInfo.cs deleted file mode 100644 index 56f242d7..00000000 --- a/source/Unity.Interception.Configuration/Src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microsoft.Practices.Unity.InterceptionExtension.Configuration")] -[assembly: AssemblyDescription("Interception configuration support for the Unity Application Block")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -[assembly: NeutralResourcesLanguage("en")] diff --git a/source/Unity.Interception.Configuration/Src/Properties/Resources.Designer.cs b/source/Unity.Interception.Configuration/Src/Properties/Resources.Designer.cs deleted file mode 100644 index 6ec6ea1c..00000000 --- a/source/Unity.Interception.Configuration/Src/Properties/Resources.Designer.cs +++ /dev/null @@ -1,136 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17379 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Practices.Unity.InterceptionExtension.Configuration.Properties.Resource" + - "s", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to The abstract type InterceptorRegistrationElement cannot be created. Please create a concrete instance.. - /// - internal static string CannotCreateInterceptorRegistrationElement { - get { - return ResourceManager.GetString("CannotCreateInterceptorRegistrationElement", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The <injection/> element is not allowed on element named '{0}' because it doesn't have a type attribute.. - /// - internal static string CannotHaveInjectionWithoutTypeName { - get { - return ResourceManager.GetString("CannotHaveInjectionWithoutTypeName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The <lifetime/> element is not allowed on element named '{0}' because it doesn't have a type attribute.. - /// - internal static string CannotHaveLifetimeWithoutTypeName { - get { - return ResourceManager.GetString("CannotHaveLifetimeWithoutTypeName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type name or alias {0} could not be resolved. Please check your configuration file and verify this type name.. - /// - internal static string CouldNotResolveType { - get { - return ResourceManager.GetString("CouldNotResolveType", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cannot create instance of type {0} with a default constructor.. - /// - internal static string ExceptionCannotCreateInstance { - get { - return ResourceManager.GetString("ExceptionCannotCreateInstance", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type name {0} resolved to type {1} is not compatible with the required type {2}.. - /// - internal static string ExceptionResolvedTypeNotCompatible { - get { - return ResourceManager.GetString("ExceptionResolvedTypeNotCompatible", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} could not be resolved to a valid type. Please double check your configuration.. - /// - internal static string InvalidInterceptorType { - get { - return ResourceManager.GetString("InvalidInterceptorType", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The interception behavior element must have at least one of the 'name' or 'type' attributes.. - /// - internal static string MustHaveAtLeastOneBehaviorAttribute { - get { - return ResourceManager.GetString("MustHaveAtLeastOneBehaviorAttribute", resourceCulture); - } - } - } -} diff --git a/source/Unity.Interception.Configuration/Src/Properties/Resources.resx b/source/Unity.Interception.Configuration/Src/Properties/Resources.resx deleted file mode 100644 index e5cd7686..00000000 --- a/source/Unity.Interception.Configuration/Src/Properties/Resources.resx +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - The abstract type InterceptorRegistrationElement cannot be created. Please create a concrete instance. - - - The <injection/> element is not allowed on element named '{0}' because it doesn't have a type attribute. - - - The <lifetime/> element is not allowed on element named '{0}' because it doesn't have a type attribute. - - - The type name or alias {0} could not be resolved. Please check your configuration file and verify this type name. - - - Cannot create instance of type {0} with a default constructor. - - - The type name {0} resolved to type {1} is not compatible with the required type {2}. - - - The type {0} could not be resolved to a valid type. Please double check your configuration. - - - The interception behavior element must have at least one of the 'name' or 'type' attributes. - - \ No newline at end of file diff --git a/source/Unity.Interception.Configuration/Src/Unity.Interception.Configuration.csproj b/source/Unity.Interception.Configuration/Src/Unity.Interception.Configuration.csproj deleted file mode 100644 index ae8b46b5..00000000 --- a/source/Unity.Interception.Configuration/Src/Unity.Interception.Configuration.csproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {80F7399F-B221-465F-97C9-4B9FC0E2F67F} - Library - Properties - Microsoft.Practices.Unity.InterceptionExtension.Configuration - Microsoft.Practices.Unity.Interception.Configuration - - - 3.5 - - - v4.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - true - full - false - ..\..\bin\Desktop\Debug - DEBUG;TRACE - prompt - 4 - true - - - ..\..\bin\Desktop\Debug\Microsoft.Practices.Unity.Interception.Configuration.xml - true - ..\..\Unity.ruleset - false - - - pdbonly - true - ..\..\bin\Desktop\Release - TRACE - prompt - 4 - ..\..\bin\Desktop\Release\Microsoft.Practices.Unity.Interception.Configuration.xml - true - ..\..\Unity.ruleset - false - - - - False - ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - - 3.5 - - - - - - - GlobalAssemblyInfo.2010.cs - - - GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - Unity.licenseheader - - - - - - - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE} - Unity.Configuration - - - {F8186B23-B0E1-4646-B5F3-14357841E2BA} - Unity.Interception - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - \ No newline at end of file diff --git a/source/Unity.Interception.Configuration/Src/packages.config b/source/Unity.Interception.Configuration/Src/packages.config deleted file mode 100644 index 50e40955..00000000 --- a/source/Unity.Interception.Configuration/Src/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/ConfigFileLocator.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/ConfigFileLocator.cs deleted file mode 100644 index ec92c574..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/ConfigFileLocator.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles -{ - // A dummy class used to locate our configuration files. - public class ConfigFileLocator - { - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/InterceptionInjectionMembers.config b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/InterceptionInjectionMembers.config deleted file mode 100644 index a0075cbb..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/InterceptionInjectionMembers.config +++ /dev/null @@ -1,202 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/InterceptorsThroughContainerElementExtension.config b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/InterceptorsThroughContainerElementExtension.config deleted file mode 100644 index 121b561b..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/InterceptorsThroughContainerElementExtension.config +++ /dev/null @@ -1,94 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/Policies.config b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/Policies.config deleted file mode 100644 index b131c83e..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/Policies.config +++ /dev/null @@ -1,330 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/SectionExtensionBasics.config b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/SectionExtensionBasics.config deleted file mode 100644 index cb26c5df..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/ConfigFiles/SectionExtensionBasics.config +++ /dev/null @@ -1,10 +0,0 @@ - - - -
- - - - - - diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/Properties/AssemblyInfo.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/Properties/AssemblyInfo.cs deleted file mode 100644 index 55d10691..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Tests.Unity.Interception.Configuration")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Tests.Unity.Interception.Configuration")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011,2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM componenets. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d82433dd-0ff9-4462-b9f4-d6600757e5f6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/SerializationFixture.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/SerializationFixture.cs deleted file mode 100644 index 2a3f4e45..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/SerializationFixture.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.TestSupport.Configuration; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - /// - /// Base class for test fixtures that are testing serialization of the - /// configuration sections. - /// - public abstract class SerializationFixture - { - protected UnityConfigurationSection SerializeAndLoadConfig(string filename, Action containerInitializer) - { - var serializer = new ConfigSerializer(filename); - var section = new UnityConfigurationSection(); - section.SectionExtensions.Add(new SectionExtensionElement() - { - TypeName = typeof(InterceptionConfigurationExtension).AssemblyQualifiedName - }); - - var container = new ContainerElement(); - section.Containers.Add(container); - - containerInitializer(container); - - serializer.Save("unity", section); - - return (UnityConfigurationSection)serializer.Load().GetSection("unity"); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/Interceptable.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/Interceptable.cs deleted file mode 100644 index 7c8d5536..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/Interceptable.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.TestObjects -{ - public class Interceptable : MarshalByRefObject - { - public virtual int DoSomething() - { - return 10; - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/MyTransparentProxyInterceptorTypeConverter.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/MyTransparentProxyInterceptorTypeConverter.cs deleted file mode 100644 index d0a3e550..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/MyTransparentProxyInterceptorTypeConverter.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.ComponentModel; -using System.Globalization; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.TestObjects -{ - public class MyTransparentProxyInterceptorTypeConverter : TypeConverter - { - public static string SourceValue; - - public override object ConvertFrom( - ITypeDescriptorContext context, - CultureInfo culture, - object value) - { - SourceValue = (string)value; - return new TransparentProxyInterceptor(); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/WrappableWithVirtualMethods.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/WrappableWithVirtualMethods.cs deleted file mode 100644 index f3c4b755..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/TestObjects/WrappableWithVirtualMethods.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.TestObjects -{ - public class WrappableWithVirtualMethods - { - public virtual void Method() - { - } - - public virtual void Method3() - { - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/Unity.Interception.Configuration.Tests.csproj b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/Unity.Interception.Configuration.Tests.csproj deleted file mode 100644 index 834a8fbe..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/Unity.Interception.Configuration.Tests.csproj +++ /dev/null @@ -1,143 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {BE0A991A-8C3E-4CDC-8DA4-2664D1BBD01D} - Library - Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests - Unity.Interception.Configuration.Tests - 4 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - 3.5 - - - true - v4.5 - http://localhost/Tests.Unity.Interception.Configuration/ - true - Web - true - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - - true - full - false - .\bin\Debug\ - DEBUG;TRACE - ..\..\..\Tests.ruleset - false - - - false - true - .\bin\Release\ - TRACE - ..\..\..\Tests.ruleset - false - - - - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE} - Unity.Configuration - - - {F8186B23-B0E1-4646-B5F3-14357841E2BA} - Unity.Interception - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - {E979857E-CDE5-4D36-9AE8-8FFF4F75AE89} - Unity.TestSupport - - - {80F7399F-B221-465F-97C9-4B9FC0E2F67F} - Unity.Interception.Configuration - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - Unity.licenseheader - - - - - \ No newline at end of file diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringContainerForInterception.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringContainerForInterception.cs deleted file mode 100644 index b638008e..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringContainerForInterception.cs +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Remoting; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringContainerForInterception - /// - [TestClass] - public class When_ConfiguringContainerForInterception : SectionLoadingFixture - { - public When_ConfiguringContainerForInterception() - : base("InterceptionInjectionMembers") - { - } - - protected override void Arrange() - { - GlobalCountInterceptionBehavior.Calls.Clear(); - base.Arrange(); - } - - protected override void Teardown() - { - GlobalCountInterceptionBehavior.Calls.Clear(); - base.Teardown(); - } - - private IUnityContainer ConfiguredContainer(string containerName) - { - return new UnityContainer().LoadConfiguration(this.section, containerName); - } - - [TestMethod] - public void Then_CanConfigureInterceptorThroughConfigurationFile() - { - var container = this.ConfiguredContainer("configuringInterceptorThroughConfigurationFile"); - - var callCount = new CallCountInterceptionBehavior(); - container.RegisterType(new InterceptionBehavior(callCount)); - - var instance = container.Resolve(); - instance.DoSomething(); - - Assert.AreEqual(1, callCount.CallCount); - } - - [TestMethod] - public void Then_CanConfigureAdditionalInterfaceThroughConfigurationFile() - { - IUnityContainer container = this.ConfiguredContainer("configuringAdditionalInterfaceThroughConfigurationFile"); - - var callCount = new CallCountInterceptionBehavior(); - container.RegisterType( - new InterceptionBehavior(callCount), - new Interceptor(new VirtualMethodInterceptor())); - - var instance = container.Resolve(); - instance.DoSomething(); - - Assert.AreEqual(1, callCount.CallCount); - Assert.IsTrue(instance is IServiceProvider); - } - - [TestMethod] - public void Then_CanConfigureResolvedInterceptionBehavior() - { - IUnityContainer container = - this.ConfiguredContainer("configuringInterceptionBehaviorWithTypeThroughConfigurationFile"); - - container.RegisterType(new Interceptor(new VirtualMethodInterceptor())); - - var instance = container.Resolve(); - instance.DoSomething(); - - Assert.AreEqual(1, GlobalCountInterceptionBehavior.Calls.Values.First()); - } - - [TestMethod] - public void Then_CanConfigureNamedResolvedBehavior() - { - IUnityContainer container = this.ConfiguredContainer("canConfigureNamedBehavior") - .RegisterType(new Interceptor(new VirtualMethodInterceptor())); - - var instance = container.Resolve(); - instance.DoSomething(); - - Assert.AreEqual(1, GlobalCountInterceptionBehavior.Calls["fixed"]); - } - - [TestMethod] - public void Then_CanConfigureBehaviorWithNameOnly() - { - var callCount = new CallCountInterceptionBehavior(); - - IUnityContainer container = this.ConfiguredContainer("canConfigureBehaviorWithNameOnly") - .RegisterType(new Interceptor(new VirtualMethodInterceptor())) - .RegisterInstance("call count", callCount); - - var instance = container.Resolve(); - instance.DoSomething(); - - Assert.AreEqual(1, callCount.CallCount); - } - - [TestMethod] - public void Then_CanConfigureDefaultInterceptor() - { - IUnityContainer container = this.ConfiguredContainer("configuringDefaultInterceptor") - .Configure() - .AddPolicy("all") - .AddMatchingRule() - .AddCallHandler() - .Container; - - var instance1 = container.Resolve(); - var instance2 = container.Resolve("two"); - - Assert.IsTrue(RemotingServices.IsTransparentProxy(instance1)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(instance2)); - } - - [TestMethod] - public void Then_CanAddInterfaceThroughConfiguredBehavior() - { - IUnityContainer container = this.ConfiguredContainer("addingInterfacesImplicitlyThroughBehavior"); - - var instance = container.Resolve(); - Assert.IsNotNull(instance as IAdditionalInterface); - } - - [TestMethod] - public void Then_CanAddInterfaceThroughExplicitConfiguration() - { - IUnityContainer container = this.ConfiguredContainer("addingInterfacesExplicitlyWithBehavior"); - - var instance = container.Resolve(); - Assert.IsNotNull(instance as IAdditionalInterface); - } - - [TestMethod] - public void Then_MultipleBehaviorsCanBeConfigured() - { - var container = this.ConfiguredContainer("multipleBehaviorsOnOneRegistration"); - var instance = container.Resolve(); - - instance.DoSomething(); - - var countHandler = (CallCountInterceptionBehavior)container.Resolve("fixed"); - - Assert.AreEqual(1, countHandler.CallCount); - - Assert.IsNotNull(instance as IAdditionalInterface); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringInterceptorsThroughContainerElementExtension.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringInterceptorsThroughContainerElementExtension.cs deleted file mode 100644 index 06536c9e..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringInterceptorsThroughContainerElementExtension.cs +++ /dev/null @@ -1,143 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Runtime.Remoting; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.TestObjects; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringInterceptorsThroughContainerElementExtension - /// - [TestClass] - public class When_ConfiguringInterceptorsThroughContainerElementExtension : SectionLoadingFixture - { - public When_ConfiguringInterceptorsThroughContainerElementExtension() - : base("InterceptorsThroughContainerElementExtension") - { - } - - private IUnityContainer GetContainer(string containerName) - { - return new UnityContainer() - .LoadConfiguration(section, containerName) - .Configure() - .AddPolicy("policy") - .AddMatchingRule() - .AddCallHandler() - .Container; - } - - [TestMethod] - public void Then_CanConfigureDefaultInterceptorForType() - { - IUnityContainer container = this.GetContainer("configuringDefaultInterceptorForType"); - - var anonymous = container.Resolve(); - var named = container.Resolve("name"); - - Assert.IsTrue(RemotingServices.IsTransparentProxy(anonymous)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(named)); - } - - [TestMethod] - public void Then_CanConfigureVirtualMethodInterceptor() - { - IUnityContainer container = this.GetContainer("configuringDefaultInterceptorForTypeWithVirtualMethodInterceptor"); - - var anonymous = container.Resolve(); - var named = container.Resolve("name"); - - Assert.AreSame(typeof(WrappableWithVirtualMethods), anonymous.GetType().BaseType); - Assert.AreSame(typeof(WrappableWithVirtualMethods), named.GetType().BaseType); - } - - [TestMethod] - public void Then_CanConfigureInterceptorForType() - { - IUnityContainer container = this.GetContainer("configuringInterceptorForType"); - - var anonymous = container.Resolve(); - var named = container.Resolve("name"); - - Assert.IsTrue(RemotingServices.IsTransparentProxy(anonymous)); - Assert.IsFalse(RemotingServices.IsTransparentProxy(named)); - } - - [TestMethod] - public void Then_CanConfigureInterceptorForTypeAndName() - { - IUnityContainer container = this.GetContainer("configuringInterceptorForTypeAndName"); - - var anonymous = container.Resolve(); - var named = container.Resolve("name"); - - Assert.IsFalse(RemotingServices.IsTransparentProxy(anonymous)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(named)); - } - - [TestMethod] - public void Then_CanConfigureSeveralInterceptors() - { - IUnityContainer container = this.GetContainer("configuringSeveralInterceptors"); - - var anonymous = container.Resolve(); - var named = container.Resolve("name"); - - Assert.IsTrue(RemotingServices.IsTransparentProxy(anonymous)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(named)); - } - - [TestMethod] - public void Then_CanMixDefaultAndNonDefaultInterceptors() - { - IUnityContainer container = this.GetContainer("mixingDefaultAndNonDefaultInterceptors"); - - var anonymousWrappable = container.Resolve(); - var namedWrappable = container.Resolve("name"); - var anonymousWrappableWithProperty - = container.Resolve(); - var namedWrappableWithProperty - = container.Resolve("name"); - - Assert.IsTrue(RemotingServices.IsTransparentProxy(anonymousWrappable)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(namedWrappable)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(anonymousWrappableWithProperty)); - Assert.IsFalse(RemotingServices.IsTransparentProxy(namedWrappableWithProperty)); - } - - [TestMethod] - public void Then_CanMixTransparentProxyAndVirtualMethodInterceptors() - { - IUnityContainer container = this.GetContainer("mixingTransparentProxyAndVirtualMethodInterceptors"); - - var anonymousWrappable = container.Resolve(); - var namedWrappable = container.Resolve("name"); - var anonymousWrappableWrappableWithVirtualMethods - = container.Resolve(); - var namedWrappableWrappableWithVirtualMethods - = container.Resolve("name"); - - Assert.IsTrue(RemotingServices.IsTransparentProxy(anonymousWrappable)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(namedWrappable)); - Assert.AreSame( - typeof(WrappableWithVirtualMethods), - anonymousWrappableWrappableWithVirtualMethods.GetType()); - Assert.AreSame( - typeof(WrappableWithVirtualMethods), - namedWrappableWrappableWithVirtualMethods.GetType().BaseType); - } - - [TestMethod] - public void Then_CanSpecifyInterceptorUsingTypeConverter() - { - this.GetContainer("specifyingInterceptorWithTypeConverter"); - - Assert.AreEqual("source value", MyTransparentProxyInterceptorTypeConverter.SourceValue); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringPolicies.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringPolicies.cs deleted file mode 100644 index 3da7401c..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_ConfiguringPolicies.cs +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - /// - /// Summary description for When_ConfiguringPolicies - /// - [TestClass] - public class When_ConfiguringPolicies : SectionLoadingFixture - { - public When_ConfiguringPolicies() - : base("Policies") - { - } - - private IUnityContainer GetConfiguredContainer(string containerName) - { - IUnityContainer container = new UnityContainer(); - section.Configure(container, containerName); - return container; - } - - [TestMethod] - public void Then_CanConfigureAnEmptyPolicy() - { - IUnityContainer container = this.GetConfiguredContainer("oneEmptyPolicy"); - - var policies = new List(container.ResolveAll()); - - Assert.AreEqual(2, policies.Count); - Assert.IsInstanceOfType(policies[0], typeof(AttributeDrivenPolicy)); - Assert.IsInstanceOfType(policies[1], typeof(RuleDrivenPolicy)); - Assert.AreEqual("policyOne", policies[1].Name); - } - - [TestMethod] - public void Then_MatchingRuleInPolicyIsConfigured() - { - IUnityContainer container = this.GetConfiguredContainer("policyWithGivenRulesAndHandlersTypes"); - - GlobalCountCallHandler.Calls.Clear(); - - container.RegisterType("wrappable", - new Interceptor(), - new InterceptionBehavior()); - - var wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["default"]); - } - - [TestMethod] - public void Then_RulesAndHandlersCanBeConfiguredExternalToPolicy() - { - IUnityContainer container - = this.GetConfiguredContainer("policyWithExternallyConfiguredRulesAndHandlers"); - - GlobalCountCallHandler.Calls.Clear(); - - container.RegisterType("wrappable", - new Interceptor(), - new InterceptionBehavior()); - - var wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler1"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler2"]); - } - - [TestMethod] - public void Then_RulesAndHandlersCanHaveInjectionConfiguredInPolicyElement() - { - IUnityContainer container - = this.GetConfiguredContainer("policyWithInjectedRulesAndHandlers"); - - GlobalCountCallHandler.Calls.Clear(); - - container - .RegisterType("wrappable", - new Interceptor(), - new InterceptionBehavior()); - - var wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler1"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler2"]); - } - - [TestMethod] - public void CanSetUpAPolicyWithLifetimeManagedInjectedRulesAndHandlers() - { - IUnityContainer container - = this.GetConfiguredContainer("policyWithLifetimeManagedInjectedRulesAndHandlers"); - - GlobalCountCallHandler.Calls.Clear(); - - container - .RegisterType("wrappable", - new Interceptor(), - new InterceptionBehavior()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler1"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler2"]); - - var matchingRuleRegistrations = container.Registrations.Where(r => r.RegisteredType == typeof(IMatchingRule)); - var callHandlerRegistrations = container.Registrations.Where(r => r.RegisteredType == typeof(ICallHandler)); - - Assert.AreEqual(2, matchingRuleRegistrations.Count()); - Assert.AreEqual( - 1, - matchingRuleRegistrations.Where(r => r.LifetimeManagerType == typeof(ContainerControlledLifetimeManager)).Count()); - Assert.AreEqual( - 1, - matchingRuleRegistrations.Where(r => r.LifetimeManagerType == typeof(TransientLifetimeManager)).Count()); - - Assert.AreEqual(2, callHandlerRegistrations.Count()); - Assert.AreEqual( - 1, - callHandlerRegistrations.Where(r => r.LifetimeManagerType == typeof(ContainerControlledLifetimeManager)).Count()); - Assert.AreEqual( - 1, - callHandlerRegistrations.Where(r => r.LifetimeManagerType == typeof(TransientLifetimeManager)).Count()); - } - - [TestMethod] - public void Then_RulesAndHandlersInDifferentPoliciesCanHaveTheSameName() - { - IUnityContainer container - = this.GetConfiguredContainer("policyWithDuplicateRuleAndHandlerNames"); - - GlobalCountCallHandler.Calls.Clear(); - - container - .RegisterType("wrappable", - new Interceptor(), - new InterceptionBehavior()); - - var wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - wrappable1.Method3(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["Method3Handler"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["Method2Handler"]); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingContainersThatConfigureInterception.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingContainersThatConfigureInterception.cs deleted file mode 100644 index df1299fc..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingContainersThatConfigureInterception.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - /// - /// Summary description for When_LoadingContainersThatConfigureInterception - /// - [TestClass] - public class When_LoadingContainersThatConfigureInterception : SectionLoadingFixture - { - public When_LoadingContainersThatConfigureInterception() - : base("InterceptionInjectionMembers") - { - } - - private IEnumerable GetRegistration(string containerName, Func predicate) - { - var containerElement = section.Containers[containerName]; - return containerElement.Registrations.Where(predicate); - } - - private static bool IsInterceptableType(RegisterElement element) - { - return element.TypeName == "Interceptable"; - } - - [TestMethod] - public void Then_InterceptionElementIsPresentInRegistrationInjectionMembers() - { - var registration = this.GetRegistration("configuringInterceptorThroughConfigurationFile", - IsInterceptableType).First(); - - registration.InjectionMembers.OfType() - .Select(element => element.TypeName) - .AssertContainsExactly("VirtualMethodInterceptor"); - } - - [TestMethod] - public void Then_ExtraInterfacesCanBeAddedInConfig() - { - var registration = this.GetRegistration( - "configuringAdditionalInterfaceThroughConfigurationFile", - IsInterceptableType).First(); - - registration.InjectionMembers.OfType() - .Select(element => element.TypeName) - .AssertContainsExactly("IServiceProvider", "IComponent"); - } - - [TestMethod] - public void Then_BehaviorsCanBeAddedInConfig() - { - var registration = this.GetRegistration( - "configuringInterceptionBehaviorWithTypeThroughConfigurationFile", - IsInterceptableType).First(); - - registration.InjectionMembers.OfType() - .Select(element => element.TypeName) - .AssertContainsExactly("GlobalCountInterceptionBehavior"); - } - - [TestMethod] - public void Then_MultipleBehaviorsCanBeAddedInConfig() - { - var registration = this.GetRegistration("multipleBehaviorsOnOneRegistration", - IsInterceptableType).First(); - - registration.InjectionMembers.OfType() - .Select(element => element.Name) - .AssertContainsExactly("addInterface", "fixed"); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingSectionThatAddsInterceptionExtensions.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingSectionThatAddsInterceptionExtensions.cs deleted file mode 100644 index a3f91ff5..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingSectionThatAddsInterceptionExtensions.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - [TestClass] - public class When_LoadingSectionThatAddsInterceptionExtensions : SectionLoadingFixture - { - public When_LoadingSectionThatAddsInterceptionExtensions() - : base("SectionExtensionBasics") - { - } - - [TestMethod] - public void Then_SectionExtensionIsPresent() - { - Assert.IsInstanceOfType(section.SectionExtensions[0].ExtensionObject, - typeof(InterceptionConfigurationExtension)); - } - - [TestMethod] - public void Then_InterceptionElementHasBeenAdded() - { - Assert.IsNotNull(ExtensionElementMap.GetContainerConfiguringElementType("interception")); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingSectionWithPolicies.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingSectionWithPolicies.cs deleted file mode 100644 index 18073ee5..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_LoadingSectionWithPolicies.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests.ConfigFiles; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - [TestClass] - public class When_LoadingSectionWithPolicies : SectionLoadingFixture - { - public When_LoadingSectionWithPolicies() - : base("Policies") - { - } - - private InterceptionElement GetInterceptionElement(string containerName) - { - return (InterceptionElement)section.Containers[containerName].ConfiguringElements[0]; - } - - [TestMethod] - public void Then_ElementWithEmptyPoliciesLoads() - { - Assert.AreEqual(0, this.GetInterceptionElement("emptyPolicies").Policies.Count); - } - - [TestMethod] - public void Then_PoliciesAreLoadedFromExplicitCollection() - { - this.GetInterceptionElement("explicitPolicyCollection").Policies.Select(p => p.Name) - .AssertContainsExactly("policyOne", "policyTwo"); - } - - [TestMethod] - public void Then_PoliciesAreLoadedFromImplicitCollection() - { - this.GetInterceptionElement("implicitPolicyCollection").Policies.Select(p => p.Name) - .AssertContainsExactly("policyA", "policyB"); - } - - [TestMethod] - public void Then_PoliciesLoadNameOnlyMatchingRules() - { - var interceptionElement = this.GetInterceptionElement("policyWithNamedMatchingRules"); - var policyOne = interceptionElement.Policies["policyOne"]; - - policyOne.MatchingRules.Select(mr => mr.Name).AssertContainsExactly("ruleOne", "ruleTwo"); - } - - [TestMethod] - public void Then_CanDefinePolicyWithMatchingRuleAndCallHandler() - { - var interceptionElement = this.GetInterceptionElement("policyWithGivenRulesAndHandlersTypes"); - var policyOne = interceptionElement.Policies["policyOne"]; - - policyOne.MatchingRules.Select(mr => mr.Name).AssertContainsExactly("rule1"); - policyOne.MatchingRules.Select(mr => mr.TypeName).AssertContainsExactly("AlwaysMatchingRule"); - - policyOne.CallHandlers.Select(ch => ch.Name).AssertContainsExactly("handler1"); - policyOne.CallHandlers.Select(ch => ch.TypeName).AssertContainsExactly("GlobalCountCallHandler"); - } - - [TestMethod] - public void Then_CanLoadPolicyWithMultipleHandlers() - { - var interceptionElement = this.GetInterceptionElement("policyWithExternallyConfiguredRulesAndHandlers"); - var policyOne = interceptionElement.Policies["policyOne"]; - - policyOne.MatchingRules.Select(mr => mr.Name).AssertContainsExactly("rule1"); - policyOne.MatchingRules.Select(mr => mr.TypeName).AssertContainsExactly(String.Empty); - - policyOne.CallHandlers.Select(ch => ch.Name).AssertContainsExactly("handler1", "handler2"); - policyOne.CallHandlers.Select(ch => ch.TypeName).AssertContainsExactly(String.Empty, String.Empty); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingInterceptionInjectionMembers.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingInterceptionInjectionMembers.cs deleted file mode 100644 index c81afc4a..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingInterceptionInjectionMembers.cs +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - /// - /// Summary description for When_SerializingInterceptionInjectionMembers - /// - [TestClass] - public class When_SerializingInterceptionInjectionMembers : SerializationFixture - { - [TestMethod] - public void Then_InterceptorGetsSerialized() - { - var loadedSection = SerializeAndLoadConfig("SerializingInjectionMembers.config", c => - { - var reg = new RegisterElement() - { - TypeName = "SomeType" - }; - - reg.InjectionMembers.Add(new InterceptorElement() - { - Name = "interceptor", - TypeName = "NoSuchInterceptor" - }); - - var reg2 = new RegisterElement() - { - TypeName = "SomeType", - Name = "Default" - }; - - reg2.InjectionMembers.Add(new InterceptorElement() - { - IsDefaultForType = true, - Name = "otherInterceptor", - TypeName = "AnotherInterceptor" - }); - - c.Registrations.Add(reg); - c.Registrations.Add(reg2); - }); - - var firstInterceptor = - (InterceptorElement)loadedSection.Containers.Default.Registrations[0].InjectionMembers[0]; - Assert.IsFalse(firstInterceptor.IsDefaultForType); - Assert.AreEqual("interceptor", firstInterceptor.Name); - Assert.AreEqual("NoSuchInterceptor", firstInterceptor.TypeName); - - var secondInterceptor = - (InterceptorElement)loadedSection.Containers.Default.Registrations[1].InjectionMembers[0]; - Assert.IsTrue(secondInterceptor.IsDefaultForType); - Assert.AreEqual("otherInterceptor", secondInterceptor.Name); - Assert.AreEqual("AnotherInterceptor", secondInterceptor.TypeName); - } - - [TestMethod] - public void Then_AdditionalInterfacesGetSerialized() - { - var loadedSection = SerializeAndLoadConfig("SerializingInjectionMembers.config", c => - { - var reg = new RegisterElement - { - TypeName = "SomeType" - }; - - reg.InjectionMembers.Add(new AddInterfaceElement() - { - TypeName = "InterfaceOne" - }); - - c.Registrations.Add(reg); - }); - - var additionalInterface = (AddInterfaceElement) - loadedSection.Containers.Default.Registrations[0].InjectionMembers[0]; - Assert.AreEqual("InterfaceOne", additionalInterface.TypeName); - } - - [TestMethod] - public void Then_BehaviorElementsGetSerialized() - { - var loadedSection = SerializeAndLoadConfig("SerializingInjectionMembers.config", c => - { - var reg = new RegisterElement - { - TypeName = "SomeType" - }; - - reg.InjectionMembers.Add(new InterceptionBehaviorElement() - { - TypeName = "SomeBehavior" - }); - - reg.InjectionMembers.Add(new InterceptionBehaviorElement() - { - Name = "NamedBehavior", - TypeName = "SomeOtherBehavior" - }); - c.Registrations.Add(reg); - }); - - var injectionMembers = - loadedSection.Containers.Default.Registrations[0].InjectionMembers - .Cast(); - - injectionMembers.Select(m => m.TypeName) - .AssertContainsExactly("SomeBehavior", "SomeOtherBehavior"); - injectionMembers.Select(m => m.Name) - .AssertContainsExactly(String.Empty, "NamedBehavior"); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingInterceptors.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingInterceptors.cs deleted file mode 100644 index f66d90df..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingInterceptors.cs +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - [TestClass] - public class When_SerializingInterceptors : SerializationFixture - { - private InterceptorsElement DoSerialization(Action interceptorInitializer) - { - var section = SerializeAndLoadConfig("SerializingInterceptors.config", c => - { - var interceptors = new InterceptorsElement(); - interceptorInitializer(interceptors); - c.ConfiguringElements.Add(interceptors); - }); - - return (InterceptorsElement)section.Containers.Default.ConfiguringElements[0]; - } - - [TestMethod] - public void Then_SingleInterceptorWithKeyIsSerialized() - { - var result = this.DoSerialization(itc => - { - var interceptorElement = new InterceptorsInterceptorElement() - { - TypeName = "InterfaceInterceptor" - }; - interceptorElement.Registrations.Add(new KeyElement() { TypeName = "MyType" }); - itc.Interceptors.Add(interceptorElement); - }); - - Assert.AreEqual(1, result.Interceptors.Count); - var resultElement = result.Interceptors[0]; - Assert.AreEqual("InterfaceInterceptor", resultElement.TypeName); - - Assert.AreEqual(1, result.Interceptors[0].Registrations.Count); - - var key = (KeyElement)resultElement.Registrations[0]; - Assert.AreEqual("MyType", key.TypeName); - Assert.AreEqual(String.Empty, key.Name); - } - - [TestMethod] - public void Then_MultipleInterceptorsWithKeysAreSerialized() - { - var result = this.DoSerialization(itc => - { - var interceptorElement1 = new InterceptorsInterceptorElement() - { - TypeName = "InterfaceInterceptor" - }; - interceptorElement1.Registrations.Add(new KeyElement() { TypeName = "MyType" }); - itc.Interceptors.Add(interceptorElement1); - - var interceptorElement2 = new InterceptorsInterceptorElement - { - TypeName = "TransparentProxyInterceptor" - }; - interceptorElement2.Registrations.Add(new DefaultElement { TypeName = "MyOtherType" }); - itc.Interceptors.Add(interceptorElement2); - }); - - Assert.AreEqual(2, result.Interceptors.Count); - - result.Interceptors.Select(i => i.Registrations.Count) - .AssertContainsExactly(1, 1); - result.Interceptors.SelectMany(i => i.Registrations) - .Select(r => r.TypeName) - .AssertContainsExactly("MyType", "MyOtherType"); - } - - [TestMethod] - public void Then_InterceptorWithMultipleRegistrationsIsSerialized() - { - var result = this.DoSerialization(itc => - { - var i1 = new InterceptorsInterceptorElement - { - TypeName = "VirtualMethodInterceptor" - }; - - i1.Registrations.Add(new DefaultElement { TypeName = "Type1" }); - i1.Registrations.Add(new KeyElement { TypeName = "Type2", Name = "name1" }); - i1.Registrations.Add(new KeyElement { TypeName = "Type2", Name = "name2" }); - i1.Registrations.Add(new KeyElement { TypeName = "Type3" }); - - itc.Interceptors.Add(i1); - }); - - result.Interceptors.SelectMany(i => i.Registrations) - .Select(r => r.TypeName) - .AssertContainsExactly("Type1", "Type2", "Type2", "Type3"); - - result.Interceptors.SelectMany(i => i.Registrations) - .OfType() - .Select(k => k.Name) - .AssertContainsExactly("name1", "name2", String.Empty); - } - } -} diff --git a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingPolicies.cs b/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingPolicies.cs deleted file mode 100644 index d7156af5..00000000 --- a/source/Unity.Interception.Configuration/Tests/Tests.Unity.Interception.Configuration/When_SerializingPolicies.cs +++ /dev/null @@ -1,237 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.Configuration; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.TestSupport.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Configuration.Tests -{ - /// - /// Summary description for When_SerializingPolicies - /// - [TestClass] - public class When_SerializingPolicies : SerializationFixture - { - [TestMethod] - public void Then_EmptyPoliciesAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("EmptyPolicies.config", c => - { - c.ConfiguringElements.Add(new InterceptionElement()); - }); - - var policies = loadedConfig.Containers.Default.ConfiguringElements[0] as InterceptionElement; - Assert.IsNotNull(policies); - Assert.AreEqual(0, policies.Policies.Count); - } - - [TestMethod] - public void Then_PoliciesWithNoContentsAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("EmptyPolicies.config", c => - { - var interceptionElement = new InterceptionElement(); - interceptionElement.Policies.Add(new PolicyElement() - { - Name = "Policy1" - }); - interceptionElement.Policies.Add(new PolicyElement() - { - Name = "Policy2" - }); - c.ConfiguringElements.Add(interceptionElement); - }); - - var policies = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - - policies.Policies.Select(p => p.Name) - .AssertContainsExactly("Policy1", "Policy2"); - } - - [TestMethod] - public void Then_MatchingRuleNamesAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("MatchingRules.config", CreateConfigWithMatchingRules); - - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - interception.Policies[0].MatchingRules.Select(mr => mr.Name) - .AssertContainsExactly("NameOnly", "NameAndType", "RuleWithLifetime", "RuleWithElements"); - } - - [TestMethod] - public void Then_MatchingRuleTypeNamesAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("MatchingRules.config", CreateConfigWithMatchingRules); - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - interception.Policies[0].MatchingRules.Select(mr => mr.TypeName) - .AssertContainsExactly(String.Empty, "AlwaysMatchingRule", "AlwaysMatchingRule", "AlwaysMatchingRule"); - } - - [TestMethod] - public void Then_MatchingRuleLifetimesAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("MatchingRules.config", CreateConfigWithMatchingRules); - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - - var lifetime = interception.Policies[0].MatchingRules - .Where(mr => mr.Name == "RuleWithLifetime") - .Select(mr => mr.Lifetime) - .First(); - - Assert.AreEqual("singleton", lifetime.TypeName); - } - - [TestMethod] - public void Then_MatchingRuleInjectionMembersAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("MatchingRules.config", CreateConfigWithMatchingRules); - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - - var injectionMembers = interception.Policies[0].MatchingRules - .Where(mr => mr.Name == "RuleWithElements") - .First().Injection; - - injectionMembers.Select(m => m.GetType()) - .AssertContainsExactly(typeof(ConstructorElement), typeof(PropertyElement)); - - Assert.AreEqual("MyProp", injectionMembers.OfType().First().Name); - } - - [TestMethod] - public void Then_CallHandlerNamesAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("CallHandlers.config", CreateConfigWithCallHandlers); - - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - interception.Policies[0].CallHandlers.Select(ch => ch.Name) - .AssertContainsExactly("NamedRule", "NameAndType", "HandlerWithLifetime", "HandlerWithElements"); - } - - [TestMethod] - public void Then_CallHandlerTypeNamesAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("CallHandlers.config", CreateConfigWithCallHandlers); - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - - interception.Policies[0].CallHandlers.Select(ch => ch.TypeName) - .AssertContainsExactly(String.Empty, "DoMoreRule", "DoSomethingRule", "CallCountHandler"); - } - - [TestMethod] - public void Then_CallHandlerLifetimesAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("CallHandlers.config", CreateConfigWithCallHandlers); - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - - var lifetime = interception.Policies[0].CallHandlers - .Where(ch => ch.Name == "HandlerWithLifetime") - .Select(ch => ch.Lifetime) - .First(); - - Assert.AreEqual("singleton", lifetime.TypeName); - } - - [TestMethod] - public void Then_CallHandlerInjectionMembersAreSerialized() - { - var loadedConfig = SerializeAndLoadConfig("CallHandlers.config", CreateConfigWithCallHandlers); - var interception = (InterceptionElement)loadedConfig.Containers.Default.ConfiguringElements[0]; - - var injectionMembers = interception.Policies[0].CallHandlers - .Where(ch => ch.Name == "HandlerWithElements") - .First().Injection; - - injectionMembers.Select(m => m.GetType()) - .AssertContainsExactly(typeof(ConstructorElement), typeof(PropertyElement)); - - Assert.AreEqual("MyProp", injectionMembers.OfType().First().Name); - } - - private static void CreateConfigWithMatchingRules(ContainerElement c) - { - var interceptionElement = new InterceptionElement(); - var policy = new PolicyElement() { Name = "PolicyOne" }; - policy.MatchingRules.Add(new MatchingRuleElement() - { - Name = "NameOnly" - }); - - policy.MatchingRules.Add(new MatchingRuleElement() - { - Name = "NameAndType", - TypeName = "AlwaysMatchingRule" - }); - - policy.MatchingRules.Add(new MatchingRuleElement - { - Name = "RuleWithLifetime", - TypeName = "AlwaysMatchingRule", - Lifetime = new LifetimeElement() - { - TypeName = "singleton" - } - }); - - var ruleWithMembers = new MatchingRuleElement - { - Name = "RuleWithElements", - TypeName = "AlwaysMatchingRule" - }; - ruleWithMembers.Injection.Add(new ConstructorElement()); - ruleWithMembers.Injection.Add(new PropertyElement() { Name = "MyProp" }); - - policy.MatchingRules.Add(ruleWithMembers); - - interceptionElement.Policies.Add(policy); - - c.ConfiguringElements.Add(interceptionElement); - } - - private static void CreateConfigWithCallHandlers(ContainerElement c) - { - var interceptionElement = new InterceptionElement(); - var policy = new PolicyElement() { Name = "PolicyOne" }; - policy.MatchingRules.Add(new MatchingRuleElement() { Name = "All", TypeName = "AlwaysMatchingRule" }); - - policy.CallHandlers.Add(new CallHandlerElement() - { - Name = "NamedRule" - }); - - policy.CallHandlers.Add(new CallHandlerElement() - { - Name = "NameAndType", - TypeName = "DoMoreRule" - }); - - policy.CallHandlers.Add(new CallHandlerElement() - { - Name = "HandlerWithLifetime", - TypeName = "DoSomethingRule", - Lifetime = new LifetimeElement() - { - TypeName = "singleton" - } - }); - - var handlerWithMembers = new CallHandlerElement() - { - Name = "HandlerWithElements", - TypeName = "CallCountHandler" - }; - handlerWithMembers.Injection.Add(new ConstructorElement()); - handlerWithMembers.Injection.Add(new PropertyElement() { Name = "MyProp" }); - - policy.CallHandlers.Add(handlerWithMembers); - - interceptionElement.Policies.Add(policy); - - c.ConfiguringElements.Add(interceptionElement); - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/AdditionalInterface.cs b/source/Unity.Interception/Src/ContainerIntegration/AdditionalInterface.cs deleted file mode 100644 index 9a3e362a..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/AdditionalInterface.cs +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Globalization; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Stores information about a single to be an additional interface for an intercepted object and - /// configures a container accordingly. - /// - public class AdditionalInterface : InterceptionMember - { - private readonly Type additionalInterface; - - /// - /// Initializes a new instance of the with a - /// . - /// - /// A descriptor representing the interception behavior to use. - /// when is - /// . - /// when is not an interface. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public AdditionalInterface(Type additionalInterface) - { - Guard.ArgumentNotNull(additionalInterface, "additionalInterface"); - if (!additionalInterface.IsInterface) - { - throw new ArgumentException( - string.Format( - CultureInfo.CurrentCulture, - Resources.ExceptionTypeIsNotInterface, - additionalInterface.Name), - "additionalInterface"); - } - - this.additionalInterface = additionalInterface; - } - - /// - /// Add policies to the to configure the container to use the represented - /// as an additional interface for the supplied parameters. - /// - /// Interface being registered. - /// Type to register. - /// Name used to resolve the type object. - /// Policy list to add policies to. - public override void AddPolicies(Type serviceType, Type implementationType, string name, IPolicyList policies) - { - AdditionalInterfacesPolicy policy = - AdditionalInterfacesPolicy.GetOrCreate(policies, implementationType, name); - policy.AddAdditionalInterface(this.additionalInterface); - } - } - - /// - /// Stores information about a single to be an additional interface for an intercepted object and - /// configures a container accordingly. - /// - /// The interface. - public class AdditionalInterface : AdditionalInterface - where T : class - { - /// - /// Initializes a new instance of the . - /// - public AdditionalInterface() - : base(typeof(T)) - { - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/DefaultInterceptionBehavior.cs b/source/Unity.Interception/Src/ContainerIntegration/DefaultInterceptionBehavior.cs deleted file mode 100644 index 37da02aa..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/DefaultInterceptionBehavior.cs +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An injection member that lets you specify behaviors that should - /// apply to all instances of a type in the container regardless - /// of what name it's resolved under. - /// - public class DefaultInterceptionBehavior : InterceptionBehaviorBase - { - /// - /// Create a new that will - /// supply the given interception behavior to the container. - /// - /// Behavior to apply to this type. - public DefaultInterceptionBehavior(IInterceptionBehavior interceptionBehavior) - : base(interceptionBehavior) - { - } - - /// - /// Create a new that will - /// resolve the given type/name pair to get the behavior. - /// - /// Type of behavior. - /// Name for behavior registration. - public DefaultInterceptionBehavior(Type behaviorType, string name) - : base(behaviorType, name) - { - } - - /// - /// Create a new that will - /// resolve the given type to get the behavior. - /// - /// Type of behavior. - public DefaultInterceptionBehavior(Type behaviorType) - : base(behaviorType) - { - } - - /// - /// Get the list of behaviors for the current type so that it can be added to. - /// - /// Policy list. - /// Implementation type to set behaviors for. - /// Name type is registered under. - /// An instance of . - protected override InterceptionBehaviorsPolicy GetBehaviorsPolicy(IPolicyList policies, Type implementationType, - string name) - { - var policy = policies.GetNoDefault(implementationType, false); - if ((policy == null) || !(policy is InterceptionBehaviorsPolicy)) - { - policy = new InterceptionBehaviorsPolicy(); - policies.Set(policy, implementationType); - } - return (InterceptionBehaviorsPolicy)policy; - } - } - - /// - /// A generic version of so you - /// can give the behavior type using generic syntax. - /// - /// Type of the behavior object to apply. - public class DefaultInterceptionBehavior : DefaultInterceptionBehavior - where TBehavior : IInterceptionBehavior - { - /// - /// Construct a new instance - /// that use the given type and name to resolve the behavior object. - /// - /// Name of the registration. - public DefaultInterceptionBehavior(string name) - : base(typeof(TBehavior), name) - { - } - - /// - /// Construct a new instance - /// that uses the given type to resolve the behavior object. - /// - public DefaultInterceptionBehavior() - : base(typeof(TBehavior)) - { - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/DefaultInterceptor.cs b/source/Unity.Interception/Src/ContainerIntegration/DefaultInterceptor.cs deleted file mode 100644 index 49a65132..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/DefaultInterceptor.cs +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A that can be passed to the - /// method to specify - /// which interceptor to use. This member sets up the default - /// interceptor for a type - this will be used regardless of which - /// name is used to resolve the type. - /// - public class DefaultInterceptor : InjectionMember - { - private readonly IInterceptor interceptor; - private readonly NamedTypeBuildKey interceptorKey; - - /// - /// Construct a new instance that, - /// when applied to a container, will register the given - /// interceptor as the default one. - /// - /// Interceptor to use. - public DefaultInterceptor(IInterceptor interceptor) - { - Guard.ArgumentNotNull(interceptor, "intereptor"); - - this.interceptor = interceptor; - } - - /// - /// Construct a new that, when - /// applied to a container, will register the given type as - /// the default interceptor. - /// - /// Type of interceptor. - /// Name to use to resolve the interceptor. - public DefaultInterceptor(Type interceptorType, string name) - { - Guard.ArgumentNotNull(interceptorType, "interceptorType"); - Guard.TypeIsAssignable(typeof(IInterceptor), interceptorType, "interceptorType"); - - this.interceptorKey = new NamedTypeBuildKey(interceptorType, name); - } - - /// - /// Construct a new that, when - /// applied to a container, will register the given type as - /// the default interceptor. - /// - /// Type of interceptor. - public DefaultInterceptor(Type interceptorType) - : this(interceptorType, null) - { - } - - /// - /// Add policies to the to configure the - /// container to call this constructor with the appropriate parameter values. - /// - /// Type of interface being registered. If no interface, - /// this will be null. - /// Type of concrete type being registered. - /// Name used to resolve the type object. - /// Policy list to add policies to. - public override void AddPolicies(Type serviceType, Type implementationType, string name, IPolicyList policies) - { - if (this.IsInstanceInterceptor) - { - this.AddDefaultInstanceInterceptor(implementationType, policies); - } - else - { - this.AddDefaultTypeInterceptor(implementationType, policies); - } - } - - private bool IsInstanceInterceptor - { - get - { - if (this.interceptor != null) - { - return this.interceptor is IInstanceInterceptor; - } - return typeof(IInstanceInterceptor).IsAssignableFrom(this.interceptorKey.Type); - } - } - - private void AddDefaultInstanceInterceptor(Type typeToIntercept, IPolicyList policies) - { - IInstanceInterceptionPolicy policy; - - if (this.interceptor != null) - { - policy = new FixedInstanceInterceptionPolicy((IInstanceInterceptor)this.interceptor); - } - else - { - policy = new ResolvedInstanceInterceptionPolicy(this.interceptorKey); - } - - policies.Set(policy, typeToIntercept); - } - - private void AddDefaultTypeInterceptor(Type typeToIntercept, IPolicyList policies) - { - ITypeInterceptionPolicy policy; - - if (this.interceptor != null) - { - policy = new FixedTypeInterceptionPolicy((ITypeInterceptor)this.interceptor); - } - else - { - policy = new ResolvedTypeInterceptionPolicy(this.interceptorKey); - } - - policies.Set(policy, typeToIntercept); - } - } - - /// - /// A generic version of so that - /// you can specify the interceptor type using generics. - /// - /// - public class DefaultInterceptor : DefaultInterceptor - where TInterceptor : ITypeInterceptor - { - /// - /// Create a new instance of . - /// - /// Name to use when resolving interceptor. - public DefaultInterceptor(string name) - : base(typeof(TInterceptor), name) - { - } - - /// - /// Create a new instance of . - /// - public DefaultInterceptor() - : base(typeof(TInterceptor)) - { - } - } -} \ No newline at end of file diff --git a/source/Unity.Interception/Src/ContainerIntegration/Interception.cs b/source/Unity.Interception/Src/ContainerIntegration/Interception.cs deleted file mode 100644 index b0d71c18..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/Interception.cs +++ /dev/null @@ -1,263 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Globalization; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.ObjectBuilder; -using Guard = Microsoft.Practices.Unity.Utility.Guard; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A Unity container extension that allows you to configure - /// whether an object should be intercepted and which mechanism should - /// be used to do it, and also provides a convenient set of methods for - /// configuring injection for instances. - /// - /// - /// - /// - /// - /// - public class Interception : UnityContainerExtension - { - /// - /// Initial the container with this extension's functionality. - /// - protected override void Initialize() - { - // The TransparentProxyInterceptionStrategy is added to the Setup (first) stage. - // This means that instances will be intercepted after type mapping and lifetime management - // have taken place. - Context.Strategies.AddNew(UnityBuildStage.Setup); - Context.Strategies.AddNew(UnityBuildStage.PreCreation); - Context.Container - .RegisterInstance( - typeof(AttributeDrivenPolicy).AssemblyQualifiedName, - new AttributeDrivenPolicy()); - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept. - /// Name type is registered under. - /// Interceptor to use. - /// This extension object. - public Interception SetInterceptorFor(Type typeToIntercept, string name, ITypeInterceptor interceptor) - { - Guard.ArgumentNotNull(typeToIntercept, "typeToIntercept"); - Guard.ArgumentNotNull(interceptor, "interceptor"); - GuardTypeInterceptable(typeToIntercept, interceptor); - - var key = new NamedTypeBuildKey(typeToIntercept, name); - - var policy = new FixedTypeInterceptionPolicy(interceptor); - Context.Policies.Set(policy, key); - - // add policy injection behavior if using this configuration API to set the interceptor - var interceptionBehaviorsPolicy = new InterceptionBehaviorsPolicy(); - interceptionBehaviorsPolicy.AddBehaviorKey(NamedTypeBuildKey.Make()); - Context.Policies.Set(interceptionBehaviorsPolicy, key); - - return this; - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept. - /// Interceptor to use. - /// This extension object. - public Interception SetInterceptorFor(Type typeToIntercept, ITypeInterceptor interceptor) - { - return this.SetInterceptorFor(typeToIntercept, null, interceptor); - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept - /// Name type is registered under. - /// Interceptor object to use. - /// This extension object. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public Interception SetInterceptorFor(string name, ITypeInterceptor interceptor) - { - return this.SetInterceptorFor(typeof(T), name, interceptor); - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept - /// Interceptor object to use. - /// This extension object. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public Interception SetInterceptorFor(ITypeInterceptor interceptor) - { - return this.SetInterceptorFor(typeof(T), null, interceptor); - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept. - /// Name type is registered under. - /// Instance interceptor to use. - /// This extension object. - public Interception SetInterceptorFor(Type typeToIntercept, string name, IInstanceInterceptor interceptor) - { - Guard.ArgumentNotNull(typeToIntercept, "typeToIntercept"); - Guard.ArgumentNotNull(interceptor, "interceptor"); - GuardTypeInterceptable(typeToIntercept, interceptor); - - var key = new NamedTypeBuildKey(typeToIntercept, name); - - var policy = new FixedInstanceInterceptionPolicy(interceptor); - Context.Policies.Set(policy, key); - - // add policy injection behavior if using this configuration API to set the interceptor - var interceptionBehaviorsPolicy = new InterceptionBehaviorsPolicy(); - interceptionBehaviorsPolicy.AddBehaviorKey(NamedTypeBuildKey.Make()); - Context.Policies.Set(interceptionBehaviorsPolicy, key); - - return this; - } - - /// - /// Set the interceptor for a type, regardless of what name is used to resolve the instances. - /// - /// Type to intercept - /// Interceptor instance. - /// This extension object. - public Interception SetDefaultInterceptorFor(Type typeToIntercept, ITypeInterceptor interceptor) - { - Guard.ArgumentNotNull(typeToIntercept, "typeToIntercept"); - Guard.ArgumentNotNull(interceptor, "interceptor"); - GuardTypeInterceptable(typeToIntercept, interceptor); - - Context.Policies.Set(new FixedTypeInterceptionPolicy(interceptor), typeToIntercept); - - // add policy injection behavior if using this configuration API to set the interceptor - var interceptionBehaviorsPolicy = new InterceptionBehaviorsPolicy(); - interceptionBehaviorsPolicy.AddBehaviorKey(NamedTypeBuildKey.Make()); - Context.Policies.Set(interceptionBehaviorsPolicy, typeToIntercept); - - return this; - } - - /// - /// Set the interceptor for a type, regardless of what name is used to resolve the instances. - /// - /// Type to intercept - /// Interceptor instance. - /// This extension object. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public Interception SetDefaultInterceptorFor(ITypeInterceptor interceptor) - { - return this.SetDefaultInterceptorFor(typeof(TTypeToIntercept), interceptor); - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept. - /// Instance interceptor to use. - /// This extension object. - public Interception SetInterceptorFor(Type typeToIntercept, IInstanceInterceptor interceptor) - { - return this.SetInterceptorFor(typeToIntercept, null, interceptor); - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept. - /// Name type is registered under. - /// Instance interceptor to use. - /// This extension object. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public Interception SetInterceptorFor(string name, IInstanceInterceptor interceptor) - { - return this.SetInterceptorFor(typeof(T), name, interceptor); - } - - /// - /// API to configure interception for a type. - /// - /// Type to intercept. - /// Instance interceptor to use. - /// This extension object. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public Interception SetInterceptorFor(IInstanceInterceptor interceptor) - { - return this.SetInterceptorFor(typeof(T), null, interceptor); - } - - /// - /// API to configure the default interception settings for a type. - /// - /// Type the interception is being configured for. - /// The interceptor to use by default. - /// This extension object. - public Interception SetDefaultInterceptorFor(Type typeToIntercept, IInstanceInterceptor interceptor) - { - Guard.ArgumentNotNull(typeToIntercept, "typeToIntercept"); - Guard.ArgumentNotNull(interceptor, "interceptor"); - GuardTypeInterceptable(typeToIntercept, interceptor); - - Context.Policies.Set(new FixedInstanceInterceptionPolicy(interceptor), typeToIntercept); - - // add policy injection behavior if using this configuration API to set the interceptor - var interceptionBehaviorsPolicy = new InterceptionBehaviorsPolicy(); - interceptionBehaviorsPolicy.AddBehaviorKey(NamedTypeBuildKey.Make()); - Context.Policies.Set(interceptionBehaviorsPolicy, typeToIntercept); - - return this; - } - - /// - /// API to configure the default interception settings for a type. - /// - /// Type the interception is being configured for. - /// The interceptor to use by default. - /// This extension object. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public Interception SetDefaultInterceptorFor(IInstanceInterceptor interceptor) - { - return this.SetDefaultInterceptorFor(typeof(TTypeToIntercept), interceptor); - } - - private static void GuardTypeInterceptable(Type typeToIntercept, IInterceptor interceptor) - { - if (!interceptor.CanIntercept(typeToIntercept)) - { - throw new ArgumentException( - string.Format( - CultureInfo.CurrentCulture, - Resources.InterceptionNotSupported, - typeToIntercept.FullName), - "typeToIntercept"); - } - } - - /// - /// Starts the definition of a new . - /// - /// The policy name. - /// - /// This is a convenient way for defining a new policy and the - /// instances and instances that are required by a policy. - /// - /// This mechanism is just a shortcut for what can be natively expressed by wiring up together objects - /// with repeated calls to the method. - /// - public PolicyDefinition AddPolicy(string policyName) - { - Guard.ArgumentNotNullOrEmpty(policyName, "policyName"); - return new PolicyDefinition(policyName, this); - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/InterceptionBehavior.cs b/source/Unity.Interception/Src/ContainerIntegration/InterceptionBehavior.cs deleted file mode 100644 index e8219324..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/InterceptionBehavior.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Stores information about a single to be used on an intercepted object and - /// configures a container accordingly. - /// - /// - public class InterceptionBehavior : InterceptionBehaviorBase - { - /// - /// Initializes a new instance of the with a - /// . - /// - /// The interception behavior to use. - public InterceptionBehavior(IInterceptionBehavior interceptionBehavior) - : base(interceptionBehavior) - { - } - - /// - /// Initializes a new instance of the with a - /// given type/name pair. - /// - /// Type of behavior to - /// - public InterceptionBehavior(Type behaviorType, string name) - : base(behaviorType, name) - { - } - - /// - /// Initializes a new instance of the with a - /// given behavior type. - /// - /// Type of behavior to - public InterceptionBehavior(Type behaviorType) - : base(behaviorType) - { - } - - /// - /// Get the list of behaviors for the current type so that it can be added to. - /// - /// Policy list. - /// Implementation type to set behaviors for. - /// Name type is registered under. - /// An instance of . - protected override InterceptionBehaviorsPolicy GetBehaviorsPolicy(IPolicyList policies, Type implementationType, string name) - { - return InterceptionBehaviorsPolicy.GetOrCreate(policies, implementationType, name); - } - } - - /// - /// A generic version of that lets you - /// specify behavior types using generic syntax. - /// - /// Type of behavior to register. - public class InterceptionBehavior : InterceptionBehavior - where TBehavior : IInterceptionBehavior - { - /// - /// Initializes a new instance of the with a - /// given behavior type. - /// - public InterceptionBehavior() : base(typeof(TBehavior)) { } - - /// - /// Initializes a new instance of the with a - /// given type/name pair. - /// - /// Name to use to resolve the behavior. - public InterceptionBehavior(string name) : base(typeof(TBehavior), name) { } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/InterceptionBehaviorBase.cs b/source/Unity.Interception/Src/ContainerIntegration/InterceptionBehaviorBase.cs deleted file mode 100644 index 8180250f..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/InterceptionBehaviorBase.cs +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Base class for injection members that allow you to add - /// interception behaviors. - /// - public abstract class InterceptionBehaviorBase : InterceptionMember - { - private readonly NamedTypeBuildKey behaviorKey; - private readonly IInterceptionBehavior explicitBehavior; - - /// - /// Initializes a new instance of the with a - /// . - /// - /// The interception behavior to use. - protected InterceptionBehaviorBase(IInterceptionBehavior interceptionBehavior) - { - Guard.ArgumentNotNull(interceptionBehavior, "interceptionBehavior"); - this.explicitBehavior = interceptionBehavior; - } - - /// - /// Initializes a new instance of the with a - /// given type/name pair. - /// - /// Type of behavior to - /// - protected InterceptionBehaviorBase(Type behaviorType, string name) - { - Guard.ArgumentNotNull(behaviorType, "behaviorType"); - Guard.TypeIsAssignable(typeof(IInterceptionBehavior), behaviorType, "behaviorType"); - this.behaviorKey = new NamedTypeBuildKey(behaviorType, name); - } - - /// - /// Initializes a new instance of the with a - /// given behavior type. - /// - /// Type of behavior to - protected InterceptionBehaviorBase(Type behaviorType) - : this(behaviorType, null) - { - } - - /// - /// Add policies to the to configure the container to use the represented - /// for the supplied parameters. - /// - /// Interface being registered. - /// Type to register. - /// Name used to resolve the type object. - /// Policy list to add policies to. - public override void AddPolicies(Type serviceType, Type implementationType, string name, IPolicyList policies) - { - if (this.explicitBehavior != null) - { - this.AddExplicitBehaviorPolicies(implementationType, name, policies); - } - else - { - this.AddKeyedPolicies(implementationType, name, policies); - } - } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:DisposeObjectsBeforeLosingScope", Justification = "Lifetime container is managed by the container.")] - private void AddExplicitBehaviorPolicies(Type implementationType, string name, IPolicyList policies) - { - var lifetimeManager = new ContainerControlledLifetimeManager(); - lifetimeManager.SetValue(this.explicitBehavior); - var behaviorName = Guid.NewGuid().ToString(); - var newBehaviorKey = new NamedTypeBuildKey(this.explicitBehavior.GetType(), behaviorName); - - policies.Set(lifetimeManager, newBehaviorKey); - - InterceptionBehaviorsPolicy behaviorsPolicy = this.GetBehaviorsPolicy(policies, implementationType, name); - behaviorsPolicy.AddBehaviorKey(newBehaviorKey); - } - - private void AddKeyedPolicies(Type implementationType, string name, IPolicyList policies) - { - var behaviorsPolicy = this.GetBehaviorsPolicy(policies, implementationType, name); - behaviorsPolicy.AddBehaviorKey(this.behaviorKey); - } - - /// - /// Get the list of behaviors for the current type so that it can be added to. - /// - /// Policy list. - /// Implementation type to set behaviors for. - /// Name type is registered under. - /// An instance of . - protected abstract InterceptionBehaviorsPolicy GetBehaviorsPolicy(IPolicyList policies, Type implementationType, string name); - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/InterceptionMember.cs b/source/Unity.Interception/Src/ContainerIntegration/InterceptionMember.cs deleted file mode 100644 index 8759c0a7..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/InterceptionMember.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Stores information about a an intercepted object and configures a container accordingly. - /// - public abstract class InterceptionMember : InjectionMember - { - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/Interceptor.cs b/source/Unity.Interception/Src/ContainerIntegration/Interceptor.cs deleted file mode 100644 index 989254fa..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/Interceptor.cs +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Stores information about the to be used to intercept an object and - /// configures a container accordingly. - /// - /// - public class Interceptor : InterceptionMember - { - private readonly IInterceptor interceptor; - private readonly NamedTypeBuildKey buildKey; - - /// - /// Initializes a new instance of the class with an interceptor instance. - /// - /// The to use. - /// when is - /// . - public Interceptor(IInterceptor interceptor) - { - Guard.ArgumentNotNull(interceptor, "interceptor"); - - this.interceptor = interceptor; - } - - /// - /// Initialize a new instance of the class with a given - /// name and type that will be resolved to provide interception. - /// - /// Type of the interceptor - /// name to use to resolve. - public Interceptor(Type interceptorType, string name) - { - Guard.ArgumentNotNull(interceptorType, "interceptorType"); - Guard.TypeIsAssignable(typeof(IInterceptor), interceptorType, "interceptorType"); - - this.buildKey = new NamedTypeBuildKey(interceptorType, name); - } - - /// - /// Initialize a new instance of the class with - /// a given type that will be resolved to provide interception. - /// - /// Type of the interceptor. - public Interceptor(Type interceptorType) - : this(interceptorType, null) - { - } - - /// - /// Add policies to the to configure the container to use the represented - /// for the supplied parameters. - /// - /// Interface being registered. - /// Type to register. - /// Name used to resolve the type object. - /// Policy list to add policies to. - public override void AddPolicies(Type serviceType, Type implementationType, string name, IPolicyList policies) - { - var key = new NamedTypeBuildKey(implementationType, name); - if (this.IsInstanceInterceptor) - { - var policy = this.CreateInstanceInterceptionPolicy(); - policies.Set(policy, key); - policies.Clear(key); - } - else - { - var policy = this.CreateTypeInterceptionPolicy(); - policies.Set(policy, key); - policies.Clear(key); - } - } - - private bool IsInstanceInterceptor - { - get - { - if (this.interceptor != null) - { - return this.interceptor is IInstanceInterceptor; - } - return typeof(IInstanceInterceptor).IsAssignableFrom(this.buildKey.Type); - } - } - - private IInstanceInterceptionPolicy CreateInstanceInterceptionPolicy() - { - if (this.interceptor != null) - { - return new FixedInstanceInterceptionPolicy((IInstanceInterceptor)this.interceptor); - } - return new ResolvedInstanceInterceptionPolicy(this.buildKey); - } - - private ITypeInterceptionPolicy CreateTypeInterceptionPolicy() - { - if (this.interceptor != null) - { - return new FixedTypeInterceptionPolicy((ITypeInterceptor)this.interceptor); - } - return new ResolvedTypeInterceptionPolicy(this.buildKey); - } - } - - /// - /// Generic version of that lets you specify an interceptor - /// type using generic syntax. - /// - /// Type of interceptor - public class Interceptor : Interceptor - where TInterceptor : IInterceptor - { - /// - /// Initialize an instance of that will - /// resolve the given interceptor type. - /// - public Interceptor() - : base(typeof(TInterceptor)) - { - } - - /// - /// Initialize an instance of that will - /// resolve the given interceptor type and name. - /// - /// Name that will be used to resolve the interceptor. - public Interceptor(string name) - : base(typeof(TInterceptor), name) - { - } - } -} \ No newline at end of file diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs deleted file mode 100644 index 4800b3ba..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/AdditionalInterfacesPolicy.cs +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that accumulates a sequence of - /// instances representing the additional interfaces for an intercepted object. - /// - public class AdditionalInterfacesPolicy : IAdditionalInterfacesPolicy - { - private readonly List additionalInterfaces; - - /// - /// Initializes a new instance of the class. - /// - public AdditionalInterfacesPolicy() - { - this.additionalInterfaces = new List(); - } - - /// - /// Gets the instances accumulated by this policy. - /// - public IEnumerable AdditionalInterfaces - { - get { return this.additionalInterfaces; } - } - - internal void AddAdditionalInterface(Type additionalInterface) - { - this.additionalInterfaces.Add(additionalInterface); - } - - internal static AdditionalInterfacesPolicy GetOrCreate( - IPolicyList policies, - Type typeToCreate, - string name) - { - NamedTypeBuildKey key = new NamedTypeBuildKey(typeToCreate, name); - IAdditionalInterfacesPolicy policy = - policies.GetNoDefault(key, false); - if ((policy == null) || !(policy is AdditionalInterfacesPolicy)) - { - policy = new AdditionalInterfacesPolicy(); - policies.Set(policy, key); - } - return (AdditionalInterfacesPolicy)policy; - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs deleted file mode 100644 index 44a07d80..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/FixedInstanceInterceptionPolicy.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Implementation of that returns a - /// pre-created interceptor. - /// - public class FixedInstanceInterceptionPolicy : IInstanceInterceptionPolicy - { - private readonly IInstanceInterceptor interceptor; - - /// - /// Create a new instance of . - /// - /// Interceptor to store. - public FixedInstanceInterceptionPolicy(IInstanceInterceptor interceptor) - { - this.interceptor = interceptor; - } - - /// - /// Interceptor to use. - /// - /// Context for current build operation. - public IInstanceInterceptor GetInterceptor(IBuilderContext context) - { - return interceptor; - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs deleted file mode 100644 index 919efa93..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/FixedTypeInterceptionPolicy.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Implementation of that returns a pre-created - /// interceptor object. - /// - public class FixedTypeInterceptionPolicy : ITypeInterceptionPolicy - { - private readonly ITypeInterceptor interceptor; - - /// - /// Create a new instance of that - /// uses the given . - /// - /// Interceptor to use. - public FixedTypeInterceptionPolicy(ITypeInterceptor interceptor) - { - this.interceptor = interceptor; - } - - /// - /// Interceptor to use to create type proxy - /// - /// Context for current build operation. - public ITypeInterceptor GetInterceptor(IBuilderContext context) - { - return interceptor; - } - - /// - /// Cache for proxied type. - /// - public Type ProxyType { get; set; } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs deleted file mode 100644 index c4db007d..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IAdditionalInterfacesPolicy.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that returns a sequence of - /// instances representing the additional interfaces for an intercepted object. - /// - public interface IAdditionalInterfacesPolicy : IBuilderPolicy - { - /// - /// Gets the instances accumulated by this policy. - /// - IEnumerable AdditionalInterfaces { get; } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs deleted file mode 100644 index 007ea29c..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IInstanceInterceptionPolicy.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An interface that determines when to intercept instances - /// and which interceptor to use. - /// - public interface IInstanceInterceptionPolicy : IBuilderPolicy - { - /// - /// Interceptor to use. - /// - /// Context for current build operation. - IInstanceInterceptor GetInterceptor(IBuilderContext context); - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs deleted file mode 100644 index 515903d5..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/IInterceptionBehaviorsPolicy.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that returns a sequence of - /// instances for an intercepted object. - /// - public interface IInterceptionBehaviorsPolicy : IBuilderPolicy - { - /// - /// Get the set of that can be used to resolve the - /// behaviors. - /// - IEnumerable BehaviorKeys { get; } - - /// - /// Get the set of object to be used for the given type and - /// interceptor. - /// - /// - /// This method will return a sequence of s. These behaviors will - /// only be included if their properties are true. - /// - /// Context for the current build operation. - /// Interceptor that will be used to invoke the behavior. - /// Type that interception was requested on. - /// Type that implements the interception. - /// - IEnumerable GetEffectiveBehaviors(IBuilderContext context, IInterceptor interceptor, - Type typeToIntercept, Type implementationType); - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs deleted file mode 100644 index 64edc3c7..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ITypeInterceptionPolicy.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Interface that controls when and how types get intercepted. - /// - public interface ITypeInterceptionPolicy : IBuilderPolicy - { - /// - /// Interceptor to use to create type proxy - /// - /// Context for current build operation. - ITypeInterceptor GetInterceptor(IBuilderContext context); - - /// - /// Cache for proxied type. - /// - Type ProxyType { get; set; } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs deleted file mode 100644 index 6d84d304..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/InstanceInterceptionStrategy.cs +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A that intercepts objects - /// in the build chain by creating a proxy object. - /// - public class InstanceInterceptionStrategy : BuilderStrategy - { - /// - /// Called during the chain of responsibility for a build operation. The - /// PostBuildUp method is called when the chain has finished the PreBuildUp - /// phase and executes in reverse order from the PreBuildUp calls. - /// - /// Context of the build operation. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void PostBuildUp(IBuilderContext context) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(context, "context"); - - // If it's already been intercepted, don't do it again. - if (context.Existing is IInterceptingProxy) - { - return; - } - - IInstanceInterceptionPolicy interceptionPolicy = - FindInterceptionPolicy(context, true); - if (interceptionPolicy == null) - { - return; - } - - var interceptor = interceptionPolicy.GetInterceptor(context); - - IInterceptionBehaviorsPolicy interceptionBehaviorsPolicy = - FindInterceptionPolicy(context, true); - if (interceptionBehaviorsPolicy == null) - { - return; - } - - IAdditionalInterfacesPolicy additionalInterfacesPolicy = - FindInterceptionPolicy(context, false); - IEnumerable additionalInterfaces = - additionalInterfacesPolicy != null ? additionalInterfacesPolicy.AdditionalInterfaces : Type.EmptyTypes; - - Type typeToIntercept = context.OriginalBuildKey.Type; - Type implementationType = context.Existing.GetType(); - - IInterceptionBehavior[] interceptionBehaviors = - interceptionBehaviorsPolicy.GetEffectiveBehaviors( - context, interceptor, typeToIntercept, implementationType) - .ToArray(); - - if (interceptionBehaviors.Length > 0) - { - context.Existing = - Intercept.ThroughProxyWithAdditionalInterfaces( - typeToIntercept, - context.Existing, - interceptor, - interceptionBehaviors, - additionalInterfaces); - } - } - - private static T FindInterceptionPolicy(IBuilderContext context, bool probeOriginalKey) - where T : class, IBuilderPolicy - { - T policy; - - // First, try for a match against the current build key - Type currentType = context.BuildKey.Type; - policy = context.Policies.Get(context.BuildKey, false) ?? - context.Policies.Get(currentType, false); - if (policy != null) - { - return policy; - } - - if (!probeOriginalKey) - { - return null; - } - - // Next, try the original build key - Type originalType = context.OriginalBuildKey.Type; - policy = context.Policies.Get(context.OriginalBuildKey, false) ?? - context.Policies.Get(originalType, false); - - return policy; - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs deleted file mode 100644 index 05c702f2..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/InterceptionBehaviorsPolicy.cs +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that accumulates a sequence of - /// instances for an intercepted object. - /// - public class InterceptionBehaviorsPolicy : IInterceptionBehaviorsPolicy - { - private readonly List behaviorKeys = new List(); - - /// - /// Get the set of that can be used to resolve the - /// behaviors. - /// - public IEnumerable BehaviorKeys - { - get { return behaviorKeys; } - } - - /// - /// Get the set of object to be used for the given type and - /// interceptor. - /// - /// - /// This method will return a sequence of s. These behaviors will - /// only be included if their properties are true. - /// - /// Context for the current build operation. - /// Interceptor that will be used to invoke the behavior. - /// Type that interception was requested on. - /// Type that implements the interception. - /// - public IEnumerable GetEffectiveBehaviors( - IBuilderContext context, IInterceptor interceptor, Type typeToIntercept, Type implementationType) - { - var interceptionRequest = new CurrentInterceptionRequest(interceptor, typeToIntercept, implementationType); - - foreach (var key in BehaviorKeys) - { - var behavior = (IInterceptionBehavior)context.NewBuildUp(key, - childContext => childContext.AddResolverOverrides( - new DependencyOverride(interceptionRequest))); - yield return behavior; - } - } - - internal void AddBehaviorKey(NamedTypeBuildKey key) - { - behaviorKeys.Add(key); - } - - internal static InterceptionBehaviorsPolicy GetOrCreate( - IPolicyList policies, - Type typeToCreate, - string name) - { - NamedTypeBuildKey key = new NamedTypeBuildKey(typeToCreate, name); - IInterceptionBehaviorsPolicy policy = - policies.GetNoDefault(key, false); - if ((policy == null) || !(policy is InterceptionBehaviorsPolicy)) - { - policy = new InterceptionBehaviorsPolicy(); - policies.Set(policy, key); - } - return (InterceptionBehaviorsPolicy)policy; - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs deleted file mode 100644 index 969b407b..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ResolvedInstanceInterceptionPolicy.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of that will - /// resolve the interceptor through the container. - /// - public class ResolvedInstanceInterceptionPolicy : IInstanceInterceptionPolicy - { - private readonly NamedTypeBuildKey buildKey; - - /// - /// Construct a new that - /// will resolve the interceptor using the given build key. - /// - /// build key to resolve. - public ResolvedInstanceInterceptionPolicy(NamedTypeBuildKey buildKey) - { - this.buildKey = buildKey; - } - - #region IInstanceInterceptionPolicy Members - - /// - /// Interceptor to use. - /// - /// Context for current build operation. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public IInstanceInterceptor GetInterceptor(IBuilderContext context) - { - Guard.ArgumentNotNull(context, "context"); - return (IInstanceInterceptor)context.NewBuildUp(buildKey); - } - - #endregion - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs deleted file mode 100644 index 2aa8e9e8..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/ResolvedTypeInterceptionPolicy.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of that will - /// resolve the interceptor through the container. - /// - public class ResolvedTypeInterceptionPolicy : ITypeInterceptionPolicy - { - private readonly NamedTypeBuildKey buildKey; - - /// - /// construct a new that - /// will resolve the interceptor with the given . - /// - /// The build key to use to resolve. - public ResolvedTypeInterceptionPolicy(NamedTypeBuildKey buildKey) - { - this.buildKey = buildKey; - } - - #region ITypeInterceptionPolicy Members - - /// - /// Interceptor to use to create type proxy - /// - /// Context for current build operation. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public ITypeInterceptor GetInterceptor(IBuilderContext context) - { - Guard.ArgumentNotNull(context, "context"); - return (ITypeInterceptor)context.NewBuildUp(buildKey); - } - - /// - /// Cache for proxied type. - /// - public Type ProxyType { get; set; } - - #endregion - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs b/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs deleted file mode 100644 index 646b5d84..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs +++ /dev/null @@ -1,196 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A that hooks up type interception. It looks for - /// a for the current build key, or the current - /// build type. If present, it substitutes types so that that proxy class gets - /// built up instead. On the way back, it hooks up the appropriate handlers. - /// - public class TypeInterceptionStrategy : BuilderStrategy - { - /// - /// Called during the chain of responsibility for a build operation. The - /// PreBuildUp method is called when the chain is being executed in the - /// forward direction. - /// - /// In this class, PreBuildUp is responsible for figuring out if the - /// class is proxyable, and if so, replacing it with a proxy class. - /// Context of the build operation. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void PreBuildUp(IBuilderContext context) - { - Guard.ArgumentNotNull(context, "context"); - - if (context.Existing != null) - { - return; - } - - Type typeToBuild = context.BuildKey.Type; - - var interceptionPolicy = FindInterceptionPolicy(context); - if (interceptionPolicy == null) - { - return; - } - - var interceptor = interceptionPolicy.GetInterceptor(context); - if (!interceptor.CanIntercept(typeToBuild)) - { - return; - } - - var interceptionBehaviorsPolicy = FindInterceptionPolicy(context); - - IEnumerable interceptionBehaviors = - interceptionBehaviorsPolicy == null - ? - Enumerable.Empty() - : - interceptionBehaviorsPolicy.GetEffectiveBehaviors( - context, interceptor, typeToBuild, typeToBuild) - .Where(ib => ib.WillExecute); - - IAdditionalInterfacesPolicy additionalInterfacesPolicy = - FindInterceptionPolicy(context); - - IEnumerable additionalInterfaces = - additionalInterfacesPolicy != null ? additionalInterfacesPolicy.AdditionalInterfaces : Type.EmptyTypes; - - context.Policies.Set( - new EffectiveInterceptionBehaviorsPolicy { Behaviors = interceptionBehaviors }, - context.BuildKey); - - Type[] allAdditionalInterfaces = - Intercept.GetAllAdditionalInterfaces(interceptionBehaviors, additionalInterfaces); - - Type interceptingType = - interceptor.CreateProxyType(typeToBuild, allAdditionalInterfaces); - - DerivedTypeConstructorSelectorPolicy.SetPolicyForInterceptingType(context, interceptingType); - } - - /// - /// Called during the chain of responsibility for a build operation. The - /// PostBuildUp method is called when the chain has finished the PreBuildUp - /// phase and executes in reverse order from the PreBuildUp calls. - /// - /// In this class, PostBuildUp checks to see if the object was proxyable, - /// and if it was, wires up the handlers. - /// Context of the build operation. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public override void PostBuildUp(IBuilderContext context) - { - Guard.ArgumentNotNull(context, "context"); - - IInterceptingProxy proxy = context.Existing as IInterceptingProxy; - if (proxy == null) - { - return; - } - - EffectiveInterceptionBehaviorsPolicy effectiveInterceptionBehaviorsPolicy = - context.Policies.Get(context.BuildKey, true); - if (effectiveInterceptionBehaviorsPolicy == null) - { - return; - } - - foreach (var interceptionBehavior in effectiveInterceptionBehaviorsPolicy.Behaviors) - { - proxy.AddInterceptionBehavior(interceptionBehavior); - } - } - - private static TPolicy FindInterceptionPolicy(IBuilderContext context) - where TPolicy : class, IBuilderPolicy - { - return context.Policies.Get(context.BuildKey, false) ?? - context.Policies.Get(context.BuildKey.Type, false); - } - - private class EffectiveInterceptionBehaviorsPolicy : IBuilderPolicy - { - public EffectiveInterceptionBehaviorsPolicy() - { - this.Behaviors = new List(); - } - - public IEnumerable Behaviors { get; set; } - } - - private class DerivedTypeConstructorSelectorPolicy : IConstructorSelectorPolicy - { - private readonly Type interceptingType; - private readonly IConstructorSelectorPolicy originalConstructorSelectorPolicy; - - public DerivedTypeConstructorSelectorPolicy( - Type interceptingType, - IConstructorSelectorPolicy originalConstructorSelectorPolicy) - { - this.interceptingType = interceptingType; - this.originalConstructorSelectorPolicy = originalConstructorSelectorPolicy; - } - - public SelectedConstructor SelectConstructor(IBuilderContext context, IPolicyList resolverPolicyDestination) - { - SelectedConstructor originalConstructor = - originalConstructorSelectorPolicy.SelectConstructor(context, resolverPolicyDestination); - - return FindNewConstructor(originalConstructor, interceptingType); - } - - private static SelectedConstructor FindNewConstructor(SelectedConstructor originalConstructor, Type interceptingType) - { - ParameterInfo[] originalParams = originalConstructor.Constructor.GetParameters(); - - ConstructorInfo newConstructorInfo = - interceptingType.GetConstructor(originalParams.Select(pi => pi.ParameterType).ToArray()); - - SelectedConstructor newConstructor = new SelectedConstructor(newConstructorInfo); - - foreach (IDependencyResolverPolicy resolver in originalConstructor.GetParameterResolvers()) - { - newConstructor.AddParameterResolver(resolver); - } - - return newConstructor; - } - - public static void SetPolicyForInterceptingType(IBuilderContext context, Type interceptingType) - { - IPolicyList selectorPolicyDestination; - var currentSelectorPolicy = context.Policies.Get(context.BuildKey, out selectorPolicyDestination); - var currentDerivedTypeSelectorPolicy = currentSelectorPolicy as DerivedTypeConstructorSelectorPolicy; - - if (currentDerivedTypeSelectorPolicy == null) - { - selectorPolicyDestination.Set( - new DerivedTypeConstructorSelectorPolicy( - interceptingType, - currentSelectorPolicy), - context.BuildKey); - } - else if (currentDerivedTypeSelectorPolicy.interceptingType != interceptingType) - { - selectorPolicyDestination.Set( - new DerivedTypeConstructorSelectorPolicy( - interceptingType, - currentDerivedTypeSelectorPolicy.originalConstructorSelectorPolicy), - context.BuildKey); - } - } - } - } -} diff --git a/source/Unity.Interception/Src/ContainerIntegration/PolicyDefinition.cs b/source/Unity.Interception/Src/ContainerIntegration/PolicyDefinition.cs deleted file mode 100644 index 0e61ac95..00000000 --- a/source/Unity.Interception/Src/ContainerIntegration/PolicyDefinition.cs +++ /dev/null @@ -1,564 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Transient class that supports convenience method for specifying interception policies. - /// - public class PolicyDefinition - { - private readonly string policyName; - private readonly Interception extension; - private readonly List rulesParameters; - private readonly List handlersNames; - - internal PolicyDefinition(string policyName, Interception extension) - { - this.policyName = policyName; - this.extension = extension; - - this.rulesParameters = new List(); - this.handlersNames = new List(); - - this.extension.Container.RegisterType(this.policyName); - UpdateRuleDrivenPolicyInjection(); - } - - private PolicyDefinition UpdateRuleDrivenPolicyInjection() - { - this.extension.Container - .RegisterType(policyName, - new InjectionConstructor(policyName, - new ResolvedArrayParameter(rulesParameters.ToArray()), - handlersNames.ToArray())); - return this; - } - - private delegate PolicyDefinition UpdateElements(string name); - - private PolicyDefinition UpdateRulesParameters(string name) - { - this.rulesParameters.Add(new ResolvedParameter(name)); - - return UpdateRuleDrivenPolicyInjection(); - } - - private PolicyDefinition UpdateHandlerNames(string name) - { - this.handlersNames.Add(name); - - return UpdateRuleDrivenPolicyInjection(); - } - - private static string NewName() - { - return Guid.NewGuid().ToString(); - } - - /// - /// The that is currently being - /// configured. - /// - public IUnityContainer Container - { - get { return extension.Container; } - } - - /// - /// The extension to which the policy was added. - /// - /// - /// Use this property to start adding a new policy. - /// - public Interception Interception - { - get { return extension; } - } - - /// - /// Adds a reference to matching rule by name. - /// - /// The name for the matching rule. - /// - /// The than allows further configuration of the policy. - /// - /// - /// The details of how the rule should be created by the container must be specified using a - /// standard injection specification mechanism. - /// - public PolicyDefinition AddMatchingRule(string name) - { - return AddElement(name, UpdateRulesParameters); - } - - /// - /// Makes a matching rule in the current policy. - /// - /// The new for the policy. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddMatchingRule(IMatchingRule instance) - { - return AddElement(instance, UpdateRulesParameters); - } - - /// - /// Configures injection for a new and makes it available - /// as a matching rule in the current policy. - /// - /// The type for the new matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddMatchingRule( - Type type, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - NewName(), - null, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Configures injection for a new and makes it available - /// as a matching rule in the current policy, using the given . - /// - /// The type for the new matching rule. - /// The that controls the lifetime - /// of the configured matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddMatchingRule( - Type type, - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - NewName(), - lifetimeManager, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Configures injection for a new using the specified name - /// and makes it available as a matching rule in the current policy. - /// - /// The type for the new matching rule. - /// The name for the injection configuration for the matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddMatchingRule( - Type type, - string name, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - name, - null, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Configures injection for a new and makes it available - /// as a matching rule in the current policy, using the given . - /// - /// The type for the new matching rule. - /// The name for the injection configuration for the matching rule. - /// The that controls the lifetime - /// of the configured matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddMatchingRule( - Type type, - string name, - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - name, - lifetimeManager, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Configures injection for a new and makes it available - /// as a matching rule in the current policy. - /// - /// The type for the new matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddMatchingRule( - params InjectionMember[] injectionMembers) - where TMatchingRule : IMatchingRule - { - return AddElement( - NewName(), - null, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Configures injection for a new and makes it available - /// as a matching rule in the current policy, using the given . - /// - /// The type for the new matching rule. - /// The that controls the lifetime - /// of the configured matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddMatchingRule( - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - where TMatchingRule : IMatchingRule - { - return AddElement( - NewName(), - lifetimeManager, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Configures injection for a new using the specified name - /// and makes it available as a matching rule in the current policy. - /// - /// The type for the new matching rule. - /// The name for the injection configuration for the matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddMatchingRule( - string name, - params InjectionMember[] injectionMembers) - where TMatchingRule : IMatchingRule - { - return AddElement( - name, - null, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Configures injection for a new using the specified name - /// and makes it available as a matching rule in the current policy, - /// using the given . - /// - /// The type for the new matching rule. - /// The name for the injection configuration for the matching rule. - /// The that controls the lifetime - /// of the configured matching rule. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddMatchingRule( - string name, - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - where TMatchingRule : IMatchingRule - { - return AddElement( - name, - lifetimeManager, - injectionMembers, - UpdateRulesParameters); - } - - /// - /// Adds a reference to call handler by name. - /// - /// The name for the call handler. - /// - /// The than allows further configuration of the policy. - /// - /// - /// The details of how the handler should be created by the container must be specified using a - /// standard injection specification mechanism. - /// - public PolicyDefinition AddCallHandler(string name) - { - return AddElement(name, UpdateHandlerNames); - } - - /// - /// Makes a call handler in the current policy. - /// - /// The new for the policy. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddCallHandler(ICallHandler instance) - { - return AddElement(instance, UpdateHandlerNames); - } - - /// - /// Configures injection for a new and makes it available - /// as a call handler in the current policy. - /// - /// The type for the new call handler. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddCallHandler( - Type type, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - NewName(), - null, - injectionMembers, - UpdateHandlerNames); - } - - /// - /// Configures injection for a new and makes it available - /// as a call handler in the current policy, using the given . - /// - /// The type for the new call handler. - /// The that controls the lifetime - /// of the configured call handler. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddCallHandler( - Type type, - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - NewName(), - lifetimeManager, - injectionMembers, - UpdateHandlerNames); - } - - /// - /// Configures injection for a new using the specified name - /// and makes it available as a call handler in the current policy. - /// - /// The type for the new call handler. - /// The name for the injection configuration for the call handler. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddCallHandler( - Type type, - string name, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - name, - null, - injectionMembers, - UpdateHandlerNames); - } - - /// - /// Configures injection for a new using the specified name - /// and makes it available as a call handler in the current policy, - /// using the given . - /// - /// The type for the new call handler. - /// The name for the injection configuration for the call handler. - /// The that controls the lifetime - /// of the configured call handler. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - public PolicyDefinition AddCallHandler( - Type type, - string name, - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - { - return AddElement( - type, - name, - lifetimeManager, - injectionMembers, - UpdateHandlerNames); - } - - /// - /// Configures injection for a new and makes it available - /// as a call handler in the current policy. - /// - /// The type for the new call handler. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddCallHandler( - params InjectionMember[] injectionMembers) - where TCallHandler : ICallHandler - { - return AddElement( - NewName(), - null, - injectionMembers, - UpdateHandlerNames); - } - - /// - /// Configures injection for a new and makes it available - /// as a call handler in the current policy, using the given . - /// - /// The type for the new call handler. - /// The that controls the lifetime - /// of the configured call handler. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddCallHandler( - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - where TCallHandler : ICallHandler - { - return AddElement( - NewName(), - lifetimeManager, - injectionMembers, - UpdateHandlerNames); - } - - /// - /// Configures injection for a new using the specified name - /// and makes it available as a call handler in the current policy. - /// - /// The type for the new call handler. - /// The name for the injection configuration for the call handler . - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddCallHandler( - string name, - params InjectionMember[] injectionMembers) - where TCallHandler : ICallHandler - { - return AddElement( - name, - null, - injectionMembers, - UpdateHandlerNames); - } - - /// - /// Configures injection for a new using the specified name - /// and makes it available as a call handler in the current policy, - /// using the given . - /// - /// The type for the new call handler. - /// The name for the injection configuration for the call handler . - /// The that controls the lifetime - /// of the configured call handler. - /// Objects containing the details on which members to inject and how. - /// - /// The than allows further configuration of the policy. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - public PolicyDefinition AddCallHandler( - string name, - LifetimeManager lifetimeManager, - params InjectionMember[] injectionMembers) - where TCallHandler : ICallHandler - { - return AddElement( - name, - lifetimeManager, - injectionMembers, - UpdateHandlerNames); - } - - [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", - Justification = "Consistency with other overloads")] - private PolicyDefinition AddElement(string name, UpdateElements update) - { - Guard.ArgumentNotNull(name, "name"); - - return update(name); - } - - private PolicyDefinition AddElement(T instance, UpdateElements update) - { - Guard.ArgumentNotNull(instance, "instance"); - - string newName = NewName(); - Container.RegisterInstance(newName, instance); - - return update(newName); - } - - private PolicyDefinition AddElement( - Type type, - string name, - LifetimeManager lifetimeManager, - InjectionMember[] injectionMembers, - UpdateElements update) - { - Guard.ArgumentNotNullOrEmpty(name, "name"); - Guard.ArgumentNotNull(type, "type"); - Guard.TypeIsAssignable(typeof(T), type, "type"); - Guard.ArgumentNotNull(injectionMembers, "injectionMembers"); - - Container.RegisterType(typeof(T), type, name, lifetimeManager, injectionMembers); - - return update(name); - } - - private PolicyDefinition AddElement( - string name, - LifetimeManager lifetimeManager, - InjectionMember[] injectionMembers, - UpdateElements update) - where TElement : T - { - return AddElement(typeof(TElement), name, lifetimeManager, injectionMembers, update); - } - } -} diff --git a/source/Unity.Interception/Src/GlobalSuppressions.cs b/source/Unity.Interception/Src/GlobalSuppressions.cs deleted file mode 100644 index 2cfae335..00000000 --- a/source/Unity.Interception/Src/GlobalSuppressions.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -// This file is used by Code Analysis to maintain SuppressMessage -// attributes that are applied to this project. -// Project-level suppressions either have no target or are given -// a specific target and scoped to a namespace, type, member, etc. -// -// To add a suppression to this file, right-click the message in the -// Error List, point to "Suppress Message(s)", and click -// "In Project Suppression File". -// You do not need to add suppressions to this file manually. - -using System.Diagnostics.CodeAnalysis; - -[assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "interceptable", Scope = "resource", Target = "Microsoft.Practices.Unity.InterceptionExtension.Properties.Resources.resources", - Justification = "interceptable is spelled correctly")] diff --git a/source/Unity.Interception/Src/Intercept.cs b/source/Unity.Interception/Src/Intercept.cs deleted file mode 100644 index 804944eb..00000000 --- a/source/Unity.Interception/Src/Intercept.cs +++ /dev/null @@ -1,394 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// High-level API for performing interception on existing and new objects. - /// - public static class Intercept - { - /// - /// Returns a for type which wraps - /// the supplied . - /// - /// The type to intercept. - /// The instance to intercept. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// Any additional interfaces the proxy must implement. - /// A proxy for compatible with . - /// when is . - /// when is . - /// when is . - /// when is . - /// when cannot intercept - /// . - public static T ThroughProxyWithAdditionalInterfaces( - T target, - IInstanceInterceptor interceptor, - IEnumerable interceptionBehaviors, - IEnumerable additionalInterfaces) - where T : class - { - return (T)ThroughProxyWithAdditionalInterfaces(typeof(T), target, interceptor, interceptionBehaviors, additionalInterfaces); - } - - /// - /// Returns a for type which wraps - /// the supplied . - /// - /// Type to intercept. - /// The instance to intercept. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// A proxy for compatible with . - /// when is . - /// when is . - /// when is . - /// when cannot intercept - /// . - public static T ThroughProxy( - T target, - IInstanceInterceptor interceptor, - IEnumerable interceptionBehaviors) - where T : class - { - return (T)ThroughProxyWithAdditionalInterfaces(typeof(T), target, interceptor, interceptionBehaviors, Type.EmptyTypes); - } - - /// - /// Returns a for type which wraps - /// the supplied . - /// - /// The type to intercept. - /// The instance to intercept. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// Any additional interfaces the proxy must implement. - /// A proxy for compatible with . - /// when is . - /// when is . - /// when is . - /// when is . - /// when is . - /// when cannot intercept - /// . - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static object ThroughProxyWithAdditionalInterfaces( - Type interceptedType, - object target, - IInstanceInterceptor interceptor, - IEnumerable interceptionBehaviors, - IEnumerable additionalInterfaces) - { - Guard.ArgumentNotNull(interceptedType, "interceptedType"); - Guard.ArgumentNotNull(target, "target"); - Guard.ArgumentNotNull(interceptor, "interceptor"); - Guard.ArgumentNotNull(interceptionBehaviors, "interceptionBehaviors"); - Guard.ArgumentNotNull(additionalInterfaces, "additionalInterfaces"); - - if (!interceptor.CanIntercept(interceptedType)) - { - throw new ArgumentException( - string.Format( - CultureInfo.CurrentCulture, - Resources.InterceptionNotSupported, - interceptedType.FullName), - "interceptedType"); - } - - var behaviors = interceptionBehaviors.ToList(); - if (behaviors.Where(ib => ib == null).Count() > 0) - { - throw new ArgumentException( - string.Format(CultureInfo.CurrentCulture, Resources.NullBehavior), - "interceptionBehaviors"); - } - - var activeBehaviors = behaviors.Where(ib => ib.WillExecute).ToList(); - - var allAdditionalInterfaces - = GetAllAdditionalInterfaces(activeBehaviors, additionalInterfaces).ToList(); - - // If no behaviors and no extra interfaces, nothing to do. - if (activeBehaviors.Count == 0 && allAdditionalInterfaces.Count == 0) - { - return target; - } - - IInterceptingProxy proxy = - interceptor.CreateProxy(interceptedType, target, allAdditionalInterfaces.ToArray()); - - foreach (IInterceptionBehavior interceptionBehavior in activeBehaviors) - { - proxy.AddInterceptionBehavior(interceptionBehavior); - } - - return proxy; - } - - /// - /// Returns a for type which wraps - /// the supplied . - /// - /// The type to intercept. - /// The instance to intercept. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// A proxy for compatible with . - /// when is . - /// when is . - /// when is . - /// when is . - /// when cannot intercept - /// . - public static object ThroughProxy( - Type interceptedType, - object target, - IInstanceInterceptor interceptor, - IEnumerable interceptionBehaviors) - { - return ThroughProxyWithAdditionalInterfaces(interceptedType, target, interceptor, interceptionBehaviors, Type.EmptyTypes); - } - - /// - /// Creates a new instance of type that is intercepted with the behaviors in - /// . - /// - /// The type of the object to create. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// Any additional interfaces the proxy must implement. - /// The arguments for the creation of the new instance. - /// An instance of a class compatible with that includes execution of the - /// given . - /// when is . - /// when is . - /// When is . - /// when cannot intercept - /// . - public static T NewInstanceWithAdditionalInterfaces( - ITypeInterceptor interceptor, - IEnumerable interceptionBehaviors, - IEnumerable additionalInterfaces, - params object[] constructorParameters) - where T : class - { - return (T)NewInstanceWithAdditionalInterfaces(typeof(T), interceptor, interceptionBehaviors, additionalInterfaces, constructorParameters); - } - - /// - /// Creates a new instance of type that is intercepted with the behaviors in - /// . - /// - /// The type of the object to create. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// The arguments for the creation of the new instance. - /// An instance of a class compatible with that includes execution of the - /// given . - /// when is . - /// when is . - /// when cannot intercept - /// . - public static T NewInstance( - ITypeInterceptor interceptor, - IEnumerable interceptionBehaviors, - params object[] constructorParameters) - where T : class - { - return - (T)NewInstanceWithAdditionalInterfaces(typeof(T), interceptor, interceptionBehaviors, Type.EmptyTypes, constructorParameters); - } - - /// - /// Creates a new instance of type that is intercepted with the behaviors in - /// . - /// - /// The type of the object to create. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// Any additional interfaces the instance must implement. - /// The arguments for the creation of the new instance. - /// An instance of a class compatible with that includes execution of the - /// given . - /// when is . - /// when is . - /// when is . - /// when is . - /// when cannot intercept - /// . - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static object NewInstanceWithAdditionalInterfaces( - Type type, - ITypeInterceptor interceptor, - IEnumerable interceptionBehaviors, - IEnumerable additionalInterfaces, - params object[] constructorParameters) - { - Guard.ArgumentNotNull(type, "type"); - Guard.ArgumentNotNull(interceptor, "interceptor"); - Guard.ArgumentNotNull(interceptionBehaviors, "interceptionBehaviors"); - Guard.ArgumentNotNull(additionalInterfaces, "additionalInterfaces"); - - if (!interceptor.CanIntercept(type)) - { - throw new ArgumentException( - string.Format( - CultureInfo.CurrentCulture, - Resources.InterceptionNotSupported, - type.FullName), - "type"); - } - - var behaviors = interceptionBehaviors.ToList(); - - if (behaviors.Where(ib => ib == null).Count() > 0) - { - throw new ArgumentException( - string.Format(CultureInfo.CurrentCulture, Resources.NullBehavior), - "interceptionBehaviors"); - } - - Type implementationType = type; - - var activeBehaviors = behaviors.Where(ib => ib.WillExecute); - - Type[] allAdditionalInterfaces = GetAllAdditionalInterfaces(activeBehaviors, additionalInterfaces); - - Type interceptionType = interceptor.CreateProxyType(implementationType, allAdditionalInterfaces); - - var proxy = (IInterceptingProxy)Activator.CreateInstance(interceptionType, constructorParameters); - - foreach (IInterceptionBehavior interceptionBehavior in activeBehaviors) - { - proxy.AddInterceptionBehavior(interceptionBehavior); - } - - return proxy; - } - - /// - /// Creates a new instance of type that is intercepted with the behaviors in - /// . - /// - /// The type of the object to create. - /// The to use when creating the proxy. - /// The interception behaviors for the new proxy. - /// The arguments for the creation of the new instance. - /// An instance of a class compatible with that includes execution of the - /// given . - /// when is . - /// when is . - /// when is . - /// when cannot intercept - /// . - public static object NewInstance( - Type type, - ITypeInterceptor interceptor, - IEnumerable interceptionBehaviors, - params object[] constructorParameters) - { - return NewInstanceWithAdditionalInterfaces(type, interceptor, interceptionBehaviors, Type.EmptyTypes, constructorParameters); - } - - /// - /// Computes the array with all the additional interfaces for the interception of an object. - /// - /// The interception behaviors for the new proxy. - /// Any additional interfaces the instance must implement. - /// An array with the required interfaces for - /// when the interfaces are not valid. - [System.Diagnostics.CodeAnalysis.SuppressMessage( - "Microsoft.Usage", - "CA2208:InstantiateArgumentExceptionsCorrectly", - Justification = "Argument ok, confused by use within a lambda expression")] - public static Type[] GetAllAdditionalInterfaces( - IEnumerable interceptionBehaviors, - IEnumerable additionalInterfaces) - { - var validatedRequiredInterfaces = - interceptionBehaviors.SelectMany(ib => - { - if (ib == null) - { - throw new ArgumentException(Resources.ExceptionContainsNullElement, "interceptionBehaviors"); - } - return - CheckInterfaces( - ib.GetRequiredInterfaces(), - "interceptionBehaviors", - error => - string.Format( - CultureInfo.CurrentCulture, - Resources.ExceptionRequiredInterfacesInvalid, - error, - ib.GetType().Name)); - }); - var validatedAdditionalInterfaces = - CheckInterfaces( - additionalInterfaces, - "additionalInterfaces", - error => - string.Format( - CultureInfo.CurrentCulture, - Resources.ExceptionAdditionalInterfacesInvalid, - error)); - - return validatedRequiredInterfaces.Concat(validatedAdditionalInterfaces).ToArray(); - } - - private static IEnumerable CheckInterfaces( - IEnumerable interfaces, - string argumentName, - Func messageFormatter) - { - if (interfaces == null) - { - throw new ArgumentException(messageFormatter(Resources.ExceptionNullInterfacesCollection)); - } - - return - interfaces - .Select(type => - { - if (type == null) - { - throw new ArgumentException( - messageFormatter(Resources.ExceptionContainsNullElement), - argumentName); - } - if (!type.IsInterface) - { - throw new ArgumentException( - messageFormatter( - string.Format( - CultureInfo.CurrentCulture, - Resources.ExceptionTypeIsNotInterface, - type.Name)), - argumentName); - } - if (type.IsGenericTypeDefinition) - { - throw new ArgumentException( - messageFormatter( - string.Format( - CultureInfo.CurrentCulture, - Resources.ExceptionTypeIsOpenGeneric, - type.Name)), - argumentName); - } - return type; - }); - } - } -} diff --git a/source/Unity.Interception/Src/InterceptionBehaviors/CurrentInterceptionRequest.cs b/source/Unity.Interception/Src/InterceptionBehaviors/CurrentInterceptionRequest.cs deleted file mode 100644 index cb15ce7f..00000000 --- a/source/Unity.Interception/Src/InterceptionBehaviors/CurrentInterceptionRequest.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A simple data holder class used to store information about the current - /// interception operation that's being set up. Useful for creating behaviors - /// that need to know this stuff (especially the PIAB behavior). - /// - public class CurrentInterceptionRequest - { - /// - /// Create a new instance of that - /// stores the given , - /// , and . - /// - /// that will be used to - /// create the intercepting type or proxy. - /// Type that interception was requested on. - /// Type of the object that will actually be intercepted. - public CurrentInterceptionRequest(IInterceptor interceptor, Type typeToIntercept, Type implementationType) - { - Interceptor = interceptor; - TypeToIntercept = typeToIntercept; - ImplementationType = implementationType; - } - - /// - /// that will be used to - /// create the intercepting type or proxy. - /// - public IInterceptor Interceptor { get; set; } - - /// - /// Type that interception was requested on. - /// - public Type TypeToIntercept { get; set; } - - /// - /// Type of the object that will actually be intercepted. - /// - public Type ImplementationType { get; set; } - } -} diff --git a/source/Unity.Interception/Src/InterceptionBehaviors/IInterceptionBehavior.cs b/source/Unity.Interception/Src/InterceptionBehaviors/IInterceptionBehavior.cs deleted file mode 100644 index 93a62386..00000000 --- a/source/Unity.Interception/Src/InterceptionBehaviors/IInterceptionBehavior.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Interception behaviors implement this interface and are called for each - /// invocation of the pipelines that they're included in. - /// - public interface IInterceptionBehavior - { - /// - /// Implement this method to execute your behavior processing. - /// - /// Inputs to the current call to the target. - /// Delegate to execute to get the next delegate in the behavior chain. - /// Return value from the target. - IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext); - - /// - /// Returns the interfaces required by the behavior for the objects it intercepts. - /// - /// The required interfaces. - [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Could require computations")] - IEnumerable GetRequiredInterfaces(); - - /// - /// Returns a flag indicating if this behavior will actually do anything when invoked. - /// - /// This is used to optimize interception. If the behaviors won't actually - /// do anything (for example, PIAB where no policies match) then the interception - /// mechanism can be skipped completely. - bool WillExecute { get; } - } - - /// - /// This delegate type is the type that points to the next - /// method to execute in the current pipeline. - /// - /// Inputs to the current method call. - /// Delegate to get the next interceptor in the chain. - /// Return from the next method in the chain. - [SuppressMessage("Microsoft.Naming", "CA1711", Justification = "A delegate is indeed required.")] - public delegate IMethodReturn InvokeInterceptionBehaviorDelegate(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext); - - /// - /// This delegate type is passed to each interceptor's Invoke method. - /// Call the delegate to get the next delegate to call to continue - /// the chain. - /// - /// Next delegate in the interceptor chain to call. - [SuppressMessage("Microsoft.Naming", "CA1711", Justification = "A delegate is indeed required.")] - public delegate InvokeInterceptionBehaviorDelegate GetNextInterceptionBehaviorDelegate(); -} diff --git a/source/Unity.Interception/Src/InterceptionBehaviors/InterceptionBehaviorPipeline.cs b/source/Unity.Interception/Src/InterceptionBehaviors/InterceptionBehaviorPipeline.cs deleted file mode 100644 index 05363765..00000000 --- a/source/Unity.Interception/Src/InterceptionBehaviors/InterceptionBehaviorPipeline.cs +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// The InterceptionBehaviorPipeline class encapsulates a list of s - /// and manages calling them in the proper order with the right inputs. - /// - public class InterceptionBehaviorPipeline - { - private readonly List interceptionBehaviors; - - /// - /// Creates a new with an empty pipeline. - /// - public InterceptionBehaviorPipeline() - { - interceptionBehaviors = new List(); - } - - /// - /// Creates a new with the given collection - /// of s. - /// - /// Collection of interception behaviors to add to the pipeline. - public InterceptionBehaviorPipeline(IEnumerable interceptionBehaviors) - { - Guard.ArgumentNotNull(interceptionBehaviors, "interceptionBehaviors"); - this.interceptionBehaviors = new List(interceptionBehaviors); - } - - /// - /// Get the number of interceptors in this pipeline. - /// - public int Count - { - get { return interceptionBehaviors.Count; } - } - - /// - /// Execute the pipeline with the given input. - /// - /// Input to the method call. - /// The ultimate target of the call. - /// Return value from the pipeline. - public IMethodReturn Invoke(IMethodInvocation input, InvokeInterceptionBehaviorDelegate target) - { - if (interceptionBehaviors.Count == 0) - { - return target(input, null); - } - - int interceptorIndex = 0; - - IMethodReturn result = interceptionBehaviors[0].Invoke(input, delegate - { - ++interceptorIndex; - if (interceptorIndex < interceptionBehaviors.Count) - { - return interceptionBehaviors[interceptorIndex].Invoke; - } - else - { - return target; - } - }); - return result; - } - - /// - /// Adds a to the pipeline. - /// - /// The interception behavior to add. - public void Add(IInterceptionBehavior interceptionBehavior) - { - Guard.ArgumentNotNull(interceptionBehavior, "interceptionBehavior"); - this.interceptionBehaviors.Add(interceptionBehavior); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/GenericParameterMapper.cs b/source/Unity.Interception/Src/Interceptors/GenericParameterMapper.cs deleted file mode 100644 index a7ff1396..00000000 --- a/source/Unity.Interception/Src/Interceptors/GenericParameterMapper.cs +++ /dev/null @@ -1,188 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Maps types involving generic parameter types from reflected types into equivalent versions involving generated types. - /// - public class GenericParameterMapper - { - private static readonly GenericParameterMapper DefaultParameterMapper = new GenericParameterMapper(Type.EmptyTypes, Type.EmptyTypes, null); - private static readonly KeyValuePair[] EmptyMappings = new KeyValuePair[0]; - - private readonly IDictionary mappedTypesCache = new Dictionary(); - private readonly ICollection> localMappings; - private readonly GenericParameterMapper parent; - - /// - /// Initializes a new instance of the class. - /// - /// A constructed generic type, open or closed. - /// The parent mapper, or . - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public GenericParameterMapper(Type type, GenericParameterMapper parent) - { - Guard.ArgumentNotNull(type, "type"); - - if (type.IsGenericType) - { - if (type.IsGenericTypeDefinition) - { - throw new ArgumentException(Resources.ExceptionCannotMapGenericTypeDefinition, "type"); - } - - this.parent = parent; - this.localMappings = - CreateMappings( - type.GetGenericTypeDefinition().GetGenericArguments(), - type.GetGenericArguments()); - } - else - { - this.localMappings = EmptyMappings; - this.parent = null; - } - } - - /// - /// Initializes a new instance of the class. - /// - /// The reflected generic parameters. - /// The generated generic parameters. - public GenericParameterMapper(Type[] reflectedParameters, Type[] generatedParameters) - : this(reflectedParameters, generatedParameters, null) - { } - - /// - /// Initializes a new instance of the class. - /// - /// The reflected generic parameters. - /// The generated generic parameters. - /// The parent mapper, or . - public GenericParameterMapper(Type[] reflectedParameters, Type[] generatedParameters, GenericParameterMapper parent) - { - this.parent = parent; - this.localMappings = CreateMappings(reflectedParameters, generatedParameters); - } - - private static ICollection> CreateMappings(Type[] reflectedParameters, Type[] generatedParameters) - { - Guard.ArgumentNotNull(reflectedParameters, "reflectedParameters"); - Guard.ArgumentNotNull(generatedParameters, "generatedParameters"); - - if (reflectedParameters.Length != generatedParameters.Length) - { - throw new ArgumentException(Resources.ExceptionMappedParametersDoNotMatch, "reflectedParameters"); - } - - var mappings = new List>(); - for (int i = 0; i < reflectedParameters.Length; i++) - { - mappings.Add(new KeyValuePair(reflectedParameters[i], generatedParameters[i])); - } - - return mappings; - } - - /// - /// Maps a type to an equivalent type involving generated types. - /// - /// The type to map. - public Type Map(Type typeToMap) - { - Type mappedType; - - if (!this.mappedTypesCache.TryGetValue(typeToMap, out mappedType)) - { - mappedType = this.DoMap(typeToMap); - this.mappedTypesCache[typeToMap] = mappedType; - } - - return mappedType; - } - - private Type DoMap(Type typeToMap) - { - if (!typeToMap.IsGenericParameter) - { - // The type does not represent a generic parameter, but it might be a type constructed with - // generic parameters - - if (typeToMap.IsArray) - { - // Array case: create a new array type for the mapped element type - - var mappedElementType = this.Map(typeToMap.GetElementType()); - - // assume a rank of 1 means vector. there is no way to check for this (IsSzArray is not public) - var mappedArrayType = - typeToMap.GetArrayRank() == 1 - ? mappedElementType.MakeArrayType() - : mappedElementType.MakeArrayType(typeToMap.GetArrayRank()); - - return mappedArrayType; - } - - if (typeToMap.IsGenericType) - { - // Generic type case: construct a new generic type with mapped types - - var mappedGenericArguments = typeToMap.GetGenericArguments().Select(gp => this.Map(gp)).ToArray(); - var mappedGenericType = typeToMap.GetGenericTypeDefinition().MakeGenericType(mappedGenericArguments); - - return mappedGenericType; - } - - return typeToMap; - } - else - { - // Map the generic parameter from the reflected type into the generated generic parameter - - var mappedType = - this.localMappings.Where(kvp => kvp.Key == typeToMap).Select(kvp => kvp.Value).FirstOrDefault() - ?? typeToMap; - - if (parent != null) - { - mappedType = this.parent.Map(mappedType); - } - - return mappedType; - } - } - - /// - /// Gets the default mapper. - /// - public static GenericParameterMapper DefaultMapper - { - get { return DefaultParameterMapper; } - } - - /// - /// Gets the formal parameters. - /// - /// - public Type[] GetReflectedParameters() - { - return this.localMappings.Select(kvp => kvp.Key).ToArray(); - } - - /// - /// Gets the actual parameters. - /// - /// - public Type[] GetGeneratedParameters() - { - return this.localMappings.Select(kvp => kvp.Value).ToArray(); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/IInterceptingProxy.cs b/source/Unity.Interception/Src/Interceptors/IInterceptingProxy.cs deleted file mode 100644 index 23aa5c6e..00000000 --- a/source/Unity.Interception/Src/Interceptors/IInterceptingProxy.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This interface is implemented by all proxy objects, type or instance based. - /// It allows for adding interception behaviors. - /// - public interface IInterceptingProxy - { - /// - /// Adds a to the proxy. - /// - /// The to add. - void AddInterceptionBehavior(IInterceptionBehavior interceptor); - } -} diff --git a/source/Unity.Interception/Src/Interceptors/IInterceptor.cs b/source/Unity.Interception/Src/Interceptors/IInterceptor.cs deleted file mode 100644 index d02a03a8..00000000 --- a/source/Unity.Interception/Src/Interceptors/IInterceptor.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Base interface for type and instance based interceptor classes. - /// - public interface IInterceptor - { - /// - /// Can this interceptor generate a proxy for the given type? - /// - /// Type to check. - /// True if interception is possible, false if not. - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "t", Justification = "Parameter name is meaningful enough in context")] - bool CanIntercept(Type t); - - /// - /// Returns a sequence of methods on the given type that can be - /// intercepted. - /// - /// Type that was specified when this interceptor - /// was created (typically an interface). - /// The concrete type of the implementing object. - /// Sequence of objects. - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Interceptable", Justification = "Interceptable is valid in this context")] - IEnumerable GetInterceptableMethods(Type interceptedType, Type implementationType); - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/IInstanceInterceptor.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/IInstanceInterceptor.cs deleted file mode 100644 index 3c5bf25f..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/IInstanceInterceptor.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Interface for interceptors that generate separate proxy - /// objects to implement interception on instances. - /// - public interface IInstanceInterceptor : IInterceptor - { - /// - /// Create a proxy object that provides interception for . - /// - /// Type to generate the proxy of. - /// Object to create the proxy for. - /// Additional interfaces the proxy must implement. - /// The proxy object. - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "t", Justification = "Parameter name is meaningful enough in context")] - IInterceptingProxy CreateProxy(Type t, object target, params Type[] additionalInterfaces); - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceImplementation.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceImplementation.cs deleted file mode 100644 index eeef7e74..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceImplementation.cs +++ /dev/null @@ -1,230 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal class InterfaceImplementation - { - private readonly TypeBuilder typeBuilder; - private readonly Type @interface; - private readonly Type targetInterface; - private readonly GenericParameterMapper genericParameterMapper; - private readonly FieldBuilder proxyInterceptionPipelineField; - private readonly bool explicitImplementation; - private readonly FieldBuilder targetField; - - public InterfaceImplementation( - TypeBuilder typeBuilder, - Type @interface, - FieldBuilder proxyInterceptionPipelineField, - bool explicitImplementation) - : this(typeBuilder, @interface, proxyInterceptionPipelineField, explicitImplementation, null) - { } - - public InterfaceImplementation( - TypeBuilder typeBuilder, - Type @interface, - FieldBuilder proxyInterceptionPipelineField, - bool explicitImplementation, - FieldBuilder targetField) - : this(typeBuilder, @interface, GenericParameterMapper.DefaultMapper, proxyInterceptionPipelineField, explicitImplementation, targetField) - { } - - public InterfaceImplementation( - TypeBuilder typeBuilder, - Type @interface, - GenericParameterMapper genericParameterMapper, - FieldBuilder proxyInterceptionPipelineField, - bool explicitImplementation, - FieldBuilder targetField) - { - this.typeBuilder = typeBuilder; - this.@interface = @interface; - this.genericParameterMapper = genericParameterMapper; - this.proxyInterceptionPipelineField = proxyInterceptionPipelineField; - this.explicitImplementation = explicitImplementation; - this.targetField = targetField; - - if (@interface.IsGenericType) - { - // when the @interface is generic we need to get references to its methods though it - // in this case, the targetInterface is a constructed version using the generic type parameters - // from the generated type generate type - var definition = @interface.GetGenericTypeDefinition(); - var mappedParameters = definition.GetGenericArguments().Select(t => genericParameterMapper.Map(t)).ToArray(); - this.targetInterface = definition.MakeGenericType(mappedParameters); - } - else - { - this.targetInterface = @interface; - } - } - - public int Implement(HashSet implementedInterfaces, int memberCount) - { - if (implementedInterfaces.Contains(this.@interface)) - { - return memberCount; - } - - implementedInterfaces.Add(this.@interface); - - typeBuilder.AddInterfaceImplementation(this.@interface); - - foreach (MethodInfo method in MethodsToIntercept()) - { - OverrideMethod(method, memberCount++); - } - - foreach (PropertyInfo property in PropertiesToIntercept()) - { - OverrideProperty(property, memberCount++); - } - - foreach (EventInfo @event in EventsToIntercept()) - { - OverrideEvent(@event, memberCount++); - } - - foreach (var @extendedInterface in this.@interface.GetInterfaces()) - { - memberCount = - new InterfaceImplementation( - this.typeBuilder, - @extendedInterface, - new GenericParameterMapper(@extendedInterface, this.genericParameterMapper), - this.proxyInterceptionPipelineField, - this.explicitImplementation, - this.targetField) - .Implement(implementedInterfaces, memberCount); - } - - return memberCount; - } - - private IEnumerable MethodsToIntercept() - { - foreach (MethodInfo method in - this.@interface.GetMethods( - BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)) - { - if (!method.IsSpecialName) - { - yield return method; - } - } - } - - private void OverrideMethod(MethodInfo method, int methodNum) - { - new InterfaceMethodOverride( - this.typeBuilder, - this.proxyInterceptionPipelineField, - this.targetField, - method, - this.targetInterface, - this.genericParameterMapper, - this.explicitImplementation, - methodNum) - .AddMethod(); - } - - private IEnumerable PropertiesToIntercept() - { - return this.@interface.GetProperties( - BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); - } - - private void OverrideProperty(PropertyInfo property, int count) - { - MethodBuilder getMethod = OverridePropertyMethod(property.GetGetMethod(), count); - MethodBuilder setMethod = OverridePropertyMethod(property.GetSetMethod(), count); - AddPropertyDefinition(property, getMethod, setMethod); - } - - private void AddPropertyDefinition(PropertyInfo property, MethodBuilder getMethod, MethodBuilder setMethod) - { - PropertyBuilder newProperty = - this.typeBuilder.DefineProperty( - property.Name, - property.Attributes, - property.PropertyType, - property.GetIndexParameters().Select(param => param.ParameterType).ToArray()); - - if (getMethod != null) - { - newProperty.SetGetMethod(getMethod); - } - - if (setMethod != null) - { - newProperty.SetSetMethod(setMethod); - } - } - - private MethodBuilder OverridePropertyMethod(MethodInfo method, int count) - { - return method == null - ? null - : new InterfaceMethodOverride( - this.typeBuilder, - this.proxyInterceptionPipelineField, - this.targetField, - method, - this.targetInterface, - this.genericParameterMapper, - this.explicitImplementation, - count) - .AddMethod(); - } - - private IEnumerable EventsToIntercept() - { - return this.@interface.GetEvents( - BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); - } - - private void OverrideEvent(EventInfo @event, int count) - { - MethodBuilder addMethod = OverrideEventMethod(@event.GetAddMethod(), count); - MethodBuilder removeMethod = OverrideEventMethod(@event.GetRemoveMethod(), count); - AddEventDefinition(@event, addMethod, removeMethod); - } - - private void AddEventDefinition(EventInfo @event, MethodBuilder addMethod, MethodBuilder removeMethod) - { - EventBuilder newEvent = this.typeBuilder.DefineEvent(@event.Name, @event.Attributes, @event.EventHandlerType); - - if (addMethod != null) - { - newEvent.SetAddOnMethod(addMethod); - } - - if (removeMethod != null) - { - newEvent.SetRemoveOnMethod(removeMethod); - } - } - - private MethodBuilder OverrideEventMethod(MethodInfo method, int count) - { - return method == null - ? null - : new InterfaceMethodOverride( - this.typeBuilder, - this.proxyInterceptionPipelineField, - this.targetField, - method, - this.targetInterface, - this.genericParameterMapper, - this.explicitImplementation, - count) - .AddMethod(); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptor.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptor.cs deleted file mode 100644 index b01a1bfd..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptor.cs +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An instance interceptor that works by generating a - /// proxy class on the fly for a single interface. - /// - public class InterfaceInterceptor : IInstanceInterceptor - { - private static readonly Dictionary InterceptorClasses = - new Dictionary(new GeneratedTypeKey.GeneratedTypeKeyComparer()); - - #region IInstanceInterceptor Members - - /// - /// Can this interceptor generate a proxy for the given type? - /// - /// Type to check. - /// True if interception is possible, false if not. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done via Guard class.")] - public bool CanIntercept(Type t) - { - Guard.ArgumentNotNull(t, "t"); - return t.IsInterface; - } - - /// - /// Returns a sequence of methods on the given type that can be - /// intercepted. - /// - /// Type that was specified when this interceptor - /// was created (typically an interface). - /// The concrete type of the implementing object. - /// Sequence of objects. - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Interceptable", - Justification = "Spelling is fine")] - public IEnumerable GetInterceptableMethods( - Type interceptedType, - Type implementationType) - { - Guard.ArgumentNotNull(interceptedType, "interceptedType"); - Guard.ArgumentNotNull(implementationType, "implementationType"); - - return DoGetInterceptableMethods(interceptedType, implementationType); - } - - private IEnumerable DoGetInterceptableMethods( - Type interceptedType, - Type implementationType) - { - if (interceptedType.IsInterface && implementationType.IsInterface - && interceptedType.IsAssignableFrom(implementationType)) - { - var methods = interceptedType.GetMethods(); - for (int i = 0; i < methods.Length; ++i) - { - yield return new MethodImplementationInfo(methods[i], methods[i]); - } - } - else - { - InterfaceMapping mapping = implementationType.GetInterfaceMap(interceptedType); - for (int i = 0; i < mapping.InterfaceMethods.Length; ++i) - { - yield return new MethodImplementationInfo(mapping.InterfaceMethods[i], mapping.TargetMethods[i]); - } - } - - foreach (var type in interceptedType.GetInterfaces()) - { - foreach (var info in DoGetInterceptableMethods(type, implementationType)) - { - yield return info; - } - } - } - - /// - /// Create a proxy object that provides interception for . - /// - /// Type to generate the proxy of. - /// Object to create the proxy for. - /// Additional interfaces the proxy must implement. - /// The proxy object. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public IInterceptingProxy CreateProxy(Type t, object target, params Type[] additionalInterfaces) - { - Guard.ArgumentNotNull(t, "t"); - Guard.ArgumentNotNull(additionalInterfaces, "additionalInterfaces"); - - Type interceptorType; - Type typeToProxy = t; - bool genericType = false; - - if (t.IsGenericType) - { - typeToProxy = t.GetGenericTypeDefinition(); - genericType = true; - } - - GeneratedTypeKey key = new GeneratedTypeKey(typeToProxy, additionalInterfaces); - lock (InterceptorClasses) - { - if (!InterceptorClasses.TryGetValue(key, out interceptorType)) - { - InterfaceInterceptorClassGenerator generator = - new InterfaceInterceptorClassGenerator(typeToProxy, additionalInterfaces); - interceptorType = generator.CreateProxyType(); - InterceptorClasses[key] = interceptorType; - } - } - - if (genericType) - { - interceptorType = interceptorType.MakeGenericType(t.GetGenericArguments()); - } - return (IInterceptingProxy)interceptorType.GetConstructors()[0].Invoke(new object[] { target, t }); - } - - #endregion - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.Desktop.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.Desktop.cs deleted file mode 100644 index 888e6964..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.Desktop.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection.Emit; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - public partial class InterfaceInterceptorClassGenerator - { - private static ModuleBuilder GetModuleBuilder() - { - string moduleName = Guid.NewGuid().ToString("N"); -#if DEBUG_SAVE_GENERATED_ASSEMBLY - return AssemblyBuilder.DefineDynamicModule(moduleName, moduleName + ".dll", true); -#else - return AssemblyBuilder.DefineDynamicModule(moduleName); -#endif - } - } -} \ No newline at end of file diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.cs deleted file mode 100644 index 041294b4..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.cs +++ /dev/null @@ -1,219 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using System.Security; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A class used to generate proxy classes for doing interception on - /// interfaces. - /// - public partial class InterfaceInterceptorClassGenerator - { - private static readonly AssemblyBuilder AssemblyBuilder; - private readonly Type typeToIntercept; - private readonly IEnumerable additionalInterfaces; - private GenericParameterMapper mainInterfaceMapper; - - private FieldBuilder proxyInterceptionPipelineField; - private FieldBuilder targetField; - private FieldBuilder typeToProxyField; - private TypeBuilder typeBuilder; - - [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", - Justification = "Need to use constructor so we can place attribute on it.")] - static InterfaceInterceptorClassGenerator() - { - AssemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly( - new AssemblyName("Unity_ILEmit_InterfaceProxies"), -#if DEBUG_SAVE_GENERATED_ASSEMBLY - AssemblyBuilderAccess.RunAndSave); -#else - AssemblyBuilderAccess.Run); -#endif - } - - /// - /// Create an instance of that - /// can construct an intercepting proxy for the given interface. - /// - /// Type of the interface to intercept. - /// Additional interfaces the proxy must implement. - public InterfaceInterceptorClassGenerator(Type typeToIntercept, IEnumerable additionalInterfaces) - { - CheckAdditionalInterfaces(additionalInterfaces); - - this.typeToIntercept = typeToIntercept; - this.additionalInterfaces = additionalInterfaces; - CreateTypeBuilder(); - } - - private static void CheckAdditionalInterfaces(IEnumerable additionalInterfaces) - { - if (additionalInterfaces == null) - { - throw new ArgumentNullException("additionalInterfaces"); - } - - foreach (var type in additionalInterfaces) - { - if (type == null) - { - throw new ArgumentException( - Resources.ExceptionContainsNullElement, - "additionalInterfaces"); - } - if (!type.IsInterface) - { - throw new ArgumentException( - string.Format(CultureInfo.CurrentCulture, Resources.ExceptionTypeIsNotInterface, type.Name), - "additionalInterfaces"); - } - if (type.IsGenericTypeDefinition) - { - throw new ArgumentException( - string.Format(CultureInfo.CurrentCulture, Resources.ExceptionTypeIsOpenGeneric, type.Name), - "additionalInterfaces"); - } - } - } - - /// - /// Create the type to proxy the requested interface - /// - /// - public Type CreateProxyType() - { - HashSet implementedInterfaces = new HashSet(); - - int memberCount = - new InterfaceImplementation( - this.typeBuilder, - this.typeToIntercept, - this.mainInterfaceMapper, - this.proxyInterceptionPipelineField, - false, - this.targetField) - .Implement(implementedInterfaces, 0); - - foreach (var @interface in this.additionalInterfaces) - { - memberCount = - new InterfaceImplementation( - this.typeBuilder, - @interface, - this.proxyInterceptionPipelineField, - true) - .Implement(implementedInterfaces, memberCount); - } - - AddConstructor(); - - Type result = typeBuilder.CreateType(); -#if DEBUG_SAVE_GENERATED_ASSEMBLY - assemblyBuilder.Save("Unity_ILEmit_InterfaceProxies.dll"); -#endif - return result; - } - - private void AddConstructor() - { - Type[] paramTypes = Sequence.Collect(typeToIntercept, typeof(Type)).ToArray(); - - ConstructorBuilder ctorBuilder = typeBuilder.DefineConstructor( - MethodAttributes.Public, - CallingConventions.HasThis, - paramTypes); - - ctorBuilder.DefineParameter(1, ParameterAttributes.None, "target"); - ctorBuilder.DefineParameter(2, ParameterAttributes.None, "typeToProxy"); - ILGenerator il = ctorBuilder.GetILGenerator(); - - // Call base class constructor - - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Call, ObjectMethods.Constructor); - - // Initialize pipeline field - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Newobj, InterceptionBehaviorPipelineMethods.Constructor); - il.Emit(OpCodes.Stfld, proxyInterceptionPipelineField); - - // Initialize the target field - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldarg_1); - il.Emit(OpCodes.Stfld, targetField); - - // Initialize the typeToProxy field - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldarg_2); - il.Emit(OpCodes.Stfld, typeToProxyField); - - il.Emit(OpCodes.Ret); - } - - private void CreateTypeBuilder() - { - TypeAttributes newAttributes = TypeAttributes.Public | TypeAttributes.Class; - - ModuleBuilder moduleBuilder = GetModuleBuilder(); - typeBuilder = moduleBuilder.DefineType(CreateTypeName(), newAttributes); - - mainInterfaceMapper = DefineGenericArguments(); - - proxyInterceptionPipelineField = InterceptingProxyImplementor.ImplementIInterceptingProxy(typeBuilder); - targetField = typeBuilder.DefineField("target", typeToIntercept, FieldAttributes.Private); - typeToProxyField = typeBuilder.DefineField("typeToProxy", typeof(Type), FieldAttributes.Private); - } - - private string CreateTypeName() - { - return "DynamicModule.ns.Wrapped_" + typeToIntercept.Name + "_" + Guid.NewGuid().ToString("N"); - } - - private GenericParameterMapper DefineGenericArguments() - { - if (!typeToIntercept.IsGenericType) - { - return GenericParameterMapper.DefaultMapper; - } - - Type[] genericArguments = typeToIntercept.GetGenericArguments(); - - GenericTypeParameterBuilder[] genericTypes = typeBuilder.DefineGenericParameters( - genericArguments.Select(t => t.Name).ToArray()); - - for (int i = 0; i < genericArguments.Length; ++i) - { - genericTypes[i].SetGenericParameterAttributes(genericArguments[i].GenericParameterAttributes); - var interfaceConstraints = new List(); - foreach (Type constraint in genericArguments[i].GetGenericParameterConstraints()) - { - if (constraint.IsClass) - { - genericTypes[i].SetBaseTypeConstraint(constraint); - } - else - { - interfaceConstraints.Add(constraint); - } - } - if (interfaceConstraints.Count > 0) - { - genericTypes[i].SetInterfaceConstraints(interfaceConstraints.ToArray()); - } - } - - return new GenericParameterMapper(genericArguments, genericTypes.Cast().ToArray()); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceMethodOverride.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceMethodOverride.cs deleted file mode 100644 index 88deea9c..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/InterfaceInterception/InterfaceMethodOverride.cs +++ /dev/null @@ -1,467 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Represents the implementation of an interface method. - /// - public class InterfaceMethodOverride - { - private static readonly MethodInfo BuildAdditionalInterfaceNonImplementedExceptionMethod = - StaticReflection.GetMethodInfo(() => InterfaceMethodOverride.BuildAdditionalInterfaceNonImplementedException()); - - private const MethodAttributes ImplicitImplementationAttributes = - MethodAttributes.Public | MethodAttributes.Virtual | MethodAttributes.Final - | MethodAttributes.HideBySig | MethodAttributes.NewSlot; - private const MethodAttributes ExplicitImplementationAttributes = - MethodAttributes.Private | MethodAttributes.Virtual | MethodAttributes.Final - | MethodAttributes.HideBySig | MethodAttributes.NewSlot; - - private readonly TypeBuilder typeBuilder; - private readonly MethodInfo methodToOverride; - private readonly ParameterInfo[] methodParameters; - private readonly FieldBuilder proxyInterceptionPipelineField; - private readonly bool explicitImplementation; - private readonly FieldBuilder targetField; - private readonly Type targetInterface; - private readonly GenericParameterMapper targetInterfaceParameterMapper; - private readonly int overrideCount; - - internal InterfaceMethodOverride( - TypeBuilder typeBuilder, - FieldBuilder proxyInterceptionPipelineField, - FieldBuilder targetField, - MethodInfo methodToOverride, - Type targetInterface, - GenericParameterMapper targetInterfaceParameterMapper, - bool explicitImplementation, - int overrideCount) - { - this.typeBuilder = typeBuilder; - this.proxyInterceptionPipelineField = proxyInterceptionPipelineField; - this.explicitImplementation = explicitImplementation; - this.targetField = targetField; - this.methodToOverride = methodToOverride; - this.targetInterface = targetInterface; - this.targetInterfaceParameterMapper = targetInterfaceParameterMapper; - this.methodParameters = methodToOverride.GetParameters(); - this.overrideCount = overrideCount; - } - - internal MethodBuilder AddMethod() - { - MethodBuilder delegateMethod = CreateDelegateImplementation(); - return CreateMethodOverride(delegateMethod); - } - - private string CreateMethodName(string purpose) - { - return "<" + methodToOverride.Name + "_" + purpose + ">__" + - overrideCount.ToString(CultureInfo.InvariantCulture); - } - - private static readonly OpCode[] LoadArgsOpcodes = - { - OpCodes.Ldarg_1, - OpCodes.Ldarg_2, - OpCodes.Ldarg_3 - }; - - private static void EmitLoadArgument(ILGenerator il, int argumentNumber) - { - if (argumentNumber < LoadArgsOpcodes.Length) - { - il.Emit(LoadArgsOpcodes[argumentNumber]); - } - else - { - il.Emit(OpCodes.Ldarg, argumentNumber + 1); - } - } - - private static readonly OpCode[] LoadConstOpCodes = - { - OpCodes.Ldc_I4_0, - OpCodes.Ldc_I4_1, - OpCodes.Ldc_I4_2, - OpCodes.Ldc_I4_3, - OpCodes.Ldc_I4_4, - OpCodes.Ldc_I4_5, - OpCodes.Ldc_I4_6, - OpCodes.Ldc_I4_7, - OpCodes.Ldc_I4_8, - }; - - private static void EmitLoadConstant(ILGenerator il, int i) - { - if (i < LoadConstOpCodes.Length) - { - il.Emit(LoadConstOpCodes[i]); - } - else - { - il.Emit(OpCodes.Ldc_I4, i); - } - } - - private static void EmitBox(ILGenerator il, Type typeOnStack) - { - if (typeOnStack.IsValueType || typeOnStack.IsGenericParameter) - { - il.Emit(OpCodes.Box, typeOnStack); - } - } - - private static void EmitUnboxOrCast(ILGenerator il, Type targetType) - { - if (targetType.IsValueType || targetType.IsGenericParameter) - { - il.Emit(OpCodes.Unbox_Any, targetType); - } - else - { - il.Emit(OpCodes.Castclass, targetType); - } - } - - private MethodBuilder CreateDelegateImplementation() - { - string methodName = CreateMethodName("DelegateImplementation"); - - MethodBuilder methodBuilder = typeBuilder.DefineMethod(methodName, - MethodAttributes.Private | MethodAttributes.HideBySig); - List outOrRefLocals = new List(); - - var paramMapper = new MethodOverrideParameterMapper(methodToOverride); - paramMapper.SetupParameters(methodBuilder, this.targetInterfaceParameterMapper); - - methodBuilder.SetReturnType(typeof(IMethodReturn)); - // Adding parameters - methodBuilder.SetParameters(typeof(IMethodInvocation), typeof(GetNextInterceptionBehaviorDelegate)); - // Parameter - methodBuilder.DefineParameter(1, ParameterAttributes.None, "inputs"); - // Parameter - methodBuilder.DefineParameter(2, ParameterAttributes.None, "getNext"); - - methodBuilder.SetCustomAttribute(new CustomAttributeBuilder(CompilerGeneratedAttributeMethods.CompilerGeneratedAttribute, new object[0])); - - ILGenerator il = methodBuilder.GetILGenerator(); - - if (this.targetField != null) - { - // forwarding implementation - Label done = il.DefineLabel(); - LocalBuilder ex = il.DeclareLocal(typeof(Exception)); - - LocalBuilder baseReturn = null; - LocalBuilder parameters = null; - - if (MethodHasReturnValue) - { - baseReturn = il.DeclareLocal(paramMapper.GetReturnType()); - } - LocalBuilder retval = il.DeclareLocal(typeof(IMethodReturn)); - - il.BeginExceptionBlock(); - // Call the target method - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldfld, targetField); - - if (methodParameters.Length > 0) - { - parameters = il.DeclareLocal(typeof(IParameterCollection)); - il.Emit(OpCodes.Ldarg_1); - il.EmitCall(OpCodes.Callvirt, IMethodInvocationMethods.GetArguments, null); - il.Emit(OpCodes.Stloc, parameters); - - for (int i = 0; i < methodParameters.Length; ++i) - { - il.Emit(OpCodes.Ldloc, parameters); - EmitLoadConstant(il, i); - il.EmitCall(OpCodes.Callvirt, IListMethods.GetItem, null); - Type parameterType = paramMapper.GetParameterType(methodParameters[i].ParameterType); - - if (parameterType.IsByRef) - { - Type elementType = parameterType.GetElementType(); - LocalBuilder refShadowLocal = il.DeclareLocal(elementType); - outOrRefLocals.Add(refShadowLocal); - EmitUnboxOrCast(il, elementType); - il.Emit(OpCodes.Stloc, refShadowLocal); - il.Emit(OpCodes.Ldloca, refShadowLocal); - } - else - { - EmitUnboxOrCast(il, parameterType); - } - } - } - - MethodInfo callTarget = methodToOverride; - if (callTarget.IsGenericMethod) - { - callTarget = methodToOverride.MakeGenericMethod(paramMapper.GenericMethodParameters); - } - - il.Emit(OpCodes.Callvirt, callTarget); - - if (MethodHasReturnValue) - { - il.Emit(OpCodes.Stloc, baseReturn); - } - - // Generate the return value - il.Emit(OpCodes.Ldarg_1); - if (MethodHasReturnValue) - { - il.Emit(OpCodes.Ldloc, baseReturn); - EmitBox(il, paramMapper.GetReturnType()); - } - else - { - il.Emit(OpCodes.Ldnull); - } - EmitLoadConstant(il, methodParameters.Length); - il.Emit(OpCodes.Newarr, typeof(object)); - - if (methodParameters.Length > 0) - { - LocalBuilder outputArguments = il.DeclareLocal(typeof(object[])); - il.Emit(OpCodes.Stloc, outputArguments); - - int outputArgNum = 0; - for (int i = 0; i < methodParameters.Length; ++i) - { - il.Emit(OpCodes.Ldloc, outputArguments); - EmitLoadConstant(il, i); - - Type parameterType = paramMapper.GetParameterType(methodParameters[i].ParameterType); - if (parameterType.IsByRef) - { - parameterType = parameterType.GetElementType(); - il.Emit(OpCodes.Ldloc, outOrRefLocals[outputArgNum++]); - EmitBox(il, parameterType); - } - else - { - il.Emit(OpCodes.Ldloc, parameters); - EmitLoadConstant(il, i); - il.Emit(OpCodes.Callvirt, IListMethods.GetItem); - } - il.Emit(OpCodes.Stelem_Ref); - } - il.Emit(OpCodes.Ldloc, outputArguments); - } - - il.Emit(OpCodes.Callvirt, IMethodInvocationMethods.CreateReturn); - il.Emit(OpCodes.Stloc, retval); - il.BeginCatchBlock(typeof(Exception)); - il.Emit(OpCodes.Stloc, ex); - // Create an exception return - il.Emit(OpCodes.Ldarg_1); - il.Emit(OpCodes.Ldloc, ex); - il.EmitCall(OpCodes.Callvirt, IMethodInvocationMethods.CreateExceptionMethodReturn, null); - il.Emit(OpCodes.Stloc, retval); - il.EndExceptionBlock(); - il.MarkLabel(done); - il.Emit(OpCodes.Ldloc, retval); - il.Emit(OpCodes.Ret); - } - else - { - // exception-throwing implementation - il.Emit(OpCodes.Ldarg_1); - il.EmitCall(OpCodes.Call, BuildAdditionalInterfaceNonImplementedExceptionMethod, null); - il.EmitCall(OpCodes.Callvirt, IMethodInvocationMethods.CreateExceptionMethodReturn, null); - il.Emit(OpCodes.Ret); - } - return methodBuilder; - } - - private MethodBuilder CreateMethodOverride(MethodBuilder delegateMethod) - { - string methodName = - this.explicitImplementation - ? methodToOverride.DeclaringType.Name + "." + methodToOverride.Name - : methodToOverride.Name; - - MethodBuilder methodBuilder = - typeBuilder.DefineMethod( - methodName, - this.explicitImplementation ? ExplicitImplementationAttributes : ImplicitImplementationAttributes); - - var paramMapper = new MethodOverrideParameterMapper(methodToOverride); - paramMapper.SetupParameters(methodBuilder, this.targetInterfaceParameterMapper); - - methodBuilder.SetReturnType(paramMapper.GetReturnType()); - methodBuilder.SetParameters(methodParameters.Select(pi => paramMapper.GetParameterType(pi.ParameterType)).ToArray()); - if (this.explicitImplementation) - { - this.typeBuilder.DefineMethodOverride(methodBuilder, this.methodToOverride); - } - - int paramNum = 1; - foreach (ParameterInfo pi in methodParameters) - { - methodBuilder.DefineParameter(paramNum++, pi.Attributes, pi.Name); - } - - ILGenerator il = methodBuilder.GetILGenerator(); - - LocalBuilder methodReturn = il.DeclareLocal(typeof(IMethodReturn)); - LocalBuilder ex = il.DeclareLocal(typeof(Exception)); - LocalBuilder parameterArray = il.DeclareLocal(typeof(object[])); - LocalBuilder inputs = il.DeclareLocal(typeof(VirtualMethodInvocation)); - - // Create instance of VirtualMethodInvocation - il.Emit(OpCodes.Ldarg_0); // target object - - // If we have a targetField, that means we're building a proxy and - // should use it as the target object. If we don't, we're building - // a type interceptor and should leave the this pointer as the - // target. - if (targetField != null) - { - il.Emit(OpCodes.Ldfld, targetField); - } - - // If we have a generic method, we want to make sure we're using the open constructed generic method - // so when a closed generic version of the method is invoked the actual type parameters are used - il.Emit( - OpCodes.Ldtoken, - methodToOverride.IsGenericMethodDefinition - ? methodToOverride.MakeGenericMethod(paramMapper.GenericMethodParameters) - : methodToOverride); - if (methodToOverride.DeclaringType.IsGenericType) - { - // if the declaring type is generic, we need to get the method from the target type - il.Emit(OpCodes.Ldtoken, targetInterface); - il.Emit(OpCodes.Call, MethodBaseMethods.GetMethodForGenericFromHandle); - } - else - { - il.Emit(OpCodes.Call, MethodBaseMethods.GetMethodFromHandle); // target method - } - - EmitLoadConstant(il, methodParameters.Length); - il.Emit(OpCodes.Newarr, typeof(object)); // object[] parameters - if (methodParameters.Length > 0) - { - il.Emit(OpCodes.Stloc, parameterArray); - - for (int i = 0; i < methodParameters.Length; ++i) - { - il.Emit(OpCodes.Ldloc, parameterArray); - EmitLoadConstant(il, i); - EmitLoadArgument(il, i); - Type elementType = paramMapper.GetParameterType(methodParameters[i].ParameterType); - if (elementType.IsByRef) - { - elementType = paramMapper.GetElementType(methodParameters[i].ParameterType); - il.Emit(OpCodes.Ldobj, elementType); - } - EmitBox(il, elementType); - il.Emit(OpCodes.Stelem_Ref); - } - - il.Emit(OpCodes.Ldloc, parameterArray); - } - il.Emit(OpCodes.Newobj, VirtualMethodInvocationMethods.VirtualMethodInvocation); - il.Emit(OpCodes.Stloc, inputs); - - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldfld, proxyInterceptionPipelineField); - il.Emit(OpCodes.Ldloc, inputs); - - // Put delegate reference onto the stack - il.Emit(OpCodes.Ldarg_0); - - MethodInfo callTarget = delegateMethod; - if (callTarget.IsGenericMethod) - { - callTarget = delegateMethod.MakeGenericMethod(paramMapper.GenericMethodParameters); - } - - il.Emit(OpCodes.Ldftn, callTarget); - - il.Emit(OpCodes.Newobj, InvokeInterceptionBehaviorDelegateMethods.InvokeInterceptionBehaviorDelegate); - - // And call the pipeline - il.Emit(OpCodes.Call, InterceptionBehaviorPipelineMethods.Invoke); - - il.Emit(OpCodes.Stloc, methodReturn); - - // Was there an exception? - Label noException = il.DefineLabel(); - il.Emit(OpCodes.Ldloc, methodReturn); - il.EmitCall(OpCodes.Callvirt, IMethodReturnMethods.GetException, null); - il.Emit(OpCodes.Stloc, ex); - il.Emit(OpCodes.Ldloc, ex); - il.Emit(OpCodes.Ldnull); - il.Emit(OpCodes.Ceq); - il.Emit(OpCodes.Brtrue_S, noException); - il.Emit(OpCodes.Ldloc, ex); - il.Emit(OpCodes.Throw); - - il.MarkLabel(noException); - - // Unpack any ref/out parameters - if (methodParameters.Length > 0) - { - int outputArgNum = 0; - for (paramNum = 0; paramNum < methodParameters.Length; ++paramNum) - { - ParameterInfo pi = methodParameters[paramNum]; - if (pi.ParameterType.IsByRef) - { - // Get the original parameter value - address of the ref or out - EmitLoadArgument(il, paramNum); - - // Get the value of this output parameter out of the Outputs collection - il.Emit(OpCodes.Ldloc, methodReturn); - il.Emit(OpCodes.Callvirt, IMethodReturnMethods.GetOutputs); - EmitLoadConstant(il, outputArgNum++); - il.Emit(OpCodes.Callvirt, IListMethods.GetItem); - EmitUnboxOrCast(il, paramMapper.GetElementType(pi.ParameterType)); - - // And store in the caller - il.Emit(OpCodes.Stobj, paramMapper.GetElementType(pi.ParameterType)); - } - } - } - - if (MethodHasReturnValue) - { - il.Emit(OpCodes.Ldloc, methodReturn); - il.EmitCall(OpCodes.Callvirt, IMethodReturnMethods.GetReturnValue, null); - EmitUnboxOrCast(il, paramMapper.GetReturnType()); - } - il.Emit(OpCodes.Ret); - - return methodBuilder; - } - - private bool MethodHasReturnValue - { - get { return methodToOverride.ReturnType != typeof(void); } - } - - /// - /// Used to throw an for non-implemented methods on the - /// additional interfaces. - /// - public static Exception BuildAdditionalInterfaceNonImplementedException() - { - return new NotImplementedException(Resources.ExceptionAdditionalInterfaceNotImplemented); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/InterceptingRealProxy.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/InterceptingRealProxy.cs deleted file mode 100644 index 4bd23b95..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/InterceptingRealProxy.cs +++ /dev/null @@ -1,212 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; -using System.Runtime.Remoting; -using System.Runtime.Remoting.Messaging; -using System.Runtime.Remoting.Proxies; -using System.Security; -using System.Security.Permissions; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This class provides the remoting based interception mechanism. It is - /// invoked by a call on the corresponding TransparentProxy - /// object. It routes calls through the handlers as appropriate. - /// - [SecurityCritical] - [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.Infrastructure)] - public class InterceptingRealProxy : RealProxy, IRemotingTypeInfo, IInterceptingProxy - { - private readonly InterceptionBehaviorPipeline interceptorsPipeline = new InterceptionBehaviorPipeline(); - private readonly object target; - private readonly ReadOnlyCollection additionalInterfaces; - private string typeName; - - /// - /// Creates a new instance that applies - /// the given policies to the given target object. - /// - /// Target object to intercept calls to. - /// Type to return as the type being proxied. - /// Additional interfaces the proxy must implement. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public InterceptingRealProxy( - object target, - Type classToProxy, - params Type[] additionalInterfaces) - : base(classToProxy) - { - Guard.ArgumentNotNull(target, "target"); - this.target = target; - this.additionalInterfaces = CheckAdditionalInterfaces(additionalInterfaces); - this.typeName = target.GetType().FullName; - } - - private static ReadOnlyCollection CheckAdditionalInterfaces(Type[] interfaces) - { - return new ReadOnlyCollection(interfaces); - } - - /// - /// Returns the target of this intercepted call. - /// - /// The target object. - public object Target - { - get { return this.target; } - } - - #region IInterceptingProxy Members - - /// - /// Adds a to the proxy. - /// - /// The to add. - [SecuritySafeCritical] - public void AddInterceptionBehavior(IInterceptionBehavior interceptor) - { - Guard.ArgumentNotNull(interceptor, "interceptor"); - - this.interceptorsPipeline.Add(interceptor); - } - - #endregion - - #region IRemotingTypeInfo Members - - /// - /// Checks whether the proxy that represents the specified object type can be cast to the type represented by the interface. - /// - /// - /// true if cast will succeed; otherwise, false. - /// - /// The type to cast to. - /// The object for which to check casting. - /// The immediate caller makes the call through a reference to the interface and does not have infrastructure permission. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - [SecurityCritical] - public bool CanCastTo(Type fromType, object o) - { - Guard.ArgumentNotNull(fromType, "fromType"); - Guard.ArgumentNotNull(o, "o"); - - if (fromType == typeof(IInterceptingProxy)) - { - return true; - } - - if (fromType.IsAssignableFrom(o.GetType())) - { - return true; - } - - foreach (Type @interface in this.additionalInterfaces) - { - if (fromType.IsAssignableFrom(@interface)) - { - return true; - } - } - - return false; - } - - /// - /// Gets or sets the fully qualified type name of the server object in a . - /// - /// - /// The fully qualified type name of the server object in a . - /// - /// The immediate caller makes the call through a reference to the interface and does not have infrastructure permission. - public string TypeName - { - [SecurityCritical] - get { return this.typeName; } - - [SecurityCritical] - set { this.typeName = value; } - } - - #endregion - - /// - /// Executes a method call represented by the - /// parameter. The CLR will call this method when a method is called - /// on the TransparentProxy. This method runs the invocation through - /// the call handler pipeline and finally sends it down to the - /// target object, and then back through the pipeline. - /// - /// An object that contains the information - /// about the method call. - /// An object contains the - /// information about the target method's return value. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", Justification = "Validation done by Guard class")] - [SecurityCritical] - public override IMessage Invoke(IMessage msg) - { - Guard.ArgumentNotNull(msg, "msg"); - - IMethodCallMessage callMessage = (IMethodCallMessage)msg; - - if (callMessage.MethodBase.DeclaringType == typeof(IInterceptingProxy)) - { - return this.HandleInterceptingProxyMethod(callMessage); - } - - TransparentProxyMethodInvocation invocation = new TransparentProxyMethodInvocation(callMessage, this.target); - IMethodReturn result = - this.interceptorsPipeline.Invoke( - invocation, - delegate(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - if (callMessage.MethodBase.DeclaringType.IsAssignableFrom(this.target.GetType())) - { - try - { - object returnValue = callMessage.MethodBase.Invoke(this.target, invocation.Arguments); - return input.CreateMethodReturn(returnValue, invocation.Arguments); - } - catch (TargetInvocationException ex) - { - // The outer exception will always be a reflection exception; we want the inner, which is - // the underlying exception. - return input.CreateExceptionMethodReturn(ex.InnerException); - } - } - else - { - return input.CreateExceptionMethodReturn( - new InvalidOperationException(Resources.ExceptionAdditionalInterfaceNotImplemented)); - } - }); - - return ((TransparentProxyMethodReturn)result).ToMethodReturnMessage(); - } - - private IMessage HandleInterceptingProxyMethod(IMethodCallMessage callMessage) - { - switch (callMessage.MethodName) - { - case "AddInterceptionBehavior": - return this.ExecuteAddInterceptionBehavior(callMessage); - } - throw new InvalidOperationException(); - } - - private IMessage ExecuteAddInterceptionBehavior(IMethodCallMessage callMessage) - { - IInterceptionBehavior interceptor = (IInterceptionBehavior)callMessage.InArgs[0]; - this.AddInterceptionBehavior(interceptor); - return new ReturnMessage(null, new object[0], 0, callMessage.LogicalCallContext, callMessage); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyInputParameterCollection.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyInputParameterCollection.cs deleted file mode 100644 index fd40f382..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyInputParameterCollection.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using System.Runtime.Remoting.Messaging; -using System.Security; -using System.Security.Permissions; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A class that wraps the inputs of a into the - /// interface. - /// - [SecurityCritical] - [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.Infrastructure)] - internal class TransparentProxyInputParameterCollection : ParameterCollection - { - /// - /// Constructs a new that wraps the - /// given method call and arguments. - /// - /// The call message. - /// The arguments. - public TransparentProxyInputParameterCollection(IMethodCallMessage callMessage, object[] arguments) - : base(arguments, callMessage.MethodBase.GetParameters(), - delegate(ParameterInfo info) { return !info.IsOut; }) - { - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyInterceptor.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyInterceptor.cs deleted file mode 100644 index c7565dab..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyInterceptor.cs +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reflection; -using System.Runtime.Remoting.Proxies; -using System.Security; -using System.Security.Permissions; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An instance interceptor that uses remoting proxies to do the - /// interception. - /// - public class TransparentProxyInterceptor : IInstanceInterceptor - { - /// - /// Can this interceptor generate a proxy for the given type? - /// - /// Type to check. - /// True if interception is possible, false if not. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public bool CanIntercept(Type t) - { - Guard.ArgumentNotNull(t, "t"); - - return (typeof(MarshalByRefObject).IsAssignableFrom(t) || t.IsInterface); - } - - /// - /// Returns a sequence of methods on the given type that can be - /// intercepted. - /// - /// The intercepted type. - /// The concrete type of the implementing object. - /// Sequence of objects. - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Interceptable", Justification = "Interceptable is valid in this context")] - public IEnumerable GetInterceptableMethods(Type interceptedType, Type implementationType) - { - if (typeof(MarshalByRefObject).IsAssignableFrom(implementationType)) - { - return GetMBROMethods(implementationType); - } - - return GetImplementedInterfaceMethods(implementationType); - } - - private static IEnumerable GetMBROMethods(Type t) - { - Dictionary haveSeenMethod = new Dictionary(); - - foreach (MethodImplementationInfo methodImpl in GetImplementedInterfaceMethods(t)) - { - haveSeenMethod[methodImpl.ImplementationMethodInfo] = true; - yield return methodImpl; - } - - foreach (MethodInfo method in t.GetMethods()) - { - if (IsNotSystemMethod(method) && !haveSeenMethod.ContainsKey(method)) - { - yield return new MethodImplementationInfo(null, method); - } - } - } - - private static IEnumerable GetImplementedInterfaceMethods(Type t) - { - foreach (Type itf in t.GetInterfaces()) - { - InterfaceMapping mapping = t.GetInterfaceMap(itf); - for (int i = 0; i < mapping.InterfaceMethods.Length; ++i) - { - yield return new MethodImplementationInfo( - mapping.InterfaceMethods[i], mapping.TargetMethods[i]); - } - } - } - - private static bool IsNotSystemMethod(MethodInfo method) - { - return method.DeclaringType != typeof(MarshalByRefObject) && method.DeclaringType != typeof(object); - } - - /// - /// Create a proxy object that provides interception for . - /// - /// Type to generate the proxy of. - /// Object to create the proxy for. - /// Additional interfaces the proxy must implement. - /// The proxy object. - [SecuritySafeCritical] - public IInterceptingProxy CreateProxy(Type t, object target, params Type[] additionalInterfaces) - { - Guard.ArgumentNotNull(t, "t"); - Guard.ArgumentNotNull(target, "target"); - - RealProxy realProxy = new InterceptingRealProxy(target, t, additionalInterfaces); - return (IInterceptingProxy)realProxy.GetTransparentProxy(); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyMethodInvocation.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyMethodInvocation.cs deleted file mode 100644 index 085fecce..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyMethodInvocation.cs +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using System.Runtime.Remoting.Messaging; -using System.Security; -using System.Security.Permissions; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of that wraps the - /// remoting based in the PIAB call - /// interface. - /// - [SecurityCritical] - [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.Infrastructure)] - public sealed class TransparentProxyMethodInvocation : IMethodInvocation - { - private IMethodCallMessage callMessage; - private TransparentProxyInputParameterCollection inputParams; - private ParameterCollection allParams; - private Dictionary invocationContext; - private object target; - private object[] arguments; - - /// - /// Creates a new implementation that wraps - /// the given , with the given ultimate - /// target object. - /// - /// Remoting call message object. - /// Ultimate target of the method call. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public TransparentProxyMethodInvocation(IMethodCallMessage callMessage, object target) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(callMessage, "callMessage"); - - this.callMessage = callMessage; - this.invocationContext = new Dictionary(); - this.target = target; - this.arguments = callMessage.Args; - this.inputParams = new TransparentProxyInputParameterCollection(callMessage, this.arguments); - this.allParams = - new ParameterCollection(arguments, callMessage.MethodBase.GetParameters(), info => true); - } - - /// - /// Gets the inputs for this call. - /// - /// The input collection. - public IParameterCollection Inputs - { - [SecuritySafeCritical] - get { return inputParams; } - } - - /// - /// Collection of all parameters to the call: in, out and byref. - /// - /// The arguments collection. - IParameterCollection IMethodInvocation.Arguments - { - [SecuritySafeCritical] - get { return allParams; } - } - - /// - /// Retrieves a dictionary that can be used to store arbitrary additional - /// values. This allows the user to pass values between call handlers. - /// - /// The invocation context dictionary. - public IDictionary InvocationContext - { - [SecuritySafeCritical] - get { return invocationContext; } - } - - /// - /// The object that the call is made on. - /// - /// The target object. - public object Target - { - [SecuritySafeCritical] - get { return target; } - } - - /// - /// The method on Target that we're aiming at. - /// - /// The target method base. - public MethodBase MethodBase - { - [SecuritySafeCritical] - get { return callMessage.MethodBase; } - } - - /// - /// Factory method that creates the correct implementation of - /// IMethodReturn. - /// - /// In this implementation we create an instance of . - /// Return value to be placed in the IMethodReturn object. - /// All arguments passed or returned as out/byref to the method. - /// Note that this is the entire argument list, including in parameters. - /// New IMethodReturn object. - [SecuritySafeCritical] - public IMethodReturn CreateMethodReturn(object returnValue, params object[] outputs) - { - return new TransparentProxyMethodReturn(callMessage, returnValue, outputs, invocationContext); - } - - /// - /// Factory method that creates the correct implementation of - /// IMethodReturn in the presence of an exception. - /// - /// Exception to be set into the returned object. - /// New IMethodReturn object - [SecuritySafeCritical] - public IMethodReturn CreateExceptionMethodReturn(Exception ex) - { - return new TransparentProxyMethodReturn(ex, callMessage, invocationContext); - } - - /// - /// Gets the collection of arguments being passed to the target. - /// - /// This method exists because the underlying remoting call message - /// does not let handlers change the arguments. - /// Array containing the arguments to the target. - internal object[] Arguments - { - get { return arguments; } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyMethodReturn.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyMethodReturn.cs deleted file mode 100644 index 407818d9..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyMethodReturn.cs +++ /dev/null @@ -1,141 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using System.Runtime.Remoting.Messaging; -using System.Security; -using System.Security.Permissions; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of that wraps the - /// remoting call and return messages. - /// - [SecurityCritical] - [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.Infrastructure)] - internal class TransparentProxyMethodReturn : IMethodReturn - { - private readonly IMethodCallMessage callMessage; - private readonly ParameterCollection outputs; - private readonly IDictionary invocationContext; - private readonly object[] arguments; - private object returnValue; - private Exception exception; - - /// - /// Creates a new object that contains a - /// return value. - /// - /// The original call message that invoked the method. - /// Return value from the method. - /// Collections of arguments passed to the method (including the new - /// values of any out params). - /// Invocation context dictionary passed into the call. - public TransparentProxyMethodReturn(IMethodCallMessage callMessage, object returnValue, object[] arguments, IDictionary invocationContext) - { - this.callMessage = callMessage; - this.invocationContext = invocationContext; - this.arguments = arguments; - this.returnValue = returnValue; - this.outputs = new TransparentProxyOutputParameterCollection(callMessage, arguments); - } - - /// - /// Creates a new object that contains an - /// exception thrown by the target. - /// - /// Exception that was thrown. - /// The original call message that invoked the method. - /// Invocation context dictionary passed into the call. - public TransparentProxyMethodReturn(Exception ex, IMethodCallMessage callMessage, IDictionary invocationContext) - { - this.callMessage = callMessage; - this.invocationContext = invocationContext; - this.exception = ex; - this.arguments = new object[0]; - this.outputs = new ParameterCollection(this.arguments, new ParameterInfo[0], pi => false); - } - - /// - /// The collection of output parameters. If the method has no output - /// parameters, this is a zero-length list (never null). - /// - /// The output parameter collection. - public IParameterCollection Outputs - { - [SecuritySafeCritical] - get { return outputs; } - } - - /// - /// Return value from the method call. - /// - /// This value is null if the method has no return value. - /// The return value. - public object ReturnValue - { - [SecuritySafeCritical] - get { return returnValue; } - - [SecuritySafeCritical] - set - { - returnValue = value; - } - } - - /// - /// If the method threw an exception, the exception object is here. - /// - /// The exception, or null if no exception was thrown. - public Exception Exception - { - [SecuritySafeCritical] - get { return exception; } - - [SecuritySafeCritical] - set - { - exception = value; - } - } - - /// - /// Retrieves a dictionary that can be used to store arbitrary additional - /// values. This allows the user to pass values between call handlers. - /// - /// This is guaranteed to be the same dictionary that was used - /// in the IMethodInvocation object, so handlers can set context - /// properties in the pre-call phase and retrieve them in the after-call phase. - /// - /// The invocation context dictionary. - public IDictionary InvocationContext - { - [SecuritySafeCritical] - get { return invocationContext; } - } - - /// - /// Constructs a for the remoting - /// infrastructure based on the contents of this object. - /// - /// The instance. - [SecurityCritical] - public IMethodReturnMessage ToMethodReturnMessage() - { - if (exception == null) - { - return - new ReturnMessage(returnValue, arguments, arguments.Length, - callMessage.LogicalCallContext, callMessage); - } - else - { - return new ReturnMessage(exception, callMessage); - } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyOutputParameterCollection.cs b/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyOutputParameterCollection.cs deleted file mode 100644 index 5e7d096c..00000000 --- a/source/Unity.Interception/Src/Interceptors/InstanceInterceptors/TransparentProxyInterception/TransparentProxyOutputParameterCollection.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Runtime.Remoting.Messaging; -using System.Security; -using System.Security.Permissions; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A class that wraps the outputs of a into the - /// interface. - /// - [SecurityCritical] - [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.Infrastructure)] - internal class TransparentProxyOutputParameterCollection : ParameterCollection - { - /// - /// Constructs a new that wraps the - /// given method call and arguments. - /// - /// The call message. - /// The arguments. - public TransparentProxyOutputParameterCollection(IMethodCallMessage callMessage, object[] arguments) - : base(arguments, callMessage.MethodBase.GetParameters(), parameterInfo => parameterInfo.ParameterType.IsByRef) - { - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/MethodImplementationInfo.cs b/source/Unity.Interception/Src/Interceptors/MethodImplementationInfo.cs deleted file mode 100644 index c90671a2..00000000 --- a/source/Unity.Interception/Src/Interceptors/MethodImplementationInfo.cs +++ /dev/null @@ -1,128 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Globalization; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A dumb data holder that returns the MethodInfo for both an - /// interface method and the method that implements that interface - /// method. - /// - public class MethodImplementationInfo - { - private readonly MethodInfo interfaceMethodInfo; - private readonly MethodInfo implementationMethodInfo; - - /// - /// Construct a new which holds - /// the given objects. - /// - /// MethodInfo for the interface method (may be null if no interface). - /// MethodInfo for implementing method. - public MethodImplementationInfo(MethodInfo interfaceMethodInfo, MethodInfo implementationMethodInfo) - { - this.interfaceMethodInfo = interfaceMethodInfo; - this.implementationMethodInfo = implementationMethodInfo; - } - - /// - /// The interface method MethodInfo. - /// - public MethodInfo InterfaceMethodInfo - { - get { return interfaceMethodInfo; } - } - - /// - /// The implementing method MethodInfo. - /// - public MethodInfo ImplementationMethodInfo - { - get { return implementationMethodInfo; } - } - - /// - /// Determines whether the specified is equal to the current . - /// - /// - /// true if the specified is equal to the current ; otherwise, false. - /// - /// The to compare with the current . - /// The parameter is null. - /// 2 - public override bool Equals(object obj) - { - MethodImplementationInfo other = obj as MethodImplementationInfo; - if (obj == null || other == null) - { - return false; - } - - return this == other; - } - - /// - /// Serves as a hash function for a particular type. - /// - /// - /// A hash code for the current . - /// - /// 2 - public override int GetHashCode() - { - int hash1 = interfaceMethodInfo != null ? interfaceMethodInfo.GetHashCode() : 0; - int hash2 = implementationMethodInfo != null ? implementationMethodInfo.GetHashCode() : 0; - return hash1 * 23 ^ hash2 * 7; - } - - /// - /// Standard equals operator - /// - public static bool operator ==(MethodImplementationInfo left, MethodImplementationInfo right) - { - if (ReferenceEquals(left, null) && ReferenceEquals(right, null)) - { - return true; - } - - if (ReferenceEquals(left, null) || ReferenceEquals(right, null)) - { - return false; - } - - return left.interfaceMethodInfo == right.interfaceMethodInfo && - left.implementationMethodInfo == right.implementationMethodInfo; - } - - /// - /// standard not equal operator. - /// - public static bool operator !=(MethodImplementationInfo left, MethodImplementationInfo right) - { - return !(left == right); - } - - /// - /// Returns a that represents the current . - /// - /// - /// A that represents the current . - /// - /// 2 - public override string ToString() - { - if (interfaceMethodInfo == null) - { - return string.Format(CultureInfo.CurrentCulture, - "No interface, implementation {0}.{1}", - implementationMethodInfo.DeclaringType.Name, implementationMethodInfo.Name); - } - return string.Format(CultureInfo.CurrentCulture, - "Interface {0}.{1}, implementation {2}.{3}", - interfaceMethodInfo.DeclaringType.Name, interfaceMethodInfo.Name, - implementationMethodInfo.DeclaringType.Name, implementationMethodInfo.Name); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/ITypeInterceptor.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/ITypeInterceptor.cs deleted file mode 100644 index bbecdcf1..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/ITypeInterceptor.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Interface for interceptor objects that generate - /// proxy types. - /// - public interface ITypeInterceptor : IInterceptor - { - /// - /// Create a type to proxy for the given type . - /// - /// Type to proxy. - /// Additional interfaces the proxy must implement. - /// New type that can be instantiated instead of the - /// original type t, and supports interception. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "t", Justification = "Parameter name is meaningful enough in context")] - Type CreateProxyType(Type t, params Type[] additionalInterfaces); - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs deleted file mode 100644 index 03c7f5c2..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/ConstructorWithResolverKeysSelectorPolicy.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A small implementation of that returns the - /// given object. - /// - public class ConstructorWithResolverKeysSelectorPolicy : IConstructorSelectorPolicy - { - private readonly SelectedConstructor selectedConstructor; - - /// - /// Create a new instance. - /// - /// Information about which constructor to select. - public ConstructorWithResolverKeysSelectorPolicy(SelectedConstructor selectedConstructor) - { - this.selectedConstructor = selectedConstructor; - } - - /// - /// Choose the constructor to call for the given type. - /// - /// Current build context - /// The to add any - /// generated resolver objects into. - /// The chosen constructor. - public SelectedConstructor SelectConstructor(IBuilderContext context, IPolicyList resolverPolicyDestination) - { - return selectedConstructor; - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/CompilerGeneratedAttributeMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/CompilerGeneratedAttributeMethods.cs deleted file mode 100644 index bfe65ac0..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/CompilerGeneratedAttributeMethods.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using System.Runtime.CompilerServices; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class CompilerGeneratedAttributeMethods - { - public static ConstructorInfo CompilerGeneratedAttribute - { - get { return StaticReflection.GetConstructorInfo(() => new CompilerGeneratedAttribute()); } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/GeneratedTypeKey.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/GeneratedTypeKey.cs deleted file mode 100644 index eb794f5a..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/GeneratedTypeKey.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal struct GeneratedTypeKey - { - private readonly Type baseType; - private readonly Type[] additionalInterfaces; - - public GeneratedTypeKey(Type baseType, Type[] additionalInterfaces) - { - this.baseType = baseType; - this.additionalInterfaces = additionalInterfaces; - } - - internal class GeneratedTypeKeyComparer : IEqualityComparer - { - public bool Equals(GeneratedTypeKey x, GeneratedTypeKey y) - { - if (!(x.baseType.Equals(y.baseType) && x.additionalInterfaces.Length == y.additionalInterfaces.Length)) - { - return false; - } - for (int i = 0; i < x.additionalInterfaces.Length; i++) - { - if (!x.additionalInterfaces[i].Equals(y.additionalInterfaces[i])) - { - return false; - } - } - - return true; - } - - public int GetHashCode(GeneratedTypeKey obj) - { - return obj.baseType.GetHashCode(); - } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IInterceptingProxyMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IInterceptingProxyMethods.cs deleted file mode 100644 index cabf2473..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IInterceptingProxyMethods.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class IInterceptingProxyMethods - { - internal static MethodInfo AddInterceptionBehavior - { - get { return StaticReflection.GetMethodInfo(ip => ip.AddInterceptionBehavior(null)); } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IListMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IListMethods.cs deleted file mode 100644 index 936bbca9..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IListMethods.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class IListMethods - { - internal static MethodInfo GetItem - { - get { return typeof(IList).GetProperty("Item").GetGetMethod(); } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IMethodInvocationMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IMethodInvocationMethods.cs deleted file mode 100644 index 0c246223..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IMethodInvocationMethods.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// MethodInfo objects for the methods we need to generate - /// calls to on IMethodInvocation. - /// - internal static class IMethodInvocationMethods - { - internal static MethodInfo CreateExceptionMethodReturn - { - get { return StaticReflection.GetMethodInfo((IMethodInvocation mi) => mi.CreateExceptionMethodReturn(default(Exception))); } - } - - internal static MethodInfo CreateReturn - { - // Using static reflection causes an FxCop rule to throw an exception here, using plain old reflection instead - // logged as https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=485609 - get { return typeof(IMethodInvocation).GetMethod("CreateMethodReturn"); } - } - - internal static MethodInfo GetArguments - { - get { return StaticReflection.GetPropertyGetMethodInfo((IMethodInvocation mi) => mi.Arguments); } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IMethodReturnMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IMethodReturnMethods.cs deleted file mode 100644 index 69b25929..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/IMethodReturnMethods.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class IMethodReturnMethods - { - internal static MethodInfo GetException - { - get { return StaticReflection.GetPropertyGetMethodInfo((IMethodReturn imr) => imr.Exception); } - } - - internal static MethodInfo GetReturnValue - { - get { return StaticReflection.GetPropertyGetMethodInfo((IMethodReturn imr) => imr.ReturnValue); } - } - - internal static MethodInfo GetOutputs - { - get { return StaticReflection.GetPropertyGetMethodInfo((IMethodReturn imr) => imr.Outputs); } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.Desktop.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.Desktop.cs deleted file mode 100644 index d6c4ca80..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.Desktop.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection.Emit; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - public partial class InterceptingClassGenerator - { - private static ModuleBuilder GetModuleBuilder() - { - string moduleName = Guid.NewGuid().ToString("N"); -#if DEBUG_SAVE_GENERATED_ASSEMBLY - return AssemblyBuilder.DefineDynamicModule(moduleName, moduleName + ".dll", true); -#else - return AssemblyBuilder.DefineDynamicModule(moduleName); -#endif - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.cs deleted file mode 100644 index 2b247e2c..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.cs +++ /dev/null @@ -1,323 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -//#define DEBUG_SAVE_GENERATED_ASSEMBLY - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using System.Security; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Class that handles generating the dynamic types used for interception. - /// - public partial class InterceptingClassGenerator - { - private static readonly AssemblyBuilder AssemblyBuilder; - - private readonly Type typeToIntercept; - private readonly IEnumerable additionalInterfaces; - private Type targetType; - private GenericParameterMapper mainTypeMapper; - - private FieldBuilder proxyInterceptionPipelineField; - private TypeBuilder typeBuilder; - - [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", - Justification = "Need to use constructor so we can place attribute on it.")] - static InterceptingClassGenerator() - { - AssemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly( - new AssemblyName("Unity_ILEmit_DynamicClasses"), -#if DEBUG_SAVE_GENERATED_ASSEMBLY - AssemblyBuilderAccess.RunAndSave); -#else - AssemblyBuilderAccess.Run); -#endif - } - - /// - /// Create a new that will generate a - /// wrapper class for the requested . - /// - /// Type to generate the wrapper for. - /// Additional interfaces the proxy must implement. - public InterceptingClassGenerator(Type typeToIntercept, params Type[] additionalInterfaces) - { - this.typeToIntercept = typeToIntercept; - this.additionalInterfaces = additionalInterfaces; - CreateTypeBuilder(); - } - - /// - /// Create the wrapper class for the given type. - /// - /// Wrapper type. - public Type GenerateType() - { - AddMethods(); - AddProperties(); - AddEvents(); - AddConstructors(); - - int memberCount = 0; - HashSet implementedInterfaces = GetImplementedInterfacesSet(); - foreach (var @interface in this.additionalInterfaces) - { - memberCount = - new InterfaceImplementation(this.typeBuilder, @interface, this.proxyInterceptionPipelineField, true) - .Implement(implementedInterfaces, memberCount); - } - - Type result = typeBuilder.CreateType(); -#if DEBUG_SAVE_GENERATED_ASSEMBLY - assemblyBuilder.Save("Unity_ILEmit_DynamicClasses.dll"); -#endif - return result; - } - - private void AddMethods() - { - int methodNum = 0; - foreach (MethodInfo method in GetMethodsToIntercept()) - { - new MethodOverride(typeBuilder, proxyInterceptionPipelineField, method, targetType, mainTypeMapper, methodNum++).AddMethod(); - } - } - - private IEnumerable GetMethodsToIntercept() - { - List methodsToIntercept = new List(); - foreach (MethodInfo method in typeToIntercept.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)) - { - if (!method.IsSpecialName && MethodOverride.MethodCanBeIntercepted(method)) - { - methodsToIntercept.Add(method); - } - } - - MethodSorter sorter = new MethodSorter(typeToIntercept, methodsToIntercept); - foreach (MethodInfo method in sorter) - { - yield return method; - } - } - - private void AddProperties() - { - // We don't actually add new properties to this class. We just override - // the get / set methods as available. Inheritance makes sure the properties - // show up properly on the derived class. - - int propertyCount = 0; - foreach (PropertyInfo property in typeToIntercept.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)) - { - OverridePropertyMethod(property.GetGetMethod(true), propertyCount); - OverridePropertyMethod(property.GetSetMethod(true), propertyCount); - ++propertyCount; - } - } - - private void OverridePropertyMethod(MethodInfo method, int count) - { - if (method != null && MethodOverride.MethodCanBeIntercepted(method)) - { - new MethodOverride(typeBuilder, proxyInterceptionPipelineField, method, targetType, mainTypeMapper, count).AddMethod(); - } - } - - private void AddEvents() - { - // We don't actually add new events to this class. We just override - // the add / remove methods as available. Inheritance makes sure the events - // show up properly on the derived class. - - int eventCount = 0; - foreach (EventInfo eventInfo in typeToIntercept.GetEvents(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)) - { - OverrideEventMethod(eventInfo.GetAddMethod(), eventCount); - OverrideEventMethod(eventInfo.GetRemoveMethod(), eventCount); - ++eventCount; - } - } - - private void OverrideEventMethod(MethodInfo method, int count) - { - if (method != null && MethodOverride.MethodCanBeIntercepted(method)) - { - new MethodOverride(typeBuilder, proxyInterceptionPipelineField, method, targetType, mainTypeMapper, count).AddMethod(); - } - } - - private void AddConstructors() - { - BindingFlags bindingFlags = - this.typeToIntercept.IsAbstract - ? BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic - : BindingFlags.Public | BindingFlags.Instance; - - foreach (ConstructorInfo ctor in typeToIntercept.GetConstructors(bindingFlags)) - { - AddConstructor(ctor); - } - } - - private void AddConstructor(ConstructorInfo ctor) - { - if (!(ctor.IsPublic || ctor.IsFamily || ctor.IsFamilyOrAssembly)) - { - return; - } - - MethodAttributes attributes = - (ctor.Attributes - & ~MethodAttributes.ReservedMask - & ~MethodAttributes.MemberAccessMask) - | MethodAttributes.Public; - - ParameterInfo[] parameters = ctor.GetParameters(); - - Type[] paramTypes = parameters.Select(item => item.ParameterType).ToArray(); - - ConstructorBuilder ctorBuilder = typeBuilder.DefineConstructor( - attributes, ctor.CallingConvention, paramTypes); - - for (int i = 0; i < parameters.Length; i++) - { - ctorBuilder.DefineParameter(i + 1, parameters[i].Attributes, parameters[i].Name); - } - - ILGenerator il = ctorBuilder.GetILGenerator(); - - // Initialize pipeline field - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Newobj, InterceptionBehaviorPipelineMethods.Constructor); - il.Emit(OpCodes.Stfld, proxyInterceptionPipelineField); - - // call base class constructor - il.Emit(OpCodes.Ldarg_0); - for (int i = 0; i < paramTypes.Length; ++i) - { - il.Emit(OpCodes.Ldarg, i + 1); - } - - il.Emit(OpCodes.Call, ctor); - - il.Emit(OpCodes.Ret); - } - - private void CreateTypeBuilder() - { - TypeAttributes newAttributes = typeToIntercept.Attributes; - newAttributes = FilterTypeAttributes(newAttributes); - - Type baseClass = GetGenericType(typeToIntercept); - - ModuleBuilder moduleBuilder = GetModuleBuilder(); - typeBuilder = moduleBuilder.DefineType( - "DynamicModule.ns.Wrapped_" + typeToIntercept.Name + "_" + Guid.NewGuid().ToString("N"), - newAttributes, - baseClass); - - this.mainTypeMapper = DefineGenericArguments(typeBuilder, baseClass); - - if (this.typeToIntercept.IsGenericType) - { - var definition = this.typeToIntercept.GetGenericTypeDefinition(); - var mappedParameters = definition.GetGenericArguments().Select(t => this.mainTypeMapper.Map(t)).ToArray(); - this.targetType = definition.MakeGenericType(mappedParameters); - } - else - { - this.targetType = this.typeToIntercept; - } - - proxyInterceptionPipelineField = InterceptingProxyImplementor.ImplementIInterceptingProxy(typeBuilder); - } - - private static Type GetGenericType(Type typeToIntercept) - { - if (typeToIntercept.IsGenericType) - { - return typeToIntercept.GetGenericTypeDefinition(); - } - return typeToIntercept; - } - - private static GenericParameterMapper DefineGenericArguments(TypeBuilder typeBuilder, Type baseClass) - { - if (!baseClass.IsGenericType) - { - return GenericParameterMapper.DefaultMapper; - } - Type[] genericArguments = baseClass.GetGenericArguments(); - - GenericTypeParameterBuilder[] genericTypes = typeBuilder.DefineGenericParameters( - genericArguments.Select(t => t.Name).ToArray()); - - for (int i = 0; i < genericArguments.Length; ++i) - { - genericTypes[i].SetGenericParameterAttributes(genericArguments[i].GenericParameterAttributes); - var interfaceConstraints = new List(); - foreach (Type constraint in genericArguments[i].GetGenericParameterConstraints()) - { - if (constraint.IsClass) - { - genericTypes[i].SetBaseTypeConstraint(constraint); - } - else - { - interfaceConstraints.Add(constraint); - } - } - if (interfaceConstraints.Count > 0) - { - genericTypes[i].SetInterfaceConstraints(interfaceConstraints.ToArray()); - } - } - - return new GenericParameterMapper(genericArguments, genericTypes.Cast().ToArray()); - } - - private static TypeAttributes FilterTypeAttributes(TypeAttributes attributes) - { - if ((attributes & TypeAttributes.NestedPublic) != 0) - { - attributes &= ~TypeAttributes.NestedPublic; - attributes |= TypeAttributes.Public; - } - - attributes &= ~TypeAttributes.ReservedMask; - attributes &= ~TypeAttributes.Abstract; - - return attributes; - } - - private HashSet GetImplementedInterfacesSet() - { - HashSet implementedInterfaces = new HashSet(); - AddToImplementedInterfaces(this.typeToIntercept, implementedInterfaces); - return implementedInterfaces; - } - - private static void AddToImplementedInterfaces(Type type, HashSet implementedInterfaces) - { - if (!implementedInterfaces.Contains(type)) - { - if (type.IsInterface) - { - implementedInterfaces.Add(type); - } - - foreach (var @interface in type.GetInterfaces()) - { - AddToImplementedInterfaces(@interface, implementedInterfaces); - } - } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingProxyImplementor.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingProxyImplementor.cs deleted file mode 100644 index 809918e9..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingProxyImplementor.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Reflection.Emit; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This class provides the code needed to implement the - /// interface on a class. - /// - internal static class InterceptingProxyImplementor - { - internal static FieldBuilder ImplementIInterceptingProxy(TypeBuilder typeBuilder) - { - typeBuilder.AddInterfaceImplementation(typeof(IInterceptingProxy)); - FieldBuilder proxyInterceptorPipelineField = - typeBuilder.DefineField( - "pipeline", - typeof(InterceptionBehaviorPipeline), - FieldAttributes.Private | FieldAttributes.InitOnly); - - ImplementAddInterceptionBehavior(typeBuilder, proxyInterceptorPipelineField); - - return proxyInterceptorPipelineField; - } - - private static void ImplementAddInterceptionBehavior(TypeBuilder typeBuilder, FieldInfo proxyInterceptorPipelineField) - { - // Declaring method builder - // Method attributes - const MethodAttributes MethodAttributes = MethodAttributes.Private | MethodAttributes.Virtual - | MethodAttributes.Final | MethodAttributes.HideBySig - | MethodAttributes.NewSlot; - - MethodBuilder methodBuilder = - typeBuilder.DefineMethod( - "Microsoft.Practices.Unity.InterceptionExtension.IInterceptingProxy.AddInterceptionBehavior", - MethodAttributes); - - // Setting return type - methodBuilder.SetReturnType(typeof(void)); - // Adding parameters - methodBuilder.SetParameters(typeof(IInterceptionBehavior)); - // Parameter method - methodBuilder.DefineParameter(1, ParameterAttributes.None, "interceptor"); - - ILGenerator il = methodBuilder.GetILGenerator(); - // Writing body - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldfld, proxyInterceptorPipelineField); - il.Emit(OpCodes.Ldarg_1); - il.EmitCall(OpCodes.Callvirt, InterceptionBehaviorPipelineMethods.Add, null); - il.Emit(OpCodes.Ret); - typeBuilder.DefineMethodOverride(methodBuilder, IInterceptingProxyMethods.AddInterceptionBehavior); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptionBehaviorPipelineMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptionBehaviorPipelineMethods.cs deleted file mode 100644 index f96a1d93..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptionBehaviorPipelineMethods.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class InterceptionBehaviorPipelineMethods - { - internal static ConstructorInfo Constructor - { - get { return StaticReflection.GetConstructorInfo(() => new InterceptionBehaviorPipeline()); } - } - - internal static MethodInfo Add - { - get { return StaticReflection.GetMethodInfo((InterceptionBehaviorPipeline pip) => pip.Add(null)); } - } - - internal static MethodInfo Invoke - { - get { return StaticReflection.GetMethodInfo((InterceptionBehaviorPipeline pip) => pip.Invoke(null, null)); } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InvokeInterceptionBehaviorDelegateMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InvokeInterceptionBehaviorDelegateMethods.cs deleted file mode 100644 index 84b525f7..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/InvokeInterceptionBehaviorDelegateMethods.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class InvokeInterceptionBehaviorDelegateMethods - { - internal static ConstructorInfo InvokeInterceptionBehaviorDelegate - { - get - { - // cannot use static reflection with delegate types - return typeof(InvokeInterceptionBehaviorDelegate) - .GetConstructor(Sequence.Collect(typeof(object), typeof(IntPtr))); - } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodBaseMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodBaseMethods.cs deleted file mode 100644 index 1567d188..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodBaseMethods.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class MethodBaseMethods - { - internal static MethodInfo GetMethodFromHandle - { - get - { - return StaticReflection.GetMethodInfo( - () => MethodBase.GetMethodFromHandle(default(RuntimeMethodHandle))); - } - } - - internal static MethodInfo GetMethodForGenericFromHandle - { - get - { - return StaticReflection.GetMethodInfo( - () => MethodBase.GetMethodFromHandle(default(RuntimeMethodHandle), default(RuntimeTypeHandle))); - } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodOverride.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodOverride.cs deleted file mode 100644 index 6404b6c5..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodOverride.cs +++ /dev/null @@ -1,496 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Represents the implementation of a method override. - /// - public class MethodOverride - { - private static readonly MethodInfo BuildAbstractMethodInvokedExceptionMethod = - StaticReflection.GetMethodInfo(() => MethodOverride.BuildAbstractMethodInvokedException()); - - private readonly TypeBuilder typeBuilder; - private readonly MethodInfo methodToOverride; - private readonly ParameterInfo[] methodParameters; - private readonly FieldBuilder proxyInterceptionPipelineField; - private readonly Type targetType; - private readonly GenericParameterMapper targetTypeParameterMapper; - private readonly int overrideCount; - - internal MethodOverride( - TypeBuilder typeBuilder, - FieldBuilder proxyInterceptionPipelineField, - MethodInfo methodToOverride, - Type targetType, - GenericParameterMapper targetTypeParameterMapper, - int overrideCount) - { - this.typeBuilder = typeBuilder; - this.proxyInterceptionPipelineField = proxyInterceptionPipelineField; - this.methodToOverride = methodToOverride; - this.methodParameters = methodToOverride.GetParameters(); - this.targetType = targetType; - - // if the method is inherited and the declaring type is generic, we need to map - // the parameters of the original declaration to the actual intercepted type type - // E.g. consider given class Type1 with virtual method "T Method()", the mappings in - // different scenarios would look like: - // Type2 : Type2 => S Method() - // Type2 : Type2> => IEnumerable Method() - // Type2 : Type1> => IEnumerable Method() - var declaringType = methodToOverride.DeclaringType; - this.targetTypeParameterMapper = - declaringType.IsGenericType && declaringType != methodToOverride.ReflectedType - ? new GenericParameterMapper(declaringType, targetTypeParameterMapper) - : targetTypeParameterMapper; - this.overrideCount = overrideCount; - } - - internal static bool MethodCanBeIntercepted(MethodInfo method) - { - return method != null && - (method.IsPublic || method.IsFamily || method.IsFamilyOrAssembly) - && method.IsVirtual - && !method.IsFinal - && method.DeclaringType != typeof(object); - } - - internal MethodBuilder AddMethod() - { - MethodBuilder delegateMethod = CreateDelegateImplementation(methodToOverride); - return CreateMethodOverride(delegateMethod); - } - - private string CreateMethodName(string purpose) - { - return "<" + methodToOverride.Name + "_" + purpose + ">__" + - overrideCount.ToString(CultureInfo.InvariantCulture); - } - - private static readonly OpCode[] LoadArgsOpcodes = - { - OpCodes.Ldarg_1, - OpCodes.Ldarg_2, - OpCodes.Ldarg_3 - }; - - private static void EmitLoadArgument(ILGenerator il, int argumentNumber) - { - if (argumentNumber < LoadArgsOpcodes.Length) - { - il.Emit(LoadArgsOpcodes[argumentNumber]); - } - else - { - il.Emit(OpCodes.Ldarg, argumentNumber + 1); - } - } - - private static readonly OpCode[] LoadConstOpCodes = - { - OpCodes.Ldc_I4_0, - OpCodes.Ldc_I4_1, - OpCodes.Ldc_I4_2, - OpCodes.Ldc_I4_3, - OpCodes.Ldc_I4_4, - OpCodes.Ldc_I4_5, - OpCodes.Ldc_I4_6, - OpCodes.Ldc_I4_7, - OpCodes.Ldc_I4_8, - }; - - private static void EmitLoadConstant(ILGenerator il, int i) - { - if (i < LoadConstOpCodes.Length) - { - il.Emit(LoadConstOpCodes[i]); - } - else - { - il.Emit(OpCodes.Ldc_I4, i); - } - } - - private static void EmitBox(ILGenerator il, Type typeOnStack) - { - if (typeOnStack.IsValueType || typeOnStack.IsGenericParameter) - { - il.Emit(OpCodes.Box, typeOnStack); - } - } - - private static void EmitUnboxOrCast(ILGenerator il, Type typeOnStack) - { - if (typeOnStack.IsValueType || typeOnStack.IsGenericParameter) - { - il.Emit(OpCodes.Unbox_Any, typeOnStack); - } - else - { - il.Emit(OpCodes.Castclass, typeOnStack); - } - } - - private MethodBuilder CreateDelegateImplementation(MethodInfo callBaseMethod) - { - string methodName = CreateMethodName("DelegateImplementation"); - - MethodBuilder methodBuilder = typeBuilder.DefineMethod(methodName, - MethodAttributes.Private | MethodAttributes.HideBySig); - List outOrRefLocals = new List(); - - var paramMapper = new MethodOverrideParameterMapper(methodToOverride); - paramMapper.SetupParameters(methodBuilder, this.targetTypeParameterMapper); - - methodBuilder.SetReturnType(typeof(IMethodReturn)); - // Adding parameters - methodBuilder.SetParameters(typeof(IMethodInvocation), typeof(GetNextInterceptionBehaviorDelegate)); - // Parameter - methodBuilder.DefineParameter(1, ParameterAttributes.None, "inputs"); - // Parameter - methodBuilder.DefineParameter(2, ParameterAttributes.None, "getNext"); - - methodBuilder.SetCustomAttribute(new CustomAttributeBuilder(CompilerGeneratedAttributeMethods.CompilerGeneratedAttribute, new object[0])); - - ILGenerator il = methodBuilder.GetILGenerator(); - - if (!this.methodToOverride.IsAbstract) - { - Label done = il.DefineLabel(); - LocalBuilder ex = il.DeclareLocal(typeof(Exception)); - - LocalBuilder baseReturn = null; - LocalBuilder parameters = null; - if (MethodHasReturnValue) - { - baseReturn = il.DeclareLocal(paramMapper.GetParameterType(methodToOverride.ReturnType)); - } - LocalBuilder retval = il.DeclareLocal(typeof(IMethodReturn)); - - il.BeginExceptionBlock(); - // Call the base method - il.Emit(OpCodes.Ldarg_0); - - if (methodParameters.Length > 0) - { - parameters = il.DeclareLocal(typeof(IParameterCollection)); - il.Emit(OpCodes.Ldarg_1); - il.EmitCall(OpCodes.Callvirt, IMethodInvocationMethods.GetArguments, null); - il.Emit(OpCodes.Stloc, parameters); - - for (int i = 0; i < methodParameters.Length; ++i) - { - il.Emit(OpCodes.Ldloc, parameters); - EmitLoadConstant(il, i); - il.EmitCall(OpCodes.Callvirt, IListMethods.GetItem, null); - - if (methodParameters[i].ParameterType.IsByRef) - { - // For out or ref, create a local variable for it, initialize, and - // pass address of the local to the base class call. - Type referredToType = paramMapper.GetElementType(methodParameters[i].ParameterType); - LocalBuilder refShadow = il.DeclareLocal(referredToType); - outOrRefLocals.Add(refShadow); - EmitUnboxOrCast(il, referredToType); - - il.Emit(OpCodes.Stloc, refShadow); - il.Emit(OpCodes.Ldloca, refShadow); - } - else - { - EmitUnboxOrCast(il, paramMapper.GetParameterType(methodParameters[i].ParameterType)); - } - } - } - - MethodInfo baseTarget = callBaseMethod; - if (baseTarget.IsGenericMethod) - { - baseTarget = callBaseMethod.MakeGenericMethod(paramMapper.GenericMethodParameters); - } - - il.Emit(OpCodes.Call, baseTarget); - - if (MethodHasReturnValue) - { - il.Emit(OpCodes.Stloc, baseReturn); - } - - // Generate the return value - il.Emit(OpCodes.Ldarg_1); - if (MethodHasReturnValue) - { - il.Emit(OpCodes.Ldloc, baseReturn); - if (ReturnType.IsValueType || ReturnType.IsGenericParameter) - { - il.Emit(OpCodes.Box, paramMapper.GetReturnType()); - } - } - else - { - il.Emit(OpCodes.Ldnull); - } - - // Set up output parameters - note the collection returned to the - // IMethodReturn object contains ALL parameter values, inputs and - // outputs. - EmitLoadConstant(il, methodParameters.Length); - il.Emit(OpCodes.Newarr, typeof(object)); - - if (methodParameters.Length > 0) - { - LocalBuilder outputParamArray = il.DeclareLocal(typeof(object[])); - il.Emit(OpCodes.Stloc, outputParamArray); - - int outputParameterNum = 0; - for (int paramNum = 0; paramNum < methodParameters.Length; ++paramNum) - { - il.Emit(OpCodes.Ldloc, outputParamArray); - EmitLoadConstant(il, paramNum); - if (methodParameters[paramNum].ParameterType.IsByRef) - { - il.Emit(OpCodes.Ldloc, outOrRefLocals[outputParameterNum]); - EmitBox(il, outOrRefLocals[outputParameterNum].LocalType); - ++outputParameterNum; - } - else - { - il.Emit(OpCodes.Ldloc, parameters); - EmitLoadConstant(il, paramNum); - il.Emit(OpCodes.Callvirt, IListMethods.GetItem); - } - il.Emit(OpCodes.Stelem_Ref); - } - il.Emit(OpCodes.Ldloc, outputParamArray); - } - - il.Emit(OpCodes.Callvirt, IMethodInvocationMethods.CreateReturn); - il.Emit(OpCodes.Stloc, retval); - il.BeginCatchBlock(typeof(Exception)); - il.Emit(OpCodes.Stloc, ex); - // Create an exception return - il.Emit(OpCodes.Ldarg_1); - il.Emit(OpCodes.Ldloc, ex); - il.EmitCall(OpCodes.Callvirt, IMethodInvocationMethods.CreateExceptionMethodReturn, null); - il.Emit(OpCodes.Stloc, retval); - il.EndExceptionBlock(); - il.MarkLabel(done); - il.Emit(OpCodes.Ldloc, retval); - il.Emit(OpCodes.Ret); - } - else - { - // exception-throwing implementation - il.Emit(OpCodes.Ldarg_1); - il.EmitCall(OpCodes.Call, BuildAbstractMethodInvokedExceptionMethod, null); - il.EmitCall(OpCodes.Callvirt, IMethodInvocationMethods.CreateExceptionMethodReturn, null); - il.Emit(OpCodes.Ret); - } - - return methodBuilder; - } - - [SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", - Justification = "Possibly agree with this, but requires more deliberate refactoring")] - private MethodBuilder CreateMethodOverride(MethodBuilder delegateMethod) - { - MethodAttributes attrs = - methodToOverride.Attributes & ~MethodAttributes.NewSlot & ~MethodAttributes.Abstract; - - MethodBuilder methodBuilder = typeBuilder.DefineMethod(methodToOverride.Name, attrs); - - var paramMapper = new MethodOverrideParameterMapper(methodToOverride); - paramMapper.SetupParameters(methodBuilder, this.targetTypeParameterMapper); - - methodBuilder.SetReturnType(paramMapper.GetParameterType(methodToOverride.ReturnType)); - methodBuilder.SetParameters(methodParameters.Select(pi => paramMapper.GetParameterType(pi.ParameterType)).ToArray()); - - int paramNum = 1; - foreach (ParameterInfo pi in methodParameters) - { - methodBuilder.DefineParameter(paramNum++, pi.Attributes, pi.Name); - } - - ILGenerator il = methodBuilder.GetILGenerator(); - - LocalBuilder methodReturn = il.DeclareLocal(typeof(IMethodReturn)); - LocalBuilder ex = il.DeclareLocal(typeof(Exception)); - LocalBuilder parameterArray = il.DeclareLocal(typeof(object[])); - LocalBuilder inputs = il.DeclareLocal(typeof(VirtualMethodInvocation)); - - // Create instance of VirtualMethodInvocation - il.Emit(OpCodes.Ldarg_0); // target object - - // If we have a generic method, we want to make sure we're using the open constructed generic method - // so when a closed generic version of the method is invoked the actual type parameters are used - il.Emit( - OpCodes.Ldtoken, - methodToOverride.IsGenericMethodDefinition - ? methodToOverride.MakeGenericMethod(paramMapper.GenericMethodParameters) - : methodToOverride); - if (methodToOverride.DeclaringType.IsGenericType) - { - // if the declaring type is generic, we need to get the method from the target type - il.Emit(OpCodes.Ldtoken, targetType); - il.Emit(OpCodes.Call, MethodBaseMethods.GetMethodForGenericFromHandle); - } - else - { - il.Emit(OpCodes.Call, MethodBaseMethods.GetMethodFromHandle); // target method - } - - EmitLoadConstant(il, methodParameters.Length); - il.Emit(OpCodes.Newarr, typeof(object)); // object[] parameters - if (methodParameters.Length > 0) - { - il.Emit(OpCodes.Stloc, parameterArray); - - for (int i = 0; i < methodParameters.Length; ++i) - { - il.Emit(OpCodes.Ldloc, parameterArray); - EmitLoadConstant(il, i); - EmitLoadArgument(il, i); - if (methodParameters[i].ParameterType.IsValueType || methodParameters[i].ParameterType.IsGenericParameter) - { - il.Emit(OpCodes.Box, paramMapper.GetParameterType(methodParameters[i].ParameterType)); - } - else if (methodParameters[i].ParameterType.IsByRef) - { - Type elementType = paramMapper.GetElementType(methodParameters[i].ParameterType); - il.Emit(OpCodes.Ldobj, elementType); - if (elementType.IsValueType || elementType.IsGenericParameter) - { - il.Emit(OpCodes.Box, elementType); - } - } - - il.Emit(OpCodes.Stelem_Ref); - } - - il.Emit(OpCodes.Ldloc, parameterArray); - } - il.Emit(OpCodes.Newobj, VirtualMethodInvocationMethods.VirtualMethodInvocation); - il.Emit(OpCodes.Stloc, inputs); - - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldfld, proxyInterceptionPipelineField); - il.Emit(OpCodes.Ldloc, inputs); - - // Put delegate reference onto the stack - il.Emit(OpCodes.Ldarg_0); - - MethodInfo invokeTarget = delegateMethod; - if (delegateMethod.IsGenericMethod) - { - invokeTarget = delegateMethod.MakeGenericMethod(paramMapper.GenericMethodParameters); - } - - il.Emit(OpCodes.Ldftn, invokeTarget); - il.Emit(OpCodes.Newobj, InvokeInterceptionBehaviorDelegateMethods.InvokeInterceptionBehaviorDelegate); - - // And call the pipeline - il.Emit(OpCodes.Call, InterceptionBehaviorPipelineMethods.Invoke); - - il.Emit(OpCodes.Stloc, methodReturn); - - // Was there an exception? - Label noException = il.DefineLabel(); - il.Emit(OpCodes.Ldloc, methodReturn); - il.EmitCall(OpCodes.Callvirt, IMethodReturnMethods.GetException, null); - il.Emit(OpCodes.Stloc, ex); - il.Emit(OpCodes.Ldloc, ex); - il.Emit(OpCodes.Ldnull); - il.Emit(OpCodes.Ceq); - il.Emit(OpCodes.Brtrue_S, noException); - il.Emit(OpCodes.Ldloc, ex); - il.Emit(OpCodes.Throw); - - il.MarkLabel(noException); - - // handle return value - if (MethodHasReturnValue) - { - il.Emit(OpCodes.Ldloc, methodReturn); - il.EmitCall(OpCodes.Callvirt, IMethodReturnMethods.GetReturnValue, null); - if (ReturnType.IsValueType || ReturnType.IsGenericParameter) - { - il.Emit(OpCodes.Unbox_Any, paramMapper.GetReturnType()); - } - else - { - il.Emit(OpCodes.Castclass, paramMapper.GetReturnType()); - } - } - - // handle byref parameters - if (methodParameters.Length > 0) - { - int outArgIndex = 0; - foreach (int parameterIndex in OutputParameterIndices) - { - // Get parameter value (the address) onto the stack) - Type elementType = paramMapper.GetElementType(methodParameters[parameterIndex].ParameterType); - EmitLoadArgument(il, parameterIndex); - - // Get result of output parameter out of the results array - il.Emit(OpCodes.Ldloc, methodReturn); - il.Emit(OpCodes.Callvirt, IMethodReturnMethods.GetOutputs); - EmitLoadConstant(il, outArgIndex); - il.Emit(OpCodes.Callvirt, IListMethods.GetItem); - EmitUnboxOrCast(il, elementType); - - // And store the results - il.Emit(OpCodes.Stobj, elementType); - ++outArgIndex; - } - } - - il.Emit(OpCodes.Ret); - - return methodBuilder; - } - - private bool MethodHasReturnValue - { - get { return methodToOverride.ReturnType != typeof(void); } - } - - private Type ReturnType - { - get { return methodToOverride.ReturnType; } - } - - private IEnumerable OutputParameterIndices - { - get - { - for (int i = 0; i < methodParameters.Length; ++i) - { - if (methodParameters[i].ParameterType.IsByRef) - { - yield return i; - } - } - } - } - - /// - /// Used to throw an for overrides on abstract methods. - /// - public static Exception BuildAbstractMethodInvokedException() - { - return new NotImplementedException(Resources.ExceptionAbstractMethodNotImplemented); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodOverrideParameterMapper.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodOverrideParameterMapper.cs deleted file mode 100644 index 9850a851..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodOverrideParameterMapper.cs +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This class handles parameter type mapping. When we generate - /// a generic method, we need to make sure our parameter type - /// objects line up with the generic parameters on the generated - /// method, not on the one we're overriding. - /// - internal class MethodOverrideParameterMapper - { - private readonly MethodInfo methodToOverride; - private GenericParameterMapper genericParameterMapper; - - public MethodOverrideParameterMapper(MethodInfo methodToOverride) - { - this.methodToOverride = methodToOverride; - } - - public void SetupParameters(MethodBuilder methodBuilder, GenericParameterMapper parentMapper) - { - if (methodToOverride.IsGenericMethod) - { - var genericArguments = methodToOverride.GetGenericArguments(); - var names = genericArguments.Select(t => t.Name).ToArray(); - var builders = methodBuilder.DefineGenericParameters(names); - for (int i = 0; i < genericArguments.Length; ++i) - { - builders[i].SetGenericParameterAttributes(genericArguments[i].GenericParameterAttributes); - - var constraintTypes = - genericArguments[i] - .GetGenericParameterConstraints() - .Select(ct => parentMapper.Map(ct)) - .ToArray(); - - var interfaceConstraints = constraintTypes.Where(t => t.IsInterface).ToArray(); - Type baseConstraint = constraintTypes.Where(t => !t.IsInterface).FirstOrDefault(); - if (baseConstraint != null) - { - builders[i].SetBaseTypeConstraint(baseConstraint); - } - if (interfaceConstraints.Length > 0) - { - builders[i].SetInterfaceConstraints(interfaceConstraints); - } - } - - this.genericParameterMapper = - new GenericParameterMapper(genericArguments, builders.Cast().ToArray(), parentMapper); - } - else - { - this.genericParameterMapper = parentMapper; - } - } - - public Type GetParameterType(Type originalParameterType) - { - return this.genericParameterMapper.Map(originalParameterType); - } - - public Type GetElementType(Type originalParameterType) - { - return GetParameterType(originalParameterType).GetElementType(); - } - - public Type GetReturnType() - { - return GetParameterType(methodToOverride.ReturnType); - } - - public Type[] GenericMethodParameters - { - get { return this.genericParameterMapper.GetGeneratedParameters(); } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodSorter.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodSorter.cs deleted file mode 100644 index adde1668..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/MethodSorter.cs +++ /dev/null @@ -1,210 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A utility class that takes a set of s - /// and pulls out shadowed methods, only returning the ones that - /// are actually accessible to be overridden. - /// - internal class MethodSorter : IEnumerable - { - private readonly Dictionary> methodsByName = new Dictionary>(); - private readonly Type declaringType; - - public MethodSorter(Type declaringType, IEnumerable methodsToSort) - { - this.declaringType = declaringType; - GroupMethodsByName(methodsToSort); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - public IEnumerator GetEnumerator() - { - foreach (KeyValuePair> methodList in methodsByName) - { - if (methodList.Value.Count == 1) - { - yield return methodList.Value[0]; - } - else - { - foreach (MethodInfo method in RemoveHiddenOverloads(methodList.Value)) - { - yield return method; - } - } - } - } - - /// - /// Take the list of methods and put them together into lists index by method name. - /// - /// Methods to sort through. - private void GroupMethodsByName(IEnumerable methodsToSort) - { - foreach (MethodInfo method in methodsToSort) - { - if (!methodsByName.ContainsKey(method.Name)) - { - methodsByName[method.Name] = new List(); - } - methodsByName[method.Name].Add(method); - } - } - - /// - /// Given a list of overloads for a method, return only those methods - /// that are actually visible. In other words, if there's a "new SomeType" method - /// somewhere, return only the new one, not the one from the base class - /// that's now hidden. - /// - /// Sequence of methods to process. - /// Sequence of returned methods. - private IEnumerable RemoveHiddenOverloads(IEnumerable methods) - { - // Group the methods by signature - List methodsByParameters = new List(methods); - methodsByParameters.Sort(CompareMethodInfosByParameterLists); - List> overloadGroups = new List>(GroupOverloadedMethods(methodsByParameters)); - - foreach (List overload in overloadGroups) - { - yield return SelectMostDerivedOverload(overload); - } - } - - /// - /// Take a semi-randomly ordered set of methods on a type and - /// sort them into groups by name and by parameter list. - /// - /// The list of methods. - /// Sequence of lists of methods, grouped by method name. - private static IEnumerable> GroupOverloadedMethods(IList sortedMethods) - { - int index = 0; - while (index < sortedMethods.Count) - { - int overloadStart = index; - List overloads = new List(); - overloads.Add(sortedMethods[overloadStart]); - ++index; - while (index < sortedMethods.Count && - CompareMethodInfosByParameterLists(sortedMethods[overloadStart], sortedMethods[index]) == 0) - { - overloads.Add(sortedMethods[index++]); - } - - yield return overloads; - } - } - - /// - /// Given a set of hiding overloads, return only the currently visible one. - /// - /// The set of overloads. - /// The most visible one. - private MethodInfo SelectMostDerivedOverload(IList overloads) - { - if (overloads.Count == 1) - { - return overloads[0]; - } - - int minDepth = int.MaxValue; - MethodInfo selectedMethod = null; - foreach (MethodInfo method in overloads) - { - int thisDepth = DeclarationDepth(method); - if (thisDepth < minDepth) - { - minDepth = thisDepth; - selectedMethod = method; - } - } - - return selectedMethod; - } - - /// - /// Given a method, return a value indicating how deeply in the - /// inheritance hierarchy the method is declared. Current type = 0, - /// parent = 1, grandparent = 2, etc. - /// - /// Method to check. - /// Declaration depth - private int DeclarationDepth(MethodInfo method) - { - int depth = 0; - Type currentType = declaringType; - while (currentType != null && method.DeclaringType != declaringType) - { - ++depth; - currentType = currentType.BaseType; - } - return depth; - } - - /// - /// A implementation that can compare two - /// based on their parameter lists. - /// - /// First to compare. - /// Second to compare. - /// < 0, 0, or > 0 based on which one is "greater" than the other. - private static int CompareMethodInfosByParameterLists(MethodInfo left, MethodInfo right) - { - return CompareParameterLists(left.GetParameters(), right.GetParameters()); - } - - /// - /// Compare two parameter lists. - /// - /// First parameter list. - /// Second parameter list. - /// < 0, 0, or > 0. - private static int CompareParameterLists(ParameterInfo[] left, ParameterInfo[] right) - { - if (left.Length != right.Length) - { - return left.Length - right.Length; - } - - for (int i = 0; i < left.Length; ++i) - { - int comparison = CompareParameterInfo(left[i], right[i]); - if (comparison != 0) - { - return comparison; - } - } - return 0; - } - - /// - /// Compare two objects by type. - /// - /// First - /// First - /// < 0, 0, or > 0 - private static int CompareParameterInfo(ParameterInfo left, ParameterInfo right) - { - if (left.ParameterType == right.ParameterType) - { - return 0; - } - return string.Compare(left.ParameterType.FullName, right.ParameterType.FullName, - StringComparison.OrdinalIgnoreCase); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/ObjectMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/ObjectMethods.cs deleted file mode 100644 index e69cab3e..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/ObjectMethods.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class ObjectMethods - { - // Zero argument constructor - internal static ConstructorInfo Constructor { get { return StaticReflection.GetConstructorInfo(() => new object()); } } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/VirtualMethodInvocationMethods.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/VirtualMethodInvocationMethods.cs deleted file mode 100644 index 047f7793..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/InterceptingClassGeneration/VirtualMethodInvocationMethods.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - internal static class VirtualMethodInvocationMethods - { - internal static ConstructorInfo VirtualMethodInvocation - { - get - { - return StaticReflection.GetConstructorInfo( - () => new VirtualMethodInvocation(default(object), default(MethodBase))); - } - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodInterceptor.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodInterceptor.cs deleted file mode 100644 index 46c4c1da..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodInterceptor.cs +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A type based interceptor that works by generated a new class - /// on the fly that derives from the target class. - /// - public class VirtualMethodInterceptor : ITypeInterceptor - { - private static readonly Dictionary DerivedClasses = - new Dictionary(new GeneratedTypeKey.GeneratedTypeKeyComparer()); - - /// - /// Can this interceptor generate a proxy for the given type? - /// - /// Type to check. - /// True if interception is possible, false if not. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done via Guard class")] - public bool CanIntercept(Type t) - { - Guard.ArgumentNotNull(t, "t"); - return t.IsClass && - (t.IsPublic || t.IsNestedPublic) && - t.IsVisible && - !t.IsSealed; - } - - /// - /// Returns a sequence of methods on the given type that can be - /// intercepted. - /// - /// The intercepted type. - /// The concrete type of the implementing object. - /// Sequence of objects. - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Interceptable", - Justification = "Spelling is fine")] - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done via Guard class")] - public IEnumerable GetInterceptableMethods(Type interceptedType, Type implementationType) - { - Guard.ArgumentNotNull(implementationType, "implementationType"); - - return DoGetInterceptableMethods(implementationType); - } - - private IEnumerable DoGetInterceptableMethods(Type implementationType) - { - var interceptableMethodsToInterfaceMap = new Dictionary(); - - foreach (MethodInfo method in - implementationType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) - { - if (MethodOverride.MethodCanBeIntercepted(method)) - { - interceptableMethodsToInterfaceMap[method] = null; - } - } - - foreach (Type itf in implementationType.GetInterfaces()) - { - var mapping = implementationType.GetInterfaceMap(itf); - for (int i = 0; i < mapping.InterfaceMethods.Length; ++i) - { - if (interceptableMethodsToInterfaceMap.ContainsKey(mapping.TargetMethods[i])) - { - interceptableMethodsToInterfaceMap[mapping.TargetMethods[i]] = mapping.InterfaceMethods[i]; - } - } - } - - foreach (var kvp in interceptableMethodsToInterfaceMap) - { - yield return new MethodImplementationInfo(kvp.Value, kvp.Key); - } - } - - /// - /// Create a type to proxy for the given type . - /// - /// Type to proxy. - /// Additional interfaces the proxy must implement. - /// New type that can be instantiated instead of the - /// original type t, and supports interception. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done via Guard class")] - public Type CreateProxyType(Type t, params Type[] additionalInterfaces) - { - Guard.ArgumentNotNull(t, "t"); - Guard.ArgumentNotNull(additionalInterfaces, "additionalInterfaces"); - - if (!CanIntercept(t)) - { - throw new InvalidOperationException( - string.Format(CultureInfo.CurrentCulture, Resources.InterceptionNotSupported, t.Name)); - } - - Type interceptorType; - Type typeToDerive = t; - bool genericType = false; - - if (t.IsGenericType) - { - typeToDerive = t.GetGenericTypeDefinition(); - genericType = true; - } - - GeneratedTypeKey key = new GeneratedTypeKey(typeToDerive, additionalInterfaces); - lock (DerivedClasses) - { - if (!DerivedClasses.TryGetValue(key, out interceptorType)) - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeToDerive, additionalInterfaces); - interceptorType = generator.GenerateType(); - DerivedClasses[key] = interceptorType; - } - } - - if (genericType) - { - interceptorType = interceptorType.MakeGenericType(t.GetGenericArguments()); - } - - return interceptorType; - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodInvocation.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodInvocation.cs deleted file mode 100644 index 59490d67..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodInvocation.cs +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.Reflection; -using System.Text; -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Implementation of used - /// by the virtual method interceptor. - /// - public class VirtualMethodInvocation : IMethodInvocation - { - private readonly ParameterCollection inputs; - private readonly ParameterCollection arguments; - private readonly Dictionary context; - private readonly object target; - private readonly MethodBase targetMethod; - - /// - /// Construct a new instance for the - /// given target object and method, passing the - /// to the target method. - /// - /// Object that is target of this invocation. - /// Method on to call. - /// Values for the parameters. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public VirtualMethodInvocation(object target, MethodBase targetMethod, params object[] parameterValues) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(targetMethod, "targetMethod"); - - this.target = target; - this.targetMethod = targetMethod; - this.context = new Dictionary(); - - ParameterInfo[] targetParameters = targetMethod.GetParameters(); - this.arguments = new ParameterCollection(parameterValues, targetParameters, param => true); - this.inputs = new ParameterCollection(parameterValues, targetParameters, param => !param.IsOut); - } - - /// - /// Gets the inputs for this call. - /// - public IParameterCollection Inputs - { - get { return inputs; } - } - - /// - /// Collection of all parameters to the call: in, out and byref. - /// - public IParameterCollection Arguments - { - get { return arguments; } - } - - /// - /// Retrieves a dictionary that can be used to store arbitrary additional - /// values. This allows the user to pass values between call handlers. - /// - public IDictionary InvocationContext - { - get { return context; } - } - - /// - /// The object that the call is made on. - /// - public object Target - { - get { return target; } - } - - /// - /// The method on Target that we're aiming at. - /// - public MethodBase MethodBase - { - get { return targetMethod; } - } - - /// - /// Factory method that creates the correct implementation of - /// IMethodReturn. - /// - /// Return value to be placed in the IMethodReturn object. - /// All arguments passed or returned as out/byref to the method. - /// Note that this is the entire argument list, including in parameters. - /// New IMethodReturn object. - public IMethodReturn CreateMethodReturn(object returnValue, params object[] outputs) - { - return new VirtualMethodReturn(this, returnValue, outputs); - } - - /// - /// Factory method that creates the correct implementation of - /// IMethodReturn in the presence of an exception. - /// - /// Exception to be set into the returned object. - /// New IMethodReturn object - public IMethodReturn CreateExceptionMethodReturn(Exception ex) - { - return new VirtualMethodReturn(this, ex); - } - } -} diff --git a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodReturn.cs b/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodReturn.cs deleted file mode 100644 index 98322389..00000000 --- a/source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodReturn.cs +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of used by - /// the virtual method interception mechanism. - /// - public class VirtualMethodReturn : IMethodReturn - { - private ParameterCollection outputs; - private Exception exception; - private IDictionary invocationContext; - private object returnValue; - - /// - /// Construct a instance that returns - /// a value. - /// - /// The method invocation. - /// Return value (should be null if method returns void). - /// All arguments (including current values) passed to the method. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public VirtualMethodReturn(IMethodInvocation originalInvocation, object returnValue, object[] arguments) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(originalInvocation, "originalInvocation"); - - invocationContext = originalInvocation.InvocationContext; - this.returnValue = returnValue; - outputs = new ParameterCollection(arguments, originalInvocation.MethodBase.GetParameters(), - delegate(ParameterInfo pi) { return pi.ParameterType.IsByRef; }); - } - - /// - /// Construct a instance for when the target method throws an exception. - /// - /// The method invocation. - /// Exception that was thrown. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public VirtualMethodReturn(IMethodInvocation originalInvocation, Exception exception) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(originalInvocation, "originalInvocation"); - - invocationContext = originalInvocation.InvocationContext; - this.exception = exception; - outputs = new ParameterCollection(new object[0], new ParameterInfo[0], delegate { return false; }); - } - - /// - /// The collection of output parameters. If the method has no output - /// parameters, this is a zero-length list (never null). - /// - public IParameterCollection Outputs - { - get { return outputs; } - } - - /// - /// Returns value from the method call. - /// - /// This value is null if the method has no return value. - public object ReturnValue - { - get { return returnValue; } - set { returnValue = value; } - } - - /// - /// If the method threw an exception, the exception object is here. - /// - public Exception Exception - { - get { return exception; } - set { exception = value; } - } - - /// - /// Retrieves a dictionary that can be used to store arbitrary additional - /// values. This allows the user to pass values between call handlers. - /// - /// This is guaranteed to be the same dictionary that was used - /// in the IMethodInvocation object, so handlers can set context - /// properties in the pre-call phase and retrieve them in the after-call phase. - /// - public IDictionary InvocationContext - { - get { return invocationContext; } - } - } -} diff --git a/source/Unity.Interception/Src/Migrated rules for Unity.Interception.ruleset b/source/Unity.Interception/Src/Migrated rules for Unity.Interception.ruleset deleted file mode 100644 index 7677376a..00000000 --- a/source/Unity.Interception/Src/Migrated rules for Unity.Interception.ruleset +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/source/Unity.Interception/Src/PolicyInjection/HandlerPipelineKey.cs b/source/Unity.Interception/Src/PolicyInjection/HandlerPipelineKey.cs deleted file mode 100644 index 43eede22..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/HandlerPipelineKey.cs +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Key for handler pipelines. - /// - public struct HandlerPipelineKey : IEquatable - { - private readonly Module module; - private readonly int methodMetadataToken; - - /// - /// Creates a new for the supplied method. - /// - /// The method for the key. - /// The new key. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "Preserve existing interface")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static HandlerPipelineKey ForMethod(MethodBase methodBase) - { - Guard.ArgumentNotNull(methodBase, "methodBase"); - - return new HandlerPipelineKey(methodBase.DeclaringType.Module, methodBase.MetadataToken); - } - - private HandlerPipelineKey(Module module, int methodMetadataToken) - { - this.module = module; - this.methodMetadataToken = methodMetadataToken; - } - - /// - /// Compare two instances. - /// - /// Object to compare to. - /// True if the two keys are equal, false if not. - public override bool Equals(object obj) - { - if (!(obj is HandlerPipelineKey)) - { - return false; - } - return this == (HandlerPipelineKey)obj; - } - - /// - /// Calculate a hash code for this instance. - /// - /// A hash code. - public override int GetHashCode() - { - return this.module.GetHashCode() ^ this.methodMetadataToken; - } - - /// - /// Compare two instances for equality. - /// - /// First of the two keys to compare. - /// Second of the two keys to compare. - /// True if the values of the keys are the same, else false. - public static bool operator ==(HandlerPipelineKey left, HandlerPipelineKey right) - { - return left.module == right.module && - left.methodMetadataToken == right.methodMetadataToken; - } - - /// - /// Compare two instances for inequality. - /// - /// First of the two keys to compare. - /// Second of the two keys to compare. - /// false if the values of the keys are the same, else true. - public static bool operator !=(HandlerPipelineKey left, HandlerPipelineKey right) - { - return !(left == right); - } - - /// - /// Compare two instances. - /// - /// Object to compare to. - /// True if the two keys are equal, false if not. - public bool Equals(HandlerPipelineKey other) - { - return this == other; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ApplyNoPoliciesMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ApplyNoPoliciesMatchingRule.cs deleted file mode 100644 index 5a275572..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ApplyNoPoliciesMatchingRule.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A implementation that fails to match - /// if the method in question has the ApplyNoPolicies attribute on it. - /// - internal class ApplyNoPoliciesMatchingRule : IMatchingRule - { - /// - /// Check if the matches this rule. - /// - /// This rule returns true if the member does NOT have the - /// on it, or a containing type doesn't have the attribute. - /// Member to check. - /// True if the rule matches, false if it doesn't. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public bool Matches(MethodBase member) - { - Guard.ArgumentNotNull(member, "member"); - - bool hasNoPoliciesAttribute = - (member.GetCustomAttributes(typeof(ApplyNoPoliciesAttribute), false).Length != 0); - - hasNoPoliciesAttribute |= - (member.DeclaringType.GetCustomAttributes(typeof(ApplyNoPoliciesAttribute), false). - Length != 0); - return !hasNoPoliciesAttribute; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/AssemblyMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/AssemblyMatchingRule.cs deleted file mode 100644 index a8f2a50b..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/AssemblyMatchingRule.cs +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that matches the assembly name of the - /// given member. - /// - public class AssemblyMatchingRule : IMatchingRule - { - private readonly string assemblyName; - - /// - /// Constructs a new with the given - /// assembly name (or partial name). - /// - /// Assembly name to match. - public AssemblyMatchingRule(string assemblyName) - { - this.assemblyName = assemblyName; - } - - /// - /// Constructs a new that matches - /// against the given assembly. - /// - /// Assembly to match. - public AssemblyMatchingRule(Assembly assembly) - : this((assembly != null) ? assembly.FullName : null) - { - if (assembly == null) - { - throw new ArgumentNullException("assembly"); - } - } - - /// - /// Determines if the supplied matches the rule. - /// - /// - /// This rule matches if the assembly containing the given - /// matches the name given. The rule used for matches lets you include the parts - /// of the assembly name in order. You can specify assembly name only, assembly and version, - /// assembly, version and culture, or the fully qualified assembly name. - /// - /// Member to check. - /// true if is in a matching assembly, false if not. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public bool Matches(MethodBase member) - { - Guard.ArgumentNotNull(member, "member"); - - if (member.DeclaringType == null) - { - return false; - } - - AssemblyName assembly = member.DeclaringType.Assembly.GetName(); - - return DoesAssemblyNameMatchString(assemblyName, assembly); - } - - private static bool DoesAssemblyNameMatchString(string assemblyNameString, AssemblyName assemblyName) - { - AssemblyName assemblyNameToMatch = null; - try - { - assemblyNameToMatch = new AssemblyName(assemblyNameString); - } - catch (ArgumentException) - { - return false; - } - - if (string.Compare(assemblyName.Name, assemblyNameToMatch.Name, StringComparison.Ordinal) == 0) - { - if (assemblyNameToMatch.Version != null && - assemblyNameToMatch.Version.CompareTo(assemblyName.Version) != 0) - { - return false; - } - byte[] requestedAsmPublicKeyToken = assemblyNameToMatch.GetPublicKeyToken(); - if (requestedAsmPublicKeyToken != null) - { - byte[] cachedAssemblyPublicKeyToken = assemblyName.GetPublicKeyToken(); - - if (Convert.ToBase64String(requestedAsmPublicKeyToken) != Convert.ToBase64String(cachedAssemblyPublicKeyToken)) - { - return false; - } - } - - CultureInfo requestedAssemblyCulture = assemblyNameToMatch.CultureInfo; - - if (requestedAssemblyCulture != null && !requestedAssemblyCulture.IsInvariantCulture()) - { - if (!assemblyName.CultureInfo.IsSameAs(requestedAssemblyCulture)) - { - return false; - } - } - - return true; - } - - return false; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/AttributeDrivenPolicyMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/AttributeDrivenPolicyMatchingRule.cs deleted file mode 100644 index 9e4a2698..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/AttributeDrivenPolicyMatchingRule.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of that checks to see if the - /// member (or type containing that member) have any s. - /// - public class AttributeDrivenPolicyMatchingRule : IMatchingRule - { - #region IMatchingRule Members - - /// - /// Checks to see if matches the rule. - /// - /// Returns true if any s are present on the method - /// or the type containing that method. - /// Member to check. - /// true if member matches, false if not. - public bool Matches(MethodBase member) - { - return ReflectionHelper.GetAllAttributes(member, true).Length > 0; - } - - #endregion - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/CustomAttributeMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/CustomAttributeMatchingRule.cs deleted file mode 100644 index 98bf7297..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/CustomAttributeMatchingRule.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of that checks to see if - /// the member tested has an arbitrary attribute applied. - /// - public class CustomAttributeMatchingRule : IMatchingRule - { - private readonly Type attributeType; - private readonly bool inherited; - - /// - /// Constructs a new . - /// - /// Attribute to match. - /// If true, checks the base class for attributes as well. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public CustomAttributeMatchingRule(Type attributeType, bool inherited) - { - Guard.ArgumentNotNull(attributeType, "attributeType"); - if (!attributeType.IsSubclassOf(typeof(Attribute))) - { - throw new ArgumentException(Resources.ExceptionAttributeNoSubclassOfAttribute, "attributeType"); - } - - this.attributeType = attributeType; - this.inherited = inherited; - } - - /// - /// Checks to see if the given matches the rule. - /// - /// Member to check. - /// true if it matches, false if not. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public bool Matches(MethodBase member) - { - Guard.ArgumentNotNull(member, "member"); - - object[] attribues = member.GetCustomAttributes(attributeType, inherited); - - return (attribues != null && attribues.Length > 0); - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/IMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/IMatchingRule.cs deleted file mode 100644 index 63ee5aa9..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/IMatchingRule.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This interface is implemented by the matching rule classes. - /// A Matching rule is used to see if a particular policy should - /// be applied to a class member. - /// - public interface IMatchingRule - { - /// - /// Tests to see if this rule applies to the given member. - /// - /// Member to test. - /// true if the rule applies, false if it doesn't. - bool Matches(MethodBase member); - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MatchingInfo.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MatchingInfo.cs deleted file mode 100644 index 91c7e439..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MatchingInfo.cs +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Class used for storing information about a single name/ignoreCase - /// pair. This class is also used as a base class for other classes that - /// need this pair plus some other properties. - /// - public class MatchingInfo - { - private string match; - private bool ignoreCase; - - /// - /// Constructs an empty object with empty - /// string and ignoreCase = false. - /// - public MatchingInfo() - : this(string.Empty, false) - { - } - - /// - /// Constructs a object that matches the given - /// string. IgnoreCase is false. - /// - /// The name to match. - public MatchingInfo(string nameToMatch) - : this(nameToMatch, false) - { - } - - /// - /// Constructs a object that matches the - /// given string, setting the ignoreCase flag to the given value. - /// - /// The name to match. - /// true to do case insensitive comparison, false to do case sensitive. - public MatchingInfo(string nameToMatch, bool ignoreCase) - { - this.match = nameToMatch; - this.ignoreCase = ignoreCase; - } - - /// - /// Gets or sets the name to match. - /// - /// The name to match. - public string Match - { - get { return match; } - set { match = value; } - } - - /// - /// Gets or sets whether to do case sensitive comparisons of Match. - /// - /// If false, case sensitive comparison. If true, case insensitive comparisons. - public bool IgnoreCase - { - get { return ignoreCase; } - set { ignoreCase = value; } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MatchingRuleSet.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MatchingRuleSet.cs deleted file mode 100644 index 81f8637c..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MatchingRuleSet.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A is a matching rule that - /// is a collection of other matching rules. All the contained - /// rules much match for the set to match. - /// - [SuppressMessage("Microsoft.Naming", "CA1710", Justification = "Using alternative suffix 'Set'.")] - public class MatchingRuleSet : List, IMatchingRule - { - /// - /// Tests the given member against the ruleset. The member matches - /// if all contained rules in the ruleset match against it. - /// - /// If the ruleset is empty, then Matches passes since no rules failed. - /// MemberInfo to test. - /// true if all contained rules match, false if any fail. - public bool Matches(MethodBase member) - { - if (this.Count == 0) - { - return false; - } - - foreach (IMatchingRule rule in this) - { - if (!rule.Matches(member)) - { - return false; - } - } - return true; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MemberNameMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MemberNameMatchingRule.cs deleted file mode 100644 index bdf04028..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MemberNameMatchingRule.cs +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A matching rule that matches when the given member name is - /// the same as the one supplied in the constructor. - /// - public class MemberNameMatchingRule : IMatchingRule - { - private readonly List patterns; - - /// - /// Create a new that matches the - /// given member name. Wildcards are allowed. - /// - /// Name to match against. Comparison is case sensitive. - public MemberNameMatchingRule(string nameToMatch) - : this(nameToMatch, false) - { - } - - /// - /// Create a new that matches the - /// given member name. Wildcards are allowed. - /// - /// Name to match against. - /// If false, name comparisons are case sensitive. If true, name comparisons are case insensitive. - public MemberNameMatchingRule(string nameToMatch, bool ignoreCase) - { - patterns = new List(); - patterns.Add(new Glob(nameToMatch, !ignoreCase)); - } - - /// - /// Create a new that matches the - /// given member names. Wildcards are allowed. - /// - /// collections of names to match. If any of these patterns match, the rule matches. Comparisons are case sensitive. - public MemberNameMatchingRule(IEnumerable namesToMatch) - : this(namesToMatch, false) - { - } - - /// - /// Create a new that matches the - /// given member names. Wildcards are allowed. - /// - /// Collections of names to match. If any of these patterns match, the rule matches. - /// If false, name comparisons are case sensitive. If true, name comparisons are case insensitive. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public MemberNameMatchingRule(IEnumerable namesToMatch, bool ignoreCase) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(namesToMatch, "namesToMatch"); - - patterns = new List(); - foreach (string name in namesToMatch) - { - patterns.Add(new Glob(name, !ignoreCase)); - } - } - - /// - /// Create a new that matches - /// one of the given member names. Wildcards are allowed. - /// - /// List of objects containing - /// the pattern to match and case sensitivity flag. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public MemberNameMatchingRule(IEnumerable matches) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(matches, "matches"); - - patterns = new List(); - foreach (MatchingInfo match in matches) - { - patterns.Add(new Glob(match.Match, !match.IgnoreCase)); - } - } - - /// - /// Check if the given matches one of this - /// object's matching patterns. - /// - /// Member to check. - /// True if matches, false if not. - public bool Matches(MethodBase member) - { - return patterns.Exists(pattern => pattern.IsMatch(member.Name)); - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MethodSignatureMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MethodSignatureMatchingRule.cs deleted file mode 100644 index aca7526a..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/MethodSignatureMatchingRule.cs +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Match methods with the given names and method signature. - /// - public class MethodSignatureMatchingRule : IMatchingRule - { - private readonly Glob methodNamePattern; - private readonly List parameterRules; - - /// - /// Creates a new that matches methods - /// with the given name, with parameter types matching the given list. - /// - /// Method name to match. Wildcards are allowed. - /// Parameter type names to match, in order. Wildcards are allowed. - /// If false, name comparisons are case sensitive. If true, name comparisons are case insensitive. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public MethodSignatureMatchingRule(string methodName, IEnumerable parameterTypeNames, bool ignoreCase) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(parameterTypeNames, "parameterTypeNames"); - - methodNamePattern = new Glob(methodName, !ignoreCase); - parameterRules = new List(); - - foreach (string parameterTypeName in parameterTypeNames) - { - parameterRules.Add(new TypeMatchingRule(parameterTypeName, ignoreCase)); - } - } - - /// - /// Create a new that matches methods - /// with the given name, with parameter types matching the given list. - /// - /// Name comparisons are case sensitive. - /// Method name to match. Wildcards are allowed. - /// Parameter type names to match, in order. Wildcards are allowed. - public MethodSignatureMatchingRule(string methodName, IEnumerable parameterTypeNames) - : this(methodName, parameterTypeNames, false) - { - } - - /// - /// Create a new that matches any method - /// with parameter types matching the given list. - /// - /// Name comparisons are case sensitive. - /// Parameter type names to match, in order. Wildcards are allowed. - public MethodSignatureMatchingRule(IEnumerable parameterTypeNames) - : this("*", parameterTypeNames, false) - { - } - - /// - /// Create a new that matches any method - /// with parameter types matching the given list. - /// - /// Parameter type names to match, in order. Wildcards are allowed. - /// If false, name comparisons are case sensitive. If true, name comparisons are case insensitive. - public MethodSignatureMatchingRule(IEnumerable parameterTypeNames, bool ignoreCase) - : this("*", parameterTypeNames, ignoreCase) - { - } - - /// - /// Check to see if the given method matches the name and signature. - /// - /// Member to check. - /// True if match, false if not. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public bool Matches(MethodBase member) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - if (!methodNamePattern.IsMatch(member.Name)) - { - return false; - } - - ParameterInfo[] parameters = member.GetParameters(); - if (parameters.Length != parameterRules.Count) - { - return false; - } - - for (int i = 0; i < parameters.Length; ++i) - { - if (!parameterRules[i].Matches(parameters[i].ParameterType)) - { - return false; - } - } - - return true; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/NamespaceMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/NamespaceMatchingRule.cs deleted file mode 100644 index e2bd4b64..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/NamespaceMatchingRule.cs +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that matches members in a given namespace. You can - /// specify either a single namespace (e.g. System.Data) or a namespace root - /// (e.g. System.Data.* to match types in that namespace or below. - /// - public class NamespaceMatchingRule : IMatchingRule - { - private readonly List matches; - - /// - /// Create a new that matches the given - /// namespace. - /// - /// namespace name to match. Comparison is case sensitive. - public NamespaceMatchingRule(string namespaceName) - : this(namespaceName, false) - { - } - - /// - /// Create a new that matches the given - /// namespace. - /// - /// namespace name to match. - /// If false, comparison is case sensitive. If true, comparison is case insensitive. - public NamespaceMatchingRule(string namespaceName, bool ignoreCase) - : this(new MatchingInfo[] { new MatchingInfo(namespaceName, ignoreCase) }) - { - } - - /// - /// Create a new that matches any of - /// the given namespace names. - /// - /// Collection of namespace names to match. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public NamespaceMatchingRule(IEnumerable matches) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(matches, "matches"); - - this.matches = new List(); - foreach (MatchingInfo match in matches) - { - this.matches.Add(new NamespaceMatchingInfo(match.Match, match.IgnoreCase)); - } - } - - /// - /// Check to see if the given is in a namespace - /// matched by any of our given namespace names. - /// - /// member to check. - /// True if member is contained in a matching namespace, false if not. - public bool Matches(MethodBase member) - { - return - matches.Exists( - delegate(NamespaceMatchingInfo match) { return match.Matches(member.DeclaringType); }); - } - - /// - /// A helper class that encapsulates the name to match, case sensitivity flag, - /// and the wildcard rules for matching namespaces. - /// - private class NamespaceMatchingInfo : MatchingInfo - { - private bool wildCard; - private const string WildCardString = ".*"; - - /// - /// Construct a new that matches the - /// given namespace name. - /// - /// Namespace name to match. - /// If false, comparison is case sensitive. If true, comparison is case insensitive. - public NamespaceMatchingInfo(string match, bool ignoreCase) - : base(match, ignoreCase) - { - if (this.NamespaceName.EndsWith(WildCardString, StringComparison.Ordinal)) - { - this.NamespaceName = this.NamespaceName.Substring(0, this.NamespaceName.Length - WildCardString.Length); - this.wildCard = true; - } - } - - private string NamespaceName - { - get { return this.Match; } - set { this.Match = value; } - } - - /// - /// Check if the given type is in a matching namespace. - /// - /// Type to check. - /// True if type is in a matching namespace, false if not. - public bool Matches(Type t) - { - if (t == null) - { - return string.IsNullOrEmpty(this.NamespaceName); - } - - StringComparison comparison = IgnoreCase - ? StringComparison.OrdinalIgnoreCase - : StringComparison.Ordinal; - - bool exactMatch = - string.Compare( - t.Namespace, - this.NamespaceName, - comparison) - == 0; - - if (this.wildCard) - { - return exactMatch || - t.Namespace.StartsWith(this.NamespaceName + ".", comparison); - } - return exactMatch; - } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ParameterTypeMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ParameterTypeMatchingRule.cs deleted file mode 100644 index 1fc8d6ba..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ParameterTypeMatchingRule.cs +++ /dev/null @@ -1,185 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that matches methods that have any parameters - /// of the given types. - /// - public class ParameterTypeMatchingRule : IMatchingRule - { - private readonly List matches; - - /// - /// Creates a new that matches if any of - /// the method parameters match ones in the given collection. - /// - /// Collection of that - /// describes the types to match. - public ParameterTypeMatchingRule(IEnumerable matches) - { - this.matches = new List(matches); - } - - /// - /// The list of describing the parameter types to match. - /// - /// The collection of matches. - public IEnumerable ParameterMatches - { - get { return matches; } - } - - /// - /// Check the given member to see if it has any matching parameters. - /// - /// Member to match. - /// true if member matches, false if it doesn't. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public bool Matches(MethodBase member) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - ParameterInfo[] parametersInfo = member.GetParameters(); - - foreach (ParameterTypeMatchingInfo matchInfo in matches) - { - TypeMatchingRule typeRule = - new TypeMatchingRule(matchInfo.Match, matchInfo.IgnoreCase); - foreach (ParameterInfo paramInfo in parametersInfo) - { - if ((!paramInfo.IsOut && !paramInfo.IsReturn()) && - (matchInfo.Kind == ParameterKind.Input || - matchInfo.Kind == ParameterKind.InputOrOutput)) - { - if (typeRule.Matches(paramInfo.ParameterType)) - { - return true; - } - } - - if (paramInfo.IsOut && - (matchInfo.Kind == ParameterKind.Output || - matchInfo.Kind == ParameterKind.InputOrOutput)) - { - if (typeRule.Matches(paramInfo.ParameterType.GetElementType())) - { - return true; - } - } - - if (paramInfo.IsReturn() && matchInfo.Kind == ParameterKind.ReturnValue) - { - if (typeRule.Matches(paramInfo.ParameterType)) - { - return true; - } - } - } - if (matchInfo.Kind == ParameterKind.ReturnValue) - { - MethodInfo method = member as MethodInfo; - if (method != null) - { - if (typeRule.Matches(method.ReturnType)) - { - return true; - } - } - } - } - return false; - } - } - - /// - /// Describes the type of parameter to match. - /// - public enum ParameterKind - { - /// - /// Input parameter - /// - Input, - - /// - /// Output parameter - /// - Output, - - /// - /// Input or output parameter - /// - InputOrOutput, - - /// - /// Method return value - /// - ReturnValue - } - - /// - /// A class that stores information about a single type to match. - /// - public class ParameterTypeMatchingInfo : MatchingInfo - { - private ParameterKind kind; - - /// - /// Creates a new uninitialized . - /// - public ParameterTypeMatchingInfo() - { - } - - /// - /// Creates a new matching the given kind of parameter. - /// - /// of parameter to match. - public ParameterTypeMatchingInfo(ParameterKind kind) - { - this.kind = kind; - } - - /// - /// Creates a new matching the given parameter - /// type and kind. - /// - /// Parameter name to match. - /// of parameter to match. - public ParameterTypeMatchingInfo(string nameToMatch, ParameterKind kind) - : base(nameToMatch) - { - this.kind = kind; - } - - /// - /// Creates a new matching the given parameter - /// type and kind. - /// - /// Parameter name to match. - /// If false, compare type names using case-sensitive comparison. - /// If true, compare type names using case-insensitive comparison. - /// of parameter to match. - public ParameterTypeMatchingInfo(string nameToMatch, bool ignoreCase, ParameterKind kind) - : base(nameToMatch, ignoreCase) - { - this.kind = kind; - } - - /// - /// What kind of parameter to match. - /// - /// indicating which kind of parameters to match. - public ParameterKind Kind - { - get { return this.kind; } - set { this.kind = value; } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/PropertyMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/PropertyMatchingRule.cs deleted file mode 100644 index 97ef0f4c..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/PropertyMatchingRule.cs +++ /dev/null @@ -1,170 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation that matches properties - /// by name. You can match the getter, setter, or both. - /// - public class PropertyMatchingRule : IMatchingRule - { - private readonly List patterns = new List(); - - /// - /// Construct a new that matches the - /// getter or setter of the given property. - /// - /// Name of the property. Name comparison is case sensitive. Wildcards are allowed. - public PropertyMatchingRule(string propertyName) - : this(propertyName, PropertyMatchingOption.GetOrSet, false) - { - } - - /// - /// Constructs a new that matches the - /// given method of the given property. - /// - /// Name of the property. Name comparison is case sensitive. Wildcards are allowed. - /// Match the getter, setter, or both. - public PropertyMatchingRule(string propertyName, PropertyMatchingOption option) - : this(propertyName, option, false) - { - } - - /// - /// Constructs a new that matches the - /// given method of the given property. - /// - /// Name of the property to match. Wildcards are allowed. - /// Match the getter, setter, or both. - /// If false, name comparison is case sensitive. If true, name comparison is case insensitive. - public PropertyMatchingRule(string propertyName, PropertyMatchingOption option, bool ignoreCase) - : this(new PropertyMatchingInfo[] { new PropertyMatchingInfo(propertyName, option, ignoreCase) }) - { - } - - /// - /// Constructs a new that matches any of the - /// given properties. - /// - /// Collection of defining which - /// properties to match. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public PropertyMatchingRule(IEnumerable matches) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(matches, "matches"); - - foreach (PropertyMatchingInfo match in matches) - { - if (match.Option != PropertyMatchingOption.Set) - { - patterns.Add(new Glob("get_" + match.Match, !match.IgnoreCase)); - } - - if (match.Option != PropertyMatchingOption.Get) - { - patterns.Add(new Glob("set_" + match.Match, !match.IgnoreCase)); - } - } - } - - /// - /// Checks if the given member matches the rule. - /// - /// Member to check. - /// True if it matches, false if it does not. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public bool Matches(MethodBase member) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - return - member.IsSpecialName && - (patterns.Exists( - delegate(Glob pattern) - { - return pattern.IsMatch(member.Name); - })); - } - } - - /// - /// Specifies which methods of a property should be matches by - /// the . - /// - public enum PropertyMatchingOption - { - /// - /// Match the property getter method. - /// - Get, - - /// - /// Match the property setter method. - /// - Set, - - /// - /// Match either the getter or setter method. - /// - GetOrSet - } - - /// - /// Information about a property match. - /// - public class PropertyMatchingInfo : MatchingInfo - { - private PropertyMatchingOption option; - - /// - /// Construct a new that matches the get or set methods - /// of the given property name, and does a case-sensitive comparison. - /// - /// Property name to match. - public PropertyMatchingInfo(string match) - : this(match, PropertyMatchingOption.GetOrSet, false) - { - } - - /// - /// Constructs a new that matches the given methods of - /// the given property name, doing a case-sensitive comparison. - /// - /// Property name to match. - /// specifying which methods of the property to match. - public PropertyMatchingInfo(string match, PropertyMatchingOption option) - : this(match, option, false) - { - } - - /// - /// Construct a new that matches the given methods of - /// the given property name. - /// - /// Property name to match. - /// specifying which methods of the property to match. - /// If false, name comparison is case sensitive. If true, name comparison is case insensitive. - public PropertyMatchingInfo(string match, PropertyMatchingOption option, bool ignoreCase) - : base(match, ignoreCase) - { - this.option = option; - } - - /// - /// The to use when doing name comparisons on this property. - /// - /// Specifies which methods of the property to match. - public PropertyMatchingOption Option - { - get { return this.option; } - set { this.option = value; } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ReturnTypeMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ReturnTypeMatchingRule.cs deleted file mode 100644 index f668c50d..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/ReturnTypeMatchingRule.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An that checks to see if a member has a specified - /// type. - /// - public class ReturnTypeMatchingRule : IMatchingRule - { - private readonly TypeMatchingRule typeMatchingRule; - - /// - /// Construct a new that matches - /// members with the given return type. - /// - /// Type to look for. - public ReturnTypeMatchingRule(Type returnType) - { - if (returnType == null) - { - throw new ArgumentNullException("returnType"); - } - typeMatchingRule = new TypeMatchingRule(returnType.FullName); - } - - /// - /// Construct a new that matches - /// the given return type by name. - /// - /// See the class for details on how - /// type name matches are done. - /// Type name to match. Name comparisons are case sensitive. - public ReturnTypeMatchingRule(string returnTypeName) - { - typeMatchingRule = new TypeMatchingRule(returnTypeName); - } - - /// - /// Construct a new that matches - /// the given return type by name. - /// - /// See the class for details on how - /// type name matches are done. - /// Type name to match. - /// If false, name comparison is case sensitive. If true, comparison - /// is case insensitive. - public ReturnTypeMatchingRule(string returnTypeName, bool ignoreCase) - { - typeMatchingRule = new TypeMatchingRule(returnTypeName, ignoreCase); - } - - /// - /// Check to see if the given member has a matching return type. - /// - /// Member to check. - /// true if return types match, false if they don't. - public bool Matches(MethodBase member) - { - MethodInfo method = member as MethodInfo; - if (method == null) - { - return false; - } - - return typeMatchingRule.Matches(method.ReturnType); - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TagAttribute.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TagAttribute.cs deleted file mode 100644 index a690364d..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TagAttribute.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A simple attribute used to "tag" classes, methods, or properties with a - /// string that can later be matched via the . - /// - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property, AllowMultiple = true)] - public sealed class TagAttribute : Attribute - { - private readonly string tag; - - /// - /// Creates a new with the given string. - /// - /// The tag string. - public TagAttribute(string tag) - { - this.tag = tag; - } - - /// - /// The string tag for this attribute. - /// - /// the tag. - public string Tag - { - get { return this.tag; } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TagAttributeMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TagAttributeMatchingRule.cs deleted file mode 100644 index 7fbb0d62..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TagAttributeMatchingRule.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Globalization; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A that checks a member for the presence - /// of the on the method, property, or class, and - /// that the given string matches. - /// - public class TagAttributeMatchingRule : IMatchingRule - { - private readonly string tagToMatch; - private readonly bool ignoreCase; - - /// - /// Constructs a new , looking for - /// the given string. The comparison is case sensitive. - /// - /// tag string to match. - public TagAttributeMatchingRule(string tagToMatch) - : this(tagToMatch, false) - { - } - - /// - /// Constructs a new , looking for - /// the given string. The comparison is case sensitive if is - /// false, case insensitive if is true. - /// - /// tag string to match. - /// if false, case-sensitive comparison. If true, case-insensitive comparison. - public TagAttributeMatchingRule(string tagToMatch, bool ignoreCase) - { - this.tagToMatch = tagToMatch; - this.ignoreCase = ignoreCase; - } - - /// - /// Check the given member for the presence of the and - /// match the strings. - /// - /// Member to check. - /// True if tag strings match, false if they don't. - public bool Matches(MethodBase member) - { - foreach (TagAttribute tagAttribute in ReflectionHelper.GetAllAttributes(member, true)) - { - if (string.Compare(tagAttribute.Tag, tagToMatch, ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal) == 0) - { - return true; - } - } - return false; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TypeMatchingRule.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TypeMatchingRule.cs deleted file mode 100644 index acadd20e..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/TypeMatchingRule.cs +++ /dev/null @@ -1,128 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A matching rule that matches when the member is declared - /// in the given type. - /// - public class TypeMatchingRule : IMatchingRule - { - private readonly List matches; - private readonly bool matchesTypelessMembers; - - /// - /// Constructs a new that matches the - /// given type. - /// - /// The type to match. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public TypeMatchingRule(Type type) - : this(SafeGetTypeName(type), false) - { - } - - /// - /// Constructs a new that matches types - /// with the given name. - /// - /// Comparisons are case sensitive. - /// Type name to match. - public TypeMatchingRule(string typeName) - : this(typeName, false) - { - } - - /// - /// Constructs a new that matches types - /// with the given name, using the given case sensitivity. - /// - /// Type name to match. - /// if false, do case-sensitive comparison. If true, do case-insensitive. - public TypeMatchingRule(string typeName, bool ignoreCase) - : this(new MatchingInfo[] { new MatchingInfo(typeName, ignoreCase) }) - { - } - - /// - /// Constructs a new that will match - /// any of the type names given in the collection of match information. - /// - /// The match information to match. - public TypeMatchingRule(IEnumerable matches) - { - this.matches = new List(matches); - matchesTypelessMembers = this.matches.Exists(delegate(MatchingInfo match) - { - return - string.IsNullOrEmpty( - match.Match); - }); - } - - /// - /// Checks if the given member matches any of this object's matches. - /// - /// Member to match. - /// True if match, false if not. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public bool Matches(MethodBase member) - { - Guard.ArgumentNotNull(member, "member"); - - if (member.DeclaringType == null) - { - return matchesTypelessMembers; - } - bool doesMatch = Matches(member.DeclaringType); - return doesMatch; - } - - /// - /// Checks if the given type matches any of this object's matches. - /// - /// Matches may be on the namespace-qualified type name or just the type name. - /// Type to check. - /// True if it matches, false if it doesn't. - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "t", Justification = "Parameter name is meaningful enough in context")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public bool Matches(Type t) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(t, "t"); - - foreach (MatchingInfo match in matches) - { - if (string.Compare(t.FullName, match.Match, Comparison(match.IgnoreCase)) == 0) - { - return true; - } - else if (string.Compare(t.Name, match.Match, Comparison(match.IgnoreCase)) == 0) - { - return true; - } - } - return false; - } - - private static StringComparison Comparison(bool ignoreCase) - { - return ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal; - } - - private static string SafeGetTypeName(Type type) - { - Guard.ArgumentNotNull(type, "type"); - return type.Name; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/UtilityExtensions.Desktop.cs b/source/Unity.Interception/Src/PolicyInjection/MatchingRules/UtilityExtensions.Desktop.cs deleted file mode 100644 index f3737cf1..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/MatchingRules/UtilityExtensions.Desktop.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Reflection; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Some utility extension methods to make things portable to Silverlight. - /// - internal static class UtilityExtensions - { - internal static bool IsReturn(this ParameterInfo parameterInfo) - { - return parameterInfo.IsRetval; - } - - internal static bool IsInvariantCulture(this CultureInfo cultureInfo) - { - return cultureInfo.LCID == CultureInfo.InvariantCulture.LCID; - } - - internal static bool IsSameAs(this CultureInfo cultureInfo, CultureInfo otherCultureInfo) - { - return cultureInfo.LCID == otherCultureInfo.LCID; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Pipeline/HandlerPipeline.cs b/source/Unity.Interception/Src/PolicyInjection/Pipeline/HandlerPipeline.cs deleted file mode 100644 index 50b1b426..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Pipeline/HandlerPipeline.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// The HandlerPipeline class encapsulates a list of s - /// and manages calling them in the proper order with the right inputs. - /// - public class HandlerPipeline - { - private readonly List handlers; - - /// - /// Creates a new with an empty pipeline. - /// - public HandlerPipeline() - { - handlers = new List(); - } - - /// - /// Creates a new with the given collection - /// of s. - /// - /// Collection of handlers to add to the pipeline. - public HandlerPipeline(IEnumerable handlers) - { - this.handlers = new List(handlers); - } - - /// - /// Get the number of handlers in this pipeline. - /// - public int Count - { - get { return handlers.Count; } - } - - /// - /// Execute the pipeline with the given input. - /// - /// Input to the method call. - /// The ultimate target of the call. - /// Return value from the pipeline. - public IMethodReturn Invoke(IMethodInvocation input, InvokeHandlerDelegate target) - { - if (handlers.Count == 0) - { - return target(input, null); - } - - int handlerIndex = 0; - - IMethodReturn result = handlers[0].Invoke(input, delegate - { - ++handlerIndex; - if (handlerIndex < handlers.Count) - { - return handlers[handlerIndex].Invoke; - } - else - { - return target; - } - }); - return result; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Pipeline/ICallHandler.cs b/source/Unity.Interception/Src/PolicyInjection/Pipeline/ICallHandler.cs deleted file mode 100644 index a55ed9ae..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Pipeline/ICallHandler.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Diagnostics.CodeAnalysis; -using System.Runtime.Remoting.Messaging; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Handlers implement this interface and are called for each - /// invocation of the pipelines that they're included in. - /// - public interface ICallHandler - { - /// - /// Implement this method to execute your handler processing. - /// - /// Inputs to the current call to the target. - /// Delegate to execute to get the next delegate in the handler - /// chain. - /// Return value from the target. - IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext); - - /// - /// Order in which the handler will be executed - /// - int Order { get; set; } - } - - /// - /// This delegate type is the type that points to the next - /// method to execute in the current pipeline. - /// - /// Inputs to the current method call. - /// Delegate to get the next handler in the chain. - /// Return from the next method in the chain. - [SuppressMessage("Microsoft.Naming", "CA1711", Justification = "A delegate is indeed required.")] - public delegate IMethodReturn InvokeHandlerDelegate(IMethodInvocation input, GetNextHandlerDelegate getNext); - - /// - /// This delegate type is passed to each handler's Invoke method. - /// Call the delegate to get the next delegate to call to continue - /// the chain. - /// - /// Next delegate in the handler chain to call. - [SuppressMessage("Microsoft.Naming", "CA1711", Justification = "A delegate is indeed required.")] - public delegate InvokeHandlerDelegate GetNextHandlerDelegate(); -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Pipeline/IMethodInvocation.cs b/source/Unity.Interception/Src/PolicyInjection/Pipeline/IMethodInvocation.cs deleted file mode 100644 index 487551c4..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Pipeline/IMethodInvocation.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This interface is used to represent the call to a method. - /// An implementation of IMethodInvocation is passed to the - /// call handlers so that they may manipulate the call - /// (typically by changing the parameters) before the final target - /// gets called. - /// - public interface IMethodInvocation - { - /// - /// Gets the inputs for this call. - /// - IParameterCollection Inputs { get; } - - /// - /// Collection of all parameters to the call: in, out and byref. - /// - IParameterCollection Arguments { get; } - - /// - /// Retrieves a dictionary that can be used to store arbitrary additional - /// values. This allows the user to pass values between call handlers. - /// - IDictionary InvocationContext { get; } - - /// - /// The object that the call is made on. - /// - object Target { get; } - - /// - /// The method on Target that we're aiming at. - /// - MethodBase MethodBase { get; } - - /// - /// Factory method that creates the correct implementation of - /// IMethodReturn. - /// - /// Return value to be placed in the IMethodReturn object. - /// All arguments passed or returned as out/byref to the method. - /// Note that this is the entire argument list, including in parameters. - /// New IMethodReturn object. - IMethodReturn CreateMethodReturn(object returnValue, params object[] outputs); - - /// - /// Factory method that creates the correct implementation of - /// IMethodReturn in the presence of an exception. - /// - /// Exception to be set into the returned object. - /// New IMethodReturn object - IMethodReturn CreateExceptionMethodReturn(Exception ex); - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Pipeline/IMethodReturn.cs b/source/Unity.Interception/Src/PolicyInjection/Pipeline/IMethodReturn.cs deleted file mode 100644 index 2876ccb8..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Pipeline/IMethodReturn.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This interface is used to represent the return value from a method. - /// An implementation of IMethodReturn is returned by call handlers, and - /// each handler can manipulate the parameters, return value, or add an - /// exception on the way out. - /// - public interface IMethodReturn - { - /// - /// The collection of output parameters. If the method has no output - /// parameters, this is a zero-length list (never null). - /// - IParameterCollection Outputs { get; } - - /// - /// Returns value from the method call. - /// - /// This value is null if the method has no return value. - object ReturnValue { get; set; } - - /// - /// If the method threw an exception, the exception object is here. - /// - Exception Exception { get; set; } - - /// - /// Retrieves a dictionary that can be used to store arbitrary additional - /// values. This allows the user to pass values between call handlers. - /// - /// This is guaranteed to be the same dictionary that was used - /// in the IMethodInvocation object, so handlers can set context - /// properties in the pre-call phase and retrieve them in the after-call phase. - /// - IDictionary InvocationContext { get; } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Pipeline/IParameterCollection.cs b/source/Unity.Interception/Src/PolicyInjection/Pipeline/IParameterCollection.cs deleted file mode 100644 index 92d75353..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Pipeline/IParameterCollection.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// This interface represents a list of either input or output - /// parameters. It implements a fixed size list, plus a couple - /// of other utility methods. - /// - public interface IParameterCollection : IList - { - /// - /// Fetches a parameter's value by name. - /// - /// parameter name. - /// value of the named parameter. - object this[string parameterName] { get; set; } - - /// - /// Gets the name of a parameter based on index. - /// - /// Index of parameter to get the name for. - /// Name of the requested parameter. - string ParameterName(int index); - - /// - /// Gets the ParameterInfo for a particular parameter by index. - /// - /// Index for this parameter. - /// ParameterInfo object describing the parameter. - ParameterInfo GetParameterInfo(int index); - - /// - /// Gets the ParameterInfo for a particular parameter by name. - /// - /// Name of the parameter. - /// ParameterInfo object for the named parameter. - ParameterInfo GetParameterInfo(string parameterName); - - /// - /// Does this collection contain a parameter value with the given name? - /// - /// Name of parameter to find. - /// True if the parameter name is in the collection, false if not. - bool ContainsParameter(string parameterName); - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Pipeline/ParameterCollection.cs b/source/Unity.Interception/Src/PolicyInjection/Pipeline/ParameterCollection.cs deleted file mode 100644 index 203096b7..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Pipeline/ParameterCollection.cs +++ /dev/null @@ -1,314 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// An implementation of that wraps a provided array - /// containing the argument values. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1035:ICollectionImplementationsHaveStronglyTypedMembers", - Justification = "Not a general purpose collection")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1039:ListsAreStronglyTyped", - Justification = "Not a general purpose collection")] - public class ParameterCollection : IParameterCollection - { - /// - /// An internal struct that maps the index in the arguments collection to the - /// corresponding about that argument. - /// - private struct ArgumentInfo - { - public int Index; - public string Name; - public ParameterInfo ParameterInfo; - - /// - /// Construct a new object linking the - /// given index and object. - /// - /// Index into arguments array (zero-based). - /// for the argument at . - public ArgumentInfo(int index, ParameterInfo parameterInfo) - { - this.Index = index; - this.Name = parameterInfo.Name; - this.ParameterInfo = parameterInfo; - } - } - - private readonly List argumentInfo; - private readonly object[] arguments; - - /// - /// Construct a new that wraps the - /// given array of arguments. - /// - /// Complete collection of arguments. - /// Type information about each parameter. - /// A that indicates - /// whether a particular parameter is part of the collection. Used to filter out only input - /// parameters, for example. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public ParameterCollection(object[] arguments, ParameterInfo[] argumentInfo, Predicate isArgumentPartOfCollection) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(arguments, "arguments"); - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(isArgumentPartOfCollection, "isArgumentPartOfCollection"); - - this.arguments = arguments; - this.argumentInfo = new List(); - for (int argumentNumber = 0; argumentNumber < argumentInfo.Length; ++argumentNumber) - { - if (isArgumentPartOfCollection(argumentInfo[argumentNumber])) - { - this.argumentInfo.Add(new ArgumentInfo(argumentNumber, argumentInfo[argumentNumber])); - } - } - } - - /// - /// Fetches a parameter's value by name. - /// - /// parameter name. - /// value of the named parameter. - public object this[string parameterName] - { - get { return arguments[argumentInfo[IndexForInputParameterName(parameterName)].Index]; } - - set { arguments[argumentInfo[IndexForInputParameterName(parameterName)].Index] = value; } - } - - private int IndexForInputParameterName(string paramName) - { - for (int i = 0; i < argumentInfo.Count; ++i) - { - if (argumentInfo[i].Name == paramName) - { - return i; - } - } - throw new ArgumentException("Invalid parameter Name", "paramName"); - } - - /// - /// Gets the value of a parameter based on index. - /// - /// Index of parameter to get the value for. - /// Value of the requested parameter. - public object this[int index] - { - get { return arguments[argumentInfo[index].Index]; } - set { arguments[argumentInfo[index].Index] = value; } - } - - /// - /// Gets the ParameterInfo for a particular parameter by index. - /// - /// Index for this parameter. - /// ParameterInfo object describing the parameter. - public ParameterInfo GetParameterInfo(int index) - { - return argumentInfo[index].ParameterInfo; - } - - /// - /// Gets the for the given named parameter. - /// - /// Name of parameter. - /// for the requested parameter. - public ParameterInfo GetParameterInfo(string parameterName) - { - return argumentInfo[IndexForInputParameterName(parameterName)].ParameterInfo; - } - - /// - /// Gets the name of a parameter based on index. - /// - /// Index of parameter to get the name for. - /// Name of the requested parameter. - public string ParameterName(int index) - { - return argumentInfo[index].Name; - } - - /// - /// Does this collection contain a parameter value with the given name? - /// - /// Name of parameter to find. - /// True if the parameter name is in the collection, false if not. - public bool ContainsParameter(string parameterName) - { - return argumentInfo.Any(info => info.Name == parameterName); - } - - /// - /// Adds to the collection. This is a read only collection, so this method - /// always throws . - /// - /// Object to add. - /// Nothing, always throws. - /// Always throws this. - public int Add(object value) - { - throw new NotSupportedException(); - } - - /// - /// Checks to see if the collection contains the given object. - /// - /// Tests for the object using object.Equals. - /// Object to find. - /// true if object is in collection, false if it is not. - public bool Contains(object value) - { - return - argumentInfo.Exists( - delegate(ArgumentInfo info) - { - var argument = arguments[info.Index]; - - if (argument == null) - { - return value == null; - } - - return argument.Equals(value); - }); - } - - /// - /// Remove all items in the collection. This collection is fixed-size, so this - /// method always throws . - /// - /// This is always thrown. - public void Clear() - { - throw new NotSupportedException(); - } - - /// - /// Returns the index of the given object, or -1 if not found. - /// - /// Object to find. - /// zero-based index of found object, or -1 if not found. - public int IndexOf(object value) - { - return argumentInfo.FindIndex( - delegate(ArgumentInfo info) - { - return arguments[info.Index].Equals(value); - }); - } - - /// - /// Inserts a new item. This is a fixed-size collection, so this method throws . - /// - /// Index to insert at. - /// Always throws. - /// Always throws this. - public void Insert(int index, object value) - { - throw new NotSupportedException(); - } - - /// - /// Removes the given item. This is a fixed-size collection, so this method throws . - /// - /// Always throws. - /// Always throws this. - public void Remove(object value) - { - throw new NotSupportedException(); - } - - /// - /// Removes the given item. This is a fixed-size collection, so this method throws . - /// - /// Always throws. - /// Always throws this. - public void RemoveAt(int index) - { - throw new NotSupportedException(); - } - - /// - /// Is this collection read only? - /// - /// No, it is not read only, the contents can change. - public bool IsReadOnly - { - get { return false; } - } - - /// - /// Is this collection fixed size? - /// - /// Yes, it is. - public bool IsFixedSize - { - get { return true; } - } - - /// - /// Copies the contents of this collection to the given array. - /// - /// Destination array. - /// index to start copying from. - public void CopyTo(Array array, int index) - { - int destIndex = 0; - argumentInfo.GetRange(index, argumentInfo.Count - index).ForEach( - delegate(ArgumentInfo info) - { - array.SetValue(arguments[info.Index], destIndex); - ++destIndex; - }); - } - - /// - /// Total number of items in the collection. - /// - /// The count. - public int Count - { - get { return argumentInfo.Count; } - } - - /// - /// Gets a synchronized version of this collection. WARNING: Not implemented completely, - /// DO NOT USE THIS METHOD. - /// - public object SyncRoot - { - get { return this; } - } - - /// - /// Is the object synchronized for thread safety? - /// - /// No, it isn't. - public bool IsSynchronized - { - get { return false; } - } - - /// - /// Gets an enumerator object to support the foreach construct. - /// - /// Enumerator object. - public IEnumerator GetEnumerator() - { - for (int i = 0; i < argumentInfo.Count; ++i) - { - yield return arguments[argumentInfo[i].Index]; - } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Pipeline/PipelineManager.cs b/source/Unity.Interception/Src/PolicyInjection/Pipeline/PipelineManager.cs deleted file mode 100644 index a787a280..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Pipeline/PipelineManager.cs +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A collection of objects, indexed - /// by . Returns an empty pipeline if a - /// MethodBase is requested that isn't in the dictionary. - /// - public class PipelineManager - { - private readonly Dictionary pipelines = - new Dictionary(); - - private static readonly HandlerPipeline EmptyPipeline = new HandlerPipeline(); - - /// - /// Retrieve the pipeline associated with the requested . - /// - /// The method for which the pipeline is being requested. - /// The handler pipeline for the given method. If no pipeline has - /// been set, returns a new empty pipeline. - public HandlerPipeline GetPipeline(MethodBase method) - { - HandlerPipelineKey key = HandlerPipelineKey.ForMethod(method); - HandlerPipeline pipeline = EmptyPipeline; - if (pipelines.ContainsKey(key)) - { - pipeline = pipelines[key]; - } - return pipeline; - } - - /// - /// Set a new pipeline for a method. - /// - /// The method on which the pipeline should be set. - /// The new pipeline. - public void SetPipeline(MethodBase method, HandlerPipeline pipeline) - { - HandlerPipelineKey key = HandlerPipelineKey.ForMethod(method); - pipelines[key] = pipeline; - } - - /// - /// Get the pipeline for the given method, creating it if necessary. - /// - /// Method to retrieve the pipeline for. - /// Handlers to initialize the pipeline with - /// True if the pipeline has any handlers in it, false if not. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public bool InitializePipeline(MethodImplementationInfo method, IEnumerable handlers) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(method, "method"); - - var pipeline = CreatePipeline(method.ImplementationMethodInfo, handlers); - if (method.InterfaceMethodInfo != null) - { - pipelines[HandlerPipelineKey.ForMethod(method.InterfaceMethodInfo)] = pipeline; - } - - return pipeline.Count > 0; - } - - private HandlerPipeline CreatePipeline(MethodInfo method, IEnumerable handlers) - { - HandlerPipelineKey key = HandlerPipelineKey.ForMethod(method); - if (pipelines.ContainsKey(key)) - { - return pipelines[key]; - } - - if (method.GetBaseDefinition() == method) - { - pipelines[key] = new HandlerPipeline(handlers); - return pipelines[key]; - } - - var basePipeline = CreatePipeline(method.GetBaseDefinition(), handlers); - pipelines[key] = basePipeline; - return basePipeline; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Policies/ApplyNoPoliciesAttribute.cs b/source/Unity.Interception/Src/PolicyInjection/Policies/ApplyNoPoliciesAttribute.cs deleted file mode 100644 index c80de451..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Policies/ApplyNoPoliciesAttribute.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Attribute used to indicate that no interception should be applied to - /// the attribute target. - /// - [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Class)] - public sealed class ApplyNoPoliciesAttribute : Attribute - { - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Policies/AttributeDrivenPolicy.cs b/source/Unity.Interception/Src/PolicyInjection/Policies/AttributeDrivenPolicy.cs deleted file mode 100644 index 16b87a93..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Policies/AttributeDrivenPolicy.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A class that reads and constructs handlers - /// based on on the target. - /// - public class AttributeDrivenPolicy : InjectionPolicy - { - private readonly AttributeDrivenPolicyMatchingRule attributeMatchRule; - - /// - /// Constructs a new instance of the . - /// - public AttributeDrivenPolicy() - : base("Attribute Driven Policy") - { - this.attributeMatchRule = new AttributeDrivenPolicyMatchingRule(); - } - - /// - /// Derived classes implement this method to calculate if the policy - /// will provide any handler to the specified member. - /// - /// Member to check. - /// true if policy applies to this member, false if not. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - protected override bool DoesMatch(MethodImplementationInfo member) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - bool matchesInterface = member.InterfaceMethodInfo != null ? this.attributeMatchRule.Matches(member.InterfaceMethodInfo) : false; - bool matchesImplementation = this.attributeMatchRule.Matches(member.ImplementationMethodInfo); - - return matchesInterface | matchesImplementation; - } - - /// - /// Derived classes implement this method to supply the list of handlers for - /// this specific member. - /// - /// Member to get handlers for. - /// The to use when creating handlers, - /// if necessary. - /// Enumerable collection of handlers for this method. - protected override IEnumerable DoGetHandlersFor(MethodImplementationInfo member, IUnityContainer container) - { - if (member.InterfaceMethodInfo != null) - { - foreach (HandlerAttribute attr in ReflectionHelper.GetAllAttributes(member.InterfaceMethodInfo, true)) - { - yield return attr.CreateHandler(container); - } - } - foreach (HandlerAttribute attr in ReflectionHelper.GetAllAttributes(member.ImplementationMethodInfo, true)) - { - yield return attr.CreateHandler(container); - } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Policies/HandlerAttribute.cs b/source/Unity.Interception/Src/PolicyInjection/Policies/HandlerAttribute.cs deleted file mode 100644 index 8191899f..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Policies/HandlerAttribute.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Base class for handler attributes used in the attribute-driven - /// interception policy. - /// - public abstract class HandlerAttribute : Attribute - { - /// - /// Derived classes implement this method. When called, it - /// creates a new call handler as specified in the attribute - /// configuration. - /// - /// The to use when creating handlers, - /// if necessary. - /// A new call handler object. - public abstract ICallHandler CreateHandler(IUnityContainer container); - - private int order; - - /// - /// Gets or sets the order in which the handler will be executed. - /// - public int Order - { - get { return this.order; } - set { this.order = value; } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Policies/InjectionPolicy.cs b/source/Unity.Interception/Src/PolicyInjection/Policies/InjectionPolicy.cs deleted file mode 100644 index 1dbf8d1c..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Policies/InjectionPolicy.cs +++ /dev/null @@ -1,141 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Base class for Policies that specifies which handlers apply to which methods of an object. - /// - /// - /// This base class always enforces the - /// before - /// passing the checks onto derived classes. This way, derived classes do not need to - /// worry about implementing this check. - /// It also means that derived classes cannot override this rule. This is considered a feature. - public abstract class InjectionPolicy - { - private readonly string name; - private readonly IMatchingRule doesNotHaveNoPoliciesAttributeRule; - - /// - /// Creates a new empty Policy. - /// - protected InjectionPolicy() - : this("Unnamed policy") - { - } - - /// - /// Creates a new empty policy with the given name. - /// - /// Name of the policy. - protected InjectionPolicy(string name) - { - this.name = name; - doesNotHaveNoPoliciesAttributeRule = new ApplyNoPoliciesMatchingRule(); - } - - /// - /// Gets the name of this policy. - /// - /// The name of the policy. - public string Name - { - get { return name; } - } - - /// - /// Checks if the rules in this policy match the given member info. - /// - /// MemberInfo to check against. - /// true if ruleset matches, false if it does not. - public bool Matches(MethodImplementationInfo member) - { - return DoesNotHaveNoPoliciesAttributeRule(member) && - DoesMatch(member); - } - - private bool DoesNotHaveNoPoliciesAttributeRule(MethodImplementationInfo method) - { - bool doesNotHaveRule = true; - doesNotHaveRule &= method.InterfaceMethodInfo != null ? doesNotHaveNoPoliciesAttributeRule.Matches(method.InterfaceMethodInfo) : true; - doesNotHaveRule &= doesNotHaveNoPoliciesAttributeRule.Matches(method.ImplementationMethodInfo); - return doesNotHaveRule; - } - - /// - /// Returns ordered collection of handlers in order that apply to the given member. - /// - /// Member that may or may not be assigned handlers by this policy. - /// The to use when creating handlers, - /// if necessary. - /// Collection of handlers (possibly empty) that apply to this member. - public virtual IEnumerable GetHandlersFor(MethodImplementationInfo member, IUnityContainer container) - { - if (DoesNotHaveNoPoliciesAttributeRule(member)) - { - List handlers = new List(DoGetHandlersFor(member, container)); - if (handlers.Count > 0) - { - foreach (ICallHandler handler in handlers) - { - yield return handler; - } - yield break; - } - } - } - - /// - /// Given a method on an object, return the set of MethodBases for that method, - /// plus any interface methods that the member implements. - /// - /// Member to get Method Set for. - /// The set of methods - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - protected static IEnumerable GetMethodSet(MethodBase member) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - List methodSet = new List(new MethodBase[] { member }); - if (member.DeclaringType != null && !member.DeclaringType.IsInterface) - { - foreach (Type itf in member.DeclaringType.GetInterfaces()) - { - InterfaceMapping mapping = member.DeclaringType.GetInterfaceMap(itf); - for (int i = 0; i < mapping.TargetMethods.Length; ++i) - { - if (mapping.TargetMethods[i] == member) - { - methodSet.Add(mapping.InterfaceMethods[i]); - } - } - } - } - - return methodSet; - } - - /// - /// Derived classes implement this method to calculate if the policy - /// will provide any handler to the specified member. - /// - /// Member to check. - /// true if policy applies to this member, false if not. - protected abstract bool DoesMatch(MethodImplementationInfo member); - - /// - /// Derived classes implement this method to supply the list of handlers for - /// this specific member. - /// - /// Member to get handlers for. - /// The to use when creating handlers, - /// if necessary. - /// Enumerable collection of handlers for this method. - protected abstract IEnumerable DoGetHandlersFor(MethodImplementationInfo member, IUnityContainer container); - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Policies/PolicySet.cs b/source/Unity.Interception/Src/PolicyInjection/Policies/PolicySet.cs deleted file mode 100644 index 10947cae..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Policies/PolicySet.cs +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A collection of Policy objects. The policies within a PolicySet combine using - /// an "or" operation. - /// - [SuppressMessage("Microsoft.Naming", "CA1710", Justification = "Using alternative suffix 'Set'.")] - public class PolicySet : List - { - /// - /// Creates a new containing the given policies. - /// - /// Policies to put into the policy set. - public PolicySet(params InjectionPolicy[] policies) - { - this.AddRange(policies); - } - - /// - /// Gets the policies that apply to the given member. - /// - /// Member to get policies for. - /// Collection of policies that apply to this member. - public IEnumerable GetPoliciesFor(MethodImplementationInfo member) - { - foreach (InjectionPolicy policy in this) - { - if (policy.Matches(member)) - { - yield return policy; - } - } - } - - /// - /// Gets the policies in the that do not - /// apply to the given member. - /// - /// Member to check. - /// Collection of policies that do not apply to . - public IEnumerable GetPoliciesNotFor(MethodImplementationInfo member) - { - foreach (InjectionPolicy policy in this) - { - if (!policy.Matches(member)) - { - yield return policy; - } - } - } - - /// - /// Gets the handlers that apply to the given member based on all policies in the . - /// - /// Member to get handlers for. - /// The to use when creating handlers, - /// if necessary. - /// Collection of call handlers for . - public IEnumerable GetHandlersFor(MethodImplementationInfo member, IUnityContainer container) - { - return new List(CalculateHandlersFor(this, member, container)); - } - - internal static IEnumerable CalculateHandlersFor( - IEnumerable policies, - MethodImplementationInfo member, - IUnityContainer container) - { - List ordered = new List(); - List nonOrdered = new List(); - - foreach (InjectionPolicy p in policies) - { - foreach (ICallHandler handler in p.GetHandlersFor(member, container)) - { - if (handler.Order != 0) - { - bool inserted = false; - // add in order to ordered - for (int i = ordered.Count - 1; i >= 0; i--) - { - if (ordered[i].Order <= handler.Order) - { - ordered.Insert(i + 1, handler); - inserted = true; - break; - } - } - if (!inserted) - { - ordered.Insert(0, handler); - } - } - else - { - nonOrdered.Add(handler); - } - } - } - ordered.AddRange(nonOrdered); - return ordered; - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/Policies/RuleDrivenPolicy.cs b/source/Unity.Interception/Src/PolicyInjection/Policies/RuleDrivenPolicy.cs deleted file mode 100644 index 1e6af73b..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/Policies/RuleDrivenPolicy.cs +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A policy is a combination of a matching rule set and a set of handlers. - /// If the policy applies to a member, then the handlers will be enabled for - /// that member. - /// - public class RuleDrivenPolicy : InjectionPolicy - { - private readonly MatchingRuleSet ruleSet; - private readonly IEnumerable callHandlerNames; - - /// - /// Creates a new object with a set of matching rules - /// and the names to use when resolving handlers. - /// - public RuleDrivenPolicy(IMatchingRule[] matchingRules, string[] callHandlerNames) - : this("Unnamed policy", matchingRules, callHandlerNames) - { - } - - /// - /// Creates a new object with a name, a set of matching rules - /// and the names to use when resolving handlers. - /// - public RuleDrivenPolicy(string name, IMatchingRule[] matchingRules, string[] callHandlerNames) - : base(name) - { - this.ruleSet = new MatchingRuleSet(); - this.ruleSet.AddRange(matchingRules); - - this.callHandlerNames = callHandlerNames; - } - - /// - /// Checks if the rules in this policy match the given member info. - /// - /// MemberInfo to check against. - /// true if ruleset matches, false if it does not. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - protected override bool DoesMatch(MethodImplementationInfo member) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - bool matchesInterface = member.InterfaceMethodInfo != null ? this.ruleSet.Matches(member.InterfaceMethodInfo) : false; - bool matchesImplementation = this.ruleSet.Matches(member.ImplementationMethodInfo); - return matchesInterface | matchesImplementation; - } - - /// - /// Return ordered collection of handlers in order that apply to the given member. - /// - /// Member that may or may not be assigned handlers by this policy. - /// The to use when creating handlers, - /// if necessary. - /// Collection of handlers (possibly empty) that apply to this member. - protected override IEnumerable DoGetHandlersFor(MethodImplementationInfo member, IUnityContainer container) - { - if (this.Matches(member)) - { - foreach (string callHandlerName in this.callHandlerNames) - { - yield return container.Resolve(callHandlerName); - } - } - } - } -} diff --git a/source/Unity.Interception/Src/PolicyInjection/PolicyInjectionBehavior.cs b/source/Unity.Interception/Src/PolicyInjection/PolicyInjectionBehavior.cs deleted file mode 100644 index d33347a0..00000000 --- a/source/Unity.Interception/Src/PolicyInjection/PolicyInjectionBehavior.cs +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// Interceptor that performs policy injection. - /// - public class PolicyInjectionBehavior : IInterceptionBehavior - { - private readonly PipelineManager pipelineManager; - - /// - /// Initializes a new instance of the with a pipeline manager. - /// - /// The for the new instance. - public PolicyInjectionBehavior(PipelineManager pipelineManager) - { - this.pipelineManager = pipelineManager; - } - - /// - /// Initializes a new instance of the with the given information - /// about what's being intercepted and the current set of injection policies. - /// - /// Information about what will be injected. - /// Current injection policies. - /// Unity container that can be used to resolve call handlers. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public PolicyInjectionBehavior(CurrentInterceptionRequest interceptionRequest, InjectionPolicy[] policies, - IUnityContainer container) - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(interceptionRequest, "interceptionRequest"); - - var allPolicies = new PolicySet(policies); - bool hasHandlers = false; - - var manager = new PipelineManager(); - - foreach (MethodImplementationInfo method in - interceptionRequest.Interceptor.GetInterceptableMethods( - interceptionRequest.TypeToIntercept, interceptionRequest.ImplementationType)) - { - bool hasNewHandlers = manager.InitializePipeline(method, - allPolicies.GetHandlersFor(method, container)); - hasHandlers = hasHandlers || hasNewHandlers; - } - pipelineManager = hasHandlers ? manager : null; - } - - /// - /// Applies the policy injection handlers configured for the invoked method. - /// - /// Inputs to the current call to the target. - /// Delegate to execute to get the next delegate in the handler - /// chain. - /// Return value from the target. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - Guard.ArgumentNotNull(input, "input"); - Guard.ArgumentNotNull(getNext, "getNext"); - - HandlerPipeline pipeline = GetPipeline(input.MethodBase); - - return pipeline.Invoke( - input, - delegate(IMethodInvocation policyInjectionInput, GetNextHandlerDelegate policyInjectionInputGetNext) - { - try - { - return getNext()(policyInjectionInput, getNext); - } - catch (TargetInvocationException ex) - { - // The outer exception will always be a reflection exception; we want the inner, which is - // the underlying exception. - return policyInjectionInput.CreateExceptionMethodReturn(ex.InnerException); - } - }); - } - - private HandlerPipeline GetPipeline(MethodBase method) - { - return this.pipelineManager.GetPipeline(method); - } - - /// - /// Returns the interfaces required by the behavior for the objects it intercepts. - /// - /// An empty array of interfaces. - public IEnumerable GetRequiredInterfaces() - { - return Type.EmptyTypes; - } - - /// - /// Returns a flag indicating if this behavior will actually do anything when invoked. - /// - /// This is used to optimize interception. If the behaviors won't actually - /// do anything (for example, PIAB where no policies match) then the interception - /// mechanism can be skipped completely. - public bool WillExecute - { - get { return pipelineManager != null; } - } - } -} diff --git a/source/Unity.Interception/Src/Properties/AssemblyInfo.cs b/source/Unity.Interception/Src/Properties/AssemblyInfo.cs deleted file mode 100644 index 81be856b..00000000 --- a/source/Unity.Interception/Src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; -using System.Security; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microsoft.Practices.Unity.InterceptionExtension")] -[assembly: AssemblyDescription("Interception support for the Unity Application Block")] - -[assembly: CLSCompliant(true)] -[assembly: ComVisible(false)] -[assembly: AssemblyProduct("Microsoft Unity Application Block")] -[assembly: AssemblyCompany("Microsoft Corporation")] - -#if !SILVERLIGHT -[assembly: AllowPartiallyTrustedCallers] -#endif - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif -[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("4.0.0.0")] -[assembly: AssemblyFileVersion("4.0.1.0")] -[assembly: AssemblyInformationalVersion("4.0.1")] - -[assembly: NeutralResourcesLanguage("en")] diff --git a/source/Unity.Interception/Src/Properties/Resources.Designer.cs b/source/Unity.Interception/Src/Properties/Resources.Designer.cs deleted file mode 100644 index 83a9a041..00000000 --- a/source/Unity.Interception/Src/Properties/Resources.Designer.cs +++ /dev/null @@ -1,207 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17379 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.Practices.Unity.InterceptionExtension.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Practices.Unity.InterceptionExtension.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Intercepted abstract method was invoked.. - /// - internal static string ExceptionAbstractMethodNotImplemented { - get { - return ResourceManager.GetString("ExceptionAbstractMethodNotImplemented", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Additional interfaces do not have an implementation.. - /// - internal static string ExceptionAdditionalInterfaceNotImplemented { - get { - return ResourceManager.GetString("ExceptionAdditionalInterfaceNotImplemented", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The additional interfaces supplied are invalid: {0}. - /// - internal static string ExceptionAdditionalInterfacesInvalid { - get { - return ResourceManager.GetString("ExceptionAdditionalInterfacesInvalid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Type must be a subclass of System.Attribute.. - /// - internal static string ExceptionAttributeNoSubclassOfAttribute { - get { - return ResourceManager.GetString("ExceptionAttributeNoSubclassOfAttribute", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Could not create instance of type {0} with no constructor arguments.. - /// - internal static string ExceptionCannotCreateInstance { - get { - return ResourceManager.GetString("ExceptionCannotCreateInstance", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cannot map generic type parameters on a generic type definition (an unbound generic type).. - /// - internal static string ExceptionCannotMapGenericTypeDefinition { - get { - return ResourceManager.GetString("ExceptionCannotMapGenericTypeDefinition", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Collection contains a null element.. - /// - internal static string ExceptionContainsNullElement { - get { - return ResourceManager.GetString("ExceptionContainsNullElement", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The lengths of the mapped generic parameters do not match.. - /// - internal static string ExceptionMappedParametersDoNotMatch { - get { - return ResourceManager.GetString("ExceptionMappedParametersDoNotMatch", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The collection of interfaces is null.. - /// - internal static string ExceptionNullInterfacesCollection { - get { - return ResourceManager.GetString("ExceptionNullInterfacesCollection", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The required interfaces for behavior {1} are invalid: {0}. - /// - internal static string ExceptionRequiredInterfacesInvalid { - get { - return ResourceManager.GetString("ExceptionRequiredInterfacesInvalid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} is not an interface.. - /// - internal static string ExceptionTypeIsNotInterface { - get { - return ResourceManager.GetString("ExceptionTypeIsNotInterface", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Null type.. - /// - internal static string ExceptionTypeIsNull { - get { - return ResourceManager.GetString("ExceptionTypeIsNull", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} is an open generic.. - /// - internal static string ExceptionTypeIsOpenGeneric { - get { - return ResourceManager.GetString("ExceptionTypeIsOpenGeneric", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} is not interceptable.. - /// - internal static string InterceptionNotSupported { - get { - return ResourceManager.GetString("InterceptionNotSupported", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Could not find the implementation of interface method {0}.{1} in type {2}. - /// - internal static string InterfaceMethodNotImplemented { - get { - return ResourceManager.GetString("InterfaceMethodNotImplemented", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Null is not permitted as an interception behavior.. - /// - internal static string NullBehavior { - get { - return ResourceManager.GetString("NullBehavior", resourceCulture); - } - } - } -} diff --git a/source/Unity.Interception/Src/Properties/Resources.resx b/source/Unity.Interception/Src/Properties/Resources.resx deleted file mode 100644 index 30d85dd9..00000000 --- a/source/Unity.Interception/Src/Properties/Resources.resx +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Intercepted abstract method was invoked. - - - Additional interfaces do not have an implementation. - - - The additional interfaces supplied are invalid: {0} - - - Type must be a subclass of System.Attribute. - - - Could not create instance of type {0} with no constructor arguments. - {0} = Name of the type that caused the exception - - - Cannot map generic type parameters on a generic type definition (an unbound generic type). - - - Collection contains a null element. - - - The lengths of the mapped generic parameters do not match. - - - The collection of interfaces is null. - - - The required interfaces for behavior {1} are invalid: {0} - - - The type {0} is not an interface. - {0} = Name of the type that caused the exception - - - Null type. - - - The type {0} is an open generic. - {0} = Name of the type that caused the exception - - - The type {0} is not interceptable. - {0} = Name of the type that caused the exception - - - Could not find the implementation of interface method {0}.{1} in type {2} - {0} = interface name, {1} = method name, {2} = implementing type name. - - - Null is not permitted as an interception behavior. - - \ No newline at end of file diff --git a/source/Unity.Interception/Src/Unity.Interception.csproj b/source/Unity.Interception/Src/Unity.Interception.csproj deleted file mode 100644 index 33a847da..00000000 --- a/source/Unity.Interception/Src/Unity.Interception.csproj +++ /dev/null @@ -1,233 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {F8186B23-B0E1-4646-B5F3-14357841E2BA} - Library - Properties - Microsoft.Practices.Unity.InterceptionExtension - Microsoft.Practices.Unity.Interception - - - 3.5 - - - v4.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - true - full - false - ..\..\bin\Desktop\Debug - TRACE;DEBUG;CODE_ANALYSIS - prompt - 4 - ..\..\bin\Desktop\Debug\Microsoft.Practices.Unity.Interception.xml - true - true - - - ..\..\Unity.ruleset - false - - - pdbonly - true - ..\..\bin\Desktop\Release - TRACE - prompt - 4 - ..\..\bin\Desktop\Release\Microsoft.Practices.Unity.Interception.xml - true - false - - - ..\..\Unity.ruleset - false - - - - False - ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - 3.5 - - - - - - - GlobalAssemblyInfo.2010.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - Unity.licenseheader - - - - - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - \ No newline at end of file diff --git a/source/Unity.Interception/Src/Utilities/Glob.cs b/source/Unity.Interception/Src/Utilities/Glob.cs deleted file mode 100644 index 028f08a3..00000000 --- a/source/Unity.Interception/Src/Utilities/Glob.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Text; -using System.Text.RegularExpressions; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A "glob" is a string matching pattern. It is similar to the - /// matches available in the file system (*.cs, for example). The Glob - /// class implements this string matching. - /// - /// Glob supports the following meta-characters: - /// * - match zero or more characters - /// ? - match any one character - /// [abc] - match one character if it's in the characters inside the brackets. - /// All other characters in the glob are literals. - /// - [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "[abc] is valid in this context but not a word to add to the dictionary.")] - public class Glob - { - private readonly Regex pattern; - - /// - /// Constructs a new instance that matches the given pattern. - /// - /// - /// The pattern match is case sensitive by default. - /// - /// Pattern to use. See summary for - /// details of the pattern. - public Glob(string pattern) - : this(pattern, true) - { - } - - /// - /// Constructs a new instance that matches the given pattern. - /// - /// The pattern to use. See summary for - /// details of the patterns supported. - /// If true, perform a case sensitive match. - /// If false, perform a case insensitive comparison. - public Glob(string pattern, bool caseSensitive) - { - this.pattern = GlobPatternToRegex(pattern, caseSensitive); - } - - /// - /// Checks to see if the given string matches the pattern. - /// - /// String to check. - /// True if it matches, false if it doesn't. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "s", Justification = "Parameter name is meaningful enough in context")] - public bool IsMatch(string s) - { - return pattern.IsMatch(s); - } - - private static Regex GlobPatternToRegex(string pattern, bool caseSensitive) - { - StringBuilder regexPattern = new StringBuilder(pattern); - - string[] globLiterals = new string[] { "\\", ".", "$", "^", "{", "(", "|", ")", "+" }; - foreach (string globLiteral in globLiterals) - { - regexPattern.Replace(globLiteral, @"\" + globLiteral); - } - regexPattern.Replace("*", ".*"); - regexPattern.Replace("?", "."); - - regexPattern.Insert(0, "^"); - regexPattern.Append("$"); - RegexOptions options = caseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase; - return new Regex(regexPattern.ToString(), options); - } - } -} diff --git a/source/Unity.Interception/Src/Utilities/ReflectionHelper.cs b/source/Unity.Interception/Src/Utilities/ReflectionHelper.cs deleted file mode 100644 index 462464ab..00000000 --- a/source/Unity.Interception/Src/Utilities/ReflectionHelper.cs +++ /dev/null @@ -1,163 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.InterceptionExtension -{ - /// - /// A collection of utility functions to encapsulate details of - /// reflection and finding attributes. - /// - public static class ReflectionHelper - { - /// - /// Given a MethodBase for a property's get or set method, - /// return the corresponding property info. - /// - /// MethodBase for the property's get or set method. - /// PropertyInfo for the property, or null if method is not part of a property. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public static PropertyInfo GetPropertyFromMethod(MethodBase method) - { - Guard.ArgumentNotNull(method, "method"); - - var methodInfo = method as MethodInfo; - if (methodInfo != null) - { - return GetPropertyFromMethod(methodInfo); - } - - return null; - } - - /// - /// Given a MethodInfo for a property's get or set method, - /// return the corresponding property info. - /// - /// MethodBase for the property's get or set method. - /// PropertyInfo for the property, or null if method is not part of a property. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class.")] - public static PropertyInfo GetPropertyFromMethod(MethodInfo method) - { - Guard.ArgumentNotNull(method, "method"); - - PropertyInfo property = null; - if (method.IsSpecialName) - { - var containingType = method.DeclaringType; - if (containingType != null) - { - var isGetter = method.Name.StartsWith("get_", StringComparison.Ordinal); - var isSetter = method.Name.StartsWith("set_", StringComparison.Ordinal); - if (isSetter || isGetter) - { - var propertyName = method.Name.Substring(4); - Type propertyType; - Type[] indexerTypes; - - GetPropertyTypes(method, isGetter, out propertyType, out indexerTypes); - - property = - containingType.GetProperty( - propertyName, - BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, - null, - propertyType, - indexerTypes, - null); - } - } - } - return property; - } - - private static void GetPropertyTypes(MethodInfo method, bool isGetter, out Type propertyType, out Type[] indexerTypes) - { - var parameters = method.GetParameters(); - if (isGetter) - { - propertyType = method.ReturnType; - indexerTypes = - parameters.Length == 0 - ? Type.EmptyTypes - : parameters.Select(pi => pi.ParameterType).ToArray(); - } - else - { - propertyType = parameters[parameters.Length - 1].ParameterType; - indexerTypes = - parameters.Length == 1 - ? Type.EmptyTypes - : parameters.Take(parameters.Length - 1).Select(pi => pi.ParameterType).ToArray(); - } - } - - /// - /// Given a particular MemberInfo, return the custom attributes of the - /// given type on that member. - /// - /// Type of attribute to retrieve. - /// The member to look at. - /// True to include attributes inherited from base classes. - /// Array of found attributes. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static TAttribute[] GetAttributes(MemberInfo member, bool inherits) where TAttribute : Attribute - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - object[] attributesAsObjects = member.GetCustomAttributes(typeof(TAttribute), inherits); - TAttribute[] attributes = new TAttribute[attributesAsObjects.Length]; - int index = 0; - Array.ForEach(attributesAsObjects, - delegate(object o) - { - attributes[index++] = (TAttribute)o; - }); - return attributes; - } - - /// - /// Given a particular MemberInfo, find all the attributes that apply to this - /// member. Specifically, it returns the attributes on the type, then (if it's a - /// property accessor) on the property, then on the member itself. - /// - /// Type of attribute to retrieve. - /// The member to look at. - /// true to include attributes inherited from base classes. - /// Array of found attributes. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static TAttribute[] GetAllAttributes(MemberInfo member, bool inherits) - where TAttribute : Attribute - { - Microsoft.Practices.Unity.Utility.Guard.ArgumentNotNull(member, "member"); - - List attributes = new List(); - - if (member.DeclaringType != null) - { - attributes.AddRange(GetAttributes(member.DeclaringType, inherits)); - - MethodInfo methodInfo = member as MethodInfo; - if (methodInfo != null) - { - PropertyInfo prop = GetPropertyFromMethod(methodInfo); - if (prop != null) - { - attributes.AddRange(GetAttributes(prop, inherits)); - } - } - } - attributes.AddRange(GetAttributes(member, inherits)); - return attributes.ToArray(); - } - } -} diff --git a/source/Unity.Interception/Src/packages.config b/source/Unity.Interception/Src/packages.config deleted file mode 100644 index 50e40955..00000000 --- a/source/Unity.Interception/Src/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/AddInterfaceFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/AddInterfaceFixture.cs deleted file mode 100644 index 1a5d08bf..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/AddInterfaceFixture.cs +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Summary description for AddInterfaceFixture - /// - [TestClass] - public class AddInterfaceFixture - { - [TestMethod] - public void CanProxyWithBehaviorThatAddsInterface() - { - var target = new MockDal(); - var proxied = Intercept.ThroughProxy(target, - new InterfaceInterceptor(), - new[] { new AdditionalInterfaceBehavior() }); - - Assert.IsNotNull(proxied); - } - - [TestMethod] - public void BehaviorAddsInterface() - { - var target = new MockDal(); - var proxied = Intercept.ThroughProxy(target, - new InterfaceInterceptor(), - new[] { new AdditionalInterfaceBehavior() }); - - Assert.IsNotNull(proxied as IAdditionalInterface); - } - - [TestMethod] - public void CanInvokeMethodAddedByBehavior() - { - var proxied = Intercept.NewInstance( - new VirtualMethodInterceptor(), - new[] { new AdditionalInterfaceBehavior() }); - - Assert.AreEqual(10, ((IAdditionalInterface)proxied).DoNothing()); - } - - [TestMethod] - public void CanManuallyAddAdditionalInterface() - { - var target = new MockDal(); - var proxied = Intercept.ThroughProxyWithAdditionalInterfaces(target, - new InterfaceInterceptor(), - new[] { new AdditionalInterfaceBehavior(false) }, - new[] { typeof(IAdditionalInterface) }); - - Assert.IsNotNull(proxied as IAdditionalInterface); - } - - [TestMethod] - public void CanInvokeMethodOnManuallyAddedInterface() - { - var target = new MockDal(); - var proxied = Intercept.ThroughProxyWithAdditionalInterfaces(target, - new InterfaceInterceptor(), - new[] { new AdditionalInterfaceBehavior(false) }, - new[] { typeof(IAdditionalInterface) }); - - Assert.AreEqual(10, ((IAdditionalInterface)proxied).DoNothing()); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs deleted file mode 100644 index 3596444f..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - public static partial class AssortedParameterKindsAreProperlyHandledHelper - { - public partial class TypeWithAssertedParameterKinds : MarshalByRefObject - { - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/AssortedParameterKindsAreProperlyHandledHelper.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/AssortedParameterKindsAreProperlyHandledHelper.cs deleted file mode 100644 index 748fa3e4..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/AssortedParameterKindsAreProperlyHandledHelper.cs +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - public static partial class AssortedParameterKindsAreProperlyHandledHelper - { - public static void PerformTest(IInterceptingProxy proxy) - { - var behavior = new FakeInterceptionBehavior(); - - int argumentsCount = 0; - object[] argumentsValuesByIndex = null; - string[] argumentsNames = null; - object[] argumentsValuesByName = null; - int inputsCount = 0; - object[] inputsValuesByIndex = null; - string[] inputsNames = null; - object[] inputsValuesByName = null; - int outputsCount = 0; - object[] outputsValuesByIndex = null; - string[] outputsNames = null; - object[] outputsValuesByName = null; - object originalReturnValue = null; - - behavior.InvokeFunc = (IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) => - { - argumentsCount = input.Arguments.Count; - argumentsValuesByIndex = Enumerable.Range(0, argumentsCount).Select(pi => input.Arguments[pi]).ToArray(); - argumentsNames = Enumerable.Range(0, argumentsCount).Select(pi => input.Arguments.GetParameterInfo(pi).Name).ToArray(); - argumentsValuesByName = argumentsNames.Select(an => input.Arguments[an]).ToArray(); - - inputsCount = input.Inputs.Count; - inputsValuesByIndex = Enumerable.Range(0, inputsCount).Select(pi => input.Inputs[pi]).ToArray(); - inputsNames = Enumerable.Range(0, inputsCount).Select(pi => input.Inputs.GetParameterInfo(pi).Name).ToArray(); - inputsValuesByName = inputsNames.Select(an => input.Inputs[an]).ToArray(); - - input.Inputs["param1"] = 11; - input.Inputs[1] = 13; - input.Inputs["param4"] = 14; - input.Inputs[3] = 15; - - var result = getNext()(input, getNext); - - outputsCount = result.Outputs.Count; - outputsValuesByIndex = Enumerable.Range(0, outputsCount).Select(pi => result.Outputs[pi]).ToArray(); - outputsNames = Enumerable.Range(0, outputsCount).Select(pi => result.Outputs.GetParameterInfo(pi).Name).ToArray(); - outputsValuesByName = outputsNames.Select(an => result.Outputs[an]).ToArray(); - - originalReturnValue = result.ReturnValue; - - result.Outputs[0] = 82; - result.Outputs["param4"] = 84; - - result.ReturnValue = 100; - - return result; - }; - - proxy.AddInterceptionBehavior(behavior); - - int param2, param4; - param4 = 4; - var returnValue = ((ITypeWithAssertedParameterKinds)proxy).DoSomething(1, out param2, 3, ref param4, 5); - - Assert.AreEqual(100, returnValue); - Assert.AreEqual(82, param2); - Assert.AreEqual(84, param4); - - Assert.AreEqual(5, argumentsCount); - CollectionAssertExtensions.AreEqual(new[] { 1, 0, 3, 4, 5 }, argumentsValuesByIndex); - CollectionAssertExtensions.AreEqual(new[] { "param1", "param2", "param3", "param4", "param5" }, argumentsNames); - CollectionAssertExtensions.AreEqual(new[] { 1, 0, 3, 4, 5 }, argumentsValuesByName); - - Assert.AreEqual(4, inputsCount); - CollectionAssertExtensions.AreEqual(new[] { 1, 3, 4, 5 }, inputsValuesByIndex); - CollectionAssertExtensions.AreEqual(new[] { "param1", "param3", "param4", "param5" }, inputsNames); - CollectionAssertExtensions.AreEqual(new[] { 1, 3, 4, 5 }, inputsValuesByName); - - Assert.AreEqual(2, outputsCount); - CollectionAssertExtensions.AreEqual(new[] { 25, 39 }, outputsValuesByIndex); - CollectionAssertExtensions.AreEqual(new[] { "param2", "param4" }, outputsNames); - CollectionAssertExtensions.AreEqual(new[] { 25, 39 }, outputsValuesByName); - - Assert.AreEqual(11 + 25 + 13 + 39 + 15, originalReturnValue); - } - - public interface ITypeWithAssertedParameterKinds - { - int DoSomething(int param1, out int param2, int param3, ref int param4, int param5); - } - - public partial class TypeWithAssertedParameterKinds : ITypeWithAssertedParameterKinds - { - public virtual int DoSomething(int param1, out int param2, int param3, ref int param4, int param5) - { - param2 = param1 + param4; - param4 = param1 + param3 + param5; - - return param1 + param2 + param3 + param4 + param5; - } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/AttributeDrivenPolicyFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/AttributeDrivenPolicyFixture.cs deleted file mode 100644 index 057814e8..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/AttributeDrivenPolicyFixture.cs +++ /dev/null @@ -1,428 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using Microsoft.Practices.Unity.Utility; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - [TestClass] - public class AttributeDrivenPolicyFixture - { - private MethodImplementationInfo nothingSpecialMethod; - private MethodImplementationInfo doSomethingMethod; - private MethodImplementationInfo getCriticalInfoMethod; - private MethodImplementationInfo mustBeFastMethod; - private MethodImplementationInfo getNameMethod; - private MethodImplementationInfo hasAttributeMethod; - private MethodImplementationInfo doesntHaveAttributeMethod; - private MethodImplementationInfo newMethod; - private MethodImplementationInfo getNewNameMethod; - - private MethodImplementationInfo getItemMethod; - private MethodImplementationInfo setItemMethod; - private MethodImplementationInfo getItemIntMethod; - private MethodImplementationInfo setItemIntMethod; - private MethodImplementationInfo getItemStringMethod; - private MethodImplementationInfo setItemStringMethod; - - [TestInitialize] - public void Setup() - { - nothingSpecialMethod = MakeMethodImpl("NothingSpecial"); - doSomethingMethod = MakeMethodImpl("DoSomething"); - getCriticalInfoMethod = MakeMethodImpl("GetCriticalInformation"); - mustBeFastMethod = MakeMethodImpl("MustBeFast"); - getNameMethod = new MethodImplementationInfo(null, typeof(AttributeTestTarget).GetProperty("Name").GetGetMethod()); - hasAttributeMethod = MakeMethodImpl("HasAttribute"); - doesntHaveAttributeMethod = MakeMethodImpl("DoesntHaveAttribute"); - newMethod = MakeMethodImpl("ANewMethod"); - getNewNameMethod = new MethodImplementationInfo(null, StaticReflection.GetPropertyGetMethodInfo((DerivedAttributeTestTarget t) => t.Name)); - - getItemMethod = new MethodImplementationInfo(null, StaticReflection.GetPropertyGetMethodInfo((DerivedAttributeTestTarget t) => t.Item)); - setItemMethod = new MethodImplementationInfo(null, StaticReflection.GetPropertySetMethodInfo((DerivedAttributeTestTarget t) => t.Item)); - - getItemIntMethod = new MethodImplementationInfo(null, typeof(DerivedAttributeTestTarget).GetMethod("get_Item", new[] { typeof(int) })); - setItemIntMethod = new MethodImplementationInfo(null, typeof(DerivedAttributeTestTarget).GetMethod("set_Item", new[] { typeof(int), typeof(object) })); - - getItemStringMethod = new MethodImplementationInfo(null, typeof(DerivedAttributeTestTarget).GetMethod("get_Item", new[] { typeof(string), typeof(double) })); - setItemStringMethod = new MethodImplementationInfo(null, typeof(DerivedAttributeTestTarget).GetMethod("set_Item", new[] { typeof(string), typeof(double), typeof(object) })); - } - - private static MethodImplementationInfo MakeMethodImpl(string name) - { - return new MethodImplementationInfo(null, typeof(T).GetMethod(name)); - } - - [TestMethod] - public void MatchingRuleMatchesForAllMethodsInAttributeTestTarget() - { - IMatchingRule rule = new AttributeDrivenPolicyMatchingRule(); - Assert.IsTrue(rule.Matches(nothingSpecialMethod.ImplementationMethodInfo)); - Assert.IsTrue(rule.Matches(doSomethingMethod.ImplementationMethodInfo)); - Assert.IsTrue(rule.Matches(getCriticalInfoMethod.ImplementationMethodInfo)); - Assert.IsTrue(rule.Matches(mustBeFastMethod.ImplementationMethodInfo)); - } - - [TestMethod] - public void MatchingRuleOnlyMatchesOnMethodsWithAttributes() - { - IMatchingRule rule = new AttributeDrivenPolicyMatchingRule(); - - Assert.IsTrue(rule.Matches(hasAttributeMethod.ImplementationMethodInfo)); - Assert.IsFalse(rule.Matches(doesntHaveAttributeMethod.ImplementationMethodInfo)); - } - - [TestMethod] - public void ShouldMatchInheritedHandlerAttributes() - { - IMatchingRule rule = new AttributeDrivenPolicyMatchingRule(); - Assert.IsTrue(rule.Matches(newMethod.ImplementationMethodInfo)); - } - - [TestMethod] - public void ShouldHaveAttributesCauseMatchesOnMethods() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - - Assert.IsTrue(policy.Matches(nothingSpecialMethod)); - Assert.IsFalse(policy.Matches(mustBeFastMethod)); - } - - [TestMethod] - public void ShouldGetCorrectHandlersForMethods() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(nothingSpecialMethod, new UnityContainer())); - - Assert.AreEqual(1, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - } - - [TestMethod] - public void ShouldGetHandlersFromClassAndMethodAttributes() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(doSomethingMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler3), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldGetNoHandlersIfApplyNoPoliciesIsPresent() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(mustBeFastMethod, new UnityContainer())); - Assert.AreEqual(0, handlers.Count); - } - - [TestMethod] - public void ShouldHaveLoggingHandlerForNothingSpecial() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers - = new List(policy.GetHandlersFor(nothingSpecialMethod, new UnityContainer())); - Assert.AreEqual(1, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - } - - [TestMethod] - public void ShouldHaveLoggingAndValidationForDoSomething() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers - = new List(policy.GetHandlersFor(doSomethingMethod, new UnityContainer())); - - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler3), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersIfAttributesAreOnProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(getNameMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler3), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersIfAttributesAreOnNewProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(getNewNameMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler1), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersToGetterIfAttributesAreOnItemProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(getItemMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler3), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersToSetterIfAttributesAreOnItemProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(setItemMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler3), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersToGetterIfAttributesAreOnIndexedItemProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(getItemIntMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler1), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersToSetterIfAttributesAreOnIndexedItemProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(setItemIntMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler1), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersToGetterIfAttributesAreOnSecondIndexedItemProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(getItemStringMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler3), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldApplyHandlersToSetterIfAttributesAreOnSecondIndexedItemProperty() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers = - new List(policy.GetHandlersFor(setItemStringMethod, new UnityContainer())); - Assert.AreEqual(2, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - Assert.AreSame(typeof(CallHandler3), handlers[1].GetType()); - } - - [TestMethod] - public void ShouldInheritHandlersFromBaseClass() - { - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers - = new List(policy.GetHandlersFor(newMethod, new UnityContainer())); - Assert.AreEqual(1, handlers.Count); - Assert.AreSame(typeof(CallHandler2), handlers[0].GetType()); - } - - [TestMethod] - public void ShouldInheritHandlersFromInterface() - { - MethodImplementationInfo getNewsMethod = new MethodImplementationInfo( - typeof(INewsService).GetMethod("GetNews"), - typeof(NewsService).GetMethod("GetNews")); - AttributeDrivenPolicy policy = new AttributeDrivenPolicy(); - List handlers - = new List(policy.GetHandlersFor(getNewsMethod, new UnityContainer())); - Assert.AreEqual(1, handlers.Count); - Assert.AreSame(typeof(CallHandler1), handlers[0].GetType()); - } - } - - [CallHandler2]//(Categories = new string[] { "one", "two" }, Priority = 34)] - internal class AttributeTestTarget - { - [CallHandler3] - public string Name - { - get { return "someName"; } - set { } - } - - [CallHandler3] - public string DoSomething(string key, - int value) - { - return "I did something"; - } - - public int GetCriticalInformation(string key) - { - return 42; - } - - [ApplyNoPolicies] - public void MustBeFast() { } - - public int NothingSpecial() - { - return 43; - } - - [CallHandler1] - public object this[int ignored] { get { return null; } set { } } - - [CallHandler3] - public object this[string ignored, double ignored2] { get { return null; } set { } } - } - - internal class SecondAttributeTestTarget - { - public void DoesntHaveAttribute() { } - - [CallHandler2] - public void HasAttribute() { } - } - - internal class DerivedAttributeTestTarget : AttributeTestTarget - { - public void ANewMethod() { } - - [CallHandler1] - public new string Name - { - get { return "someOtherName"; } - set { } - } - - [CallHandler3] - public object Item { get; set; } - } - - public interface INewsService - { - [CallHandler1]//(0, 0, 30)] - IList GetNews(); - } - - public class NewsService : INewsService - { - public IList GetNews() - { - return new List { "News1", "News2", "News3" }; - } - } - - public class CallHandler1Attribute : HandlerAttribute - { - public override ICallHandler CreateHandler(IUnityContainer ignored) - { - return new CallHandler1(); - } - } - - public class CallHandler1 : ICallHandler - { - #region ICallHandler Members - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - throw new Exception("The method or operation is not implemented."); - } - - public int Order - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class CallHandler2Attribute : HandlerAttribute - { - public override ICallHandler CreateHandler(IUnityContainer ignored) - { - return new CallHandler2(); - } - } - - public class CallHandler2 : ICallHandler - { - #region ICallHandler Members - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - throw new Exception("The method or operation is not implemented."); - } - - public int Order - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class CallHandler3Attribute : HandlerAttribute - { - public override ICallHandler CreateHandler(IUnityContainer ignored) - { - return new CallHandler3(); - } - } - - public class CallHandler3 : ICallHandler - { - #region ICallHandler Members - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - throw new Exception("The method or operation is not implemented."); - } - - public int Order - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/CodeplexIssuesFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/CodeplexIssuesFixture.cs deleted file mode 100644 index 17d2c35a..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/CodeplexIssuesFixture.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Summary description for CodeplexIssuesFixture - /// - [TestClass] - public class CodeplexIssuesFixture - { - public interface IRepository { } - public class TestRepository : IRepository { } - public class TestService - { - public TestService(IRepository repository) - { - } - } - - [TestMethod] - public void DependenciesAndInterceptionMixProperly() - { - var container = new UnityContainer() - .AddNewExtension() - .RegisterType() - .RegisterType( - new Interceptor()); - - var svc1 = container.Resolve(); - var svc2 = container.Resolve(); - - Assert.AreNotSame(svc1, svc2); - Assert.IsNotNull(svc1 as IInterceptingProxy); - Assert.IsNotNull(svc2 as IInterceptingProxy); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ConvenienceConfigurationFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ConvenienceConfigurationFixture.cs deleted file mode 100644 index 8eb29441..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ConvenienceConfigurationFixture.cs +++ /dev/null @@ -1,352 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - [TestClass] - public class ConvenienceConfigurationFixture - { - [TestMethod] - public void CanSetUpAnEmptyRule() - { - // there is no visible effect for this, but it should still be resolved. - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - // empty - container - .Configure() - .AddPolicy("policy1"); - - List policies - = new List(container.ResolveAll()); - - Assert.AreEqual(2, policies.Count); - Assert.IsInstanceOfType(policies[0], typeof(AttributeDrivenPolicy)); - Assert.IsInstanceOfType(policies[1], typeof(RuleDrivenPolicy)); - Assert.AreEqual("policy1", policies[1].Name); - } - - [TestMethod] - public void SettingUpRuleWithNullNameThrows() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - try - { - container.Configure().AddPolicy(null); - Assert.Fail("should have thrown"); - } - catch (ArgumentException) - { - } - } - - [TestMethod] - public void SettingUpRuleWithEmptyNameThrows() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - try - { - container.Configure().AddPolicy(string.Empty); - Assert.Fail("should have thrown"); - } - catch (ArgumentException) - { - } - } - - [TestMethod] - public void CanSetUpSeveralEmptyRules() - { - // there is no visible effect for this, but it should still be resolved. - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - // empty - container - .Configure() - .AddPolicy("policy1").Interception - .AddPolicy("policy2"); - - List policies - = new List(container.ResolveAll()); - - Assert.AreEqual(3, policies.Count); - Assert.IsInstanceOfType(policies[0], typeof(AttributeDrivenPolicy)); - Assert.IsInstanceOfType(policies[1], typeof(RuleDrivenPolicy)); - Assert.AreEqual("policy1", policies[1].Name); - Assert.IsInstanceOfType(policies[2], typeof(RuleDrivenPolicy)); - Assert.AreEqual("policy2", policies[2].Name); - } - - [TestMethod] - public void CanSetUpAPolicyWithGivenRulesAndHandlers() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - IMatchingRule rule1 = new AlwaysMatchingRule(); - ICallHandler handler1 = new CallCountHandler(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule(rule1) - .AddCallHandler(handler1); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, ((CallCountHandler)handler1).CallCount); - } - - [TestMethod] - public void CanSetUpAPolicyWithGivenRulesAndHandlersTypes() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule(typeof(AlwaysMatchingRule)) - .AddCallHandler(typeof(GlobalCountCallHandler)); - - GlobalCountCallHandler.Calls.Clear(); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["default"]); - } - - [TestMethod] - public void CanSetUpAPolicyWithGivenRulesAndHandlersTypesWithGenerics() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule() - .AddCallHandler(); - - GlobalCountCallHandler.Calls.Clear(); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["default"]); - } - - [TestMethod] - public void CanSetUpAPolicyWithInjectedRulesAndHandlers() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule() - .AddCallHandler( - new InjectionConstructor("handler1")) - .AddCallHandler( - new InjectionConstructor("handler2"), - new InjectionProperty("Order", 10)); - - GlobalCountCallHandler.Calls.Clear(); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler1"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler2"]); - } - - [TestMethod] - public void CanSetUpAPolicyWithNonGenericInjectedRulesAndHandlers() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule(typeof(AlwaysMatchingRule)) - .AddCallHandler( - typeof(GlobalCountCallHandler), - new InjectionConstructor("handler1")) - .AddCallHandler( - typeof(GlobalCountCallHandler), - new InjectionConstructor("handler2"), - new InjectionProperty("Order", 10)); - - GlobalCountCallHandler.Calls.Clear(); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler1"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler2"]); - } - - [TestMethod] - public void CanSetUpAPolicyWithExternallyConfiguredRulesAndHandlers() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule("rule1") - .AddCallHandler("handler1") - .AddCallHandler("handler2").Interception.Container - .RegisterType("rule1") - .RegisterType( - "handler1", - new InjectionConstructor("handler1")) - .RegisterType( - "handler2", - new InjectionConstructor("handler2"), - new InjectionProperty("Order", 10)); - - GlobalCountCallHandler.Calls.Clear(); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler1"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler2"]); - } - - [TestMethod] - public void CanSetUpAPolicyWithNamedInjectedRulesAndHandlers() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule("rule1") - .AddCallHandler( - "handler1", - new InjectionConstructor("handler1")) - .AddCallHandler( - "handler2", - new InjectionConstructor("handler2"), - new InjectionProperty("Order", 10)); - - GlobalCountCallHandler.Calls.Clear(); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - GlobalCountCallHandler handler1 = (GlobalCountCallHandler)container.Resolve("handler1"); - GlobalCountCallHandler handler2 = (GlobalCountCallHandler)container.Resolve("handler2"); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler1"]); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["handler2"]); - Assert.AreEqual(0, handler1.Order); - Assert.AreEqual(10, handler2.Order); - } - - [TestMethod] - public void CanSetUpAPolicyWithLifetimeManagedNamedInjectedRulesAndHandlers() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule( - "rule1", - new ContainerControlledLifetimeManager()) - .AddCallHandler( - "handler1", - (LifetimeManager)null) - .AddCallHandler( - "handler2", - new ContainerControlledLifetimeManager(), - new InjectionProperty("Order", 10)); - - GlobalCountCallHandler.Calls.Clear(); - - container - .Configure() - .SetInterceptorFor("wrappable", new VirtualMethodInterceptor()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - wrappable1.Method2(); - - CallCountHandler handler1 = (CallCountHandler)container.Resolve("handler1"); - CallCountHandler handler2 = (CallCountHandler)container.Resolve("handler2"); - - Assert.AreEqual(0, handler1.CallCount); // not lifetime maanaged - Assert.AreEqual(1, handler2.CallCount); // lifetime managed - } - - [TestMethod] - public void SettingUpAPolicyWithANullRuleElementThrows() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - try - { - container - .Configure() - .AddPolicy("policy1") - .AddMatchingRule(typeof(AlwaysMatchingRule)) - .AddMatchingRule((string)null) - .AddCallHandler(new CallCountHandler()); - Assert.Fail("Should have thrown"); - } - catch (ArgumentException) - { - } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/EventInterceptionFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/EventInterceptionFixture.cs deleted file mode 100644 index e50b9eae..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/EventInterceptionFixture.cs +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Test fixture to verify fix of codeplex issue - /// http://unity.codeplex.com/WorkItem/View.aspx?WorkItemId=4608 : - /// Intercepting event add/remove methods does not work with VirtualMethodInterceptor - /// or InterfaceInterceptor - /// - [TestClass] - public class EventInterceptionFixture - { - private IUnityContainer container; - - [TestInitialize] - public void Setup() - { - container = new UnityContainer(); - container.RegisterType("MyHandler", new ContainerControlledLifetimeManager()); - container.AddNewExtension(); - - container.Configure() - .AddPolicy("My Policy") - .AddMatchingRule(new AlwaysMatchingRule()) - .AddCallHandler("MyHandler"); - } - - [TestMethod] - public void CanInterceptEventWithVirtualMethodInterceptor() - { - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - var o = container.Resolve(); - - o.E1 += (sender, args) => { }; - - var handler = (MyCallHandler)container.Resolve("MyHandler"); - Assert.IsTrue(handler.WasCalled); - } - - [TestMethod] - public void CanInterceptEventWithInterfaceInterceptor() - { - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - var o = container.Resolve(); - - o.E1 += (sender, args) => { }; - - var handler = (MyCallHandler)container.Resolve("MyHandler"); - Assert.IsTrue(handler.WasCalled); - } - - public class MyCallHandler : ICallHandler - { - public bool WasCalled = false; - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - WasCalled = true; - return getNext()(input, getNext); - } - - public int Order { get; set; } - } - - public interface IMyInterface - { - event EventHandler E1; - } - - public class MyClass : IMyInterface - { - // Disable "event not used" warning - it's a test -#pragma warning disable 67 - public virtual event EventHandler E1; -#pragma warning restore 67 - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/FakeObjects/FakeInterceptionBehavior.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/FakeObjects/FakeInterceptionBehavior.cs deleted file mode 100644 index ea83cc34..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/FakeObjects/FakeInterceptionBehavior.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - internal class FakeInterceptionBehavior : IInterceptionBehavior - { - public Func InvokeFunc { get; set; } - - IMethodReturn IInterceptionBehavior.Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - return this.InvokeFunc.Invoke(input, getNext); - } - - IEnumerable IInterceptionBehavior.GetRequiredInterfaces() - { - return Type.EmptyTypes; - } - - bool IInterceptionBehavior.WillExecute - { - get { return true; } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/FakeObjects/FakeMethodCallMessage.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/FakeObjects/FakeMethodCallMessage.cs deleted file mode 100644 index d804f427..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/FakeObjects/FakeMethodCallMessage.cs +++ /dev/null @@ -1,144 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using System.Runtime.Remoting.Messaging; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// An implementation of IMethodCallMessage that can be used to mock - /// out calls. - /// - internal class FakeMethodCallMessage : IMethodCallMessage - { - private MethodBase methodBase; - private object[] arguments; - private List inputArgumentIndex = new List(); - private List outputArgumentIndex = new List(); - private ParameterInfo[] parameterInfo; - - private Hashtable properties = new Hashtable(); - - public FakeMethodCallMessage(MethodBase methodBase, params object[] arguments) - { - this.methodBase = methodBase; - this.parameterInfo = methodBase.GetParameters(); - - this.arguments = arguments; - int i = 0; - foreach (ParameterInfo param in parameterInfo) - { - if (param.IsOut) - { - outputArgumentIndex.Add(i); - } - else - { - inputArgumentIndex.Add(i); - } - ++i; - } - } - - public string GetInArgName(int index) - { - return parameterInfo[inputArgumentIndex[index]].Name; - } - - public object GetInArg(int argNum) - { - return arguments[inputArgumentIndex[argNum]]; - } - - public int InArgCount - { - get { return inputArgumentIndex.Count; } - } - - public object[] InArgs - { - get - { - object[] inArgs = new object[InArgCount]; - int inArgsIndex = 0; - inputArgumentIndex.ForEach(delegate(int i) - { - inArgs[inArgsIndex++] = arguments[i]; - }); - return inArgs; - } - } - - public string GetArgName(int index) - { - return parameterInfo[index].Name; - } - - public object GetArg(int argNum) - { - return arguments[argNum]; - } - - public string Uri - { - get { return "http://tempuri.org/FakeMethodCallMessage"; } - } - - public string MethodName - { - get { return methodBase.Name; } - } - - public string TypeName - { - get { return methodBase.DeclaringType.Name; } - } - - public object MethodSignature - { - get - { - List signatureTypes = new List(); - foreach (ParameterInfo paramInfo in parameterInfo) - { - signatureTypes.Add(paramInfo.ParameterType); - } - return signatureTypes.ToArray(); - } - } - - public int ArgCount - { - get { return parameterInfo.Length; } - } - - public object[] Args - { - get { return arguments; } - } - - public bool HasVarArgs - { - get { return false; } - } - - public LogicalCallContext LogicalCallContext - { - get { return null; } - } - - public MethodBase MethodBase - { - get { return methodBase; } - } - - public IDictionary Properties - { - get { return properties; } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/HandlerInvocationFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/HandlerInvocationFixture.cs deleted file mode 100644 index 196f9116..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/HandlerInvocationFixture.cs +++ /dev/null @@ -1,152 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Tests for various kinds of things handlers can do. - /// - [TestClass] - public class HandlerInvocationFixture - { - private IUnityContainer container; - - [TestInitialize] - public void SetUp() - { - container = new UnityContainer() - .AddNewExtension() - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - container.Configure() - .AddPolicy("Double your inputs") - .AddMatchingRule( - new InjectionConstructor("DoSomething")) - .AddCallHandler("Handler1"); - - container.Configure() - .AddPolicy("Triple an output parameter") - .AddMatchingRule(new MemberNameMatchingRule(new[] { "DoSomethingElse", "DoSomethingElseWithRef" })) - .AddCallHandler("Handler2"); - - container.RegisterInstance("Handler1", new DoubleInputHandler()); - container.RegisterInstance("Handler2", new TripleOutputHandler()); - } - - [TestMethod] - public void HandlersCanChangeInputsBeforeTargetIsCalled() - { - var intercepted = container.Resolve(); - Assert.AreEqual(0, intercepted.MostRecentInput); - intercepted.DoSomething(2); - Assert.AreEqual(4, intercepted.MostRecentInput); - } - - [TestMethod] - public void HandlersCanChangeOutputsAfterTargetReturns() - { - var intercepted = container.Resolve(); - int output; - - intercepted.DoSomethingElse(2, out output); - - Assert.AreEqual((2 + 5) * 3, output); - } - - [TestMethod] - public void HandlersCanChangeRefsAfterTargetReturns() - { - var intercepted = container.Resolve(); - int output = 3; - - intercepted.DoSomethingElseWithRef(2, ref output); - - Assert.AreEqual((2 + 3 + 5) * 3, output); - } - } - - public class DoubleInputHandler : ICallHandler - { - private int order = 0; - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - int i = (int)(input.Inputs[0]) * 2; - input.Inputs[0] = i; - return getNext()(input, getNext); - } - } - - public class TripleOutputHandler : ICallHandler - { - private int order = 0; - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - IMethodReturn result = getNext()(input, getNext); - if (result.Exception == null) - { - int output = (int)result.Outputs[0] * 3; - result.Outputs[0] = output; - } - return result; - } - } - - public interface ICanChangeParametersTarget - { - int MostRecentInput { get; } - void DoSomething(int i); - void DoSomethingElse(int i, out int j); - void DoSomethingElseWithRef(int i, ref int j); - } - - public class CanChangeParametersTarget : ICanChangeParametersTarget - { - private int mostRecentInput = 0; - - public int MostRecentInput - { - get { return mostRecentInput; } - } - - public void DoSomething(int i) - { - mostRecentInput = i; - } - - public void DoSomethingElse(int i, out int j) - { - j = i + 5; - } - - public void DoSomethingElseWithRef(int i, ref int j) - { - j = i + j + 5; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptFixture.cs deleted file mode 100644 index 56fd9534..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptFixture.cs +++ /dev/null @@ -1,444 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - [TestClass] - public class InterceptFixture - { - [TestMethod] - public void CanInterceptTargetWithInstanceInterceptor() - { - bool invoked = false; - IInterceptionBehavior interceptionBehavior = - new DelegateInterceptionBehavior((mi, next) => { invoked = true; return mi.CreateMethodReturn(100); }); - - IInterface proxy = (IInterface) - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(10), - new InterfaceInterceptor(), - new[] { interceptionBehavior }, - Type.EmptyTypes); - - int value = proxy.DoSomething(); - - Assert.AreEqual(100, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void GeneratedProxyImplementsUserProvidedAdditionalInterfaces() - { - bool invoked = false; - IInterceptionBehavior interceptionBehavior = - new DelegateInterceptionBehavior((mi, next) => { invoked = true; return mi.CreateMethodReturn(100); }); - - IInterface proxy = (IInterface) - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(10), - new InterfaceInterceptor(), - new[] { interceptionBehavior }, - new[] { typeof(ISomeInterface) }); - - int value = ((ISomeInterface)proxy).DoSomethingElse(); - - Assert.AreEqual(100, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void GeneratedProxyImplementsInterceptionBehaviorProvidedAdditionalInterfaces() - { - bool invoked = false; - IInterceptionBehavior interceptionBehavior = - new DelegateInterceptionBehavior( - (mi, next) => { invoked = true; return mi.CreateMethodReturn(100); }, - () => new[] { typeof(ISomeInterface) }); - - IInterface proxy = (IInterface) - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(10), - new InterfaceInterceptor(), - new[] { interceptionBehavior }, - Type.EmptyTypes); - - int value = ((ISomeInterface)proxy).DoSomethingElse(); - - Assert.AreEqual(100, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void CanInterceptTargetWithInstanceInterceptorUsingGenericVersion() - { - bool invoked = false; - IInterceptionBehavior interceptionBehavior = - new DelegateInterceptionBehavior((mi, next) => { invoked = true; return mi.CreateMethodReturn(100); }); - - IInterface proxy = - Intercept.ThroughProxyWithAdditionalInterfaces( - new BaseClass(10), - new InterfaceInterceptor(), - new[] { interceptionBehavior }, - Type.EmptyTypes); - - int value = proxy.DoSomething(); - - Assert.AreEqual(100, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingANullTypeThrows() - { - Intercept.ThroughProxyWithAdditionalInterfaces( - null, - new BaseClass(), - new InterfaceInterceptor(), - new IInterceptionBehavior[0], - Type.EmptyTypes); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingANullTargetThrows() - { - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - null, - new InterfaceInterceptor(), - new IInterceptionBehavior[0], - Type.EmptyTypes); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingWithANullInterceptorThrows() - { - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(), - null, - new IInterceptionBehavior[0], - Type.EmptyTypes); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingTypesNotCompatibleWithTheInterceptorThrows() - { - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(), - new RejectingInterceptor(), - new IInterceptionBehavior[0], - Type.EmptyTypes); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingWithANullSetOfInterceptionBehaviorsThrows() - { - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(), - new InterfaceInterceptor(), - null, - Type.EmptyTypes); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingWithANullSetOfAdditionalInterfacesThrows() - { - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(), - new InterfaceInterceptor(), - new IInterceptionBehavior[0], - null); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingWithASetOfAdditionalInterfacesIncludingNonInterfaceTypeThrows() - { - Intercept.ThroughProxyWithAdditionalInterfaces( - typeof(IInterface), - new BaseClass(), - new InterfaceInterceptor(), - new IInterceptionBehavior[0], - new[] { typeof(object) }); - } - - [TestMethod] - public void CanInterceptNewInstanceWithTypeInterceptor() - { - bool invoked = false; - IInterceptionBehavior interceptionBehavior = - new DelegateInterceptionBehavior((mi, next) => { invoked = true; return mi.CreateMethodReturn(100); }); - - BaseClass instance = (BaseClass) - Intercept.NewInstanceWithAdditionalInterfaces( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new[] { interceptionBehavior }, - Type.EmptyTypes, - 10); - - int value = instance.DoSomething(); - - Assert.AreEqual(100, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void CanInterceptNewInstanceWithTypeInterceptorUsingGenericVersion() - { - bool invoked = false; - IInterceptionBehavior interceptionBehavior = - new DelegateInterceptionBehavior((mi, next) => { invoked = true; return mi.CreateMethodReturn(100); }); - - BaseClass instance = - Intercept.NewInstanceWithAdditionalInterfaces( - new VirtualMethodInterceptor(), - new[] { interceptionBehavior }, - Type.EmptyTypes, - 10); - - int value = instance.DoSomething(); - - Assert.AreEqual(100, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingNewInstanceOfANullTypeThrows() - { - Intercept.NewInstance( - null, - new VirtualMethodInterceptor(), - new IInterceptionBehavior[0]); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingNewInstanceWithANullInterceptorThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - null, - new IInterceptionBehavior[0]); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceOfTypeNotCompatibleWithTheInterceptorThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - new RejectingInterceptor(), - new IInterceptionBehavior[0]); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingNewInstanceWithANullSetOfInterceptionBehaviorsThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - new VirtualMethodInterceptor(), - null); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void InterceptingNewInstanceWithANullSetOfAdditionalInterfacesThrows() - { - Intercept.NewInstanceWithAdditionalInterfaces( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[0], - null); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfAdditionalInterfacesWithNullElementsThrows() - { - Intercept.NewInstanceWithAdditionalInterfaces( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[0], - new Type[] { null }); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfAdditionalInterfacesWithNonInterfaceElementsThrows() - { - Intercept.NewInstanceWithAdditionalInterfaces( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[0], - new Type[] { typeof(object) }); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfAdditionalInterfacesWithGenericInterfaceElementsThrows() - { - Intercept.NewInstanceWithAdditionalInterfaces( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[0], - new Type[] { typeof(IComparable<>) }); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfBehaviorsWithNullElementsThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[] { null }); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfBehaviorsWithElementReturningNullRequiredInterfacesThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[] - { - new DelegateInterceptionBehavior(null, () => null) - }); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfBehaviorsWithElementReturningRequiredInterfacesWithNullElementThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[] - { - new DelegateInterceptionBehavior(null, () => new Type[] { null }) - }); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfBehaviorsWithElementReturningRequiredInterfacesWithNonInterfaceElementThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[] - { - new DelegateInterceptionBehavior(null, () => new Type[] { typeof(object) }) - }); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void InterceptingNewInstanceWithASetOfBehaviorsWithElementReturningRequiredInterfacesWithGenericInterfaceElementThrows() - { - Intercept.NewInstance( - typeof(BaseClass), - new VirtualMethodInterceptor(), - new IInterceptionBehavior[] - { - new DelegateInterceptionBehavior(null, () => new Type[] { typeof(IEnumerable<>) }) - }); - } - - [TestMethod] - public void CanInterceptAbstractClassWithVirtualMethodInterceptor() - { - bool invoked = false; - IInterceptionBehavior interceptionBehavior = - new DelegateInterceptionBehavior((mi, next) => { invoked = true; return mi.CreateMethodReturn(100); }); - - AbstractClass instance = - Intercept.NewInstance( - new VirtualMethodInterceptor(), - new[] { interceptionBehavior }); - - int value = instance.DoSomething(); - - Assert.AreEqual(100, value); - Assert.IsTrue(invoked); - } - - public class BaseClass : IInterface - { - private readonly int value; - - public BaseClass() - : this(0) - { } - - public BaseClass(int value) - { - this.value = value; - } - - public virtual int DoSomething() - { - return value; - } - } - - public interface IInterface - { - int DoSomething(); - } - - public interface ISomeInterface - { - int DoSomethingElse(); - } - - public class RejectingInterceptor : IInstanceInterceptor, ITypeInterceptor - { - public bool CanIntercept(Type t) - { - return false; - } - - public IEnumerable GetInterceptableMethods(Type interceptedType, Type implementationType) - { - throw new NotImplementedException(); - } - - public IInterceptingProxy CreateProxy(Type t, object target, params Type[] additionalInterfaces) - { - throw new NotImplementedException(); - } - - public Type CreateProxyType(Type t, params Type[] additionalInterfaces) - { - throw new NotImplementedException(); - } - } - - public abstract class AbstractClass - { - public abstract int DoSomething(); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionConfigurationFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionConfigurationFixture.cs deleted file mode 100644 index fef473ae..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionConfigurationFixture.cs +++ /dev/null @@ -1,164 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - [TestClass] - public class InterceptionConfigurationFixture - { - [TestMethod] - public void CanSetUpInterceptorThroughInjectionMember() - { - CallCountHandler handler = new CallCountHandler(); - - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - container.Configure() - .AddPolicy("policy") - .AddMatchingRule() - .AddCallHandler(handler); - - container.RegisterType( - "test", - new Interceptor(), - new InterceptionBehavior()); - - IInterface instance = container.Resolve("test"); - - instance.DoSomething("1"); - - Assert.AreEqual(1, handler.CallCount); - } - - [TestMethod] - public void CanSetUpInterceptorThroughInjectionMemberForExistingInterceptor() - { - CallCountInterceptionBehavior interceptionBehavior = new CallCountInterceptionBehavior(); - - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container.RegisterType( - "test", - new Interceptor(), - new InterceptionBehavior(interceptionBehavior)); - - IInterface instance = container.Resolve("test"); - - instance.DoSomething("1"); - - Assert.AreEqual(1, interceptionBehavior.CallCount); - } - - [TestMethod] - public void CanSetUpAdditionalInterfaceThroughInjectionMemberForInstanceInterception() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - int invokeCount = 0; - - container.RegisterType( - "test", - new Interceptor(), - new AdditionalInterface(typeof(IOtherInterface)), - new InterceptionBehavior( - new DelegateInterceptionBehavior( - (mi, gn) => { invokeCount++; return mi.CreateMethodReturn(0); }))); - - IInterface instance = container.Resolve("test"); - - ((IOtherInterface)instance).DoSomethingElse("1"); - - Assert.AreEqual(1, invokeCount); - } - - [TestMethod] - public void CanSetUpAdditionalInterfaceThroughInjectionMemberForTypeInterception() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - int invokeCount = 0; - - container.RegisterType( - "test", - new Interceptor(), - new AdditionalInterface(typeof(IOtherInterface)), - new InterceptionBehavior( - new DelegateInterceptionBehavior( - (mi, gn) => { invokeCount++; return mi.CreateMethodReturn(0); }))); - - IInterface instance = container.Resolve("test"); - - ((IOtherInterface)instance).DoSomethingElse("1"); - - Assert.AreEqual(1, invokeCount); - } - - [TestMethod] - public void CanSetUpAdditionalInterfaceThroughGenericInjectionMemberForTypeInterception() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - int invokeCount = 0; - - container.RegisterType( - "test", - new Interceptor(), - new AdditionalInterface(), - new InterceptionBehavior( - new DelegateInterceptionBehavior( - (mi, gn) => { invokeCount++; return mi.CreateMethodReturn(0); }))); - - IInterface instance = container.Resolve("test"); - - ((IOtherInterface)instance).DoSomethingElse("1"); - - Assert.AreEqual(1, invokeCount); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void ConfiguringAnAdditionalInterfaceWithANonInterfaceTypeThrows() - { - new AdditionalInterface(typeof(int)); - } - - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void ConfiguringAnAdditionalInterfaceWithANullTypeThrows() - { - new AdditionalInterface(null); - } - - public class BaseClass : IInterface - { - public int DoSomething(string param) - { - return int.Parse(param); - } - - public int Property - { - get; - set; - } - } - - public interface IInterface - { - int DoSomething(string param); - int Property { get; set; } - } - - public interface IOtherInterface - { - int DoSomethingElse(string param); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionFixture.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionFixture.Desktop.cs deleted file mode 100644 index e1c84ea8..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionFixture.Desktop.cs +++ /dev/null @@ -1,410 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Remoting; -using System.Text; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - public partial class InterceptionFixture - { - [TestMethod] - public void CanConfigureRemotingInterceptionOnMBRO() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container.Configure().SetInterceptorFor(new TransparentProxyInterceptor()); - } - - [TestMethod] - public void CanConfigureRemotingInterceptionOnInterface() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container.Configure().SetInterceptorFor(new TransparentProxyInterceptor()); - } - - [TestMethod] - public void ConfiguringRemotingInterceptionOnNonMBROTypeThrows() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - try - { - container.Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - Assert.Fail("Call to SetInjectorFor() should have thrown"); - } - catch (ArgumentException) - { - // expected exception - } - } - - [TestMethod] - public void CanConfigureDefaultRemotingInterceptionOnMBRO() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container.Configure() - .SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - } - - [TestMethod] - public void CanConfigureDefaultRemotingInterceptionOnInterface() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - container.Configure() - .SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - } - - [TestMethod] - public void ConfiguringDefaultRemotingInterceptionOnNonMBROTypeThrows() - { - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - - try - { - container.Configure() - .SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - Assert.Fail("Call to SetInjectorFor() should have thrown"); - } - catch (ArgumentException) - { - // expected exception - } - } - - [TestMethod] - public void CanCreateWrappedObjectIfInterceptionPolicyIsSet() - { - IUnityContainer container = CreateContainer("CanCreateWrappedObject"); - container - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Wrappable wrappable = container.Resolve(); - Assert.IsNotNull(wrappable); - Assert.IsTrue(RemotingServices.IsTransparentProxy(wrappable)); - } - - [TestMethod] - public void CanCreateWrappedObjectIfDefaultInterceptionPolicy() - { - IUnityContainer container = CreateContainer("CanCreateWrappedObject"); - container.Configure().SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - - Wrappable wrappable = container.Resolve(); - Assert.IsNotNull(wrappable); - Assert.IsTrue(RemotingServices.IsTransparentProxy(wrappable)); - } - - [TestMethod] - public void CanCreateNamedWrappedObjectIfDefaultInterceptionPolicy() - { - IUnityContainer container = CreateContainer("CanCreateWrappedObject"); - container.Configure().SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - - Wrappable wrappable = container.Resolve("someName"); - var wrappable2 = container.Resolve("another"); - Assert.IsNotNull(wrappable); - Assert.IsTrue(RemotingServices.IsTransparentProxy(wrappable)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(wrappable2)); - } - - [TestMethod] - public void CanSetDefaultInterceptionPolicyThroughRegisterType() - { - IUnityContainer container = CreateContainer("CanCreateWrappedObject"); - container.RegisterType( - new DefaultInterceptor(new TransparentProxyInterceptor()), - new DefaultInterceptionBehavior()); - - var wrappable = container.Resolve("someName"); - var wrappable2 = container.Resolve("another"); - Assert.IsTrue(RemotingServices.IsTransparentProxy(wrappable)); - Assert.IsTrue(RemotingServices.IsTransparentProxy(wrappable2)); - } - - [TestMethod] - public void WillNotCreateWrappedObjectIfNoInterceptionPolicyIsSpecified() - { - IUnityContainer container = CreateContainer("CanCreateWrappedObject"); - - Wrappable wrappable = container.Resolve(); - Assert.IsNotNull(wrappable); - Assert.IsFalse(RemotingServices.IsTransparentProxy(wrappable)); - } - - [TestMethod] - public void CanInterceptExistingWrappedObject() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanCreateWrappedObject") - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Wrappable wrappable = container.BuildUp(new Wrappable()); - wrappable.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanCreateWrappedObject"]); - } - - [TestMethod] - public void CanInterceptCallsToDerivedOfMBRO() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptCallsToDerivedOfMBRO") - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - DerivedWrappable wrappable = container.Resolve(); - wrappable.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptCallsToDerivedOfMBRO"]); - } - - [TestMethod] - public void CanInterceptCallsToMBROOverInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptCallsToMBROOverInterface"); - container - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Wrappable wrappable = container.Resolve(); - ((Interface)wrappable).Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptCallsToMBROOverInterface"]); - } - - [TestMethod] - public void CanInterceptCallsToMappedMBROOverInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptCallsToMappedMBROOverInterface"); - container - .RegisterType() - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrappable = container.Resolve(); - wrappable.Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptCallsToMappedMBROOverInterface"]); - } - - [TestMethod] - public void CanInterceptCallsToMappedMBROOverInterfaceCastedToType() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptCallsToMappedMBROOverInterfaceCastedToType"); - container - .RegisterType() - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrappable = container.Resolve(); - ((Wrappable)wrappable).Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptCallsToMappedMBROOverInterfaceCastedToType"]); - } - - [TestMethod] - public void CanInterceptCallsToLifetimeManagedMappedMBROOverInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptCallsToMappedMBROOverInterface"); - container - .RegisterType(new ContainerControlledLifetimeManager()) - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrappable = container.Resolve(); - wrappable.Method(); - Wrappable wrappable2 = container.Resolve(); - wrappable2.Method(); - - Assert.AreEqual(2, GlobalCountCallHandler.Calls["CanInterceptCallsToMappedMBROOverInterface"]); - } - - [TestMethod] - public void CanInterceptCallsToMappedMBROOverInterfaceWithDefaultConfiguredForType() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container - = CreateContainer("CanInterceptCallsToMappedMBROOverInterfaceWithDefaultConfiguredForType"); - container - .RegisterType() - .Configure() - .SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrappable = container.Resolve(); - wrappable.Method(); - - Assert.AreEqual( - 1, - GlobalCountCallHandler.Calls["CanInterceptCallsToMappedMBROOverInterfaceWithDefaultConfiguredForType"]); - } - - [TestMethod] - public void CanInterceptCallsToMappedMBROOverInterfaceWithDefaultConfiguredForInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container - = CreateContainer("CanInterceptCallsToMappedMBROOverInterfaceWithDefaultConfiguredForInterface"); - container - .RegisterType() - .Configure() - .SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrappable = container.Resolve(); - wrappable.Method(); - - Assert.AreEqual( - 1, - GlobalCountCallHandler.Calls["CanInterceptCallsToMappedMBROOverInterfaceWithDefaultConfiguredForInterface"]); - } - - [TestMethod] - public void CanInterceptCallsToMappedMBROOverDifferentInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptCallsToMappedMBROOverDifferentInterface"); - container - .RegisterType() - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrappable = container.Resolve(); - ((InterfaceA)wrappable).MethodA(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptCallsToMappedMBROOverDifferentInterface"]); - } - - [TestMethod] - public void CanConfigureInterceptionOnInterfaceToWrapMBRO() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanConfigureInterceptionOnInterfaceToWrapMBRO"); - container.RegisterType(); - container - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrapped = container.Resolve(); - wrapped.Method3(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanConfigureInterceptionOnInterfaceToWrapMBRO"]); - } - - [TestMethod] - public void CanConfigureInterceptionOnInterfaceToWrapNonMBRO() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanConfigureInterceptionOnInterfaceToWrapNonMBRO"); - container.RegisterType(); - container - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrapped = container.Resolve(); - wrapped.Method3(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanConfigureInterceptionOnInterfaceToWrapNonMBRO"]); - } - - [TestMethod] - public void CanInterceptCallToMapppedNonMBROThroughDifferentInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanConfigureInterceptionOnInterfaceToWrapNonMBRO"); - container.RegisterType(); - container - .Configure() - .SetInterceptorFor(new TransparentProxyInterceptor()); - - Interface wrapped = container.Resolve(); - ((InterfaceA)wrapped).MethodA(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanConfigureInterceptionOnInterfaceToWrapNonMBRO"]); - } - - [TestMethod] - public void CanInterceptMBROWithDependencyOnOtherMBRO() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = new UnityContainer(); - - container.AddNewExtension(); - - container - .RegisterInstance( - "parentRule", - new TypeMatchingRule(typeof(WrappableWithProperty))) - .RegisterInstance( - "childRule", - new TypeMatchingRule(typeof(Wrappable))) - .RegisterInstance( - "parentCallHandler", - new GlobalCountCallHandler("parent")) - .RegisterInstance( - "childCallHandler", - new GlobalCountCallHandler("child")) - .RegisterType("parentPolicy", - new InjectionConstructor( - new ResolvedArrayParameter( - new ResolvedParameter("parentRule")), - new string[] { "parentCallHandler" })) - .RegisterType("childPolicy", - new InjectionConstructor( - new ResolvedArrayParameter( - new ResolvedParameter("childRule")), - new string[] { "childCallHandler" })) - .RegisterType(new InjectionProperty("Wrappable")) - .Configure() - .SetDefaultInterceptorFor(new TransparentProxyInterceptor()) - .SetDefaultInterceptorFor(new TransparentProxyInterceptor()); - - WrappableWithProperty instance = container.Resolve(); - - instance.Method(); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["parent"]); // method - - instance.Wrappable.Method(); - Assert.AreEqual(2, GlobalCountCallHandler.Calls["parent"]); // method and getter - Assert.AreEqual(1, GlobalCountCallHandler.Calls["child"]); - } - - public partial class BaseInterceptable : MarshalByRefObject - { - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionFixture.cs deleted file mode 100644 index 0a05a10b..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterceptionFixture.cs +++ /dev/null @@ -1,267 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - [TestClass] - public partial class InterceptionFixture - { - [TestMethod] - public void AttributeDrivenPolicyIsAddedByDefault() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = new UnityContainer(); - container.AddNewExtension(); - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Interface wrappedOverInterface = container.Resolve(); - wrappedOverInterface.Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["WrappableThroughInterfaceWithAttributes-Method"]); - } - - [TestMethod] - public void CanInterceptWrappedObject() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanCreateWrappedObject"); - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Wrappable wrappable = container.Resolve(); - wrappable.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanCreateWrappedObject"]); - } - - [TestMethod] - public void CanInterceptWrappedObjectWithRef() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptWrappedObjectWithRef"); - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Wrappable wrappable = container.Resolve(); - object someObj = null; - wrappable.MethodRef(ref someObj); - - Assert.AreEqual("parameter", someObj); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptWrappedObjectWithRef"]); - } - - [TestMethod] - public void CanInterceptWrappedObjectWithValueTypeRef() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptWrappedObjectWithValueTypeRef"); - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Wrappable wrappable = container.Resolve(); - int someObj = 0; - wrappable.MethodRefValue(ref someObj); - - Assert.AreEqual(42, someObj); - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptWrappedObjectWithValueTypeRef"]); - } - - [TestMethod] - public void CanInterceptLifetimeManagedWrappedObject() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanCreateWrappedObject"); - container - .RegisterType(new ContainerControlledLifetimeManager(), - new Interceptor(), - new InterceptionBehavior()); - - Wrappable wrappable = container.Resolve(); - wrappable.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanCreateWrappedObject"]); - } - - [TestMethod] - public void CanInterceptNamedWrappedObject() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanCreateWrappedObject") - .RegisterType("wrappable", - new Interceptor(), - new InterceptionBehavior()); - - Wrappable wrappable1 = container.Resolve("wrappable"); - Wrappable wrappable2 = container.Resolve(); - wrappable1.Method2(); - wrappable2.Method2(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanCreateWrappedObject"]); - } - - [TestMethod] - public void InterfaceImplementationsOnDerivedClassesAreWrappedMultipleTimes() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer( - "InterfaceImplementationsOnDerivedClassesAreWrappedMultipleTimes") - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - DerivedWrappable wrappable = container.Resolve(); - wrappable.Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["InterfaceImplementationsOnDerivedClassesAreWrappedMultipleTimes"]); - } - - [TestMethod] - public void CanCreateWrappedObjectOverInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanCreateWrappedObjectOverInterface"); - container - .RegisterType() - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Interface wrappedOverInterface = container.Resolve(); - wrappedOverInterface.Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanCreateWrappedObjectOverInterface"]); - } - - [TestMethod] - public void CanCreatLifetimeManagedeWrappedObjectOverInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanCreateWrappedObjectOverInterface"); - container - .RegisterType(new ContainerControlledLifetimeManager()) - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Interface wrappedOverInterface = container.Resolve(); - wrappedOverInterface.Method(); - WrappableThroughInterface wrapped = container.Resolve(); - wrapped.Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanCreateWrappedObjectOverInterface"]); - } - - [TestMethod] - public void CanInterceptExistingWrappedObjectOverInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanCreateWrappedObjectOverInterface") - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Interface wrappedOverInterface = container.BuildUp(new WrappableThroughInterface()); - wrappedOverInterface.Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanCreateWrappedObjectOverInterface"]); - } - - [TestMethod] - public void InstanceInterceptionDoesNotReturnProxyWhenNoHandlerAreConfigured() - { - IUnityContainer container = new UnityContainer() - .AddNewExtension() - .RegisterType( - new DefaultInterceptor(new InterfaceInterceptor()), - new DefaultInterceptionBehavior()); - - IDal dal = container.Resolve(); - - Assert.IsFalse(dal is IInterceptingProxy); - } - - private IUnityContainer CreateContainer(string globalCallHandlerName) - { - IUnityContainer container = new UnityContainer(); - - container.AddNewExtension(); - - container.RegisterInstance( - "alwaystrue", - new AlwaysMatchingRule()); - container.RegisterInstance( - "globalCountHandler", - new GlobalCountCallHandler(globalCallHandlerName)); - - container.Configure() - .AddPolicy("policy") - .AddMatchingRule("alwaystrue") - .AddCallHandler("globalCountHandler"); - - return container; - } - - [TestMethod] - public void CanInterceptCallFromBaseOfWrappedInterface() - { - GlobalCountCallHandler.Calls.Clear(); - - IUnityContainer container = CreateContainer("CanInterceptCallFromBaseOfWrappedInterface"); - container.RegisterType() - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - Interface wrappedOverInterface = container.Resolve(); - wrappedOverInterface.Method3(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptCallFromBaseOfWrappedInterface"]); - } - - [TestMethod] - public void CanInterceptMethodOnDerivedType() - { - GlobalCountCallHandler.Calls.Clear(); - - var container = CreateContainer("CanInterceptMethodOnDerivedType"); - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - - var instance = container.Resolve(); - - instance.Method(); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["CanInterceptMethodOnDerivedType"]); - } - - public partial class BaseInterceptable - { - public virtual void Method() - { - } - } - - public class DerivedInterceptable : BaseInterceptable - { - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs deleted file mode 100644 index 545145d9..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs +++ /dev/null @@ -1,153 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.InterfaceInterception -{ - [TestClass] - public class ContainerInterfaceInterceptionFixture - { - [TestMethod] - public void CanInterceptInstancesViaTheContainer() - { - IUnityContainer container = new UnityContainer() - .AddNewExtension() - .RegisterType() - .Configure() - .SetInterceptorFor(new InterfaceInterceptor()) - .AddPolicy("AlwaysMatches") - .AddMatchingRule() - .AddCallHandler("callCount", new ContainerControlledLifetimeManager()) - .Interception - .Container; - - IDal dal = container.Resolve(); - - Assert.IsTrue(dal is IInterceptingProxy); - - dal.Deposit(50.0); - dal.Deposit(65.0); - dal.Withdraw(15.0); - - CallCountHandler handler = (CallCountHandler)(container.Resolve("callCount")); - Assert.AreEqual(3, handler.CallCount); - } - - [TestMethod] - public void CanInterceptOpenGenericInterfaces() - { - IUnityContainer container = new UnityContainer() - .AddNewExtension() - .RegisterType(typeof(InterfaceInterceptorFixture.IGenericOne<>), typeof(InterfaceInterceptorFixture.GenericImplementationOne<>)) - .Configure() - .SetInterceptorFor(typeof(InterfaceInterceptorFixture.IGenericOne<>), new InterfaceInterceptor()) - .AddPolicy("AlwaysMatches") - .AddMatchingRule() - .AddCallHandler("callCount", new ContainerControlledLifetimeManager()) - .Interception - .Container; - - InterfaceInterceptorFixture.IGenericOne target = container.Resolve>(); - - decimal result = target.DoSomething(52m); - Assert.AreEqual(52m, result); - target.DoSomething(17m); - target.DoSomething(84.2m); - - CallCountHandler handler = (CallCountHandler)(container.Resolve("callCount")); - Assert.AreEqual(3, handler.CallCount); - } - - [TestMethod] - public void CanInterceptGenericInterfaceWithConstraints() - { - var container = new UnityContainer() - .AddNewExtension() - .RegisterType(typeof(IGenericInterfaceWithConstraints<>), typeof(ImplementsGenericInterface<>), - new Interceptor(), - new InterceptionBehavior(new NoopBehavior())); - - var result = container.Resolve>(); - - Assert.IsNotNull(result as IInterceptingProxy); - } - - public interface IGenericInterfaceWithConstraints - where T : class - { - void TestMethod1(); - - void TestMethod2() - where T2 : struct; - - void TestMethod3() - where T3 : class; - - void TestMethod4() - where T4 : class, new(); - - void TestMethod5() - where T5 : InjectionPolicy; - - void TestMethod6() - where T6 : IMatchingRule; - } - - public class ImplementsGenericInterface : IGenericInterfaceWithConstraints - where T : class - { - public void TestMethod1() - { - throw new NotImplementedException(); - } - - public void TestMethod2() where T2 : struct - { - throw new NotImplementedException(); - } - - public void TestMethod3() where T3 : class - { - throw new NotImplementedException(); - } - - public void TestMethod4() where T4 : class, new() - { - throw new NotImplementedException(); - } - - public void TestMethod5() where T5 : InjectionPolicy - { - throw new NotImplementedException(); - } - - public void TestMethod6() where T6 : IMatchingRule - { - throw new NotImplementedException(); - } - } - - private class NoopBehavior : IInterceptionBehavior - { - public IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - return getNext()(input, getNext); - } - - public IEnumerable GetRequiredInterfaces() - { - return Enumerable.Empty(); - } - - public bool WillExecute - { - get { return true; } - } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs deleted file mode 100644 index db1a3a1f..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Remoting.Messaging; -using System.Runtime.Remoting.Proxies; -using System.Text; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.InterfaceInterception -{ - public partial class InterfaceInterceptorFixture - { - [TestMethod] - public void InterceptorCanInterceptProxyInstances() - { - CallCountInterceptionBehavior callCounter = new CallCountInterceptionBehavior(); - - ProxiedInterfaceImpl impl = new ProxiedInterfaceImpl(); - IProxiedInterface instance = (IProxiedInterface)new MyProxy(typeof(IProxiedInterface), impl).GetTransparentProxy(); - - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - - IInterceptingProxy proxy = (IInterceptingProxy)interceptor.CreateProxy(typeof(IProxiedInterface), (IProxiedInterface)instance); - proxy.AddInterceptionBehavior(callCounter); - - IProxiedInterface inter = (IProxiedInterface)proxy; - - Assert.AreEqual("hello world", inter.DoSomething()); - Assert.AreEqual(1, callCounter.CallCount); - } - - [TestMethod] - public void CanGetInterceptableMethodsForProxy() - { - ProxiedInterfaceImpl impl = new ProxiedInterfaceImpl(); - IProxiedInterface instance = (IProxiedInterface)new MyProxy(typeof(IProxiedInterface), impl).GetTransparentProxy(); - - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - - var interceptableMethods = interceptor.GetInterceptableMethods(typeof(IProxiedInterface), instance.GetType()).ToArray(); - - interceptableMethods.Where(x => x.InterfaceMethodInfo.Name == "DoSomething").AssertHasItems(); - } - - private class MyProxy : RealProxy - { - private Type t; - private object impl; - - public MyProxy(Type t, object impl) - : base(t) - { - this.t = t; - this.impl = impl; - } - - public override IMessage Invoke(IMessage msg) - { - IMethodCallMessage method = msg as IMethodCallMessage; - if (method != null) - { - if (method.MethodName == "GetType") - { - return new ReturnMessage(this.t, new object[0], 0, method.LogicalCallContext, method); - } - object result = method.MethodBase.Invoke(this.impl, method.InArgs); - return new ReturnMessage(result, new object[0], 0, method.LogicalCallContext, method); - } - - return null; - } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/InterfaceInterceptorFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/InterfaceInterceptorFixture.cs deleted file mode 100644 index fc50a127..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/InterfaceInterception/InterfaceInterceptorFixture.cs +++ /dev/null @@ -1,1663 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.InterfaceInterception -{ - [TestClass] - public partial class InterfaceInterceptorFixture - { - [TestMethod] - public void InterceptorDoesNotInterceptClass() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - Assert.IsFalse(interceptor.CanIntercept(GetType())); - } - - [TestMethod] - public void InterceptorCanInterceptInterface() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - Assert.IsTrue(interceptor.CanIntercept(typeof(IMatchingRule))); - } - - [TestMethod] - public void InterceptorReturnsCorrectMethodsForInterceptableType() - { - List methods = - new InterfaceInterceptor().GetInterceptableMethods(typeof(IInterfaceOne), typeof(ImplementationOne)).ToList(); - - List expected = Sequence.Collect( - new MethodImplementationInfo(typeof(IInterfaceOne).GetMethod("TargetMethod"), - typeof(ImplementationOne).GetMethod("TargetMethod"))).ToList(); - - CollectionAssertExtensions.AreEquivalent(expected, methods); - } - - [TestMethod] - public void InterceptorIncludesMethodsFromBaseInterfaceForInterface() - { - List methods = - new InterfaceInterceptor().GetInterceptableMethods(typeof(Interface), - typeof(Interface)).ToList(); - - List expected = Sequence.Collect( - new MethodImplementationInfo(typeof(Interface).GetMethod("Method"), - typeof(Interface).GetMethod("Method")), - new MethodImplementationInfo(typeof(InterfaceBase).GetMethod("Method3"), - typeof(InterfaceBase).GetMethod("Method3"))) - .ToList(); - - CollectionAssertExtensions.AreEquivalent(expected, methods); - } - - [TestMethod] - public void InterceptorIncludesMethodsFromBaseInterfaceForInterceptableType() - { - List methods = - new InterfaceInterceptor().GetInterceptableMethods(typeof(Interface), - typeof(WrappableThroughInterface)).ToList(); - - List expected = Sequence.Collect( - new MethodImplementationInfo(typeof(Interface).GetMethod("Method"), - typeof(WrappableThroughInterface).GetMethod("Method")), - new MethodImplementationInfo(typeof(InterfaceBase).GetMethod("Method3"), - typeof(WrappableThroughInterface).GetMethod("Method3"))) - .ToList(); - - CollectionAssertExtensions.AreEquivalent(expected, methods); - } - - [TestMethod] - public void InterceptorMapsGenericMethodsOnClosedGenericInterfaces() - { - List methods = - new InterfaceInterceptor().GetInterceptableMethods(typeof(IGenericOne), typeof(GenericImplementationOne)).ToList(); - - List expected = - GetExpectedMethods, GenericImplementationOne>("DoSomething") - .ToList(); - - CollectionAssertExtensions.AreEquivalent(expected, methods); - } - - [TestMethod] - public void InterceptorCreatesProxyInstance() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - ImplementsInterfaceOne target = new ImplementsInterfaceOne(); - - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IInterfaceOne), target); - - IInterfaceOne intercepted = (IInterfaceOne)proxy; - intercepted.TargetMethod(); - - Assert.IsTrue(target.TargetMethodCalled); - } - - [TestMethod] - public void GeneratedProxyCallsInterceptionBehaviors() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - ImplementsInterfaceOne target = new ImplementsInterfaceOne(); - - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IInterfaceOne), target); - CallCountInterceptionBehavior interceptionBehavior = new CallCountInterceptionBehavior(); - proxy.AddInterceptionBehavior(interceptionBehavior); - - IInterfaceOne intercepted = (IInterfaceOne)proxy; - - intercepted.TargetMethod(); - intercepted.TargetMethod(); - intercepted.TargetMethod(); - - Assert.AreEqual(3, interceptionBehavior.CallCount); - } - - [TestMethod] - public void ParametersPassProperlyToTarget() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - MyDal target = new MyDal(); - - CallCountHandler depositHandler = new CallCountHandler(); - CallCountHandler withdrawHandler = new CallCountHandler(); - PipelineManager manager = new PipelineManager(); - manager.SetPipeline(typeof(IDal).GetMethod("Deposit"), - new HandlerPipeline(new ICallHandler[] { depositHandler })); - manager.SetPipeline(typeof(IDal).GetMethod("Withdraw"), - new HandlerPipeline(new ICallHandler[] { withdrawHandler })); - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IDal), target); - proxy.AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - - IDal intercepted = (IDal)proxy; - - intercepted.Deposit(100.0); - intercepted.Deposit(25.95); - intercepted.Deposit(19.95); - - intercepted.Withdraw(15.00); - intercepted.Withdraw(6.25); - - Assert.AreEqual(3, depositHandler.CallCount); - Assert.AreEqual(2, withdrawHandler.CallCount); - - Assert.AreEqual(100.0 + 25.95 + 19.95 - 15.00 - 6.25, target.Balance); - } - - [TestMethod] - public void CanGenerateProxyForClosedGeneric() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - GenericImplementationOne target = new GenericImplementationOne(); - - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IGenericOne), target); - CallCountInterceptionBehavior interceptionBehavior = new CallCountInterceptionBehavior(); - proxy.AddInterceptionBehavior(interceptionBehavior); - - IGenericOne intercepted = (IGenericOne)proxy; - DateTime now = DateTime.Now; - - DateTime result = intercepted.DoSomething(now); - - Assert.AreEqual(now, result); - Assert.IsTrue(target.DidSomething); - Assert.AreEqual(1, interceptionBehavior.CallCount); - } - - [TestMethod] - public void RefsAndOutsAreProperlyHandled() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - ImplementsHaveSomeRefsAndOuts target = new ImplementsHaveSomeRefsAndOuts(); - - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IHaveSomeRefsAndOuts), target); - CallCountInterceptionBehavior interceptionBehavior = new CallCountInterceptionBehavior(); - proxy.AddInterceptionBehavior(interceptionBehavior); - - IHaveSomeRefsAndOuts intercepted = (IHaveSomeRefsAndOuts)proxy; - - int a; - string s = "something"; - intercepted.DoSomething(out a, ref s); - - Assert.AreEqual(37, a); - Assert.AreEqual("+++something***", s); - Assert.AreEqual(1, interceptionBehavior.CallCount); - } - - [TestMethod] - public void AssortedParameterKindsAreProperlyHandled() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - AssortedParameterKindsAreProperlyHandledHelper.TypeWithAssertedParameterKinds target = - new AssortedParameterKindsAreProperlyHandledHelper.TypeWithAssertedParameterKinds(); - - IInterceptingProxy proxy = - interceptor.CreateProxy( - typeof(AssortedParameterKindsAreProperlyHandledHelper.ITypeWithAssertedParameterKinds), - target); - - AssortedParameterKindsAreProperlyHandledHelper.PerformTest(proxy); - } - - [TestMethod] - public void ReflectingOverProxyTypeReturnsProperties() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IHaveSomeProperties), target); - - List interfaceProperties = new List(typeof(IHaveSomeProperties).GetProperties()); - List proxyProperties = new List(proxy.GetType().GetProperties()); - - Assert.AreEqual(interfaceProperties.Count, proxyProperties.Count); - } - - [TestMethod] - public void ProxyInterceptsEvents() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - ClassWithEvents target = new ClassWithEvents(); - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IDoEvents), target); - CallCountInterceptionBehavior interceptionBehavior = new CallCountInterceptionBehavior(); - proxy.AddInterceptionBehavior(interceptionBehavior); - - ((IDoEvents)proxy).SomeEvent += (s, a) => { }; - - Assert.AreEqual(1, interceptionBehavior.CallCount); - } - - [TestMethod] - public void ProxySendsOriginalWhenRaisingEvent() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - ClassWithEvents target = new ClassWithEvents(); - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(IDoEvents), target); - CallCountInterceptionBehavior interceptionBehavior = new CallCountInterceptionBehavior(); - proxy.AddInterceptionBehavior(interceptionBehavior); - object sender = null; - ((IDoEvents)proxy).SomeEvent += (s, a) => { sender = s; }; - - // act - ((IDoEvents)proxy).TriggerIt(); - - // assert - Assert.AreSame(target, sender); - Assert.AreEqual(2, interceptionBehavior.CallCount); // adding + calling TriggerIt - } - - public interface IProxiedInterface - { - string DoSomething(); - } - - public class ProxiedInterfaceImpl : IProxiedInterface - { - public string DoSomething() - { - return "hello world"; - } - } - - [TestMethod] - public void CanInterceptDerivedInterface() - { - IUnityContainer container = new UnityContainer(); - container.RegisterType(); - - container.AddNewExtension() - .Configure() - .SetDefaultInterceptorFor(new InterfaceInterceptor()); - - var svc = container.Resolve(); - svc.Save(new Order()); - - //doesnt throw - } - - public interface IService - { - void Save(T entity); - } - - public interface IOrderService : IService - { - void GetCustomerOrders(Customer customer); - } - - public abstract class ServiceBase : IService - { - public void Save(T entity) - { - //Some code that saves a generic entity - } - } - - public class OrderService : ServiceBase, IOrderService - { - public void GetCustomerOrders(Customer customer) - { - //Some code that gets customer orders - } - } - - public class Customer - { - } - public class Order - { - } - - public class CallCountAttribute : HandlerAttribute - { - public static CallCountHandler Handler = new CallCountHandler(); - - public override ICallHandler CreateHandler(IUnityContainer container) - { - return Handler; - } - } - - private static IEnumerable GetExpectedMethods(params string[] methodNames) - { - return GetExpectedMethods(typeof(TInterface), typeof(TImplementation), methodNames); - } - - private static IEnumerable GetExpectedMethods(Type interfaceType, Type implementationType, params string[] methodNames) - { - foreach (string name in methodNames) - { - yield return new MethodImplementationInfo( - interfaceType.GetMethod(name), - implementationType.GetMethod(name)); - } - } - - internal class ImplementationOne : IInterfaceOne - { - public void TargetMethod() - { - } - } - - public interface IGenericOne - { - T DoSomething(T something); - } - - public class GenericImplementationOne : IGenericOne - { - public bool DidSomething; - - public T DoSomething(T something) - { - DidSomething = true; - return something; - } - } - - private class ImplementsInterfaceOne : IInterfaceOne - { - public bool TargetMethodCalled; - - public void TargetMethod() - { - TargetMethodCalled = true; - } - } - - public interface IHaveSomeRefsAndOuts - { - void DoSomething(out int a, ref string s); - } - - private class ImplementsHaveSomeRefsAndOuts : IHaveSomeRefsAndOuts - { - public void DoSomething(out int a, ref string s) - { - a = 37; - s = "+++" + s + "***"; - } - } - - [AttributeUsage(AttributeTargets.All)] - public class SampleAttribute : Attribute - { - private readonly string name; - - public SampleAttribute(string name) - { - this.name = name; - } - - public string Name - { - get { return this.name; } - } - } - - public interface IHaveSomeProperties - { - string AMethod(int x); - - int IntProperty { get; set; } - [Sample("A name")] - string Name { get; set; } - } - - private class HasSomeProperties : IHaveSomeProperties - { - private int intValue; - private string stringValue; - - public string AMethod(int x) - { - return "**" + x + "++"; - } - - public int IntProperty - { - get { return intValue; } - set { intValue = value; } - } - - public string Name - { - get { return stringValue; } - set { stringValue = value; } - } - } - - private class MyDal : IDal - { - private double balance; - - public double Balance { get { return balance; } } - - public void Deposit(double amount) - { - balance += amount; - } - - public void Withdraw(double amount) - { - balance -= amount; - } - } - - public interface IDoEvents - { - event EventHandler SomeEvent; - void TriggerIt(); - } - - public class ClassWithEvents : IDoEvents - { - public event EventHandler SomeEvent; - - public void TriggerIt() - { - SomeEvent(this, new EventArgs()); - } - } - - public interface IInterfaceTwo - { - void TargetMethod(int parameter); - } - - [TestMethod] - public void CanCreateProxyForMultipleInterfaces() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IInterfaceOne)); - - // assert - Assert.IsTrue(proxy is IHaveSomeProperties); - Assert.IsTrue(proxy is IInterfaceOne); - } - - [TestMethod] - public void InvokingMethodOnAdditionalInterfaceThrowsIfNotHandledByInterceptor() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - object proxy = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IInterfaceOne)); - - // act - Exception exception = null; - try - { - ((IInterfaceOne)proxy).TargetMethod(); - Assert.Fail("should have thrown"); - } - catch (NotImplementedException e) - { - exception = e; - } - - // assert - Assert.IsNotNull(exception); - } - - [TestMethod] - public void CanSuccessfullyInvokeAnAdditionalInterfaceMethodIfAnInterceptorDoesNotForwardTheCall() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - object proxy = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IInterfaceOne)); - bool invoked = false; - ((IInterceptingProxy)proxy).AddInterceptionBehavior( - new DelegateInterceptionBehavior( - (input, getNext) => { invoked = true; return input.CreateMethodReturn(null); })); - - // act - ((IInterfaceOne)proxy).TargetMethod(); - - // assert - Assert.IsTrue(invoked); - } - - [TestMethod] - public void CanImplementINotifyPropertyChanged() - { - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - object proxy = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(INotifyPropertyChanged)); - string changeProperty = null; - PropertyChangedEventHandler handler = (sender, args) => changeProperty = args.PropertyName; - - ((IInterceptingProxy)proxy).AddInterceptionBehavior(new NaiveINotifyPropertyChangedInterceptionBehavior()); - ((INotifyPropertyChanged)proxy).PropertyChanged += handler; - - ((IHaveSomeProperties)proxy).IntProperty = 100; - - Assert.AreEqual(100, ((IHaveSomeProperties)proxy).IntProperty); - Assert.AreEqual("IntProperty", changeProperty); - - changeProperty = null; - ((INotifyPropertyChanged)proxy).PropertyChanged -= handler; - - ((IHaveSomeProperties)proxy).IntProperty = 200; - - Assert.AreEqual(200, ((IHaveSomeProperties)proxy).IntProperty); - Assert.AreEqual(null, changeProperty); - } - - [TestMethod] - public void ProxiedInterfaceIsImplementedImplicitly() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IInterfaceTwo)); - InterfaceMapping interfaceMapping = proxy.GetType().GetInterfaceMap(typeof(IHaveSomeProperties)); - - // assert - Assert.IsNull(interfaceMapping.TargetMethods.FirstOrDefault(mi => !mi.IsPublic)); - } - - [TestMethod] - public void AdditionalInterfaceIsImplementedExplicitly() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IInterfaceTwo)); - InterfaceMapping interfaceMapping = proxy.GetType().GetInterfaceMap(typeof(IInterfaceTwo)); - - // assert - Assert.IsNull(interfaceMapping.TargetMethods.FirstOrDefault(mi => mi.IsPublic)); - } - - [TestMethod] - public void CanImplementMultipleInterfacesWithSameMethodSignatures() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - BaseInterfaceImplementation target = new BaseInterfaceImplementation(); - object proxy = interceptor.CreateProxy(typeof(IBaseInterface), target, typeof(IBaseInterface2)); - object[] returnValues = new object[] { this, "return value" }; - int returnValue = 0; - ((IInterceptingProxy)proxy).AddInterceptionBehavior( - new DelegateInterceptionBehavior( - (mi, getNext) => - { - return mi.CreateMethodReturn(returnValues[returnValue++]); - })); - - // act - object value1 = ((IBaseInterface)proxy).TargetMethod(); - string value2 = ((IBaseInterface2)proxy).TargetMethod(); - - // assert - Assert.AreEqual(this, value1); - Assert.AreEqual("return value", value2); - } - - [TestMethod] - public void CanImplementMultipleAdditionalInterfacesWithCommonAncestors() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy = - interceptor.CreateProxy( - typeof(IHaveSomeProperties), - target, - typeof(IDerivedInterface1), - typeof(IDerivedInterface2)); - - // assert - Assert.IsTrue(proxy is IHaveSomeProperties); - Assert.IsTrue(proxy is IDerivedInterface1); - Assert.IsTrue(proxy is IDerivedInterface2); - } - - [TestMethod] - public void CanImplementAdditionalClosedGenericInterface() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy = - interceptor.CreateProxy( - typeof(IHaveSomeProperties), - target, - typeof(IGenericOne)); - - // assert - Assert.IsTrue(proxy is IHaveSomeProperties); - Assert.IsTrue(proxy is IGenericOne); - } - - [TestMethod] - public void CanImplementAdditionalClosedGenericInterfaceMultipleTimesWithDifferentParameters() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy = - interceptor.CreateProxy( - typeof(IHaveSomeProperties), - target, - typeof(IGenericOne), - typeof(IGenericOne)); - - // assert - Assert.IsTrue(proxy is IHaveSomeProperties); - Assert.IsTrue(proxy is IGenericOne); - Assert.IsTrue(proxy is IGenericOne); - } - - [TestMethod] - public void SupplyingOpenGenericInterfacesAsAdditionalInterfacesThrows() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - Exception exception = null; - try - { - object proxy = - interceptor.CreateProxy( - typeof(IHaveSomeProperties), - target, - typeof(IGenericOne<>)); - } - catch (ArgumentException e) - { - exception = e; - } - - // assert - Assert.IsNotNull(exception); - } - - [TestMethod] - public void SupplyingNonInterfacesAsAdditionalInterfacesThrows() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - Exception exception = null; - try - { - object proxy = - interceptor.CreateProxy( - typeof(IHaveSomeProperties), - target, - typeof(Exception)); - } - catch (ArgumentException e) - { - exception = e; - } - - // assert - Assert.IsNotNull(exception); - } - - [TestMethod] - public void SupplyingNullInterfacesAsAdditionalInterfacesThrows() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - Exception exception = null; - try - { - object proxy = - interceptor.CreateProxy( - typeof(IHaveSomeProperties), - target, - (Type)null); - } - catch (ArgumentException e) - { - exception = e; - } - - // assert - Assert.IsNotNull(exception); - } - - [TestMethod] - public void SupplyingANullArrayOfAdditionalInterfacesThrows() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - Exception exception = null; - try - { - object proxy = - interceptor.CreateProxy( - typeof(IHaveSomeProperties), - target, - (Type[])null); - } - catch (ArgumentNullException e) - { - exception = e; - } - - // assert - Assert.IsNotNull(exception); - } - - public interface IBaseInterface - { - object TargetMethod(); - } - - public interface IBaseInterface2 - { - string TargetMethod(); - } - - public interface IDerivedInterface1 : IBaseInterface - { - object TargetMethod(string param1); - } - - public interface IDerivedInterface2 : IBaseInterface - { - void TargetMethod(string param1); - } - - public class BaseInterfaceImplementation : IBaseInterface - { - public object TargetMethod() - { - return null; - } - } - - [TestMethod] - public void MultipleProxiesForTheSameInterfaceHaveTheSameType() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy1 = interceptor.CreateProxy(typeof(IHaveSomeProperties), target); - object proxy2 = interceptor.CreateProxy(typeof(IHaveSomeProperties), target); - - // assert - Assert.AreSame(proxy1.GetType(), proxy2.GetType()); - } - - [TestMethod] - public void ProxiesForTheSameInterfaceButDifferentAdditionalInterfacesDoNotHaveTheSameType() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy1 = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IBaseInterface)); - object proxy2 = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IBaseInterface2)); - - // assert - Assert.AreNotSame(proxy1.GetType(), proxy2.GetType()); - Assert.IsTrue(proxy1 is IBaseInterface); - Assert.IsTrue(proxy2 is IBaseInterface2); - } - - [TestMethod] - public void ProxiesForTheSameAdditionalInterfacesButInDifferentOrderDoNotHaveTheSameType() - { - // arrange - IInstanceInterceptor interceptor = new InterfaceInterceptor(); - HasSomeProperties target = new HasSomeProperties(); - - // act - object proxy1 = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IBaseInterface), typeof(IBaseInterface2)); - object proxy2 = interceptor.CreateProxy(typeof(IHaveSomeProperties), target, typeof(IBaseInterface2), typeof(IBaseInterface)); - - // assert - Assert.AreNotSame(proxy1.GetType(), proxy2.GetType()); - Assert.IsTrue(proxy1 is IBaseInterface); - Assert.IsTrue(proxy1 is IBaseInterface2); - Assert.IsTrue(proxy2 is IBaseInterface); - Assert.IsTrue(proxy2 is IBaseInterface2); - } - - [TestMethod] - public void InterfaceInterceptorSetsTargetToTargetObject() - { - object suppliedTarget = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - suppliedTarget = inputs.Target; - return getNext()(inputs, getNext); - }); - - var actualTarget = new ImplementsInterfaceOne(); - - var proxy = Intercept.ThroughProxy( - actualTarget, new InterfaceInterceptor(), - new[] { behavior }); - - proxy.TargetMethod(); - - Assert.IsTrue(actualTarget.TargetMethodCalled); - Assert.AreSame(actualTarget, suppliedTarget); - } - - [TestMethod] - public void CanInterceptInterfaceWithGenericMethod() - { - var target = new ClassWithGenericMethod(); - - bool behaviorWasCalled = false; - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - behaviorWasCalled = true; - return getNext()(inputs, getNext); - }); - - var proxy = Intercept.ThroughProxy( - target, new InterfaceInterceptor(), - new[] { behavior }); - - proxy.DoSomething(); - - Assert.IsTrue(behaviorWasCalled); - } - - public interface IConstrainedInterface - where T : IBaseInterface - { - void SomeMethod(); - - //void SomeGenericMethod() - // where TParam : IBaseInterface; - } - - public class ConstrainedImpl : IConstrainedInterface - { - public void SomeMethod() { } - //public void SomeGenericMethod() where TParam : IBaseInterface - //{ - //} - } - -#if false - /// - /// Test class used to reverse engineer required generated code. - /// - class ConstraintedInterfaceInterceptor : IInterceptingProxy, IConstrainedInterface - //where T : IBaseInterface - { - readonly PipelineManager pipelines; - private readonly IConstrainedInterface target; - - public ConstraintedInterfaceInterceptor(IConstrainedInterface target) - { - this.target = target; - pipelines = new PipelineManager(); - } - - public void SomeMethod() - { - MethodInfo targetMethod = typeof(IConstrainedInterface).GetMethod("SomeMethod"); - - VirtualMethodInvocation input = new VirtualMethodInvocation(target, targetMethod); - HandlerPipeline pipeline = pipelines.GetPipeline(targetMethod); - IMethodReturn returnMessage = pipeline.Invoke(input, delegate(IMethodInvocation inputs, GetNextHandlerDelegate getNext) - { - try - { - target.SomeMethod(); - return inputs.CreateMethodReturn(null); - } - catch (Exception ex) - { - - return inputs.CreateExceptionMethodReturn(ex); - } - }); - - if (returnMessage.Exception != null) - { - throw returnMessage.Exception; - } - } - - public void SomeGenericMethod() where TParam : IBaseInterface - { - MethodInfo mi = typeof (IConstrainedInterface).GetMethod("SomeGenericMethod"); - var t1 = typeof (IConstrainedInterface); - var t2 = typeof (IConstrainedInterface<>); - var mh = mi.MethodHandle; - var th = mi.DeclaringType.TypeHandle; - var tm = MethodBase.GetMethodFromHandle(mh, th); - - MethodInfo targetMethod = typeof(IConstrainedInterface).GetMethod("SomeGenericMethod"); - - VirtualMethodInvocation input = new VirtualMethodInvocation(target, targetMethod); - HandlerPipeline pipeline = pipelines.GetPipeline(targetMethod); - IMethodReturn returnMessage = pipeline.Invoke(input, delegate(IMethodInvocation inputs, GetNextHandlerDelegate getNext) - { - try - { - target.SomeGenericMethod(); - return inputs.CreateMethodReturn(null); - } - catch (Exception ex) - { - - return inputs.CreateExceptionMethodReturn(ex); - } - }); - - if (returnMessage.Exception != null) - { - throw returnMessage.Exception; - } - } - - public void AddInterceptionBehavior(IInterceptionBehavior interceptor) - { - throw new NotImplementedException(); - } - } -#endif - - [TestMethod] - public void CanInterceptGenericInterfaceWithInterfaceConstraint() - { - var target = new ConstrainedImpl(); - - bool behaviorWasCalled = false; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - behaviorWasCalled = true; - return getNext()(inputs, getNext); - }); - - var proxy = Intercept.ThroughProxy>( - target, new InterfaceInterceptor(), - new[] { behavior }); - - proxy.SomeMethod(); - - Assert.IsTrue(behaviorWasCalled); - } - - [TestMethod] - public void CanInterceptNonGenericMethodOnNonGenericInterface() - { - var target = new NonGenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.NonGenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodOnNonGenericInterface() - { - var target = new NonGenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintOnNonGenericInterface() - { - var target = new NonGenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethodWithConstraints(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptNonGenericMethodOnGenericInterface() - { - var target = new GenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.NonGenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodOnGenericInterface() - { - var target = new GenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodOnGenericInterfaceUsingValueType() - { - var target = new GenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - var result = proxy.GenericMethodDifferentReturnType(100, null); - - Assert.AreEqual(100, result); - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(int), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(int), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintOnGenericInterface() - { - var target = new GenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethodWithConstraints(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintRelatedToInterfaceOnGenericInterface() - { - var target = new GenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethodWithConstraintsOnTheInterfaceParameter(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptNonGenericMethodOnGenericInterfaceWithConstraint() - { - var target = new GenericClassWithConstraint(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.NonGenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodOnGenericInterfaceWithConstraint() - { - var target = new GenericClassWithConstraint(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintOnGenericInterfaceWithConstraint() - { - var target = new GenericClassWithConstraint(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethodWithConstraints(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintRelatedToInterfaceOnGenericInterfaceWithConstraint() - { - var target = new GenericClassWithConstraint(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.GenericMethodWithConstraintsOnTheInterfaceParameter(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - public interface INonGenericInterface - { - string NonGenericMethod(IEnumerable param1, string param2); - - T GenericMethod(IEnumerable param1, T param2); - - T GenericMethodWithConstraints(IEnumerable param1, T param2) where T : class; - } - - public interface IGenericInterface - { - string NonGenericMethod(T1 param1, string param2); - - T GenericMethod(T1 param1, T param2); - - T1 GenericMethodDifferentReturnType(T1 param1, T param2); - - T GenericMethodWithConstraints(T1 param1, T param2) where T : class; - - T GenericMethodWithConstraintsOnTheInterfaceParameter(T1 param1, T param2) where T : T1; - } - - public interface IGenericInterfaceWithConstraint - where T1 : class - { - string NonGenericMethod(T1 param1, string param2); - - T GenericMethod(T1 param1, T param2); - - T GenericMethodWithConstraints(T1 param1, T param2) where T : class; - - T GenericMethodWithConstraintsOnTheInterfaceParameter(T1 param1, T param2) where T : T1; - } - - public class NonGenericClass : INonGenericInterface - { - public string NonGenericMethod(IEnumerable param1, string param2) - { - return null; - } - - public T GenericMethod(IEnumerable param1, T param2) - { - return default(T); - } - - public T GenericMethodWithConstraints(IEnumerable param1, T param2) where T : class - { - return default(T); - } - } - - public class GenericClass : IGenericInterface - { - public string NonGenericMethod(T1 param1, string param2) - { - return null; - } - - public T GenericMethod(T1 param1, T param2) - { - var handle = MethodBase.GetCurrentMethod().MethodHandle; - - return default(T); - } - - public T GenericMethodWithConstraints(T1 param1, T param2) where T : class - { - return default(T); - } - - public T GenericMethodWithConstraintsOnTheInterfaceParameter(T1 param1, T param2) where T : T1 - { - return default(T); - } - - public T1 GenericMethodDifferentReturnType(T1 param1, T param2) - { - return param1; - } - } - - public class GenericClassWithConstraint : IGenericInterfaceWithConstraint - where T1 : class - { - public string NonGenericMethod(T1 param1, string param2) - { - return null; - } - - public T GenericMethod(T1 param1, T param2) - { - return default(T); - } - - public T GenericMethodWithConstraints(T1 param1, T param2) where T : class - { - return default(T); - } - - public T GenericMethodWithConstraintsOnTheInterfaceParameter(T1 param1, T param2) where T : T1 - { - return default(T); - } - } - - [TestMethod] - public void CanInterceptConstrainedInheritedInterfaceMethod() - { - var target = new DerivedNonGenericClass(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.Test>(); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(List), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(0, invocation.MethodBase.GetParameters().Count()); - } - - public interface IBaseGenericInterface - { - TDerived Test() where TDerived : TBase; - } - - public class BaseGenericClass : IBaseGenericInterface - { - public virtual TDerivedType Test() where TDerivedType : TBaseType - { - return default(TDerivedType); - } - } - - public interface IDerivedNonGenericInterface : IBaseGenericInterface> - { - } - - public class DerivedNonGenericClass : BaseGenericClass>, IDerivedNonGenericInterface - { - } - - [TestMethod] - public void CanInterceptConstrainedInheritedInterfaceMethod2() - { - var target = new Class3>(); - - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - proxy.TestMethod, DerivedType>( - new DerivedType(), - new BaseType[0], - Enumerable.Empty(), - new List[0]); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(List), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(4, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(BaseType), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(2).ParameterType); - Assert.AreSame(typeof(List[]), invocation.MethodBase.GetParameters().ElementAt(3).ParameterType); - } - - public interface IInterface1 - { - W1 TestMethod(T1 a, U1 b, IEnumerable c, W1[] d) - where W1 : V1 - where X1 : T1; - } - - public interface IInterface2 : IInterface1, V2> - where T2 : new() - { } - - public interface IInterface3 : IInterface2 - where V3 : class - { } - - public class Class3 : IInterface3 - where Y : class - { - public Za TestMethod(BaseType a, IEnumerable b, IEnumerable c, Za[] d) - where Za : Y - where Zb : BaseType - { - return default(Za); - } - } - - public class BaseType { } - - public class DerivedType : BaseType { } - - [TestMethod] - public void CanInterceptConstrainedInheritedInterfaceMethod3() - { - var target = new ClassA2(); - - IMethodInvocation invocation; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var proxy = - Intercept.ThroughProxy>( - target, - new InterfaceInterceptor(), - new[] { behavior }); - - invocation = null; - - proxy.Test, List>(new ISet[0], new List()); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(KeyValuePair, IEnumerable>[]>), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(ISet[]), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(List), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - - invocation = null; - - proxy.CompareTo((object)this); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(int), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(1, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(object), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - - invocation = null; - - proxy.CompareTo(Guid.Empty); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(int), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(1, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(Guid), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - } - - public interface IInterfaceA1 : IComparable - { - KeyValuePair[]> Test(TA1[] p1, M2 p2) - where M1 : TA1 - where M2 : IEnumerable; - } - - public interface IInterfaceA2 : IInterfaceA1, Guid>, IComparable - where TC2 : class, new() - { } - - public class ClassA2 : IInterfaceA2 - where TC2 : class, new() - { - public KeyValuePair>[]> Test(ISet[] p1, M2 p2) - where M1 : ISet - where M2 : IEnumerable - { - return default(KeyValuePair>[]>); - } - - public int CompareTo(object obj) - { - return 0; - } - - public int CompareTo(Guid other) - { - return 0; - } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRuleSetFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRuleSetFixture.cs deleted file mode 100644 index d15f09ff..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRuleSetFixture.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Tests for the MatchingRuleSet class - /// - [TestClass] - public class MatchingRuleSetFixture - { - [TestMethod] - public void ShouldNotMatchWithNoContainedRules() - { - MatchingRuleSet ruleSet = new MatchingRuleSet(); - - MethodBase member = GetType().GetMethod("ShouldNotMatchWithNoContainedRules"); - Assert.IsFalse(ruleSet.Matches(member)); - } - - [TestMethod] - public void ShouldMatchWithMatchingTypeRule() - { - MatchingRuleSet ruleSet = new MatchingRuleSet(); - ruleSet.Add(new TypeMatchingRule(typeof(MatchingRuleSetFixture))); - MethodBase member = GetType().GetMethod("ShouldMatchWithMatchingTypeRule"); - Assert.IsTrue(ruleSet.Matches(member)); - } - - [TestMethod] - public void ShouldNotMatchWhenOneRuleDoesntMatch() - { - MethodBase member = GetType().GetMethod("ShouldNotMatchWhenOneRuleDoesntMatch"); - MatchingRuleSet ruleSet = new MatchingRuleSet(); - - ruleSet.Add(new TypeMatchingRule(typeof(MatchingRuleSetFixture))); - Assert.IsTrue(ruleSet.Matches(member)); - - ruleSet.Add(new MemberNameMatchingRule("ThisMethodDoesntExist")); - Assert.IsFalse(ruleSet.Matches(member)); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.2008.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.2008.cs deleted file mode 100644 index 697fab69..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.2008.cs +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - // Tests on assembly matching rules that only work in VS 2008/.NET 3.5 - public partial class AssemblyMatchingRuleFixture - { - [TestMethod] - public void CanMatchAssemblyNameByNameAndVersion() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=2.0.0.0"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyNameByNameVersionAndKey() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyNameByNameVersionAndCulture() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=2.0.0.0, Culture=neutral"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyByFullyQualifiedName() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanExplicitlyDenyMatchOnNoKey() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=(null)"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanExplicitlyDenyMatchOnSpecificKey() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanExplicitlyDenyMatchOnSpecificCulture() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=2.0.0.0, Culture=nl-NL, PublicKeyToken=b77a5c561934e089"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyNameUsingArbitraryAmountOfSpaces() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib,Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.2010.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.2010.cs deleted file mode 100644 index 970f7d00..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.2010.cs +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - // Tests on assembly matching rules that only work in VS 2010/.NET 4.0 - public partial class AssemblyMatchingRuleFixture - { - [TestMethod] - public void CanMatchAssemblyNameByNameAndVersion() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=4.0.0.0"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyNameByNameVersionAndKey() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=4.0.0.0, PublicKeyToken=b77a5c561934e089"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyNameByNameVersionAndCulture() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=4.0.0.0, Culture=neutral"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyByFullyQualifiedName() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanExplicitlyDenyMatchOnNoKey() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=(null)"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanExplicitlyDenyMatchOnSpecificKey() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanExplicitlyDenyMatchOnSpecificCulture() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=4.0.0.0, Culture=nl-NL, PublicKeyToken=b77a5c561934e089"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchAssemblyNameUsingArbitraryAmountOfSpaces() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib,Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.cs deleted file mode 100644 index cc42a6e2..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/AssemblyMatchingRuleFixture.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public partial class AssemblyMatchingRuleFixture - { - private MethodBase objectToStringMethod; - - [TestInitialize] - public void TestInitialize() - { - objectToStringMethod = typeof(object).GetMethod("ToString"); - } - - [TestMethod] - public void CanMatchAssemblyNameByNameOnly() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanExplicitlyDenyMatchOnVersion() - { - AssemblyMatchingRule matchingRule = new AssemblyMatchingRule("mscorlib, Version=1.2.3.4, Culture=neutral, PublicKeyToken=b77a5c561934e089"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/CustomAttributeMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/CustomAttributeMatchingRuleFixture.cs deleted file mode 100644 index ba460360..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/CustomAttributeMatchingRuleFixture.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class CustomAttributeMatchingRuleFixture - { - [TestMethod] - public void CustomAttributeRuleMatchesWhenAttributeFuond() - { - MethodInfo method = typeof(TestObject).GetMethod("MethodWithAttribute"); - CustomAttributeMatchingRule rule = new CustomAttributeMatchingRule(typeof(RandomAttribute), false); - Assert.IsTrue(rule.Matches(method)); - } - - [TestMethod] - public void CustomAttributeRuleDeniesMatchWhenNoAttributeFound() - { - MethodInfo method = typeof(TestObject).GetMethod("MethodWithoutAttribute"); - CustomAttributeMatchingRule rule = new CustomAttributeMatchingRule(typeof(RandomAttribute), false); - Assert.IsFalse(rule.Matches(method)); - } - - [TestMethod] - public void CustomAttributeRuleSearchesInheritanceChainWhenInheritedIsTrue() - { - MethodInfo method = typeof(DerivedObject).GetMethod("MethodWithAttribute"); - CustomAttributeMatchingRule rule = new CustomAttributeMatchingRule(typeof(RandomAttribute), true); - Assert.IsTrue(rule.Matches(method)); - } - - [TestMethod] - public void CustomAttributeRuleDoesNotSearchInheritanceChainWhenInheritedIsFalse() - { - MethodInfo method = typeof(DerivedObject).GetMethod("MethodWithAttribute"); - CustomAttributeMatchingRule rule = new CustomAttributeMatchingRule(typeof(RandomAttribute), false); - Assert.IsFalse(rule.Matches(method)); - } - - private class DerivedObject : TestObject - { - public override void MethodWithAttribute() { } - } - - private class TestObject - { - [RandomAttribute] - public virtual void MethodWithAttribute() { } - - public void MethodWithoutAttribute() { } - } - - private class RandomAttribute : Attribute { } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/GlobFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/GlobFixture.cs deleted file mode 100644 index 3bf93db7..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/GlobFixture.cs +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - /// - /// Test figure for the Glob class, which implements matching using - /// file system style patterns for simple pattern matches rather than - /// full-bore regexes. - /// - [TestClass] - public class GlobFixture - { - [TestMethod] - public void ShouldMatchExactlyWhenNoWildcards() - { - Glob glob = new Glob("MyClass"); - Assert.IsTrue(glob.IsMatch("MyClass")); - Assert.IsFalse(glob.IsMatch("MyClass2")); - Assert.IsFalse(glob.IsMatch("ReallyMyClass")); - } - - [TestMethod] - public void ShouldMatchWithTrailingWildcard() - { - Glob glob = new Glob("MyClass*"); - Assert.IsTrue(glob.IsMatch("MyClass")); - Assert.IsTrue(glob.IsMatch("MyClassAndMore2")); - Assert.IsFalse(glob.IsMatch("ReallyMyClass")); - } - - [TestMethod] - public void ShouldMatchWithLeadingWildcard() - { - Glob glob = new Glob("*Class"); - Assert.IsTrue(glob.IsMatch("MyClass")); - Assert.IsTrue(glob.IsMatch("My.other.Class")); - Assert.IsFalse(glob.IsMatch("MyClassAndMore2")); - } - - [TestMethod] - public void ShouldBeCaseSensitiveByDefault() - { - Glob glob = new Glob("MyClass"); - Assert.IsFalse(glob.IsMatch("myclass")); - } - - [TestMethod] - public void ShouldMatchWithCaseInsensitiveFlag() - { - Glob glob = new Glob("MyClass", false); - - Assert.IsTrue(glob.IsMatch("myclass")); - } - - [TestMethod] - public void DotsShouldBeLiterals() - { - Glob glob = new Glob("*.cs"); - - Assert.IsTrue(glob.IsMatch("someFile.cs")); - Assert.IsFalse(glob.IsMatch("notmatchedcs")); - } - - [TestMethod] - public void BracketsShouldMatchSingleCharacters() - { - Glob glob = new Glob("Test[0-9][0-9]"); - Assert.IsTrue(glob.IsMatch("Test01")); - Assert.IsTrue(glob.IsMatch("Test54")); - Assert.IsFalse(glob.IsMatch("Test200")); - } - - [TestMethod] - public void QuestionMarksShouldMatchSingleCharacters() - { - Glob glob = new Glob("one??two"); - - Assert.IsTrue(glob.IsMatch("one00two")); - Assert.IsTrue(glob.IsMatch("oneWEtwo")); - Assert.IsFalse(glob.IsMatch("oneTooManytwo")); - Assert.IsTrue(glob.IsMatch("one??two")); - } - - [TestMethod] - public void DollarSignsAndCaretsAreLiterals() - { - Glob glob = new Glob("abc$def^*"); - Assert.IsTrue(glob.IsMatch("abc$def^")); - Assert.IsTrue(glob.IsMatch("abc$def^Stuff")); - Assert.IsFalse(glob.IsMatch("abc$")); - } - - [TestMethod] - public void ShouldMatchNothingWithEmptyPattern() - { - Glob glob = new Glob(string.Empty); - Assert.IsFalse(glob.IsMatch("a")); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/MemberNameMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/MemberNameMatchingRuleFixture.cs deleted file mode 100644 index 2deb2e26..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/MemberNameMatchingRuleFixture.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class MemberNameMatchingRuleFixture - { - private MethodInfo methodOne; - private MethodInfo methodTwo; - private MethodInfo save; - private MethodInfo reset; - private MethodInfo closeAndReset; - - [TestInitialize] - public void Setup() - { - methodOne = typeof(TestTarget).GetMethod("MethodOne"); - methodTwo = typeof(TestTarget).GetMethod("MethodTwo"); - save = typeof(TestTarget).GetMethod("Save"); - reset = typeof(TestTarget).GetMethod("Reset"); - closeAndReset = typeof(TestTarget).GetMethod("CloseAndReset"); - } - - [TestMethod] - public void ShouldMatchExactName() - { - MemberNameMatchingRule rule = new MemberNameMatchingRule("Save"); - Assert.IsTrue(rule.Matches(save)); - } - - [TestMethod] - public void ShouldMatchWithWildcard() - { - MemberNameMatchingRule rule = new MemberNameMatchingRule("*Reset"); - foreach (MethodInfo method in new MethodInfo[] { reset, closeAndReset }) - { - Assert.IsTrue(rule.Matches(method), - "Match failed for method {0}", method.Name); - } - } - - [TestMethod] - public void ShouldMatchMultipleMethods() - { - IMatchingRule rule = new MemberNameMatchingRule( - new string[] { "MethodTwo", "Save" }); - Assert.IsFalse(rule.Matches(methodOne)); - Assert.IsTrue(rule.Matches(methodTwo)); - Assert.IsTrue(rule.Matches(save)); - } - - [TestMethod] - public void ShouldMatchMultipleWildcards() - { - IMatchingRule rule = new MemberNameMatchingRule( - new string[] { "Method*", "*Reset" }); - foreach (MethodInfo method in new MethodInfo[] { methodOne, methodTwo, reset, closeAndReset }) - { - Assert.IsTrue(rule.Matches(method), - "Match failed for method {0}", method.Name); - } - } - } - - public class TestTarget - { - public void CloseAndReset() { } - - public void MethodOne() { } - - public void MethodTwo() { } - - public void Reset() { } - - public void Save() { } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/MethodSignatureMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/MethodSignatureMatchingRuleFixture.cs deleted file mode 100644 index 70567601..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/MethodSignatureMatchingRuleFixture.cs +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class MethodSignatureMatchingRuleFixture - { - private MethodBase objectToStringMethod; - private MethodBase objectCtor; - private MethodBase stringCopyToMethod; - - [TestInitialize] - public void TestInitialize() - { - objectToStringMethod = typeof(object).GetMethod("ToString"); - objectCtor = typeof(object).GetConstructor(new Type[0]); - stringCopyToMethod = typeof(string).GetMethod("CopyTo"); - } - - [TestMethod] - public void MatchIsDeniedWhenParamterValuesCountDiffers() - { - List oneParam = new List(); - oneParam.Add("one"); - - MethodSignatureMatchingRule matchingRule = new MethodSignatureMatchingRule(oneParam); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchOnParameterlessMethods() - { - List parameterLess = new List(); - MethodSignatureMatchingRule matchingRule = new MethodSignatureMatchingRule(parameterLess); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void CanMatchOnMultipleParameterTypes() - { - List parametersForCopyToMethod = new List(); - parametersForCopyToMethod.Add("System.Int32"); - parametersForCopyToMethod.Add("System.Char[]"); - parametersForCopyToMethod.Add("System.Int32"); - parametersForCopyToMethod.Add("System.Int32"); - - MethodSignatureMatchingRule matchingRule = new MethodSignatureMatchingRule(parametersForCopyToMethod); - Assert.IsTrue(matchingRule.Matches(stringCopyToMethod)); - } - - [TestMethod] - public void MatchIsDeniedWhenASingleParameterIsWrong() - { - List parametersForCopyToMethod = new List(); - parametersForCopyToMethod.Add("System.Int32"); - parametersForCopyToMethod.Add("System.Char[]"); - parametersForCopyToMethod.Add("System.NotAnInt32"); - parametersForCopyToMethod.Add("System.Int32"); - - MethodSignatureMatchingRule matchingRule = new MethodSignatureMatchingRule(parametersForCopyToMethod); - Assert.IsFalse(matchingRule.Matches(stringCopyToMethod)); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/NamespaceMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/NamespaceMatchingRuleFixture.cs deleted file mode 100644 index da02bf2d..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/NamespaceMatchingRuleFixture.cs +++ /dev/null @@ -1,178 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.SeparateTopLevel; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevel; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevel.SecondLevel; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevel.SecondLevel.ThirdLevel; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevelTwo; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -[module: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1403:FileMayOnlyContainASingleNamespace", Justification = "Test needs multiple namespaces so keep the namespaces and test together")] - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - /// - /// Unit tests for NamespaceMatchingRule - /// - [TestClass] - public class NamespaceMatchingRuleFixture - { - private const string TopLevelNamespace = - "Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevel"; - - private const string TopLevelNamespaceWildcard = - "Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevel.*"; - - private const string SecondLevelNamespace = - "Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevel.SecondLevel"; - - private const string ThirdLevelNamespace = - "Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevel.SecondLevel.ThirdLevel"; - - private const string TopLevelTwoNamespace = - "Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules.TopLevelTwo"; - - [TestMethod] - public void ShouldMatchWhenInExactNamespace() - { - TestMatch(TopLevelNamespace, typeof(TopLevelTarget), true); - } - - [TestMethod] - public void ShouldNotMatchWhenInChildNamespace() - { - TestMatch(TopLevelNamespace, typeof(SecondLevelTarget), false); - } - - [TestMethod] - public void ShouldMatchWithIgnoreCaseTurnedOn() - { - TestMatch(TopLevelNamespace, true, typeof(TopLevelTarget), true); - } - - [TestMethod] - public void ShouldNotMatchWhenInChildNamespaceWithIgnoreCase() - { - TestMatch(TopLevelNamespace, true, typeof(SecondLevelTarget), false); - } - - [TestMethod] - public void ShouldMatchInExactNamespaceWithWildcard() - { - TestMatch(TopLevelNamespaceWildcard, typeof(TopLevelTarget), true); - } - - [TestMethod] - public void ShouldMatchInChildNamespaceWithWildcard() - { - TestMatch(TopLevelNamespaceWildcard, typeof(SecondLevelTarget), true); - } - - [TestMethod] - public void ShouldNotMatchIfNotInSameOrChildNamespace() - { - TestMatch(TopLevelNamespaceWildcard, typeof(SeparateTarget), false); - } - - [TestMethod] - public void ShouldNotMatchIfNamespaceOfTargetStartsWithSameStringAsMatchingNamespace() - { - TestMatch(TopLevelNamespaceWildcard, typeof(TopLevelTwoTarget), false); - } - - [TestMethod] - public void ShouldNotMatchIfTargetIsInParentNamespace() - { - TestMatch(SecondLevelNamespace, typeof(TopLevelTarget), false); - } - - [TestMethod] - public void ShouldMatchWithWildcardMultipleLevelsDeep() - { - TestMatch(TopLevelNamespaceWildcard, typeof(ThirdLevelTarget), true); - } - - [TestMethod] - public void ShouldMatchWithMultipleMatchOptions() - { - IMatchingRule rule = - new NamespaceMatchingRule(new MatchingInfo[] - { - new MatchingInfo(TopLevelNamespace), - new MatchingInfo(ThirdLevelNamespace), - new MatchingInfo(TopLevelTwoNamespace.ToUpperInvariant(), true) - }); - - Assert.IsTrue(rule.Matches(GetTargetMethod(typeof(TopLevelTarget)))); - Assert.IsFalse(rule.Matches(GetTargetMethod(typeof(SecondLevelTarget)))); - Assert.IsTrue(rule.Matches(GetTargetMethod(typeof(ThirdLevelTarget)))); - Assert.IsFalse(rule.Matches(GetTargetMethod(typeof(SeparateTarget)))); - Assert.IsTrue(rule.Matches(GetTargetMethod(typeof(TopLevelTwoTarget)))); - } - - private void TestMatch(string namespaceName, - bool ignoreCase, - Type targetType, - bool shouldMatch) - { - NamespaceMatchingRule rule = new NamespaceMatchingRule(namespaceName, ignoreCase); - MethodInfo methodToMatch = targetType.GetMethod("TargetMethod"); - Assert.AreEqual(shouldMatch, rule.Matches(methodToMatch)); - } - - private void TestMatch(string namespaceName, - Type targetType, - bool shouldMatch) - { - TestMatch(namespaceName, false, targetType, shouldMatch); - } - - private MethodInfo GetTargetMethod(Type t) - { - return t.GetMethod("TargetMethod"); - } - } - - namespace TopLevel - { - internal class TopLevelTarget - { - public void TargetMethod() { } - } - - namespace SecondLevel - { - internal class SecondLevelTarget - { - public void TargetMethod() { } - } - - namespace ThirdLevel - { - internal class ThirdLevelTarget - { - public void TargetMethod() { } - } - } - } - } - - namespace SeparateTopLevel - { - internal class SeparateTarget - { - public void TargetMethod() { } - } - } - - namespace TopLevelTwo - { - internal class TopLevelTwoTarget - { - public void TargetMethod() { } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/ParameterTypeMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/ParameterTypeMatchingRuleFixture.cs deleted file mode 100644 index 0cffea65..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/ParameterTypeMatchingRuleFixture.cs +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class ParameterTypeMatchingRuleFixture - { - private MethodInfo targetMethodString; - private MethodInfo targetMethodInt; - private MethodInfo returnsAString; - private MethodInfo targetMethodIntString; - private MethodInfo targetMethodStringInt; - private MethodInfo targetWithOutParams; - - [TestInitialize] - public void Setup() - { - Type targetType = typeof(ParameterTypeMatchingRuleTarget); - targetMethodString = targetType.GetMethod("TargetMethodString"); - targetMethodInt = targetType.GetMethod("TargetMethodInt"); - returnsAString = targetType.GetMethod("ReturnsAString"); - targetMethodIntString = targetType.GetMethod("TargetMethodIntString"); - targetMethodStringInt = targetType.GetMethod("TargetMethodStringInt"); - targetWithOutParams = targetType.GetMethod("TargetWithOutParams"); - } - - [TestMethod] - public void ShouldMatchOnSingleInputParameter() - { - ParameterTypeMatchingRule rule = new ParameterTypeMatchingRule( - new ParameterTypeMatchingInfo[] - { - new ParameterTypeMatchingInfo("System.String", false, ParameterKind.Input) - }); - - Assert.IsTrue(rule.Matches(targetMethodString)); - Assert.IsFalse(rule.Matches(targetMethodInt)); - } - - [TestMethod] - public void ShouldMatchOnReturnType() - { - ParameterTypeMatchingRule rule = new ParameterTypeMatchingRule( - new ParameterTypeMatchingInfo[] - { - new ParameterTypeMatchingInfo("System.String", false, ParameterKind.ReturnValue) - }); - Assert.IsFalse(rule.Matches(targetMethodString)); - Assert.IsTrue(rule.Matches(returnsAString)); - } - - [TestMethod] - public void ShouldMatchOnOneOfManyParameters() - { - ParameterTypeMatchingRule rule = new ParameterTypeMatchingRule( - new ParameterTypeMatchingInfo[] - { - new ParameterTypeMatchingInfo("System.Int32", false, ParameterKind.Input) - }); - - Assert.IsTrue(rule.Matches(targetMethodInt)); - Assert.IsTrue(rule.Matches(targetMethodIntString)); - Assert.IsTrue(rule.Matches(targetMethodStringInt)); - Assert.IsFalse(rule.Matches(returnsAString)); - } - - [TestMethod] - public void ShouldMatchOnOutParams() - { - ParameterTypeMatchingRule rule = new ParameterTypeMatchingRule( - new ParameterTypeMatchingInfo[] - { - new ParameterTypeMatchingInfo("System.Int32", false, ParameterKind.Output) - }); - Assert.IsTrue(rule.Matches(targetWithOutParams)); - Assert.IsFalse(rule.Matches(targetMethodInt)); - } - - [TestMethod] - public void ShouldMatchInOrOut() - { - ParameterTypeMatchingRule rule = new ParameterTypeMatchingRule( - new ParameterTypeMatchingInfo[] - { - new ParameterTypeMatchingInfo("System.Int32", false, ParameterKind.InputOrOutput) - }); - Assert.IsTrue(rule.Matches(targetWithOutParams)); - Assert.IsTrue(rule.Matches(targetMethodInt)); - } - - [TestMethod] - public void ShouldMatchOr() - { - ParameterTypeMatchingRule rule = new ParameterTypeMatchingRule( - new ParameterTypeMatchingInfo[] - { - new ParameterTypeMatchingInfo("System.Int32", false, ParameterKind.InputOrOutput), - new ParameterTypeMatchingInfo("String", false, ParameterKind.InputOrOutput), - }); - - Assert.IsTrue(rule.Matches(targetMethodString)); - Assert.IsTrue(rule.Matches(targetMethodInt)); - Assert.IsTrue(rule.Matches(targetMethodIntString)); - Assert.IsTrue(rule.Matches(targetWithOutParams)); - Assert.IsFalse(rule.Matches(returnsAString)); - } - } - - public class ParameterTypeMatchingRuleTarget - { - public string ReturnsAString() - { - return String.Empty; - } - - public void TargetMethodInt(int intParam) { } - - public void TargetMethodIntString(int intParam, - string stringParam) { } - - public void TargetMethodString(string param1) { } - - public void TargetMethodStringInt(string stringParam, - int intParam) { } - - public string TargetWithOutParams(double doubleParam, - out int outIntParam) - { - outIntParam = 42; - return String.Empty; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/PropertyMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/PropertyMatchingRuleFixture.cs deleted file mode 100644 index 1807fd5c..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/PropertyMatchingRuleFixture.cs +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class PropertyMatchingRuleFixture - { - private MethodInfo getMyProperty; - private MethodInfo setMyProperty; - private MethodInfo getMyOtherProperty; - private MethodInfo setNotAProperty; - private MethodInfo getACompletelyDifferentProperty; - private MethodInfo setACompletelyDifferentProperty; - - [TestInitialize] - public void Setup() - { - Type propTarget = typeof(PropertyTarget); - getMyProperty = propTarget.GetProperty("MyProperty").GetGetMethod(); - setMyProperty = propTarget.GetProperty("MyProperty").GetSetMethod(); - getMyOtherProperty = propTarget.GetProperty("MyOtherProperty").GetGetMethod(); - setNotAProperty = propTarget.GetMethod("SetNotAProperty"); - getACompletelyDifferentProperty = - propTarget.GetProperty("ACompletelyDifferentProperty").GetGetMethod(); - setACompletelyDifferentProperty = - propTarget.GetProperty("ACompletelyDifferentProperty").GetSetMethod(); - } - - [TestMethod] - public void ShouldMatchPropertyName() - { - IMatchingRule rule = - new PropertyMatchingRule("MyProperty"); - Assert.IsTrue(rule.Matches(getMyProperty)); - Assert.IsTrue(rule.Matches(setMyProperty)); - } - - [TestMethod] - public void ShouldNotMatchSetWithGetOption() - { - IMatchingRule rule = - new PropertyMatchingRule("MyProperty", PropertyMatchingOption.Get); - Assert.IsTrue(rule.Matches(getMyProperty)); - Assert.IsFalse(rule.Matches(setMyProperty)); - } - - [TestMethod] - public void ShouldNotMatchGetWithSetOption() - { - IMatchingRule rule = - new PropertyMatchingRule("MyProperty", PropertyMatchingOption.Set); - Assert.IsFalse(rule.Matches(getMyProperty)); - Assert.IsTrue(rule.Matches(setMyProperty)); - } - - [TestMethod] - public void ShouldMatchWithWildcard() - { - IMatchingRule rule = - new PropertyMatchingRule("My*"); - Assert.IsTrue(rule.Matches(getMyProperty)); - Assert.IsTrue(rule.Matches(setMyProperty)); - Assert.IsTrue(rule.Matches(getMyOtherProperty)); - } - - [TestMethod] - public void ShouldNotMatchPathologiciallyNamedMethod() - { - IMatchingRule rule = new PropertyMatchingRule("NotAProperty"); - Assert.IsFalse(rule.Matches(setNotAProperty)); - } - - [TestMethod] - public void ShouldMatchWithMultipleMatchTargets() - { - IMatchingRule rule = new PropertyMatchingRule(new PropertyMatchingInfo[] - { - new PropertyMatchingInfo("MyProperty"), - new PropertyMatchingInfo("ACompletelyDifferentProperty", PropertyMatchingOption.Set) - }); - Assert.IsTrue(rule.Matches(getMyProperty)); - Assert.IsTrue(rule.Matches(setMyProperty)); - Assert.IsFalse(rule.Matches(getMyOtherProperty)); - Assert.IsFalse(rule.Matches(getACompletelyDifferentProperty)); - Assert.IsTrue(rule.Matches(setACompletelyDifferentProperty)); - } - } - - internal class PropertyTarget - { - public double ACompletelyDifferentProperty - { - get { return -23.4; } - set { } - } - - public string MyOtherProperty - { - get { return "abc"; } - } - - public int MyProperty - { - get { return 1; } - set { } - } - - public void NotAProperty() { } - - public void SetNotAProperty(string value) { } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/ReturnTypeMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/ReturnTypeMatchingRuleFixture.cs deleted file mode 100644 index 40786cb7..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/ReturnTypeMatchingRuleFixture.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class ReturnTypeMatchingRuleFixture - { - private MethodBase objectToStringMethod; - private MethodBase objectCtor; - private MethodBase stringCopyToMethod; - - [TestInitialize] - public void TestInitialize() - { - objectToStringMethod = typeof(object).GetMethod("ToString"); - objectCtor = typeof(object).GetConstructor(new Type[0]); - stringCopyToMethod = typeof(string).GetMethod("CopyTo"); - } - - [TestMethod] - public void MatchIsDeniedWhenReturnTypeNameDiffers() - { - IMatchingRule matchingRule = new ReturnTypeMatchingRule("System.wichReturnType?"); - Assert.IsFalse(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void MatchIsAcceptedWhenReturnTypeNameIsExactMatch() - { - IMatchingRule matchingRule = new ReturnTypeMatchingRule("System.String"); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - - [TestMethod] - public void MatchIsDeniedWhenReturnTypeIsSpecifiedButNoReturnTypeExistsOnMethodBase() - { - IMatchingRule matchingRule = new ReturnTypeMatchingRule("void"); - Assert.IsFalse(matchingRule.Matches(objectCtor)); - } - - [TestMethod] - public void MatchIsAcceptedWhenReturnTypeIsVoidAndMethodReturnsVoid() - { - IMatchingRule matchingRule = new ReturnTypeMatchingRule("System.Void"); - Assert.IsTrue(matchingRule.Matches(stringCopyToMethod)); - } - - [TestMethod] - public void MatchIsAcceptedForTypeNameWithoutNamespace() - { - IMatchingRule matchingRule = new ReturnTypeMatchingRule("string", true); - Assert.IsTrue(matchingRule.Matches(objectToStringMethod)); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/TagAttributeMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/TagAttributeMatchingRuleFixture.cs deleted file mode 100644 index 9fe8aad6..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/TagAttributeMatchingRuleFixture.cs +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class TagAttributeMatchingRuleFixture - { - [TestMethod] - public void RuleMatchesWhenTagMatches() - { - MethodInfo method = typeof(AnnotatedWithTags).GetMethod("Tagged"); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("Tagged"); - - Assert.IsTrue(rule.Matches(method)); - } - - [TestMethod] - public void RuleCanMatchCaseInsensitive() - { - MethodInfo method = typeof(AnnotatedWithTags).GetMethod("Tagged"); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("taGGed", true); - - Assert.IsTrue(rule.Matches(method)); - } - - [TestMethod] - public void RuleCanMatchesCaseSensitiveByDefault() - { - MethodInfo method = typeof(AnnotatedWithTags).GetMethod("Tagged"); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("taGGed"); - - Assert.IsFalse(rule.Matches(method)); - } - - [TestMethod] - public void RuleDeniesMatchWhenTagTextDoesNotCorrespond() - { - MethodInfo method = typeof(AnnotatedWithTags).GetMethod("Tagged"); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("WhichTag?"); - - Assert.IsFalse(rule.Matches(method)); - } - - [TestMethod] - public void RuleDeniesMatchWhenTagAttributeIsNotDeclared() - { - MethodInfo method = typeof(AnnotatedWithTags).GetMethod("NotTagged"); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("Tagged"); - - Assert.IsFalse(rule.Matches(method)); - } - - [TestMethod] - public void ShouldMatchRuleForTaggedProperty() - { - MethodInfo method = typeof(AnnotatedWithTags).GetProperty("Name").GetGetMethod(); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("Tagged"); - Assert.IsTrue(rule.Matches(method)); - } - - [TestMethod] - public void ShouldMatchRuleForTaggedClass() - { - MethodInfo method1 = typeof(AnnotatedWithTagsOnClass).GetMethod("Method1"); - MethodInfo method2 = typeof(AnnotatedWithTagsOnClass).GetMethod("Method2"); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("Tagged"); - - Assert.IsTrue(rule.Matches(method1)); - Assert.IsTrue(rule.Matches(method2)); - } - - [TestMethod] - public void ShouldMatchForMethodWhenTagIsOnInterface() - { - MethodInfo createMethod = typeof(DaoImpl).GetMethod("Create"); - MethodInfo interfaceMethod = typeof(IDao).GetMethod("Create"); - TagAttributeMatchingRule rule = new TagAttributeMatchingRule("Tag on interface", true); - Assert.IsFalse(rule.Matches(createMethod)); - Assert.IsTrue(rule.Matches(interfaceMethod)); - } - - //[TestMethod] - //public void ShouldMatchForMethodWhenTagIsOnInterfaceViaPolicy() - //{ - // RuleDrivenPolicy policy = new RuleDrivenPolicy("Count tagged calls"); - // policy.RuleSet.Add(new TagAttributeMatchingRule("Tag on interface", true)); - // policy.Handlers.Add(new CallCountHandler()); - - // MethodInfo createMethod = typeof(DaoImpl).GetMethod("Create"); - // List handlers = new List(policy.GetHandlersFor(createMethod)); - // Assert.AreEqual(1, handlers.Count); - // Assert.IsTrue(handlers[0] is CallCountHandler); - //} - - private class AnnotatedWithTags - { - [Tag("Tagged")] - public string Name - { - get { return "Annotated"; } - } - - public void NotTagged() { } - - [Tag("Tagged")] - public void Tagged() { } - } - - [Tag("Tagged")] - private class AnnotatedWithTagsOnClass - { - public void Method1() { } - - public void Method2() { } - } - - private interface IDao - { - [Tag("Tag on interface")] - void Create(); - } - - private class DaoImpl : IDao - { - public void Create() { } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/TypeMatchingRuleFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/TypeMatchingRuleFixture.cs deleted file mode 100644 index ba1eb567..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MatchingRules/TypeMatchingRuleFixture.cs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -using System; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -[module: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1403:FileMayOnlyContainASingleNamespace", Justification = "Test needs multiple namespaces so keep the namespaces and test together")] - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.MatchingRules -{ - [TestClass] - public class TypeMatchingRuleFixture - { - [TestMethod] - public void ShouldMatchExactClassName() - { - TestMatch("MyType1", typeof(MyType1), true); - } - - [TestMethod] - public void ShouldNotMatchWithDifferentClassName() - { - TestMatch("MyType1", typeof(MyType2), false); - } - - [TestMethod] - public void ShouldMatchInDifferentNamespaces() - { - TestMatch("MyType1", typeof(ANestedNamespace.MyType1), true); - } - - [TestMethod] - public void ShouldMatchCaseInsensitive() - { - TestMatch("mytype2", typeof(MyType2), true, true); - } - - [TestMethod] - public void ShouldMatchWithFullTypeName() - { - TestMatch( - typeof(MyType1).FullName, - typeof(MyType1), false, true); - } - - [TestMethod] - public void ShouldNotMatchFullNameWithDifferentNamespace() - { - TestMatch(typeof(MyType1).FullName, typeof(ANestedNamespace.MyType1), false); - } - - [TestMethod] - public void ShouldMatchOneOfMultipleMatchOptions() - { - IMatchingRule rule = new TypeMatchingRule(new MatchingInfo[] - { - new MatchingInfo(typeof(MyType1).FullName), - new MatchingInfo("MYTYPE2", true) - }); - Assert.IsTrue(rule.Matches(typeof(MyType1).GetMethod("TargetMethod"))); - Assert.IsFalse(rule.Matches(typeof(ANestedNamespace.MyType1).GetMethod("TargetMethod"))); - Assert.IsTrue(rule.Matches(typeof(MyType2).GetMethod("TargetMethod"))); - } - - [TestMethod] - public void ShouldNotMatchTypeIfItImplementsMatchingInterface() - { - TestMatch(typeof(IInterfaceOne).FullName, typeof(ANestedNamespace.MyType1), false); - TestMatch(typeof(IInterfaceOne).FullName, typeof(MyType1), false); - } - - public void TestMatch(string typeName, - Type typeToMatch, - bool ignoreCase, - bool shouldMatch) - { - TypeMatchingRule rule = new TypeMatchingRule(typeName, ignoreCase); - MethodInfo methodToMatch = typeToMatch.GetMethod("TargetMethod"); - Assert.AreEqual(shouldMatch, rule.Matches(methodToMatch)); - } - - public void TestMatch(string typeName, - Type typeToMatch, - bool shouldMatch) - { - TestMatch(typeName, typeToMatch, false, shouldMatch); - } - } - - internal class MyType1 - { - public void TargetMethod() { } - } - - namespace ANestedNamespace - { - internal class MyType1 : IInterfaceOne - { - public void TargetMethod() { } - } - } - - internal class MyType2 : IAnotherInterface - { - public void ADifferentTargetMethod() { } - - public void TargetMethod() { } - } - - public interface IInterfaceOne - { - void TargetMethod(); - } - - internal interface IAnotherInterface - { - void ADifferentTargetMethod(); - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/MethodSignatureFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/MethodSignatureFixture.cs deleted file mode 100644 index 791ed4f0..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/MethodSignatureFixture.cs +++ /dev/null @@ -1,253 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - [TestClass] - public class MethodSignatureFixture - { - private IUnityContainer container; - - [TestInitialize] - public void SetUp() - { - container = new UnityContainer(); - } - - [TestMethod] - public void ShouldPassWithNoParameters() - { - ISignatureTestTarget target = GetTarget(); - target.MethodWithNoParameters(); - } - - [TestMethod] - public void ShouldPassWithSimpleInputs() - { - ISignatureTestTarget target = GetTarget(); - target.MethodWithSimpleInputs(1, "two"); - } - - [TestMethod] - public void ShouldPassWithOutParams() - { - ISignatureTestTarget target = GetTarget(); - int first; - string second; - target.MethodWithOutParams(out first, out second); - Assert.AreEqual(1, first); - Assert.AreEqual("two", second); - } - - [TestMethod] - public void ShouldPassWithInOutRef() - { - ISignatureTestTarget target = GetTarget(); - string two; - float three = 1.0f; - - target.MethodWithInOutByrefParams(1, out two, ref three, 5.0M); - Assert.AreEqual("owt", two); - Assert.AreEqual(3.0f, three); - } - - [TestMethod] - public void ShouldPassWithVarArgs() - { - ISignatureTestTarget target = GetTarget(); - target.MethodWithVarArgs(1, "two", "two and a half", "two and three quarters"); - } - - private ISignatureTestTarget GetTarget() - { - var interceptor = new InterfaceInterceptor(); - PolicySet policySet = GetPolicies(); - var target = new SignatureTestTarget(); - IInterceptingProxy proxy = interceptor.CreateProxy(typeof(ISignatureTestTarget), target); - - PipelineManager manager = new PipelineManager(); - foreach (MethodImplementationInfo method in interceptor.GetInterceptableMethods(typeof(ISignatureTestTarget), typeof(SignatureTestTarget))) - { - HandlerPipeline pipeline = new HandlerPipeline( - policySet.GetHandlersFor(method, container)); - manager.SetPipeline(method.ImplementationMethodInfo, pipeline); - } - proxy.AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - - return (ISignatureTestTarget)proxy; - } - - private PolicySet GetPolicies() - { - PolicySet policies = new PolicySet(); - - RuleDrivenPolicy noParamsPolicy - = new RuleDrivenPolicy( - "noParamsPolicy", - new IMatchingRule[] { new MatchByNameRule("MethodWithNoParameters") }, - new string[] { "Handler1" }); - container.RegisterInstance("Handler1", new SignatureCheckingHandler(new Type[] { })); - policies.Add(noParamsPolicy); - - RuleDrivenPolicy simpleInputsPolicy - = new RuleDrivenPolicy( - "simpleInputsPolicy", - new IMatchingRule[] { new MatchByNameRule("MethodWithSimpleInputs") }, - new string[] { "Handler2" }); - container.RegisterInstance( - "Handler2", - new SignatureCheckingHandler(new Type[] { typeof(int), typeof(string) })); - policies.Add(simpleInputsPolicy); - - RuleDrivenPolicy outParamsPolicy - = new RuleDrivenPolicy( - "outParamsPolicy", - new IMatchingRule[] { new MatchByNameRule("MethodWithOutParams") }, - new string[] { "Handler3" }); - container.RegisterInstance( - "Handler3", - new SignatureCheckingHandler(new Type[] { typeof(int).MakeByRefType(), typeof(string).MakeByRefType() })); - policies.Add(outParamsPolicy); - - RuleDrivenPolicy mixedParamsPolicy - = new RuleDrivenPolicy( - "mixedParamsPolicy", - new IMatchingRule[] { new MatchByNameRule("MethodWithInOutByrefParams") }, - new string[] { "Handler4" }); - container.RegisterInstance( - "Handler4", - new SignatureCheckingHandler( - new Type[] - { - typeof(int), - typeof(string).MakeByRefType(), - typeof(float).MakeByRefType(), - typeof(decimal) - })); - policies.Add(mixedParamsPolicy); - - RuleDrivenPolicy varargsParamsPolicy - = new RuleDrivenPolicy( - "varargsParamsPolicy", - new IMatchingRule[] { new MatchByNameRule("MethodWithVarArgs") }, - new string[] { "Handler5" }); - container.RegisterInstance( - "Handler5", - new SignatureCheckingHandler(new Type[] { typeof(int), typeof(string).MakeArrayType() })); - policies.Add(varargsParamsPolicy); - - return policies; - } - } - - public interface ISignatureTestTarget - { - void MethodWithInOutByrefParams(int one, - out string two, - ref float three, - decimal four); - - void MethodWithNoParameters(); - - void MethodWithOutParams(out int first, - out string second); - - void MethodWithSimpleInputs(int one, - string two); - - void MethodWithVarArgs(int one, - params string[] two); - } - - internal class SignatureTestTarget : ISignatureTestTarget - { - public void MethodWithInOutByrefParams(int one, - out string two, - ref float three, - decimal four) - { - two = "owt"; - three = 3.0f; - } - - public void MethodWithNoParameters() { } - - public void MethodWithOutParams(out int first, - out string second) - { - first = 1; - second = "two"; - } - - public void MethodWithSimpleInputs(int one, - string two) { } - - public void MethodWithVarArgs(int one, - params string[] two) { } - } - - internal class MatchAllRule : IMatchingRule - { - public bool Matches(MethodBase member) - { - return true; - } - } - - internal class MatchByNameRule : IMatchingRule - { - private string name; - - public MatchByNameRule(string name) - { - this.name = name; - } - - public bool Matches(MethodBase member) - { - return member.Name == name; - } - } - - internal class SignatureCheckingHandler : ICallHandler - { - private Type[] expectedSignature; - private int order = 0; - - public SignatureCheckingHandler(Type[] expectedSignature) - { - this.expectedSignature = expectedSignature; - } - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - Assert.IsNotNull(expectedSignature); - - Type[] messageSignature = input.MethodBase.GetParameters().Select(info => info.ParameterType).ToArray(); - - Assert.AreEqual(expectedSignature.Length, messageSignature.Length); - for (int i = 0; i < messageSignature.Length; ++i) - { - Assert.AreSame(expectedSignature[i], messageSignature[i], - "Signature for method {0} failed to match for parameter {1}", - input.MethodBase.Name, i); - } - - return getNext()(input, getNext); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ClassWithGenericMethod.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ClassWithGenericMethod.cs deleted file mode 100644 index 56bd5f56..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ClassWithGenericMethod.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class ClassWithGenericMethod : IInterfaceWithGenericMethod - { - public T DoSomething() - { - return default(T); - } - } -} \ No newline at end of file diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/CritialFakeDal.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/CritialFakeDal.Desktop.cs deleted file mode 100644 index 456f6b2f..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/CritialFakeDal.Desktop.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - internal class CritialFakeDal : MarshalByRefObject - { - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/CriticalFakeDal.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/CriticalFakeDal.cs deleted file mode 100644 index 48ffd563..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/CriticalFakeDal.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Specialized; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - [ApplyNoPolicies] - internal partial class CriticalFakeDal - { - private bool throwException; - private double balance = 0.0; - - public bool ThrowException - { - get { return throwException; } - set { throwException = value; } - } - - public double Balance - { - get { return balance; } - set { balance = value; } - } - - public int DoSomething(string x) - { - if (throwException) - { - throw new InvalidOperationException("Catastrophic"); - } - return 42; - } - - public string SomethingCritical() - { - return "Don't intercept me"; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ExceptionEatingHandler.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ExceptionEatingHandler.cs deleted file mode 100644 index 1e7de80c..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ExceptionEatingHandler.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - internal class ExceptionEatingHandler : ICallHandler - { - private int order; - private Exception thrownException; - - public Exception ThrownException - { - get { return thrownException; } - } - - #region ICallHandler Members - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - IMethodReturn result = getNext()(input, getNext); - - if (result.Exception != null) - { - thrownException = result.Exception; - result.Exception = null; - } - - return result; - } - - public int Order - { - get { return order; } - set { order = value; } - } - - #endregion - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ExceptionSwizzlerHandler.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ExceptionSwizzlerHandler.cs deleted file mode 100644 index a181bc95..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ExceptionSwizzlerHandler.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Specialized; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class ExceptionSwizzlerHandler : ICallHandler - { - private int order = 0; - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get - { - return order; - } - set - { - order = value; - } - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - InvokeHandlerDelegate next = getNext(); - return next(input, getNext); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/IInterfaceWithGenericMethod.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/IInterfaceWithGenericMethod.cs deleted file mode 100644 index cfb63e17..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/IInterfaceWithGenericMethod.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public interface IInterfaceWithGenericMethod - { - [TestHandler] - T DoSomething(); - } -} \ No newline at end of file diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/InterfacesOnlyDal.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/InterfacesOnlyDal.cs deleted file mode 100644 index ed1edcc0..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/InterfacesOnlyDal.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Specialized; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class InterfacesOnlyDal : IDal, IMonitor - { - public void Deposit(double amount) - { - } - - #region IDal Members - - public void Withdraw(double amount) - { - } - - #endregion - - #region IMonitor Members - - public void Log(string message) - { - } - - #endregion - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MakeReturnNullHandler.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MakeReturnNullHandler.cs deleted file mode 100644 index b02ae58f..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MakeReturnNullHandler.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class MakeReturnNullHandler : ICallHandler - { - private int order = 0; - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get - { - return order; - } - set - { - order = value; - } - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - IMethodReturn result = input.CreateMethodReturn(null); - return result; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDal.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDal.Desktop.cs deleted file mode 100644 index 13ba721f..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDal.Desktop.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public partial class MockDal : MarshalByRefObject - { - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDal.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDal.cs deleted file mode 100644 index 630cb9ef..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDal.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Specialized; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public interface IDal - { - void Deposit(double amount); - void Withdraw(double amount); - } - - public interface IMonitor - { - void Log(string message); - } - - public partial class MockDal : IDal, IMonitor - { - private bool throwException; - private double balance = 0.0; - - public bool ThrowException - { - get { return throwException; } - set { throwException = value; } - } - - public double Balance - { - get { return balance; } - set { balance = value; } - } - - public int DoSomething(string x) - { - if (throwException) - { - throw new InvalidOperationException("Catastrophic"); - } - return 42; - } - - #region IDal Members - - public void Deposit(double amount) - { - } - - public void Withdraw(double amount) - { - } - - #endregion - - #region IMonitor Members - - public void Log(string message) - { - } - - #endregion - - [ApplyNoPolicies] - public string SomethingCritical() - { - return "Don't intercept me"; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs deleted file mode 100644 index 3ca776d9..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - internal partial class MockDalWithOverloads : MarshalByRefObject - { - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDalWithOverloads.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDalWithOverloads.cs deleted file mode 100644 index 014a791b..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/MockDalWithOverloads.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - internal partial class MockDalWithOverloads - { - public int DoSomething(string s) - { - return 42; - } - - [Tag("NullString")] - public string DoSomething(int i) - { - return (i * 2).ToString(); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/PostCallCountHandler.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/PostCallCountHandler.cs deleted file mode 100644 index 7667a4f2..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/PostCallCountHandler.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - internal class PostCallCountHandler : ICallHandler - { - private int order; - private int callsCompleted = 0; - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - IMethodReturn result = getNext()(input, getNext); - callsCompleted++; - return result; - } - - public int Order - { - get { return order; } - set { order = value; } - } - - public int CallsCompleted - { - get { return callsCompleted; } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ShortcuttingHandler.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ShortcuttingHandler.cs deleted file mode 100644 index 37fe5dd1..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/ShortcuttingHandler.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class ShortcuttingHandler : ICallHandler - { - private string shortcutKey; - private int order = 0; - - public ShortcuttingHandler(string shortcutKey) - { - this.shortcutKey = shortcutKey; - } - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get - { - return order; - } - set - { - order = value; - } - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - string key = (string)input.Inputs[0]; - if (key == shortcutKey) - { - IMethodReturn result = input.CreateMethodReturn(-1); - return result; - } - return getNext()(input, getNext); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TestHandler.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TestHandler.cs deleted file mode 100644 index 83478576..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TestHandler.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class TestHandler : ICallHandler - { - #region ICallHandler Members - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - var methodName = input.MethodBase.Name; - var target = input.Target; - - return getNext()(input, getNext); - } - - public int Order { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TestHandlerAttribute.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TestHandlerAttribute.cs deleted file mode 100644 index b1e1d8d6..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TestHandlerAttribute.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class TestHandlerAttribute : HandlerAttribute - { - public override ICallHandler CreateHandler(IUnityContainer container) - { - return new TestHandler(); - } - } -} \ No newline at end of file diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TypeMatchingAssignmentRule.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TypeMatchingAssignmentRule.cs deleted file mode 100644 index 7c1b359e..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ObjectsUnderTest/TypeMatchingAssignmentRule.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest -{ - public class TypeMatchingAssignmentRule : IMatchingRule - { - private Type matchType; - - public TypeMatchingAssignmentRule(Type matchType) - { - this.matchType = matchType; - } - - public bool Matches(MethodBase member) - { - //if(member is Type) - //{ - // return member == matchType; - //} - - return (member.DeclaringType == matchType); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/ParameterCollectionFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/ParameterCollectionFixture.cs deleted file mode 100644 index 4953fc38..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/ParameterCollectionFixture.cs +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.Utility; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - [TestClass] - public class ParameterCollectionFixture - { - [TestMethod] - public void CanAccessNonFilteredParameters() - { - var collection = - new ParameterCollection( - new object[] { 10, 20, 30, 40, 50 }, - StaticReflection.GetMethodInfo(() => TestMethod(null, null, null, null, null)).GetParameters(), - pi => true); - - Assert.AreEqual(5, collection.Count); - CollectionAssertExtensions.AreEqual( - new[] { 10, 20, 30, 40, 50 }, - collection); - CollectionAssertExtensions.AreEqual( - new[] { 50, 20, 40, 30, 10 }, - new[] { 4, 1, 3, 2, 0 }.Select(i => collection[i]).ToArray()); - CollectionAssertExtensions.AreEqual( - new[] { 50, 20, 40, 30, 10 }, - new[] { "param5", "param2", "param4", "param3", "param1" }.Select(i => collection[i]).ToArray()); - CollectionAssertExtensions.AreEqual( - new[] { "param1", "param2", "param3", "param4", "param5" }, - Enumerable.Range(0, 5).Select(i => collection.ParameterName(i)).ToArray()); - CollectionAssertExtensions.AreEqual( - new[] { "param1", "param2", "param3", "param4", "param5" }, - Enumerable.Range(0, 5).Select(i => collection.GetParameterInfo(i).Name).ToArray()); - } - - [TestMethod] - public void CanAccessFilteredParameters() - { - var param = 1; - var collection = - new ParameterCollection( - new object[] { 10, 20, 30, 40, 50 }, - StaticReflection.GetMethodInfo(() => TestMethod(null, null, null, null, null)).GetParameters(), - pi => param++ % 2 == 1); - - Assert.AreEqual(3, collection.Count); - CollectionAssertExtensions.AreEqual( - new[] { 10, 30, 50 }, - collection); - CollectionAssertExtensions.AreEqual( - new[] { 50, 30, 10 }, - new[] { 2, 1, 0 }.Select(i => collection[i]).ToArray()); - CollectionAssertExtensions.AreEqual( - new[] { 50, 30, 10 }, - new[] { "param5", "param3", "param1" }.Select(i => collection[i]).ToArray()); - CollectionAssertExtensions.AreEqual( - new[] { "param1", "param3", "param5" }, - Enumerable.Range(0, 3).Select(i => collection.ParameterName(i)).ToArray()); - CollectionAssertExtensions.AreEqual( - new[] { "param1", "param3", "param5" }, - Enumerable.Range(0, 3).Select(i => collection.GetParameterInfo(i).Name).ToArray()); - } - - [TestMethod] - public void FilteredCollectionReturnsRightParameterByName() - { - object dummy; - object dummy2; - var inputsCollection = - new ParameterCollection(new object[] { "one", "two", "three", "four" }, - StaticReflection.GetMethodInfo(() => MethodWithOuts(out dummy, null, out dummy2, null)).GetParameters(), - pi => !pi.IsOut); - - Assert.AreEqual(2, inputsCollection.Count); - CollectionAssertExtensions.AreEqual(new object[] { "two", "four" }, inputsCollection); - Assert.AreEqual("two", inputsCollection["param2"]); - Assert.AreEqual("four", inputsCollection["param4"]); - } - - [TestMethod] - public void WhenParameterValueIsNull() - { - var collection = - new ParameterCollection( - new object[] { null }, - StaticReflection.GetMethodInfo(() => TestMethod(null, null, null, null, null)).GetParameters(), - p => true); - - var result = collection.Contains(null); - - Assert.IsTrue(result); - } - - [TestMethod] - public void ContainsParameterWorksAsExpected() - { - var collection = - new ParameterCollection( - new object[] { null }, - StaticReflection.GetMethodInfo(() => TestMethod(null, null, null, null, null)).GetParameters(), - p => true); - - Assert.IsTrue(new[] { "param1", "param2", "param3", "param4", "param5" }.All(collection.ContainsParameter)); - Assert.IsTrue(new[] { "someOtherParam", "notThisOneEither" }.All(p => !collection.ContainsParameter(p))); - } - - public static void TestMethod(object param1, object param2, object param3, object param4, object param5) - { - } - - public static void MethodWithOuts(out object param1, object param2, out object param3, object param4) - { - param1 = null; - param3 = null; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PipelineFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PipelineFixture.cs deleted file mode 100644 index 61920765..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PipelineFixture.cs +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Tests for the HandlerPipeline class - /// - [TestClass] - public class PipelineFixture - { - private CallCountHandler callCountHandler; - private StringReturnRewriteHandler returnHandler; - - [TestMethod] - public void ShouldBeCreatable() - { - HandlerPipeline pipeline = new HandlerPipeline(); - } - - [TestMethod] - public void ShouldBeCreateableWithHandlers() - { - IUnityContainer container = GetContainer(); - PolicySet policies = GetPolicies(container); - HandlerPipeline pipeline - = new HandlerPipeline(policies.GetHandlersFor(GetTargetMemberInfo(), container)); - } - - [TestMethod] - public void ShouldBeInvokable() - { - IUnityContainer container = GetContainer(); - PolicySet policies = GetPolicies(container); - HandlerPipeline pipeline - = new HandlerPipeline(policies.GetHandlersFor(GetTargetMemberInfo(), container)); - - IMethodReturn result = pipeline.Invoke( - MakeCallMessage(), - delegate(IMethodInvocation message, - GetNextHandlerDelegate getNext) - { - return MakeReturnMessage(message); - }); - Assert.IsNotNull(result); - Assert.AreEqual(1, callCountHandler.CallCount); - Assert.AreEqual(returnHandler.ValueToRewriteTo, (string)result.ReturnValue); - } - - public virtual string MyTargetMethod(int i) - { - return string.Format("i = {0}", i); - } - - private PolicySet GetPolicies(IUnityContainer container) - { - RuleDrivenPolicy p - = new RuleDrivenPolicy( - "PipelineTestPolicy", - new IMatchingRule[] { new AlwaysMatchingRule() }, - new string[] { "call count", "rewrite" }); - - return new PolicySet(p); - } - - private IUnityContainer GetContainer() - { - callCountHandler = new CallCountHandler(); - returnHandler = new StringReturnRewriteHandler("REWRITE"); - - IUnityContainer container - = new UnityContainer() - .RegisterInstance("call count", callCountHandler) - .RegisterInstance("rewrite", returnHandler); - - return container; - } - - private MethodImplementationInfo GetTargetMemberInfo() - { - return - new MethodImplementationInfo(null, (MethodInfo)(GetType().GetMember("MyTargetMethod")[0])); - } - - private IMethodInvocation MakeCallMessage() - { - IMethodInvocation invocation = new VirtualMethodInvocation(this, GetTargetMemberInfo().ImplementationMethodInfo, 15); - return invocation; - } - - private IMethodReturn MakeReturnMessage(IMethodInvocation input) - { - IMethodReturn result = input.CreateMethodReturn(MyTargetMethod((int)input.Inputs[0])); - return result; - } - } - - internal class StringReturnRewriteHandler : ICallHandler - { - private int order = 0; - private string valueToRewriteTo; - - public StringReturnRewriteHandler(string valueToRewriteTo) - { - this.valueToRewriteTo = valueToRewriteTo; - } - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public string ValueToRewriteTo - { - get { return valueToRewriteTo; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - IMethodReturn retval = getNext()(input, getNext); - retval.ReturnValue = valueToRewriteTo; - return retval; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyFixture.cs deleted file mode 100644 index 86d13432..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyFixture.cs +++ /dev/null @@ -1,205 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Tests for the Policy class - /// - [TestClass] - public class PolicyFixture - { - //[TestMethod] - //public void ShouldInitializeToEmpty() - //{ - // RuleDrivenPolicy p = new RuleDrivenPolicy("Empty"); - // Assert.AreEqual("Empty", p.Name); - // Assert.AreEqual(0, p.RuleSet.Count); - // Assert.AreEqual(0, p.Handlers.Count); - //} - - //[TestMethod] - //public void ShouldPreserveHandlerOrder() - //{ - // RuleDrivenPolicy p = new RuleDrivenPolicy("OrderedHandlers"); - - // ICallHandler h1 = new Handler1(); - // ICallHandler h2 = new Handler2(); - // ICallHandler h3 = new Handler3(); - - // p.Handlers.Add(h2); - // p.Handlers.Add(h1); - // p.Handlers.Add(h3); - - // Assert.AreEqual(3, p.Handlers.Count); - // Assert.AreSame(h2, p.Handlers[0]); - // Assert.AreSame(h1, p.Handlers[1]); - // Assert.AreSame(h3, p.Handlers[2]); - //} - - [TestMethod] - public void ShouldHaveNoHandlersWhenPolicyDoesntMatch() - { - IMatchingRule[] rules = { }; - IUnityContainer container = CreateConfiguredContainer(); - - InjectionPolicy p = CreatePolicy(container, rules); - - MethodImplementationInfo thisMember = GetMethodImplInfo("ShouldHaveNoHandlersWhenPolicyDoesntMatch"); - List memberHandlers - = new List(p.GetHandlersFor(thisMember, container)); - Assert.AreEqual(0, memberHandlers.Count); - } - - [TestMethod] - public void ShouldGetHandlersInOrderWithGetHandlersFor() - { - IMatchingRule[] rules = { new MemberNameMatchingRule("ShouldGetHandlersInOrderWithGetHandlersFor") }; - IUnityContainer container = CreateConfiguredContainer(); - - InjectionPolicy p = CreatePolicy(container, rules); - - MethodImplementationInfo member = GetMethodImplInfo("ShouldGetHandlersInOrderWithGetHandlersFor"); - - List expectedHandlers = new List(container.ResolveAll()); - List actualHandlers = new List(p.GetHandlersFor(member, container)); - - CollectionAssertExtensions.AreEqual( - expectedHandlers, - actualHandlers, - new TypeComparer()); - } - - [TestMethod] - public void ShouldBeAbleToMatchPropertyGet() - { - IMatchingRule[] rules = { new MemberNameMatchingRule("get_Balance") }; - IUnityContainer container = CreateConfiguredContainer(); - - InjectionPolicy p = CreatePolicy(container, rules); - - PropertyInfo balanceProperty = typeof(MockDal).GetProperty("Balance"); - MethodImplementationInfo getMethod = new MethodImplementationInfo(null, balanceProperty.GetGetMethod()); - - List expectedHandlers = new List(container.ResolveAll()); - List actualHandlers = new List(p.GetHandlersFor(getMethod, container)); - - CollectionAssertExtensions.AreEqual( - expectedHandlers, - actualHandlers, - new TypeComparer()); - } - - private static InjectionPolicy CreatePolicy(IUnityContainer container, IMatchingRule[] rules) - { - InjectionPolicy p - = new RuleDrivenPolicy(rules, new string[] { "handler1", "handler2", "handler3" }); - return p; - } - - private static IUnityContainer CreateConfiguredContainer() - { - IUnityContainer container = - new UnityContainer() - .RegisterType("handler1") - .RegisterType("handler2") - .RegisterType("handler3"); - return container; - } - - private static MethodImplementationInfo GetMethodImplInfo(string methodName) - { - return new MethodImplementationInfo(null, - typeof(T).GetMethod(methodName)); - } - } - - public class Handler1 : ICallHandler - { - private int order = 0; - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - throw new NotImplementedException(); - } - } - - public class Handler2 : ICallHandler - { - private int order = 0; - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - throw new NotImplementedException(); - } - } - - public class Handler3 : ICallHandler - { - private int order = 0; - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - throw new NotImplementedException(); - } - } - - public interface IYetAnotherInterface - { - void MyMethod(); - } - - public class YetAnotherMyType : IYetAnotherInterface - { - public void MyMethod() { } - } - - public class TypeComparer : IComparer - { - public int Compare(object x, object y) - { - if (x.GetType() == y.GetType()) - { - return 0; - } - return -1; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/HandlerPipelineKeyFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/HandlerPipelineKeyFixture.cs deleted file mode 100644 index 5555bda6..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/HandlerPipelineKeyFixture.cs +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Utility; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection -{ - [TestClass] - public class HandlerPipelineKeyFixture - { - [TestMethod] - public void KeysForSameMethodAreEqual() - { - var key1 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(b => b.Method1())); - var key2 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(b => b.Method1())); - - Assert.AreEqual(key1, key2); - } - - [TestMethod] - public void KeysForSameMethodReflectedFromDifferentTypesAreEqual() - { - var key1 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(b => b.Method2())); - var key2 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(b => b.Method2())); - - Assert.AreEqual(key1, key2); - } - - [TestMethod] - public void KeysForSameMethodReflectedFromDifferentTypesOnDifferentModulesAreEqual() - { - var key1 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(o => o.ToString())); - var key2 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(b => b.ToString())); - - Assert.AreEqual(key1, key2); - } - - [TestMethod] - public void KeysForDifferentMethodsAreNotEqual() - { - var key1 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(b => b.Method1())); - var key2 = HandlerPipelineKey.ForMethod(StaticReflection.GetMethodInfo(b => b.Method2())); - - Assert.AreNotEqual(key1, key2); - } - - [TestMethod] - public void KeysForOverridenMethodReflectedFromDifferentTypesAreNotEqual() - { - // using plain reflection - lambdas get optimized so we cannot get the override through them - var key1 = HandlerPipelineKey.ForMethod(typeof(Base).GetMethod("Method1")); - var key2 = HandlerPipelineKey.ForMethod(typeof(Derived).GetMethod("Method1")); - - Assert.AreNotEqual(key1, key2); - } - - public class Base - { - public virtual void Method1() { } - public virtual void Method2() { } - public override string ToString() - { - return base.ToString(); - } - } - - public class Derived : Base - { - public override void Method1() - { - base.Method1(); - } - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionBehaviorFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionBehaviorFixture.cs deleted file mode 100644 index 17680981..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionBehaviorFixture.cs +++ /dev/null @@ -1,191 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection -{ - public class ContainerConfiguredForPolicyInjectionContext - { - [TestInitialize] - public void Setup() - { - Arrange(); - } - - protected virtual void Arrange() - { - Container = - new UnityContainer() - .RegisterType("derived", - new Interceptor(), - new InterceptionBehavior()) - .RegisterType("derived-nooverride", - new Interceptor(), - new InterceptionBehavior()) - .RegisterType( - new Interceptor(), - new InterceptionBehavior()) - .AddNewExtension() - .Configure() - .AddPolicy("base") - .AddMatchingRule(new TypeMatchingRule(typeof(BaseClass))) - .AddMatchingRule(new MemberNameMatchingRule("InterceptedMethod")) - .AddCallHandler(new AppendSuffixCallHandler { Suffix = "-basehandler", Order = 1 }) - .Interception - .AddPolicy("derived-no-override") - .AddMatchingRule(new TypeMatchingRule(typeof(DerivedWithNoOverrideClass))) - .AddMatchingRule(new MemberNameMatchingRule("InterceptedMethod")) - .AddCallHandler(new AppendSuffixCallHandler { Suffix = "-derivednooverridehandler", Order = 2 }) - .Interception - .AddPolicy("derived") - .AddMatchingRule(new TypeMatchingRule(typeof(DerivedClass))) - .AddMatchingRule(new MemberNameMatchingRule("InterceptedMethod")) - .AddCallHandler(new AppendSuffixCallHandler { Suffix = "-derivedhandler", Order = 3 }) - .Interception - .Container; - } - - public IUnityContainer Container { get; set; } - } - - [TestClass] - public class GivenInterceptedInstanceOfDerivedTypeWithNoOverride : ContainerConfiguredForPolicyInjectionContext - { - public BaseClass Instance { get; set; } - - protected override void Arrange() - { - base.Arrange(); - - Instance = Container.Resolve("derived-nooverride"); - } - - [TestMethod] - [Ignore] // not supported yet - public void WhenInvokingMethodFromReferenceToTheBaseClass_ThenInterceptorsForTheBaseAndDerivedClassAreApplied() - { - var result = ((BaseClass)Instance).InterceptedMethod(); - - Assert.AreEqual("base-derivednooverridehandler-basehandler", result); - } - - [TestMethod] - [Ignore] // not supported yet - public void WhenInvokingMethodFromReferenceToTheDerivedClass_ThenInterceptorsForTheBaseAndDerivedClassAreApplied() - { - var result = ((DerivedWithNoOverrideClass)Instance).InterceptedMethod(); - - Assert.AreEqual("base-derivednooverridehandler-basehandler", result); - } - } - - [TestClass] - public class GivenInterceptedInstanceOfDerivedTypeWithOverride : ContainerConfiguredForPolicyInjectionContext - { - public BaseClass Instance { get; set; } - - protected override void Arrange() - { - base.Arrange(); - - Instance = Container.Resolve("derived"); - } - - [TestMethod] - [Ignore] // not supported yet - public void WhenInvokingMethodFromReferenceToTheBaseClass_ThenInterceptorsForTheBaseAndDerivedClassAreApplied() - { - var result = ((BaseClass)Instance).InterceptedMethod(); - - Assert.AreEqual("base-derivedhandler-basehandler", result); - } - - [TestMethod] - [Ignore] // not supported yet - public void WhenInvokingMethodFromReferenceToTheDerivedClass_ThenInterceptorsForTheBaseAndDerivedClassAreApplied() - { - var result = ((DerivedClass)Instance).InterceptedMethod(); - - Assert.AreEqual("base-derivedhandler-basehandler", result); - } - } - - public class BaseClass - { - public virtual string InterceptedMethod() - { - return "base"; - } - - [AppendSuffixCallHandlerNoInheritance(Suffix = "-basehandler", Order = 1)] - public virtual string AttributeNoInheritanceInterceptedMethod() - { - return "base"; - } - - [AppendSuffixCallHandlerInheritance(Suffix = "-basehandler", Order = 1)] - public virtual string AttributeInheritanceInterceptedMethod() - { - return "base"; - } - } - - public class DerivedClass : BaseClass - { - public override string InterceptedMethod() - { - return "derived"; - } - - [AppendSuffixCallHandlerNoInheritance(Suffix = "-derivedhandler", Order = 2)] - public new virtual string AttributeNoInheritanceInterceptedMethod() - { - return "base"; - } - - [AppendSuffixCallHandlerInheritance(Suffix = "-derivedhandler", Order = 2)] - public new virtual string AttributeInheritanceInterceptedMethod() - { - return "base"; - } - } - - public class DerivedWithNoOverrideClass : BaseClass - { - } - - public class AppendSuffixCallHandler : ICallHandler - { - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - var methodReturn = getNext()(input, getNext); - if (methodReturn.ReturnValue != null && methodReturn.ReturnValue is string) - { - methodReturn.ReturnValue = ((string)methodReturn.ReturnValue) + this.Suffix; - } - - return methodReturn; - } - - public int Order { get; set; } - - public string Suffix { get; set; } - } - - [AttributeUsage(AttributeTargets.Method, Inherited = false)] - public class AppendSuffixCallHandlerNoInheritanceAttribute : HandlerAttribute - { - public override ICallHandler CreateHandler(IUnityContainer container) - { - return new AppendSuffixCallHandler { Suffix = this.Suffix, Order = this.Order }; - } - - public string Suffix { get; set; } - } - - [AttributeUsage(AttributeTargets.Method, Inherited = true)] - public class AppendSuffixCallHandlerInheritanceAttribute : AppendSuffixCallHandlerNoInheritanceAttribute - { - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs deleted file mode 100644 index f00eff11..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection -{ - public partial class PolicyInjectionWithGenericMethodsFixture - { - [TestMethod] - public void TransparentProxyCanInterceptNonGenericMethod() - { - CanInterceptNonGenericMethod(); - } - - [TestMethod] - public void TransparentProxyCanInterceptGenericMethod() - { - CanInterceptGenericMethod(); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs deleted file mode 100644 index 1072b44e..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection -{ - /// - /// Summary description for PolicyInjectionWithGenericMethodsFixture - /// - [TestClass] - public partial class PolicyInjectionWithGenericMethodsFixture - { - [TestCleanup] - public void Teardown() - { - GlobalCountCallHandler.Calls.Clear(); - } - - [TestMethod] - public void InterfaceInterceptorCanInterceptNonGenericMethod() - { - CanInterceptNonGenericMethod(); - } - - [TestMethod] - public void InterfaceInterceptorCanInterceptGenericMethod() - { - CanInterceptGenericMethod(); - } - - [TestMethod] - public void VirtualMethodCanInterceptNonGenericMethod() - { - CanInterceptNonGenericMethod(); - } - - [TestMethod] - public void VirtualMethodCanInterceptGenericMethod() - { - CanInterceptGenericMethod(); - } - - private static IUnityContainer CreateContainer() - where TInterceptor : IInterceptor - { - return new UnityContainer() - .AddNewExtension() - .RegisterType( - new Interceptor(), - new InterceptionBehavior()); - } - - private static void CanInterceptNonGenericMethod() - where TInterceptor : IInterceptor - { - var container = CreateContainer(); - - var instance = container.Resolve(); - - instance.DoSomethingElse("boo"); - - Assert.AreEqual(1, GlobalCountCallHandler.Calls["NonGeneric"]); - } - - private static void CanInterceptGenericMethod() - where TInterceptor : IInterceptor - { - var container = CreateContainer(); - - var instance = container.Resolve(); - - instance.DoSomething(); - instance.DoSomething(); - - Assert.AreEqual(2, GlobalCountCallHandler.Calls["Generic"]); - } - } - - public interface IInterfaceWithGenericMethod - { - [GlobalCountCallHandler(HandlerName = "Generic")] - T DoSomething(); - - [GlobalCountCallHandler(HandlerName = "NonGeneric")] - void DoSomethingElse(string param); - } - - public class MyClass : IInterfaceWithGenericMethod - { - public virtual T DoSomething() - { - return default(T); - } - - public virtual void DoSomethingElse(string param) - { - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs deleted file mode 100644 index 8eab81a5..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection -{ - public partial class VirtualMethodOverrideFixture - { - [TestMethod] - public void CanInterceptDoSomethingMethodWithTransparentProxy() - { - var container = CreateContainer(); - AddInterceptDoSomethingPolicy(container); - InterceptWith(container); - - var log = container.Resolve>>(); - - var target = container.Resolve(); - target.DoSomething(); - - AssertOneHandlerCreated(log); - var handlerId = GetHandlerId(log); - - Assert.IsTrue(log.ContainsKey(handlerId)); - Assert.AreEqual(1, log[handlerId].Count); - } - - public partial class RootClass : MarshalByRefObject - { - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/VirtualMethodOverrideFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/VirtualMethodOverrideFixture.cs deleted file mode 100644 index edb6b6c9..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicyInjection/VirtualMethodOverrideFixture.cs +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.PolicyInjection -{ - /// - /// Tests to verify behavior of call handlers in the presence of - /// overridden virtual methods. - /// - [TestClass] - public partial class VirtualMethodOverrideFixture - { - private static string GetHandlerId(IDictionary> log) - { - return log["created"][0]; - } - - private static void AssertOneHandlerCreated(IDictionary> log) - { - Assert.IsTrue(log.ContainsKey("created")); - Assert.AreEqual(1, log["created"].Count); - } - - [TestMethod] - public void CallHandlerRunsWhenCallingThroughBaseClassReference() - { - var container = CreateContainer(); - container.RegisterType(); - AddInterceptDoSomethingPolicy(container); - - InterceptWith(container); - - var log = container.Resolve>>(); - - var target = container.Resolve(); - var baseRef = (RootClass)target; - - baseRef.DoSomething(); - - Assert.IsTrue(log.ContainsKey("created"), "No handlers were created"); - - Assert.IsTrue(log.Keys.Any(k => log["created"].Any(entry => entry == k)), - "Log doesn't contain any calls to handlers"); - } - - #region Classes to intercept - - public partial class RootClass - { - public virtual string DoSomething() - { - return "RootClass.DoSomething"; - } - } - - public class DerivedClass : RootClass - { - public override string DoSomething() - { - return "Derived " + base.DoSomething(); - } - } - - public class DoubleDerivedClass : DerivedClass - { - public override string DoSomething() - { - return "DoubleDerived.DoSomething"; - } - } - - #endregion - - #region Dummy call handler for testing - - public class TestingCallHandler : ICallHandler - { - private readonly Dictionary> log; - - public TestingCallHandler(Dictionary> log) - { - this.log = log; - Log("created", Id); - } - - /// - /// Implement this method to execute your handler processing. - /// - /// Inputs to the current call to the target. - /// Delegate to execute to get the next delegate in the handler - /// chain. - /// Return value from the target. - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - Log(Id, "invoked method " + input.MethodBase.DeclaringType.FullName + input.MethodBase.Name); - return getNext()(input, getNext); - } - - public int Order { get; set; } - - private string Id - { - get - { - return GetHashCode().ToString(); - } - } - - private void Log(string key, string value) - { - if (!log.ContainsKey(key)) - { - log[key] = new List(); - } - log[key].Add(value); - } - } - - #endregion - - private static IUnityContainer CreateContainer() - { - var container = new UnityContainer() - .AddNewExtension() - .RegisterType("Testing") - .RegisterInstance(new Dictionary>()); - return container; - } - - private static void AddInterceptDoSomethingPolicy(IUnityContainer container) - { - container.Configure() - .AddPolicy("InterceptDoSomething") - .AddMatchingRule(new MemberNameMatchingRule("DoSomething")) - .AddCallHandler("Testing"); - } - - private static void InterceptWith(IUnityContainer container) - where TInterceptor : IInterceptor, new() - { - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicySetFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicySetFixture.cs deleted file mode 100644 index 4dc03b94..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/PolicySetFixture.cs +++ /dev/null @@ -1,379 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Tests for the PolicySet class. - /// - [TestClass] - public class PolicySetFixture - { - private IUnityContainer container; - - [TestInitialize] - public void SetUp() - { - container = new UnityContainer(); - } - - //[TestMethod] - //public void ShouldInitializeToEmpty() - //{ - // PolicySet policies = new PolicySet(); - - // Assert.IsFalse(policies.AppliesTo(GetType())); - // MethodInfo thisMember = GetType().GetMethod("ShouldInitializeToEmpty"); - // List handlers = new List(policies.GetHandlersFor(thisMember)); - // Assert.AreEqual(0, handlers.Count); - //} - - [TestMethod] - public void ShouldBeAbleToAddOnePolicy() - { - container - .RegisterInstance("Handler1", new Handler1()) - .RegisterInstance("Handler2", new Handler2()); - - PolicySet policies = new PolicySet(); - - RuleDrivenPolicy p - = new RuleDrivenPolicy( - "NameMatching", - new IMatchingRule[] { new MemberNameMatchingRule("ShouldBeAbleToAddOnePolicy") }, - new string[] { "Handler1", "Handler2" }); - - policies.Add(p); - - MethodImplementationInfo thisMember = GetMethodImplInfo("ShouldBeAbleToAddOnePolicy"); - List handlers = - new List(policies.GetHandlersFor(thisMember, container)); - - Assert.AreEqual(2, handlers.Count); - Assert.IsTrue(typeof(Handler1) == handlers[0].GetType()); - Assert.IsTrue(typeof(Handler2) == handlers[1].GetType()); - } - - [TestMethod] - public void ShouldMatchPolicyByTypeName() - { - PolicySet policies = GetMultiplePolicySet(); - - MethodImplementationInfo nameDoesntMatchMember = GetMethodImplInfo("NameDoesntMatch"); - MethodImplementationInfo nameMatchMember = GetMethodImplInfo("NameMatch"); - - List nameDoesntMatchHandlers = - new List(policies.GetHandlersFor(nameDoesntMatchMember, container)); - List nameMatchHandlers = - new List(policies.GetHandlersFor(nameMatchMember, container)); - - Assert.AreEqual(1, nameDoesntMatchHandlers.Count); - Assert.IsTrue(typeof(Handler1) == nameDoesntMatchHandlers[0].GetType()); - - Assert.AreEqual(2, nameMatchHandlers.Count); - Assert.IsTrue(typeof(Handler1) == nameMatchHandlers[0].GetType()); - Assert.IsTrue(typeof(Handler2) == nameMatchHandlers[1].GetType()); - } - - [TestMethod] - public void ShouldMatchPolicyByMethodName() - { - PolicySet policies = GetMultiplePolicySet(); - - MethodImplementationInfo noMatchMember = GetMethodImplInfo("NoMatch"); - MethodImplementationInfo nameMatchMember = GetMethodImplInfo("NameMatch"); - List noMatchHandlers = - new List(policies.GetHandlersFor(noMatchMember, container)); - List nameMatchHandlers = - new List(policies.GetHandlersFor(nameMatchMember, container)); - - Assert.AreEqual(0, noMatchHandlers.Count); - Assert.AreEqual(1, nameMatchHandlers.Count); - Assert.IsTrue(typeof(Handler2) == nameMatchHandlers[0].GetType()); - } - - [TestMethod] - public void ShouldNotMatchPolicyWhenNoRulesMatch() - { - PolicySet policies = GetMultiplePolicySet(); - - MethodImplementationInfo noMatchMember = GetMethodImplInfo("NoMatchHere"); - List noMatchHandlers = - new List(policies.GetHandlersFor(noMatchMember, container)); - Assert.AreEqual(0, noMatchHandlers.Count); - } - - [TestMethod] - public void ShouldGetCorrectHandlersGivenAttributesOnInterfaceMethodsAfterAddingAttributeDrivenPolicy() - { - PolicySet policies = new PolicySet(); - - List oneHandlers - = new List(policies.GetHandlersFor(GetMethodImplInfo("One"), container)); - - Assert.AreEqual(0, oneHandlers.Count); - - policies.Add(new AttributeDrivenPolicy()); - - MethodImplementationInfo oneInfo = new MethodImplementationInfo( - typeof(IOne).GetMethod("One"), - typeof(TwoType).GetMethod("One")); - - oneHandlers - = new List(policies.GetHandlersFor(oneInfo, container)); - - Assert.AreEqual(2, oneHandlers.Count); - Assert.IsTrue(oneHandlers[0] is MarkerCallHandler); - Assert.IsTrue(oneHandlers[1] is MarkerCallHandler); - - Assert.AreEqual("IOneOne", ((MarkerCallHandler)oneHandlers[0]).HandlerName); - Assert.AreEqual("MethodOneOverride", ((MarkerCallHandler)oneHandlers[1]).HandlerName); - } - - [TestMethod] - public void ShouldNotDuplicateHandlersWhenCreatingViaInterface() - { - container - .RegisterInstance("Handler1", new CallCountHandler()) - .RegisterInstance("Handler2", new CallCountHandler()); - - RuleDrivenPolicy policy - = new RuleDrivenPolicy("MatchesInterfacePolicy", - new IMatchingRule[] { new TypeMatchingRule("ITwo") }, - new string[] { "Handler1", "Handler2" }); - - PolicySet policies = new PolicySet(policy); - MethodImplementationInfo twoInfo = new MethodImplementationInfo( - typeof(ITwo).GetMethod("Two"), typeof(TwoType).GetMethod("Two")); - - List handlers - = new List(policies.GetHandlersFor(twoInfo, container)); - Assert.AreEqual(2, handlers.Count); - } - - [TestMethod] - public void HandlersOrderedProperly() - { - RuleDrivenPolicy policy - = new RuleDrivenPolicy("MatchesInterfacePolicy", - new IMatchingRule[] { new TypeMatchingRule("ITwo") }, - new string[] { "Handler1", "Handler2", "Handler3", "Handler4" }); - - ICallHandler handler1 = new CallCountHandler(); - handler1.Order = 3; - - ICallHandler handler2 = new CallCountHandler(); - handler2.Order = 0; - - ICallHandler handler3 = new CallCountHandler(); - handler3.Order = 2; - - ICallHandler handler4 = new CallCountHandler(); - handler4.Order = 1; - - container - .RegisterInstance("Handler1", handler1) - .RegisterInstance("Handler2", handler2) - .RegisterInstance("Handler3", handler3) - .RegisterInstance("Handler4", handler4); - - PolicySet policies = new PolicySet(policy); - - MethodImplementationInfo twoInfo = new MethodImplementationInfo( - typeof(ITwo).GetMethod("Two"), typeof(TwoType).GetMethod("Two")); - List handlers - = new List(policies.GetHandlersFor(twoInfo, container)); - - Assert.AreSame(handler4, handlers[0]); - Assert.AreSame(handler3, handlers[1]); - Assert.AreSame(handler1, handlers[2]); - Assert.AreSame(handler2, handlers[3]); - } - - [TestMethod] - public void HandlersOrderedProperlyUsingRelativeAndAbsoluteOrder() - { - RuleDrivenPolicy policy - = new RuleDrivenPolicy("MatchesInterfacePolicy", - new IMatchingRule[] { new TypeMatchingRule("ITwo") }, - new string[] { "Handler1", "Handler2", "Handler3", "Handler4", "Handler5", "Handler6" }); - - ICallHandler handler1 = new CallCountHandler(); - handler1.Order = 0; - - ICallHandler handler2 = new CallCountHandler(); - handler2.Order = 3; - - ICallHandler handler3 = new CallCountHandler(); - handler3.Order = 3; - - ICallHandler handler4 = new CallCountHandler(); - handler4.Order = 2; - - ICallHandler handler5 = new CallCountHandler(); - handler5.Order = 4; - - ICallHandler handler6 = new CallCountHandler(); - handler6.Order = 1; - - container - .RegisterInstance("Handler1", handler1) - .RegisterInstance("Handler2", handler2) - .RegisterInstance("Handler3", handler3) - .RegisterInstance("Handler4", handler4) - .RegisterInstance("Handler5", handler5) - .RegisterInstance("Handler6", handler6); - - PolicySet policies = new PolicySet(policy); - - MethodImplementationInfo twoInfo = new MethodImplementationInfo( - typeof(ITwo).GetMethod("Two"), typeof(TwoType).GetMethod("Two")); - - List handlers - = new List(policies.GetHandlersFor(twoInfo, container)); - - Assert.AreEqual(handler6, handlers[0]); - Assert.AreEqual(handler4, handlers[1]); - Assert.AreEqual(handler2, handlers[2]); - Assert.AreEqual(handler3, handlers[3]); - Assert.AreEqual(handler5, handlers[4]); - Assert.AreEqual(handler1, handlers[5]); - } - - private PolicySet GetMultiplePolicySet() - { - container - .RegisterInstance("Handler1", new Handler1()) - .RegisterInstance("Handler2", new Handler2()); - - RuleDrivenPolicy typeMatchPolicy - = new RuleDrivenPolicy("MatchesType", - new IMatchingRule[] { new TypeMatchingRule(typeof(MatchesByType)) }, - new string[] { "Handler1" }); - - RuleDrivenPolicy nameMatchPolicy - = new RuleDrivenPolicy("MatchesName", - new IMatchingRule[] { new MemberNameMatchingRule("NameMatch") }, - new string[] { "Handler2" }); - - return new PolicySet(typeMatchPolicy, nameMatchPolicy); - } - - private MethodInfo GetNameDoesntMatchMethod() - { - return typeof(MatchesByType).GetMethod("NameDoesntMatch"); - } - - private MethodImplementationInfo GetMethodImplInfo(string methodName) - { - return new MethodImplementationInfo(null, - typeof(T).GetMethod(methodName)); - } - } - - internal class MatchesByType - { - // Matches type policy - public void NameDoesntMatch() { } - - // matches type & name policies - public void NameMatch() { } - } - - internal class MatchesByMemberName - { - public void NameMatch() { } - - public void NoMatch() { } - } - - internal class NoMatchAnywhere - { - public void NoMatchHere() { } - } - - public interface IOne - { - [MarkerCallHandler("IOneOne")] - void One(); - } - - public interface ITwo - { - void Two(); - } - - public class OneType : IOne - { - public void MethodOne() { } - - public virtual void MethodTwo() { } - - public virtual void One() { } - } - - public class TwoType : OneType, ITwo - { - public void BarOne() { } - - public override void MethodTwo() { } - - [MarkerCallHandler("MethodOneOverride")] - public override void One() { } - - public void Two() { } - } - - public class MarkerCallHandler : ICallHandler - { - private string handlerName; - private int order = 0; - - public MarkerCallHandler(string handlerName) - { - this.handlerName = handlerName; - } - - public string HandlerName - { - get { return handlerName; } - set { handlerName = value; } - } - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get { return order; } - set { order = value; } - } - - public IMethodReturn Invoke(IMethodInvocation input, - GetNextHandlerDelegate getNext) - { - return getNext()(input, getNext); - } - } - - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Method)] - public class MarkerCallHandlerAttribute : HandlerAttribute - { - private string handlerName; - - public MarkerCallHandlerAttribute(string handlerName) - { - this.handlerName = handlerName; - } - - public override ICallHandler CreateHandler(IUnityContainer ignored) - { - return new MarkerCallHandler(this.handlerName); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/Properties/AssemblyInfo.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/Properties/AssemblyInfo.cs deleted file mode 100644 index 514722ce..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Security; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Tests.Unity.Interception")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Tests.Unity.Interception")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011,2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8fea423a-5107-4a95-8391-57c468e04d7e")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/IntegrationFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/IntegrationFixture.cs deleted file mode 100644 index 2a20f7f7..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/IntegrationFixture.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.TransparentProxyInterception -{ - [TestClass] - public class IntegrationFixture - { - [TestMethod] - public void CanInterceptGenericMethodWithHandlerAttributeThroughInterface() - { - var container = new UnityContainer(); - container.AddNewExtension(); - container.RegisterType( - new Interceptor(new TransparentProxyInterceptor())); - - var instance = container.Resolve(); - - var result = instance.DoSomething(); - - Assert.AreEqual(0, result); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/InterceptingRealProxyFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/InterceptingRealProxyFixture.cs deleted file mode 100644 index 37afe691..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/InterceptingRealProxyFixture.cs +++ /dev/null @@ -1,312 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.ComponentModel; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.TransparaentProxyInterception.Tests -{ - [TestClass] - public class InterceptingRealProxyFixture - { - [TestMethod] - public void CanProxyMBROMethods() - { - MBROWithOneMethod original = new MBROWithOneMethod(); - MBROWithOneMethod proxy = new InterceptingRealProxy(original, typeof(MBROWithOneMethod)) - .GetTransparentProxy() as MBROWithOneMethod; - - Assert.IsNotNull(proxy); - } - - [TestMethod] - public void ProxyImplementsIInterceptingProxy() - { - MBROWithOneMethod original = new MBROWithOneMethod(); - MBROWithOneMethod proxy = new InterceptingRealProxy(original, typeof(MBROWithOneMethod)) - .GetTransparentProxy() as MBROWithOneMethod; - - Assert.IsNotNull(proxy as IInterceptingProxy); - } - - [TestMethod] - public void CanInterceptMethodsThroughProxy() - { - CallCountInterceptionBehavior interceptor = new CallCountInterceptionBehavior(); - - MBROWithOneMethod original = new MBROWithOneMethod(); - MBROWithOneMethod intercepted = new InterceptingRealProxy(original, typeof(MBROWithOneMethod)) - .GetTransparentProxy() as MBROWithOneMethod; - - IInterceptingProxy proxy = (IInterceptingProxy)intercepted; - proxy.AddInterceptionBehavior(interceptor); - - int result = intercepted.DoSomething(5); - - Assert.AreEqual(5 * 3, result); - Assert.AreEqual(1, interceptor.CallCount); - } - - [TestMethod] - public void ProxyInterceptsAddingAHandlerToAnEvent() - { - // arrange - CallCountInterceptionBehavior interceptor - = new CallCountInterceptionBehavior(); - - MBROWithAnEvent original = new MBROWithAnEvent(); - MBROWithAnEvent intercepted = new InterceptingRealProxy(original, typeof(MBROWithAnEvent)) - .GetTransparentProxy() as MBROWithAnEvent; - - ((IInterceptingProxy)intercepted).AddInterceptionBehavior(interceptor); - - // act - intercepted.SomeEvent += (s, a) => { }; - - // assert - Assert.AreEqual(1, interceptor.CallCount); - } - - [TestMethod] - public void ProxySendsOriginalWhenRaisingEvent() - { - // arrange - CallCountInterceptionBehavior interceptor = new CallCountInterceptionBehavior(); - - MBROWithAnEvent original = new MBROWithAnEvent(); - MBROWithAnEvent intercepted = new InterceptingRealProxy(original, typeof(MBROWithAnEvent)) - .GetTransparentProxy() as MBROWithAnEvent; - - ((IInterceptingProxy)intercepted).AddInterceptionBehavior(interceptor); - object sender = null; - intercepted.SomeEvent += (s, a) => { sender = s; }; - - // act - intercepted.TriggerIt(); - - // assert - Assert.AreSame(original, sender); - Assert.AreEqual(2, interceptor.CallCount); // adding + calling TriggerIt - } - - [TestMethod] - public void CanCreateProxyWithAdditionalInterfaces() - { - MBROWithOneMethod original = new MBROWithOneMethod(); - MBROWithOneMethod proxy = - new InterceptingRealProxy(original, typeof(MBROWithOneMethod), typeof(InterfaceOne)) - .GetTransparentProxy() as MBROWithOneMethod; - - Assert.IsTrue(proxy is InterfaceOne); - } - - [TestMethod] - public void InvokingMethodOnAdditionalInterfaceThrowsIfNotHandledByInterceptor() - { - MBROWithOneMethod original = new MBROWithOneMethod(); - InterfaceOne proxy = - new InterceptingRealProxy(original, typeof(MBROWithOneMethod), typeof(InterfaceOne)) - .GetTransparentProxy() as InterfaceOne; - - try - { - proxy.Something(); - Assert.Fail("should have thrown"); - } - catch (InvalidOperationException) - { - // expected - } - } - - [TestMethod] - public void CanSuccessfullyInvokeAnAdditionalInterfaceMethodIfAnInterceptorDoesNotForwardTheCall() - { - MBROWithOneMethod original = new MBROWithOneMethod(); - InterfaceOne proxy = - new InterceptingRealProxy(original, typeof(MBROWithOneMethod), typeof(InterfaceOne)) - .GetTransparentProxy() as InterfaceOne; - bool invoked = false; - ((IInterceptingProxy)proxy).AddInterceptionBehavior( - new DelegateInterceptionBehavior( - (input, getNext) => { invoked = true; return input.CreateMethodReturn(null); })); - - proxy.Something(); - - Assert.IsTrue(invoked); - } - - [TestMethod] - public void CanImplementINotifyPropertyChanged() - { - MBROWithOneProperty target = new MBROWithOneProperty(); - MBROWithOneProperty proxy = - new InterceptingRealProxy(target, typeof(MBROWithOneProperty), typeof(INotifyPropertyChanged)) - .GetTransparentProxy() as MBROWithOneProperty; - ((IInterceptingProxy)proxy).AddInterceptionBehavior(new NaiveINotifyPropertyChangedInterceptionBehavior()); - - string changeProperty; - PropertyChangedEventHandler handler = (sender, args) => changeProperty = args.PropertyName; - - changeProperty = null; - ((INotifyPropertyChanged)proxy).PropertyChanged += handler; - - proxy.TheProperty = 100; - - Assert.AreEqual(100, proxy.TheProperty); - Assert.AreEqual("TheProperty", changeProperty); - - changeProperty = null; - ((INotifyPropertyChanged)proxy).PropertyChanged -= handler; - - proxy.TheProperty = 200; - - Assert.AreEqual(200, proxy.TheProperty); - Assert.AreEqual(null, changeProperty); - } - - [TestMethod] - public void CanImplementINotifyPropertyChangedThroughInterface() - { - ObjectWithOnePropertyForImplicitlyImplementedInterface target = new ObjectWithOnePropertyForImplicitlyImplementedInterface(); - IInterfaceWithOneProperty proxy = - new InterceptingRealProxy(target, typeof(IInterfaceWithOneProperty), typeof(INotifyPropertyChanged)) - .GetTransparentProxy() as IInterfaceWithOneProperty; - ((IInterceptingProxy)proxy).AddInterceptionBehavior(new NaiveINotifyPropertyChangedInterceptionBehavior()); - - string changeProperty; - PropertyChangedEventHandler handler = (sender, args) => changeProperty = args.PropertyName; - - changeProperty = null; - ((INotifyPropertyChanged)proxy).PropertyChanged += handler; - - proxy.TheProperty = 100; - - Assert.AreEqual(100, proxy.TheProperty); - Assert.AreEqual("TheProperty", changeProperty); - - changeProperty = null; - ((INotifyPropertyChanged)proxy).PropertyChanged -= handler; - - proxy.TheProperty = 200; - - Assert.AreEqual(200, proxy.TheProperty); - Assert.AreEqual(null, changeProperty); - } - - [TestMethod] - public void CanImplementINotifyPropertyChangedThroughExplicitInterface() - { - ObjectWithOnePropertyForExplicitlyImplementedInterface target = new ObjectWithOnePropertyForExplicitlyImplementedInterface(); - IInterfaceWithOneProperty proxy = - new InterceptingRealProxy(target, typeof(IInterfaceWithOneProperty), typeof(INotifyPropertyChanged)) - .GetTransparentProxy() as IInterfaceWithOneProperty; - ((IInterceptingProxy)proxy).AddInterceptionBehavior(new NaiveINotifyPropertyChangedInterceptionBehavior()); - - string changeProperty; - PropertyChangedEventHandler handler = (sender, args) => changeProperty = args.PropertyName; - - changeProperty = null; - ((INotifyPropertyChanged)proxy).PropertyChanged += handler; - - proxy.TheProperty = 100; - - Assert.AreEqual(100, proxy.TheProperty); - Assert.AreEqual("TheProperty", changeProperty); - - changeProperty = null; - ((INotifyPropertyChanged)proxy).PropertyChanged -= handler; - - proxy.TheProperty = 200; - - Assert.AreEqual(200, proxy.TheProperty); - Assert.AreEqual(null, changeProperty); - } - - [TestMethod] - public void CanInterceptGenericMethodOnInterface() - { - var interceptor = new CallCountInterceptionBehavior(); - - var original = new ObjectWithGenericMethod(); - var intercepted = new InterceptingRealProxy(original, typeof(IInterfaceWithGenericMethod)) - .GetTransparentProxy() as IInterfaceWithGenericMethod; - - IInterceptingProxy proxy = (IInterceptingProxy)intercepted; - proxy.AddInterceptionBehavior(interceptor); - - var result = intercepted.GetTypeName(6); - - Assert.AreEqual("Int32", result); - Assert.AreEqual(1, interceptor.CallCount); - } - - internal class MBROWithOneMethod : MarshalByRefObject - { - public int DoSomething(int i) - { - return i * 3; - } - } - - internal interface InterfaceOne - { - void Something(); - } - - internal class MBROWithInterface : MarshalByRefObject, InterfaceOne - { - public void Something() - { - } - } - - public class MBROWithAnEvent : MarshalByRefObject - { - public event EventHandler SomeEvent; - - public void TriggerIt() - { - this.SomeEvent(this, new EventArgs()); - } - } - - internal class MBROWithOneProperty : MarshalByRefObject - { - public int TheProperty { get; set; } - } - - internal class ObjectWithOnePropertyForImplicitlyImplementedInterface : IInterfaceWithOneProperty - { - public int TheProperty { get; set; } - } - - internal class ObjectWithOnePropertyForExplicitlyImplementedInterface : IInterfaceWithOneProperty - { - int IInterfaceWithOneProperty.TheProperty { get; set; } - } - - internal interface IInterfaceWithOneProperty - { - int TheProperty { get; set; } - } - - internal interface IInterfaceWithGenericMethod - { - string GetTypeName(T argument); - } - - internal class ObjectWithGenericMethod : IInterfaceWithGenericMethod - { - #region IInterfaceWithGenericMethod Members - - public string GetTypeName(T argument) - { - return argument.GetType().Name; - } - - #endregion - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs deleted file mode 100644 index f0371325..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs +++ /dev/null @@ -1,293 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.TransparentProxyInterception -{ - [TestClass] - public class TransparentProxyInterceptorFixture - { - [TestMethod] - public void InterceptorReturnsSingleMethod() - { - List methods = GetMethods(); - - CollectionAssertExtensions.AreEquivalent(GetOnlyImplementations(typeof(SingleInterceptableMethod), "MyMethod"), - methods); - } - - [TestMethod] - public void InterceptorReturnsAllMethodsIncludingInheritedOnes() - { - List methods = GetMethods(); - - CollectionAssertExtensions.AreEquivalent( - GetOnlyImplementations(typeof(InheritsSingleMethodAndAdds), "MyMethod", "AnotherMethod", "StillMoreMethod"), - methods); - } - - [TestMethod] - public void NonMBROReturnsInterfaceMethods() - { - List methods = GetMethods(); - - Assert.AreEqual(2, methods.Count); - - List expected = GetExpectedMethodImplementations(typeof(IMyOperations), typeof(Operations)); - - CollectionAssertExtensions.AreEquivalent(expected, methods); - } - - [TestMethod] - public void ReturnsAllInterfaceMethods() - { - List methods = GetMethods(); - - CollectionAssertExtensions.AreEquivalent( - GetExpectedMethodImplementations(typeof(IMyOperations), typeof(Incoherent)) - .Concat(GetExpectedMethodImplementations(typeof(ImTiredOfInterfaces), typeof(Incoherent))).ToList(), - methods); - } - - [TestMethod] - public void EmptyInterfacesContributeNoMethods() - { - List methods = GetMethods(); - - CollectionAssertExtensions.AreEquivalent( - GetExpectedMethodImplementations(typeof(IMyOperations), typeof(Marked)), - methods); - } - - [TestMethod] - public void PropertiesAreReturnedAsGetAndSetMethods() - { - List methods = GetMethods(); - - CollectionAssertExtensions.AreEquivalent( - GetOnlyImplementations(typeof(HasProperties), "get_SettableProp", "set_SettableProp", "get_GetOnly"), - methods); - } - - [TestMethod] - public void InterfacePropertiesAreReturned() - { - List methods = GetMethods(); - - CollectionAssertExtensions.AreEquivalent( - GetExpectedMethodImplementations(typeof(IHasProperties), typeof(PropThroughInterface)), - methods); - } - - [TestMethod] - public void MBROReturnBothInterfaceAndClassProperties() - { - List methods = GetMethods(); - - var expected = GetExpectedMethodImplementations(typeof(IHasProperties), typeof(MBROWithPropThroughInterface)) - .Concat(GetOnlyImplementations(typeof(MBROWithPropThroughInterface), "get_Gettable")); - - CollectionAssertExtensions.AreEquivalent(expected.ToList(), methods); - } - - [TestMethod] - public void ExplicitImplementationsAreFound() - { - List methods = GetMethods(); - - var expected = GetExpectedMethodImplementations(typeof(IMyOperations), typeof(ExplicitImplementation)) - .Concat(GetOnlyImplementations(typeof(ExplicitImplementation), "AClassMethod")); - CollectionAssertExtensions.AreEquivalent(expected.ToList(), methods); - } - - [TestMethod] - public void AssortedParameterKindsAreProperlyHandled() - { - var interceptor = new TransparentProxyInterceptor(); - var target = new AssortedParameterKindsAreProperlyHandledHelper.TypeWithAssertedParameterKinds(); - - IInterceptingProxy proxy = - interceptor.CreateProxy( - typeof(AssortedParameterKindsAreProperlyHandledHelper.TypeWithAssertedParameterKinds), - target); - - AssortedParameterKindsAreProperlyHandledHelper.PerformTest(proxy); - } - - private static List GetMethods() - { - return new List(new TransparentProxyInterceptor().GetInterceptableMethods(typeof(T), typeof(T))); - } - - private static List GetExpectedMethodImplementations(Type interfaceType, Type implementationType) - { - InterfaceMapping mapping = implementationType.GetInterfaceMap(interfaceType); - List results = new List(mapping.InterfaceMethods.Length); - - for (int i = 0; i < mapping.InterfaceMethods.Length; ++i) - { - results.Add(new MethodImplementationInfo(mapping.InterfaceMethods[i], mapping.TargetMethods[i])); - } - return results; - } - - private static List GetOnlyImplementations(Type implementationType, params string[] methodNames) - { - return - methodNames.Select( - methodName => new MethodImplementationInfo(null, implementationType.GetMethod(methodName))).ToList(); - } - - [TestMethod] - public void CanCreateProxyWithAdditionalInterfaces() - { - IInstanceInterceptor interceptor = new TransparentProxyInterceptor(); - SingleInterceptableMethod target = new SingleInterceptableMethod(); - - object proxy = interceptor.CreateProxy(typeof(SingleInterceptableMethod), target, typeof(IMyOperations)); - - Assert.IsTrue(proxy is IMyOperations); - } - } - - internal class SingleInterceptableMethod : MarshalByRefObject - { - public void MyMethod() { } - } - - internal class InheritsSingleMethodAndAdds : SingleInterceptableMethod - { - public void AnotherMethod() - { - } - - public void StillMoreMethod() - { - } - } - - internal interface IMyOperations - { - void Add(); - void Multiply(); - } - - internal interface ImTiredOfInterfaces - { - void YaddaYadda(); - } - - internal interface IMarkerInterface - { - } - - internal class Operations : IMyOperations - { - public void Add() - { - } - - public void Multiply() - { - } - - public void NotAnInterfaceMethod() - { - } - } - - internal class Incoherent : IMyOperations, ImTiredOfInterfaces - { - public void Add() - { - throw new System.NotImplementedException(); - } - - public void Multiply() - { - throw new System.NotImplementedException(); - } - - public void YaddaYadda() - { - throw new System.NotImplementedException(); - } - } - - internal class Marked : IMyOperations, IMarkerInterface - { - public void Add() - { - throw new System.NotImplementedException(); - } - - public void Multiply() - { - throw new System.NotImplementedException(); - } - } - - internal class HasProperties : MarshalByRefObject - { - public string SettableProp - { - get { return null; } - set { } - } - - public int GetOnly - { - get { return 42; } - } - } - - internal interface IHasProperties - { - string StringProp { get; set; } - } - - internal class PropThroughInterface : IHasProperties - { - public string StringProp - { - get { throw new System.NotImplementedException(); } - set { throw new System.NotImplementedException(); } - } - } - - internal class MBROWithPropThroughInterface : MarshalByRefObject, IHasProperties - { - public string StringProp - { - get { throw new System.NotImplementedException(); } - set { throw new System.NotImplementedException(); } - } - - public int Gettable - { - get { return 37; } - } - } - - internal class ExplicitImplementation : MarshalByRefObject, IMyOperations - { - void IMyOperations.Add() - { - throw new System.NotImplementedException(); - } - - void IMyOperations.Multiply() - { - throw new System.NotImplementedException(); - } - - public void AClassMethod() - { - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs deleted file mode 100644 index 62cb6a45..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using System.Runtime.Remoting.Messaging; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests -{ - /// - /// Tests for the TransparentProxyMethodInvocation class, which wraps - /// a IMethodCallMessage in an IMethodInvocation implementation. - /// - [TestClass] - public class TransparentProxyMethodInvocationFixture - { - #region Test Methods - - [TestMethod] - public void ShouldBeCreatable() - { - MethodBase methodInfo = GetTargetMethodInfo("FirstTarget"); - InvocationTarget target = new InvocationTarget(); - IMethodInvocation invocation = GetInvocation(methodInfo, target); - } - - [TestMethod] - public void ShouldMapInputsCorrectly() - { - MethodBase methodInfo = GetTargetMethodInfo("FirstTarget"); - InvocationTarget target = new InvocationTarget(); - IMethodInvocation invocation = GetInvocation(methodInfo, target); - - Assert.AreEqual(2, invocation.Inputs.Count); - Assert.AreEqual(1, invocation.Inputs[0]); - Assert.AreEqual("two", invocation.Inputs[1]); - Assert.AreEqual("two", invocation.Inputs["two"]); - Assert.AreEqual(1, invocation.Inputs["one"]); - Assert.AreEqual(methodInfo, invocation.MethodBase); - Assert.AreSame(target, invocation.Target); - } - - [TestMethod] - public void ShouldBeAbleToAddToContext() - { - MethodBase methodInfo = GetTargetMethodInfo("FirstTarget"); - InvocationTarget target = new InvocationTarget(); - IMethodInvocation invocation = GetInvocation(methodInfo, target); - - invocation.InvocationContext["firstItem"] = 1; - invocation.InvocationContext["secondItem"] = "hooray!"; - - Assert.AreEqual(2, invocation.InvocationContext.Count); - Assert.AreEqual(1, invocation.InvocationContext["firstItem"]); - Assert.AreEqual("hooray!", invocation.InvocationContext["secondItem"]); - } - - [TestMethod] - public void ShouldBeAbleToChangeInputs() - { - MethodBase methodInfo = GetTargetMethodInfo("FirstTarget"); - InvocationTarget target = new InvocationTarget(); - IMethodInvocation invocation = GetInvocation(methodInfo, target); - - Assert.AreEqual(1, invocation.Inputs["one"]); - invocation.Inputs["one"] = 42; - Assert.AreEqual(42, invocation.Inputs["one"]); - } - - #endregion - - #region Helper factories - - private MethodBase GetTargetMethodInfo(string methodName) - { - return (MethodBase)(typeof(InvocationTarget).GetMember(methodName)[0]); - } - - private IMethodInvocation GetInvocation(MethodBase methodInfo, - InvocationTarget target) - { - IMethodCallMessage remotingMessage = new FakeMethodCallMessage(methodInfo, new object[] { 1, "two" }); - - return new TransparentProxyMethodInvocation(remotingMessage, target); - } - - #endregion - } - - public class InvocationTarget : MarshalByRefObject - { - public string FirstTarget(int one, - string two) - { - return "Boo!"; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/Unity.Interception.Tests.csproj b/source/Unity.Interception/Tests/Tests.Unity.Interception/Unity.Interception.Tests.csproj deleted file mode 100644 index 2691b6ef..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/Unity.Interception.Tests.csproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {3FC0084C-6077-4F87-8A51-2F755C83D7C8} - Library - Properties - Microsoft.Practices.Unity.InterceptionExtension.Tests - Unity.Interception.Tests - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - 3.5 - - - true - v4.5 - http://localhost/Tests.Unity.Interception/ - true - Web - true - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\..\Tests.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\..\Tests.ruleset - false - - - - - - 3.5 - - - - - - - GlobalAssemblyInfo.2010.cs - - - - - - - - - - - - - - - - - - - - Unity.licenseheader - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F8186B23-B0E1-4646-B5F3-14357841E2BA} - Unity.Interception - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - {E979857E-CDE5-4D36-9AE8-8FFF4F75AE89} - Unity.TestSupport - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - \ No newline at end of file diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs deleted file mode 100644 index 57bea250..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs +++ /dev/null @@ -1,427 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.ComponentModel; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterception -{ - /// - /// Tests for the virtual method interception mechanism as invoked - /// through the container. - /// - [TestClass] - public class ContainerVirtualMethodInterceptionFixture - { - [TestMethod] - public void InterceptedClassGetsReturned() - { - CallCountHandler h1 = new CallCountHandler(); - CallCountHandler h2 = new CallCountHandler(); - - IUnityContainer container = GetConfiguredContainer(h1, h2); - AddPoliciesToContainer(container); - ConfigureInterceptionWithRegisterType(container); - - Interceptee target = container.Resolve(); - - Assert.AreNotSame(typeof(Interceptee), target.GetType()); - } - - [TestMethod] - public void AttachedHandlersAreCalled() - { - CallCountHandler h1 = new CallCountHandler(); - CallCountHandler h2 = new CallCountHandler(); - - IUnityContainer container = new UnityContainer() - .AddNewExtension() - .RegisterInstance("h1", h1) - .RegisterInstance("h2", h2) - .RegisterType( - new Interceptor(), - new InterceptionBehavior()) - .Configure() - .AddPolicy("methodOne") - .AddMatchingRule(new InjectionConstructor("MethodOne")) - .AddCallHandler("h1") - .Interception - .AddPolicy("methodTwo") - .AddMatchingRule(new InjectionConstructor("MethodTwo")) - .AddCallHandler("h2") - .Interception.Container; - - Interceptee target = container.Resolve(); - - int oneCount = 0; - int twoCount = 0; - - for (oneCount = 0; oneCount < 2; ++oneCount) - { - target.MethodOne(); - } - - for (twoCount = 0; twoCount < 3; ++twoCount) - { - target.MethodTwo("hi", twoCount); - } - - Assert.AreEqual(oneCount, h1.CallCount); - Assert.AreEqual(twoCount, h2.CallCount); - } - - [TestMethod] - public void RegisteringInterceptionOnOpenGenericsLetsYouResolveMultipleClosedClasses() - { - IUnityContainer container = new UnityContainer() - .AddNewExtension(); - - AddPoliciesToContainer(container); - - container.Configure() - .SetDefaultInterceptorFor(typeof(GenericFactory<>), new VirtualMethodInterceptor()); - - GenericFactory resultOne = container.Resolve>(); - GenericFactory resultTwo = container.Resolve>(); - - Assert.IsTrue(resultOne is IInterceptingProxy); - Assert.IsTrue(resultTwo is IInterceptingProxy); - - Assert.AreEqual("**Hi**", resultTwo.MakeAT().GetAValue("Hi")); - } - - [TestMethod] - public virtual void TestNewVirtualOverride() - { - IUnityContainer container = GetContainer(); - - NewVirtualOverrideTestClass testClass = container.Resolve(); - - Assert.IsTrue(testClass.TestMethod1(), "override"); - Assert.IsTrue(testClass.TestMethod2(), "new virtual"); - Assert.IsTrue(testClass.TestMethod3(), "always true"); - Assert.IsTrue(testClass.TestMethod4(), "abstract"); - - Assert.AreEqual(4, container.Resolve("TestCallHandler").CallCount); - } - - [TestMethod] - public void CanInterceptWithInterceptorSetAsDefaultForBaseClassWithMultipleImplementations() - { - IUnityContainer container = - new UnityContainer() - .RegisterType("one") - .RegisterType("two") - .AddNewExtension() - .Configure() - .SetDefaultInterceptorFor(new VirtualMethodInterceptor()) - .Container; - - BaseClass instanceOne = container.Resolve("one"); - BaseClass instanceTwo = container.Resolve("two"); - - Assert.AreEqual("ImplementationOne", instanceOne.Method()); - Assert.AreEqual("ImplementationTwo", instanceTwo.Method()); - } - - [TestMethod] - public void CanAddInterceptionBehaviorsWithRequiredInterfaces() - { - IUnityContainer container = - new UnityContainer() - .AddNewExtension() - .RegisterType( - new Interceptor(), - new InterceptionBehavior(new NaiveINotifyPropertyChangedInterceptionBehavior())); - - ClassWithVirtualProperty instance = container.Resolve(); - - string changedProperty = null; - ((INotifyPropertyChanged)instance).PropertyChanged += (s, a) => changedProperty = a.PropertyName; - - instance.Property = 10; - - Assert.AreEqual("Property", changedProperty); - } - - [TestMethod] - public void ResolvingKeyForTheSecondTimeAfterAddingBehaviorWithRequiredInterfaceReflectsLastConfiguration() - { - IUnityContainer container = - new UnityContainer() - .AddNewExtension() - .RegisterType(new Interceptor()); - - Assert.IsFalse(container.Resolve() is INotifyPropertyChanged); - - container - .RegisterType( - new InterceptionBehavior(new NaiveINotifyPropertyChangedInterceptionBehavior())); - - Assert.IsTrue(container.Resolve() is INotifyPropertyChanged); - } - - [TestMethod] - public void GeneratedDerivedTypeIsCached() - { - IUnityContainer container = - new UnityContainer() - .AddNewExtension() - .RegisterType(new Interceptor()); - - ClassWithVirtualProperty instanceOne = container.Resolve(); - ClassWithVirtualProperty instanceTwo = container.Resolve(); - - Assert.AreSame(typeof(ClassWithVirtualProperty), instanceOne.GetType().BaseType); - Assert.AreSame(instanceOne.GetType(), instanceTwo.GetType()); - } - - [TestMethod] - public void CanInterceptClassWithSingleNonDefaultConstructor() - { - CallCountInterceptionBehavior callCountBehavior = new CallCountInterceptionBehavior(); - - IUnityContainer container = - new UnityContainer() - .AddNewExtension() - .RegisterType( - new InjectionConstructor("some value"), - new Interceptor(), - new InterceptionBehavior(callCountBehavior)); - - ClassWithSingleNonDefaultConstructor instance = container.Resolve(); - - string value = instance.GetValue(); - - Assert.AreEqual("some value", value); - Assert.AreEqual(1, callCountBehavior.CallCount); - } - - [TestMethod] - public void CanInterceptGenericTypeWithGenericMethodsWithConstraints() - { - var container = new UnityContainer() - .AddNewExtension() - .RegisterType(typeof(GenericTypeWithGenericMethodsAndConstraints<>), - new Interceptor()); - - var result = container.Resolve>(); - - Type interceptedType = result.GetType(); - Type genericInterceptedType = interceptedType.GetGenericTypeDefinition(); - Assert.IsFalse(interceptedType.ContainsGenericParameters); - Assert.IsTrue(interceptedType.IsGenericType); - Assert.IsFalse(interceptedType.IsGenericTypeDefinition); - } - - protected virtual IUnityContainer GetContainer() - { - IUnityContainer container = new UnityContainer() - .AddNewExtension() - .RegisterType("AlwaysMatchingRule") - .RegisterType("TestCallHandler", new ContainerControlledLifetimeManager()); - - container.Configure() - .SetDefaultInterceptorFor(new VirtualMethodInterceptor()) - .AddPolicy("Rules") - .AddMatchingRule("AlwaysMatchingRule") - .AddCallHandler("TestCallHandler"); - - return container; - } - - private IUnityContainer GetConfiguredContainer(ICallHandler h1, ICallHandler h2) - { - IUnityContainer container = new UnityContainer() - .AddNewExtension() - .RegisterInstance("h1", h1) - .RegisterInstance("h2", h2); - - return container; - } - - private IUnityContainer AddPoliciesToContainer(IUnityContainer container) - { - container.Configure() - .AddPolicy("MethodOne") - .AddMatchingRule(new InjectionConstructor("MethodOne")) - .AddCallHandler("h1") - .Interception - .AddPolicy("MethodTwo") - .AddMatchingRule(new InjectionConstructor("MethodTwo")) - .AddCallHandler("h2"); - return container; - } - - private IUnityContainer ConfigureInterceptionWithRegisterType(IUnityContainer container) - { - container.RegisterType( - new Interceptor(), - new InterceptionBehavior()); - return container; - } - } - - public class Interceptee - { - public virtual int MethodOne() - { - return 37; - } - - public virtual string MethodTwo(string s, int i) - { - return s + ";" + i.ToString(); - } - } - - public class GenericFactory where T : class, new() - { - public T MakeAT() - { - return new T(); - } - } - - public class SubjectOne - { - } - - public class SubjectTwo - { - public string GetAValue(string s) - { - return "**" + s + "**"; - } - } - - public class NewVirtualOverrideTestClass : NewVirtualOverrideTestClassBase - { - public override bool TestMethod1() - { - return true; - } - - public new virtual bool TestMethod2() - { - return true; - } - - public override bool TestMethod4() - { - return true; - } - - public new virtual void TestMethod5(int bb) - { - } - } - - public abstract class NewVirtualOverrideTestClassBase - { - public virtual bool TestMethod1() - { - return false; - } - - public virtual bool TestMethod2() - { - return false; - } - - public virtual bool TestMethod3() - { - return true; - } - - public abstract bool TestMethod4(); - - public virtual void TestMethod5(int a) - { - } - } - - public class BaseClass - { - public virtual string Method() - { - return "base"; - } - } - - public class ImplementationOne : BaseClass - { - public override string Method() - { - return "ImplementationOne"; - } - } - - public class ImplementationTwo : BaseClass - { - public override string Method() - { - return "ImplementationTwo"; - } - } - - public class ClassWithVirtualProperty - { - public virtual int Property { get; set; } - } - - public class ClassWithSingleNonDefaultConstructor - { - private string value; - - public ClassWithSingleNonDefaultConstructor(string value) - { - this.value = value; - } - - public virtual string GetValue() - { - return value; - } - } - - internal class ClassWithInternalConstructor - { - public ClassWithInternalConstructor() - { - } - - public virtual int Method() - { - return 10; - } - } - - public class GenericTypeWithGenericMethodsAndConstraints - where T : class - { - public virtual void TestMethod1() - { } - - public virtual void TestMethod2() - where T2 : struct - { } - - public virtual void TestMethod3() - where T3 : class - { } - - public virtual void TestMethod4() - where T4 : class, new() - { } - - public virtual void TestMethod5() - where T5 : InjectionPolicy - { } - - public virtual void TestMethod6() - where T6 : IMatchingRule - { } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs deleted file mode 100644 index fe195c1b..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security; -using System.Security.Permissions; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterception -{ - public partial class InterceptingClassGenerationFixture - { - [TestMethod] - public void GeneratedTypeForAdditionalInterfaceWithMethodsHavingSignaturesMatchingMethodsInTheBaseClassIsVerifiable() - { - PermissionSet grantSet = new PermissionSet(PermissionState.None); - grantSet.AddPermission( - new SecurityPermission( - SecurityPermissionFlag.Execution - | SecurityPermissionFlag.ControlEvidence - | SecurityPermissionFlag.ControlPolicy)); - grantSet.AddPermission( - new ReflectionPermission(ReflectionPermissionFlag.RestrictedMemberAccess - | ReflectionPermissionFlag.MemberAccess)); - grantSet.AddPermission(new FileIOPermission(PermissionState.Unrestricted)); - - AppDomain sandbox = - AppDomain.CreateDomain( - "sandbox", - AppDomain.CurrentDomain.Evidence, - new AppDomainSetup { ApplicationBase = AppDomain.CurrentDomain.BaseDirectory }, - grantSet); - - sandbox.DoCallBack(() => - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(MainType), typeof(IDoSomething), typeof(IDoSomethingToo)); - Type generatedType = generator.GenerateType(); - }); - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingClassGenerationFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingClassGenerationFixture.cs deleted file mode 100644 index 6f32d5e5..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingClassGenerationFixture.cs +++ /dev/null @@ -1,988 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Reflection; -using System.Security; -using System.Security.Permissions; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.InterceptionExtension.Tests.ObjectsUnderTest; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.Practices.Unity.Utility; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterception -{ - [TestClass] - public partial class InterceptingClassGenerationFixture - { - [TestMethod] - public void CanCreateInterceptingClassOverClassWithDefaultConstructor() - { - ClassWithDefaultCtor instance = WireupHelper.GetInterceptingInstance(); - Assert.AreNotSame(typeof(ClassWithDefaultCtor), instance.GetType()); - } - - [TestMethod] - public void InterceptingClassCallsBaseClassConstructor() - { - ClassWithDefaultCtor instance = WireupHelper.GetInterceptingInstance(); - Assert.IsTrue(instance.CtorWasCalled); - } - - [TestMethod] - public void CanCreateInterceptingClassOverClassWithoutDefaultConstructor() - { - ClassWithOneParamCtor instance = WireupHelper.GetInterceptingInstance(37); - Assert.AreEqual(37, instance.CtorValue); - } - - [TestMethod] - public void CanInterceptClassThatHasMultipleConstructors() - { - ClassWithMultipleCtors defaultInstance = WireupHelper.GetInterceptingInstance(); - Assert.IsTrue(defaultInstance.DefaultCalled); - - ClassWithMultipleCtors intInstance = WireupHelper.GetInterceptingInstance(42); - Assert.AreEqual(42, intInstance.IntValue); - Assert.IsFalse(intInstance.DefaultCalled); - - ClassWithMultipleCtors bothInstance = WireupHelper.GetInterceptingInstance(51, "Hello"); - Assert.AreEqual(51, bothInstance.IntValue); - Assert.AreEqual("Hello", bothInstance.StringValue); - Assert.IsFalse(bothInstance.DefaultCalled); - } - - [TestMethod] - public void CanInterceptVoidNoArgMethods() - { - ClassWithDefaultCtor instance = WireupHelper.GetInterceptingInstance(); - instance.MethodOne(); - Assert.IsTrue(instance.OneWasCalled); - } - - [TestMethod] - public void InterceptingClassOverridesBaseClassVirtualMethods() - { - Type baseType = typeof(ClassWithDefaultCtor); - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - InterceptingClassGenerator generator = new InterceptingClassGenerator(baseType); - Type generatedType = generator.GenerateType(); - - MethodInfo methodOne = generatedType.GetMethod("MethodOne"); - MethodInfo calculateAnswer = generatedType.GetMethod("CalculateAnswer"); - - Assert.AreSame(generatedType, methodOne.DeclaringType); - Assert.AreSame(generatedType, calculateAnswer.DeclaringType); - } - - [TestMethod] - public void InterceptingClassImplementsIInterceptingProxy() - { - ClassWithDefaultCtor instance = WireupHelper.GetInterceptingInstance(); - Assert.IsTrue(instance is IInterceptingProxy); - } - - [TestMethod] - public void CanAddInterceptionBehaviorsToPipeline() - { - ClassWithDefaultCtor instance = WireupHelper.GetInterceptingInstance(); - IInterceptingProxy pm = (IInterceptingProxy)instance; - - CallCountInterceptionBehavior interceptor = new CallCountInterceptionBehavior(); - - pm.AddInterceptionBehavior(interceptor); - } - - [TestMethod] - public void CallingMethodInvokesHandlers() - { - MethodInfo methodOne = typeof(ClassWithDefaultCtor).GetMethod("MethodOne"); - ClassWithDefaultCtor instance = WireupHelper.GetInterceptingInstance(); - IInterceptingProxy pm = (IInterceptingProxy)instance; - - CallCountHandler handler = new CallCountHandler(); - PostCallCountHandler postHandler = new PostCallCountHandler(); - HandlerPipeline pipeline = new HandlerPipeline(new ICallHandler[] { postHandler, handler }); - PipelineManager manager = new PipelineManager(); - manager.SetPipeline(methodOne, pipeline); - pm.AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - - instance.MethodOne(); - - Assert.AreEqual(1, handler.CallCount); - Assert.AreEqual(1, postHandler.CallsCompleted); - } - - [TestMethod] - public void ThrowingFromInterceptedMethodStillRunsAllHandlers() - { - MethodInfo thrower = typeof(ClassWithDefaultCtor).GetMethod("NotImplemented"); - ClassWithDefaultCtor instance = WireupHelper.GetInterceptingInstance(); - IInterceptingProxy pm = (IInterceptingProxy)instance; - - CallCountHandler handler = new CallCountHandler(); - PostCallCountHandler postHandler = new PostCallCountHandler(); - HandlerPipeline pipeline = new HandlerPipeline(new ICallHandler[] { postHandler, handler }); - PipelineManager manager = new PipelineManager(); - manager.SetPipeline(thrower, pipeline); - pm.AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - - try - { - instance.NotImplemented(); - Assert.Fail("Should have thrown before getting here"); - } - catch (NotImplementedException) - { - // We're expecting this one - } - - Assert.AreEqual(1, handler.CallCount); - Assert.AreEqual(1, postHandler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptMethodsThatHaveReturnValues() - { - PostCallCountHandler handler = new PostCallCountHandler(); - ClassWithDefaultCtor instance = WireupHelper.GetInterceptedInstance("CalculateAnswer", handler); - - int result = instance.CalculateAnswer(); - - Assert.AreEqual(42, result); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptMethodsThatReturnReferenceTypes() - { - PostCallCountHandler handler = new PostCallCountHandler(); - ClassWithDefaultCtor instance = WireupHelper.GetInterceptedInstance("GimmeName", handler); - - string result = instance.GimmeName(); - - Assert.AreEqual("name", result); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptMethodsWithParameters() - { - PostCallCountHandler handler = new PostCallCountHandler(); - ClassWithDefaultCtor instance = WireupHelper.GetInterceptedInstance("AddUp", handler); - - string result = instance.AddUp(5, 12); - - Assert.AreEqual("17", result); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptMethodsWithRefParameters() - { - PostCallCountHandler handler = new PostCallCountHandler(); - ClassWithDefaultCtor instance = WireupHelper.GetInterceptedInstance("MethodWithRefParameters", handler); - - string s = "abc"; - int result = instance.MethodWithRefParameters(5, ref s, 10); - - Assert.AreEqual(15, result); - Assert.AreEqual("abc hooray!", s); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptMethodsWithOutParameters() - { - PostCallCountHandler handler = new PostCallCountHandler(); - ClassWithDefaultCtor instance = WireupHelper.GetInterceptedInstance("OutParams", handler); - - int plusOne; - int timesTwo; - - instance.OutParams(5, out plusOne, out timesTwo); - - Assert.AreEqual(5 + 1, plusOne); - Assert.AreEqual(5 * 2, timesTwo); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptNestedClass() - { - PostCallCountHandler handler = new PostCallCountHandler(); - NestedClass instance = WireupHelper.GetInterceptedInstance("MakeAValue", handler); - - int result = instance.MakeAValue(12); - - Assert.AreEqual((12 * 37) + (12 / 2), result); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptEventsMethods() - { - CallCountInterceptionBehavior interceptor = new CallCountInterceptionBehavior(); - ClassWithAVirtualEvent instance = WireupHelper.GetInterceptingInstance(); - ((IInterceptingProxy)instance).AddInterceptionBehavior(interceptor); - - instance.SomeEvent += (sender, args) => { }; - - Assert.AreEqual(1, interceptor.CallCount); - } - - [TestMethod] - public void FiringAnEventIsNotIntercepted() - { - CallCountInterceptionBehavior interceptor = new CallCountInterceptionBehavior(); - ClassWithAVirtualEvent instance = WireupHelper.GetInterceptingInstance(); - ((IInterceptingProxy)instance).AddInterceptionBehavior(interceptor); - - instance.SomeEvent += (sender, args) => { }; - instance.TriggerIt(); - - Assert.AreEqual(1, interceptor.CallCount); - } - - [TestMethod] - [ExpectedException(typeof(InvalidOperationException))] - public void AttemptingToInterceptInvalidClassThrows() - { - PostCallCountHandler handler = new PostCallCountHandler(); - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - - interceptor.CreateProxyType(typeof(CantTouchThis)); - } - - [TestMethod] - public void CanInterceptClosedGenericType() - { - PostCallCountHandler handler = new PostCallCountHandler(); - InterceptingGenericClass instance = - WireupHelper.GetInterceptedInstance>("Decorate", handler); - - DateTime now = DateTime.Now; - - string result = instance.Decorate(now); - - Assert.AreEqual("**" + now + "**", result); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptGenericMethodOnClosedGenericType() - { - PostCallCountHandler handler = new PostCallCountHandler(); - InterceptingGenericClass instance = - WireupHelper.GetInterceptedInstance>("Reverse", handler); - - string result = instance.Reverse(137); - - Assert.AreEqual("731", result); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void GenericWrapperWorks() - { - PostCallCountHandler handler = new PostCallCountHandler(); - InterceptingGenericClass instance = - new WrapperGeneric(); - - PipelineManager pm = new PipelineManager(); - MethodBase reverse = typeof(InterceptingGenericClass).GetMethod("Reverse"); - pm.SetPipeline(reverse, new HandlerPipeline(Sequence.Collect(handler))); - ((IInterceptingProxy)instance).AddInterceptionBehavior(new PolicyInjectionBehavior(pm)); - - string result = instance.Reverse(137); - - Assert.AreEqual("731", result); - Assert.AreEqual(1, handler.CallsCompleted); - } - - [TestMethod] - public void CanInterceptMethodWithGenericReturnTypeForValueTypeGenericParameter() - { - PostCallCountHandler handler = new PostCallCountHandler(); - ClassWithDefaultCtor instance - = WireupHelper.GetInterceptedInstance("MethodWithGenericReturnType", handler); - int value = instance.MethodWithGenericReturnType(5); - Assert.AreEqual(5, value); - Assert.AreEqual(1, handler.CallsCompleted); - } - - public class NestedClass - { - public virtual int MakeAValue(int source) - { - return (source * 37) + (source / 2); - } - } - - internal class CantTouchThis - { - public virtual void Something() - { - } - } - - [TestMethod] - public void CanImplementAdditionalInterfaces() - { - // arrange - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(MainType), typeof(IAdditionalInterface)); - Type generatedType = generator.GenerateType(); - - // act - object instance = Activator.CreateInstance(generatedType); - - // assert - Assert.IsTrue(instance is MainType); - Assert.IsTrue(instance is IAdditionalInterface); - } - - [TestMethod] - public void InvokingMethodOnAdditionalInterfaceThrowsIfNotHandledByInterceptor() - { - // arrange - InterceptingClassGenerator generator = new InterceptingClassGenerator(typeof(MainType), typeof(IAdditionalInterface)); - Type generatedType = generator.GenerateType(); - object instance = Activator.CreateInstance(generatedType); - - // act - Exception exception = null; - try - { - ((IAdditionalInterface)instance).DoSomethingElse(); - Assert.Fail("should have thrown"); - } - catch (NotImplementedException e) - { - exception = e; - } - - // assert - Assert.IsNotNull(exception); - } - - [TestMethod] - public void CanSuccessfullyInvokeAnAdditionalInterfaceMethodIfAnInterceptorDoesNotForwardTheCall() - { - // arrange - InterceptingClassGenerator generator = new InterceptingClassGenerator(typeof(MainType), typeof(IAdditionalInterface)); - Type generatedType = generator.GenerateType(); - object instance = Activator.CreateInstance(generatedType); - bool invoked = false; - ((IInterceptingProxy)instance).AddInterceptionBehavior( - new DelegateInterceptionBehavior( - (input, getNext) => { invoked = true; return input.CreateMethodReturn(100); })); - - // act - int result = ((IAdditionalInterface)instance).DoSomethingElse(); - - // assert - Assert.IsTrue(invoked); - Assert.AreEqual(100, result); - } - - [TestMethod] - public void CanImplementINotifyPropertyChanged() - { - InterceptingClassGenerator generator = new InterceptingClassGenerator(typeof(MainType), typeof(INotifyPropertyChanged)); - Type generatedType = generator.GenerateType(); - object instance = Activator.CreateInstance(generatedType); - string changeProperty = null; - PropertyChangedEventHandler handler = (sender, args) => changeProperty = args.PropertyName; - - ((IInterceptingProxy)instance).AddInterceptionBehavior(new NaiveINotifyPropertyChangedInterceptionBehavior()); - ((INotifyPropertyChanged)instance).PropertyChanged += handler; - - ((MainType)instance).IntProperty = 100; - - Assert.AreEqual(100, ((MainType)instance).IntProperty); - Assert.AreEqual("IntProperty", changeProperty); - - changeProperty = null; - ((INotifyPropertyChanged)instance).PropertyChanged -= handler; - - ((MainType)instance).IntProperty = 200; - - Assert.AreEqual(200, ((MainType)instance).IntProperty); - Assert.AreEqual(null, changeProperty); - } - - [TestMethod] - public void CanImplementAdditionalInterfaceWithMethodsHavingSignaturesMatchingMethodsInTheBaseClass() - { - // arrange - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(MainType), typeof(IDoSomething)); - Type generatedType = generator.GenerateType(); - - // act - object instance = Activator.CreateInstance(generatedType); - - // assert - Assert.IsTrue(instance is MainType); - Assert.IsTrue(instance is IDoSomething); - } - - [TestMethod] - public void CanInvokeMethodsFromDifferentTypesWithMatchingSignatures() - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(MainType), typeof(IDoSomething), typeof(IDoSomethingToo)); - Type generatedType = generator.GenerateType(); - - object instance = Activator.CreateInstance(generatedType); - List invokedMethods = new List(); - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, n) => - { - invokedMethods.Add(mi.MethodBase); - return mi.CreateMethodReturn(1); - })); - - ((MainType)instance).DoSomething(); - ((IDoSomething)instance).DoSomething(); - ((IDoSomethingToo)instance).DoSomething(); - - Assert.AreSame(StaticReflection.GetMethodInfo(i => i.DoSomething()), invokedMethods[0]); - Assert.AreSame(StaticReflection.GetMethodInfo(i => i.DoSomething()), invokedMethods[1]); - Assert.AreSame(StaticReflection.GetMethodInfo(i => i.DoSomething()), invokedMethods[2]); - } - - [TestMethod] - public void DoesNotReImplementAdditionalInterfaceAlreadyImplementedByInterceptedClass() - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(InterfaceImplementingMainType), typeof(IDeriveFromIDoSomething)); - Type generatedType = generator.GenerateType(); - - object instance = Activator.CreateInstance(generatedType); - List interceptedMethods = new List(); - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, n) => - { - interceptedMethods.Add(mi.MethodBase); - return mi.CreateMethodReturn(1); - })); - - ((InterfaceImplementingMainType)instance).DoSomething(); - ((InterfaceImplementingMainType)instance).DoSomething(String.Empty); - ((IDoSomething)instance).DoSomething(); - ((IDoSomething)instance).DoSomething(String.Empty); - ((IDeriveFromIDoSomething)instance).DoSomething(); - ((IDeriveFromIDoSomething)instance).DoSomething(String.Empty); - ((IDeriveFromIDoSomething)instance).DoSomethingElse(); - - Assert.AreEqual(4, interceptedMethods.Count); - // only the virtual implicit method implementation is invoked for IDoSomething - Assert.AreSame( - StaticReflection.GetMethodInfo(i => i.DoSomething(null)), - interceptedMethods[0]); - Assert.AreSame( - StaticReflection.GetMethodInfo(i => i.DoSomething(null)), - interceptedMethods[1]); - Assert.AreSame( - StaticReflection.GetMethodInfo(i => i.DoSomething(null)), - interceptedMethods[2]); - Assert.AreSame( - StaticReflection.GetMethodInfo(i => i.DoSomethingElse()), - interceptedMethods[3]); - } - - [TestMethod] - public void CanInterceptProtectedVirtualProperties() - { - InterceptingClassGenerator generator = new InterceptingClassGenerator(typeof(ClassWithProtectedProperty)); - Type generatedType = generator.GenerateType(); - - ClassWithProtectedProperty instance = (ClassWithProtectedProperty)Activator.CreateInstance(generatedType); - int intercepts = 0; - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => - { - intercepts++; - return gn()(mi, gn); - })); - - instance.SetProperty(10); - int value = instance.GetProperty(); - - Assert.AreEqual(10, value); - Assert.AreEqual(2, intercepts); - } - - [TestMethod] - public void CanInterceptProtectedInternalVirtualProperties() - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(ClassWithProtectedInternalProperty)); - Type generatedType = generator.GenerateType(); - - ClassWithProtectedInternalProperty instance = - (ClassWithProtectedInternalProperty)Activator.CreateInstance(generatedType); - int intercepts = 0; - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => - { - intercepts++; - return gn()(mi, gn); - })); - - instance.SetProperty(10); - int value = instance.GetProperty(); - - Assert.AreEqual(10, value); - Assert.AreEqual(2, intercepts); - } - - [TestMethod] - public void DoesNotInterceptInternalVirtualProperties() - { - InterceptingClassGenerator generator = new InterceptingClassGenerator(typeof(ClassWithInternalProperty)); - Type generatedType = generator.GenerateType(); - - ClassWithInternalProperty instance = (ClassWithInternalProperty)Activator.CreateInstance(generatedType); - int intercepts = 0; - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => - { - intercepts++; - return gn()(mi, gn); - })); - - instance.SetProperty(10); - int value = instance.GetProperty(); - - Assert.AreEqual(10, value); - Assert.AreEqual(0, intercepts); - } - - [TestMethod] - public void CanInterceptProtectedAccesorOnMixedPrivateProtectedVirtualProperties() - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(ClassWithMixedPrivateProtectedProperty)); - Type generatedType = generator.GenerateType(); - - ClassWithMixedPrivateProtectedProperty instance = - (ClassWithMixedPrivateProtectedProperty)Activator.CreateInstance(generatedType); - int intercepts = 0; - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => - { - intercepts++; - return gn()(mi, gn); - })); - - instance.SetProperty(10); - int value = instance.GetProperty(); - - Assert.AreEqual(10, value); - Assert.AreEqual(1, intercepts); - } - - [TestMethod] - public void CanInterceptMixedPublicProtectedVirtualProperties() - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(ClassWithMixedPublicProtectedProperty)); - Type generatedType = generator.GenerateType(); - - ClassWithMixedPublicProtectedProperty instance = - (ClassWithMixedPublicProtectedProperty)Activator.CreateInstance(generatedType); - int intercepts = 0; - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => - { - intercepts++; - return gn()(mi, gn); - })); - - instance.SetProperty(10); - int value = instance.GetProperty(); - - Assert.AreEqual(10, value); - Assert.AreEqual(2, intercepts); - } - - [TestMethod] - public void CanInterceptClassWithReservedTypeAttributes() - { - InterceptingClassGenerator generator = - new InterceptingClassGenerator(typeof(ClassWithPermissionAttribute)); - Type generatedType = generator.GenerateType(); - - ClassWithPermissionAttribute instance = (ClassWithPermissionAttribute)Activator.CreateInstance(generatedType); - int intercepts = 0; - ((IInterceptingProxy)instance) - .AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => { intercepts++; return gn()(mi, gn); })); - - instance.Method(); - - Assert.AreEqual(1, intercepts); - } - } - - public class ClassWithDefaultCtor - { - public bool CtorWasCalled; - public bool OneWasCalled; - - public ClassWithDefaultCtor() - { - CtorWasCalled = true; - } - - public virtual void MethodOne() - { - OneWasCalled = true; - } - - public virtual void NotImplemented() - { - throw new NotImplementedException("Not implemented on purpose"); - } - - public virtual int CalculateAnswer() - { - return 42; - } - - public virtual string GimmeName() - { - return "name"; - } - - public virtual string AddUp(int x, int y) - { - return (x + y).ToString(); - } - - public virtual int MethodWithRefParameters(int x, ref string y, float f) - { - y = y + " hooray!"; - return x + (int)f; - } - - public virtual void OutParams(int x, out int plusOne, out int timesTwo) - { - plusOne = x + 1; - timesTwo = x * 2; - } - - public virtual T MethodWithGenericReturnType(T item) - { - return item; - } - } - - // This class isn't actually used, it was a template we used to decompile the - // IL and figure out what code to generate. - public class Wrapper : ClassWithDefaultCtor, IInterceptingProxy - { - private readonly InterceptionBehaviorPipeline pipeline = new InterceptionBehaviorPipeline(); - - private static readonly MethodBase MethodOneMethod = typeof(ClassWithDefaultCtor).GetMethod("MethodOne"); - private static readonly MethodBase CalculateAnswerMethod = typeof(ClassWithDefaultCtor).GetMethod("CalculateAnswer"); - private static readonly MethodBase AddUpMethod = typeof(ClassWithDefaultCtor).GetMethod("AddUp"); - private static readonly MethodBase MethodWithRefParametersMethod = typeof(ClassWithDefaultCtor).GetMethod("MethodWithRefParameters"); - private static readonly MethodBase OutParamsMethod = typeof(ClassWithDefaultCtor).GetMethod("OutParams"); - - private static readonly MethodBase MethodWithGenericReturnTypeMethod = typeof(ClassWithDefaultCtor).GetMethods() - .Where(m => m.Name == "MethodWithGenericReturnType").First(); - - public override T MethodWithGenericReturnType(T item) - { - var input = new VirtualMethodInvocation(this, Wrapper.MethodWithGenericReturnTypeMethod, item); - IMethodReturn result = this.pipeline.Invoke(input, this.MethodWithGenericReturnType_Delegate); - if (result.Exception != null) - { - throw result.Exception; - } - return (T)result.ReturnValue; - } - - private IMethodReturn MethodWithGenericReturnType_Delegate(IMethodInvocation inputs, GetNextInterceptionBehaviorDelegate getNext) - { - try - { - T result = base.MethodWithGenericReturnType((T)inputs.Arguments[0]); - return inputs.CreateMethodReturn(result, inputs.Arguments); - } - catch (Exception ex) - { - return inputs.CreateExceptionMethodReturn(ex); - } - } - - /// - /// Adds a to the proxy. - /// - /// The to add. - public void AddInterceptionBehavior(IInterceptionBehavior interceptor) - { - this.pipeline.Add(interceptor); - } - } - - public class ClassWithOneParamCtor - { - public int CtorValue; - - public ClassWithOneParamCtor(int i) - { - CtorValue = i; - } - } - - public class ClassWithMultipleCtors - { - public int IntValue; - public string StringValue; - public bool DefaultCalled; - - public ClassWithMultipleCtors() - { - DefaultCalled = true; - } - - public ClassWithMultipleCtors(int intValue) - { - IntValue = intValue; - } - - public ClassWithMultipleCtors(string stringValue) - { - StringValue = stringValue; - } - - public ClassWithMultipleCtors(int intValue, string stringValue) - { - IntValue = intValue; - StringValue = stringValue; - } - } - - public class InterceptingGenericClass - { - public virtual string Decorate(T obj) - { - return "**" + obj + "**"; - } - - public virtual string Reverse(TItem obj) - { - char[] chars = obj.ToString().ToCharArray(); - Array.Reverse(chars); - return chars.JoinStrings(String.Empty); - } - } - - public class WrapperGeneric : InterceptingGenericClass, IInterceptingProxy - { - private InterceptionBehaviorPipeline pipeline = new InterceptionBehaviorPipeline(); - private MethodBase reverse = typeof(InterceptingGenericClass).GetMethod("Reverse"); - - [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1100:DoNotPrefixCallsWithBaseUnlessLocalImplementationExists", Justification = "Point of the test is to call base class and Reverse is overridden and virtual.")] - private string BaseReverse(TITem obj) - { - return base.Reverse(obj); - } - - public void AddInterceptionBehavior(IInterceptionBehavior interceptor) - { - this.pipeline.Add(interceptor); - } - - public IEnumerable GetInterceptableMethods() - { - throw new NotImplementedException(); - } - - private IMethodReturn Reverse_DelegateImpl(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - try - { - string baseResult = BaseReverse((TItem)input.Arguments[0]); - return input.CreateMethodReturn(baseResult); - } - catch (Exception ex) - { - return input.CreateExceptionMethodReturn(ex); - } - } - - public override string Reverse(TItem obj) - { - VirtualMethodInvocation inputs = new VirtualMethodInvocation(this, this.reverse, obj); - IMethodReturn result = this.pipeline.Invoke(inputs, this.Reverse_DelegateImpl); - if (result.Exception != null) - { - throw result.Exception; - } - return (string)result.ReturnValue; - } - } - - public class ClassWithAVirtualEvent - { - public virtual event EventHandler SomeEvent; - - public void TriggerIt() - { - SomeEvent(this, new EventArgs()); - } - } - - public class WrapperWithEvent : ClassWithAVirtualEvent, IInterceptingProxy - { - public void AddInterceptionBehavior(IInterceptionBehavior interceptor) - { - throw new NotImplementedException(); - } - - public IEnumerable GetInterceptableMethods() - { - throw new NotImplementedException(); - } - - public override event EventHandler SomeEvent - { - add - { - base.SomeEvent += value; - } - - remove - { - base.SomeEvent -= value; - } - } - } - - public class MainType - { - public virtual int DoSomething() - { - return 5; - } - - public virtual int IntProperty { get; set; } - } - - public interface IAdditionalInterface - { - int DoSomethingElse(); - - string SomeProperty { get; set; } - } - - public interface IDoSomething - { - int DoSomething(); - int DoSomething(string parameter); - } - - public interface IDoSomethingToo - { - int DoSomething(); - } - - public class InterfaceImplementingMainType : IDoSomething - { - public int DoSomething() - { - return 1; - } - - public virtual int DoSomething(string parameter) - { - return 1; - } - } - - public interface IDeriveFromIDoSomething : IDoSomething - { - int DoSomethingElse(); - } - - public class ClassWithProtectedProperty - { - public int GetProperty() { return Property; } - public void SetProperty(int value) { Property = value; } - protected virtual int Property { get; set; } - } - - public class ClassWithInternalProperty - { - public int GetProperty() { return Property; } - public void SetProperty(int value) { Property = value; } - internal virtual int Property { get; set; } - } - - public class ClassWithProtectedInternalProperty - { - public int GetProperty() { return Property; } - public void SetProperty(int value) { Property = value; } - protected internal virtual int Property { get; set; } - } - - public class ClassWithMixedPrivateProtectedProperty - { - public int GetProperty() { return Property; } - public void SetProperty(int value) { Property = value; } - private int propertyValue; - - protected virtual int Property - { - private get { return propertyValue; } - set { propertyValue = value; } - } - } - - public class ClassWithMixedPublicProtectedProperty - { - public int GetProperty() { return Property; } - public void SetProperty(int value) { Property = value; } - private int propertyValue; - - public virtual int Property - { - get { return propertyValue; } - protected set { propertyValue = value; } - } - } - -#if !SILVERLIGHT - [System.Web.AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = System.Web.AspNetHostingPermissionLevel.Minimal)] -#endif - public class ClassWithPermissionAttribute - { - public virtual void Method() - { - } - } - - public class DerivedFromMainType : MainType - { - public virtual new int DoSomething() - { - return 10; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs deleted file mode 100644 index 66742de6..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterception -{ - [TestClass] - public class InterceptingInterfaceMethodsFixture - { - [TestMethod] - public void ImplicitlyImplementedMethodsAreInterceptedIfVirtual() - { - CallCountHandler handler = new CallCountHandler(); - Interesting instance = WireupHelper.GetInterceptedInstance("DoSomethingInteresting", handler); - - instance.DoSomethingInteresting(); - - Assert.IsTrue(instance.SomethingWasCalled); - Assert.AreEqual(1, handler.CallCount); - } - } - - public interface IOne - { - void DoSomethingInteresting(); - } - - public class Interesting : IOne - { - public bool SomethingWasCalled; - - public virtual void DoSomethingInteresting() - { - SomethingWasCalled = true; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs deleted file mode 100644 index 81ef441a..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Security; -using System.Security.Permissions; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterceptorTests -{ - public partial class VirtualMethodInterceptorFixture - { - [TestMethod] - public void GeneratedTypeForAbstractIsVerifiable() - { - PermissionSet permissionSet = new PermissionSet(PermissionState.None); - permissionSet.AddPermission( - new SecurityPermission( - SecurityPermissionFlag.Execution - | SecurityPermissionFlag.ControlPolicy - | SecurityPermissionFlag.ControlPrincipal)); - permissionSet.AddPermission(new FileIOPermission(PermissionState.Unrestricted)); - - AppDomain domain = - AppDomain.CreateDomain( - "isolated", - AppDomain.CurrentDomain.Evidence, - AppDomain.CurrentDomain.SetupInformation, - permissionSet); - - DerivedTypeCreator creator = (DerivedTypeCreator) - domain.CreateInstanceAndUnwrap( - typeof(DerivedTypeCreator).Assembly.FullName, - typeof(DerivedTypeCreator).FullName); - - creator.CreateType(typeof(AbstractClassWithPublicConstructor)); - } - } - - public partial class DerivedTypeCreator : MarshalByRefObject - { - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs deleted file mode 100644 index e0e19d6b..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs +++ /dev/null @@ -1,1038 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterceptorTests -{ - /// - /// Tests for the class. - /// - [TestClass] - public partial class VirtualMethodInterceptorFixture - { - [TestMethod] - public void CanInterceptBasicClass() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Assert.IsTrue(interceptor.CanIntercept(typeof(ClassWithNoVirtuals))); - } - - [TestMethod] - public void CantInterceptSealedClass() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Assert.IsFalse(interceptor.CanIntercept(typeof(CantOverride))); - } - - [TestMethod] - public void InterceptableClassWithNoVirtualMethodsReturnsEmptyMethodList() - { - List methods = - new List( - new VirtualMethodInterceptor().GetInterceptableMethods(typeof(ClassWithNoVirtuals), typeof(ClassWithNoVirtuals))); - Assert.AreEqual(0, methods.Count); - } - - [TestMethod] - public void CanInterceptMethods() - { - CallCountHandler h1 = new CallCountHandler(); - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(TwoOverrideableMethods)); - - TwoOverrideableMethods instance = - (TwoOverrideableMethods)Activator.CreateInstance(proxyType); - PipelineManager manager = new PipelineManager(); - ((IInterceptingProxy)instance).AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - SetPipeline(manager, instance, "DoSomething", h1); - - instance.DoSomething(); - - Assert.IsTrue(instance.DidSomething); - Assert.AreEqual(1, h1.CallCount); - } - - [TestMethod] - public void CanInterceptProperties() - { - CallCountHandler getHandler = new CallCountHandler(); - CallCountHandler setHandler = new CallCountHandler(); - - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Assert.IsTrue(interceptor.CanIntercept(typeof(OverrideableProperies))); - - Type proxyType = interceptor.CreateProxyType(typeof(OverrideableProperies)); - OverrideableProperies instance = (OverrideableProperies)Activator.CreateInstance(proxyType); - - PipelineManager manager = new PipelineManager(); - ((IInterceptingProxy)instance).AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - SetPipeline(manager, instance, "get_IntProperty", getHandler); - SetPipeline(manager, instance, "set_IntProperty", setHandler); - - instance.IntProperty = 12; - instance.IntProperty = 15; - - int total = 0; - for (int i = 0; i < 5; ++i) - { - total += instance.IntProperty; - } - - Assert.AreEqual(5 * 15, total); - - Assert.AreEqual(5, getHandler.CallCount); - Assert.AreEqual(2, setHandler.CallCount); - } - - [TestMethod] - public void ReflectingOverProxyTypesGivesOnlyBaseProperties() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Assert.IsTrue(interceptor.CanIntercept(typeof(OverrideableProperies))); - - Type proxyType = interceptor.CreateProxyType(typeof(OverrideableProperies)); - PropertyInfo[] properties = proxyType.GetProperties(); - - Assert.AreEqual(2, properties.Length); - - Assert.IsTrue(properties.All(pi => pi.DeclaringType == typeof(OverrideableProperies))); - } - - [TestMethod] - public void EventsAreIntercepted() - { - CallCountHandler fireHandler = new CallCountHandler(); - CallCountHandler addHandler = new CallCountHandler(); - - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Assert.IsTrue(interceptor.CanIntercept(typeof(OverrideableProperies))); - - Type proxyType = interceptor.CreateProxyType(typeof(ClassWithEvent)); - ClassWithEvent instance = (ClassWithEvent)Activator.CreateInstance(proxyType); - PipelineManager manager = new PipelineManager(); - ((IInterceptingProxy)instance).AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - SetPipeline(manager, instance, "add_MyEvent", addHandler); - SetPipeline(manager, instance, "FireMyEvent", fireHandler); - - bool raised = false; - instance.MyEvent += delegate { raised = true; }; - - instance.FireMyEvent(); - instance.FireMyEvent(); - - Assert.IsTrue(raised); - - Assert.AreEqual(2, fireHandler.CallCount); - Assert.AreEqual(1, addHandler.CallCount); - } - - [TestMethod] - public void ReflectionOverInheritedClassesReturnsProperAttributes() - { - Type targetType = typeof(OverriddenProperties); - - PropertyInfo[] baseProperties = typeof(OverrideableProperies).GetProperties(); - PropertyInfo[] properties = targetType.GetProperties(); - - Assert.AreEqual(baseProperties.Length, properties.Length); - - PropertyInfo stringProperty = targetType.GetProperty("StringProperty"); - Attribute[] attrs = Attribute.GetCustomAttributes(stringProperty, typeof(MultiAttribute)); - Assert.AreEqual(2, attrs.Length); - } - - [TestMethod] - public void CanInterceptTypeWithNonDefaultCtor() - { - CallCountHandler h1 = new CallCountHandler(); - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(ClassWithNonDefaultCtor)); - - ClassWithNonDefaultCtor instance = - (ClassWithNonDefaultCtor)Activator.CreateInstance(proxyType, "arg-value"); - - PipelineManager manager = new PipelineManager(); - ((IInterceptingProxy)instance).AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - SetPipeline(manager, instance, "GetArg", h1); - - Assert.AreEqual("arg-value", instance.GetArg()); - - Assert.AreEqual(1, h1.CallCount); - } - - [TestMethod] - public void CanGenerateDerivedTypeForAbstractType() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(AbstractClassWithPublicConstructor)); - - Assert.AreSame(typeof(AbstractClassWithPublicConstructor), proxyType.BaseType); - } - - [TestMethod] - public void CanCreateInstanceForGeneratedTypeForAbstractType() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(AbstractClassWithPublicConstructor)); - - Activator.CreateInstance(proxyType); - } - - [TestMethod] - public void CanInvokeVirtualMethodOnInterceptedAbstractTypeInstance() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(AbstractClassWithPublicConstructor)); - - AbstractClassWithPublicConstructor instance = - (AbstractClassWithPublicConstructor)Activator.CreateInstance(proxyType); - bool invoked = false; - ((IInterceptingProxy)instance).AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => { invoked = true; return gn()(mi, gn); })); - - int value = instance.VirtualMethod(); - - Assert.AreEqual(10, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void InvokingAbstractMethodFromInterceptedAbstracTypeInstanceThrows() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(AbstractClassWithPublicConstructor)); - - AbstractClassWithPublicConstructor instance = - (AbstractClassWithPublicConstructor)Activator.CreateInstance(proxyType); - - try - { - instance.AbstractMethod(); - Assert.Fail("should have thrown"); - } - catch (NotImplementedException) - { - } - } - - [TestMethod] - public void CanCreateInstanceForGeneratedTypeForAbstractTypeWithProtectedConstructor() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(AbstractClassWithProtectedConstructor)); - - Activator.CreateInstance(proxyType, 100); - } - - [TestMethod] - public void CanInvokeVirtualMethodOnInterceptedAbstractTypeWithProtectedConstructorInstance() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(AbstractClassWithProtectedConstructor)); - - AbstractClassWithProtectedConstructor instance = - (AbstractClassWithProtectedConstructor)Activator.CreateInstance(proxyType, 200); - bool invoked = false; - ((IInterceptingProxy)instance).AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => { invoked = true; return gn()(mi, gn); })); - - int value = instance.VirtualMethod(); - - Assert.AreEqual(200, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void CanInvokeOverridenAbstractMethodMethodOnInterceptedDerivedFromAbstractTypeInstance() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(DerivedFromAbstractClassWithPublicConstructor)); - - DerivedFromAbstractClassWithPublicConstructor instance = - (DerivedFromAbstractClassWithPublicConstructor)Activator.CreateInstance(proxyType); - bool invoked = false; - ((IInterceptingProxy)instance).AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => { invoked = true; return gn()(mi, gn); })); - - int value = instance.AbstractMethod(); - - Assert.AreEqual(200, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void CanInvokeOverridenAbstractMethodMethodOnInterceptedAbstractDerivedFromAbstractTypeInstance() - { - VirtualMethodInterceptor interceptor = new VirtualMethodInterceptor(); - Type proxyType = interceptor.CreateProxyType(typeof(AbstractDerivedFromAbstractClassWithPublicConstructor)); - - AbstractDerivedFromAbstractClassWithPublicConstructor instance = - (AbstractDerivedFromAbstractClassWithPublicConstructor)Activator.CreateInstance(proxyType); - bool invoked = false; - ((IInterceptingProxy)instance).AddInterceptionBehavior( - new DelegateInterceptionBehavior((mi, gn) => { invoked = true; return gn()(mi, gn); })); - - int value = instance.AbstractMethod(); - - Assert.AreEqual(200, value); - Assert.IsTrue(invoked); - } - - [TestMethod] - public void AssortedParameterKindsAreProperlyHandled() - { - var interceptor = new VirtualMethodInterceptor(); - - var type = interceptor.CreateProxyType(typeof(AssortedParameterKindsAreProperlyHandledHelper.TypeWithAssertedParameterKinds)); - - IInterceptingProxy proxy = Activator.CreateInstance(type) as IInterceptingProxy; - - AssortedParameterKindsAreProperlyHandledHelper.PerformTest(proxy); - } - - private void SetPipeline(PipelineManager manager, object instance, string methodName, params ICallHandler[] handlers) - { - HandlerPipeline pipeline = new HandlerPipeline(handlers); - MethodInfo targetMethod = instance.GetType().BaseType.GetMethod(methodName); - IInterceptingProxy proxy = (IInterceptingProxy)instance; - manager.SetPipeline(targetMethod, pipeline); - } - - //[TestMethod] - //public void CanInterceptGenericInterfaceWithInterfaceConstraint() - //{ - // var target = new ConstrainedImpl(); - // - // bool behaviorWasCalled = false; - // - // var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - // { - // behaviorWasCalled = true; - // return getNext()(inputs, getNext); - // }); - // - // var proxy = Intercept.ThroughProxy>( - // target, new InterfaceInterceptor(), - // new[] { behavior }); - // - // proxy.SomeMethod(); - // - // Assert.IsTrue(behaviorWasCalled); - // - //} - - [TestMethod] - public void CanInterceptNonGenericMethodOnNonGenericInterface() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.NonGenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodOnNonGenericInterface() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintOnNonGenericInterface() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethodWithConstraints(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptNonGenericMethodOnGenericInterface() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.NonGenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodOnGenericInterface() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintOnGenericInterface() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethodWithConstraints(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintRelatedToInterfaceOnGenericInterface() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethodWithConstraintsOnTheInterfaceParameter(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptNonGenericMethodOnGenericInterfaceWithConstraint() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.NonGenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodOnGenericInterfaceWithConstraint() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethod(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintOnGenericInterfaceWithConstraint() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethodWithConstraints(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - [TestMethod] - public void CanInterceptGenericMethodWithConstraintRelatedToInterfaceOnGenericInterfaceWithConstraint() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.GenericMethodWithConstraintsOnTheInterfaceParameter(null, null); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(string), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(string), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - } - - public class NonGenericClass - { - public virtual string NonGenericMethod(IEnumerable param1, string param2) - { - return null; - } - - public virtual T GenericMethod(IEnumerable param1, T param2) - { - return default(T); - } - - public virtual T GenericMethodWithConstraints(IEnumerable param1, T param2) where T : class - { - return default(T); - } - } - - public class GenericClass - { - public virtual string NonGenericMethod(T1 param1, string param2) - { - return null; - } - - public virtual T GenericMethod(T1 param1, T param2) - { - var handle = MethodBase.GetCurrentMethod().MethodHandle; - - return default(T); - } - - public virtual T GenericMethodWithConstraints(T1 param1, T param2) where T : class - { - return default(T); - } - - public virtual T GenericMethodWithConstraintsOnTheInterfaceParameter(T1 param1, T param2) where T : T1 - { - return default(T); - } - } - - public class GenericClassWithConstraint - where T1 : class - { - public virtual string NonGenericMethod(T1 param1, string param2) - { - return null; - } - - public virtual T GenericMethod(T1 param1, T param2) - { - return default(T); - } - - public virtual T GenericMethodWithConstraints(T1 param1, T param2) where T : class - { - return default(T); - } - - public virtual T GenericMethodWithConstraintsOnTheInterfaceParameter(T1 param1, T param2) where T : T1 - { - return default(T); - } - } - - [TestMethod] - public void CanInterceptConstrainedInheritedInterfaceMethod() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.Test>(); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(List), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(0, invocation.MethodBase.GetParameters().Count()); - } - - public class BaseGenericClass - { - public virtual TDerivedType Test() where TDerivedType : TBaseType - { - return default(TDerivedType); - } - } - - public class DerivedNonGenericClass : BaseGenericClass> - { - } - - [TestMethod] - public void CanInterceptConstrainedInheritedInterfaceMethod2() - { - IMethodInvocation invocation = null; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - instance.TestMethod, DerivedType>( - new DerivedType(), - new BaseType[0], - Enumerable.Empty(), - new List[0]); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(List), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(4, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(BaseType), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - Assert.AreSame(typeof(IEnumerable), invocation.MethodBase.GetParameters().ElementAt(2).ParameterType); - Assert.AreSame(typeof(List[]), invocation.MethodBase.GetParameters().ElementAt(3).ParameterType); - } - - public class Class1 - { - public virtual W1 TestMethod(T1 a, U1 b, IEnumerable c, W1[] d) - where W1 : V1 - where X1 : T1 - { - return default(W1); - } - } - - public class Class2 : Class1, V2> - where T2 : new() - { } - - public class Class3 : Class2 - where V3 : class - { } - - public class BaseType { } - - public class DerivedType : BaseType { } - - [TestMethod] - public void CanInterceptConstrainedInheritedInterfaceMethod3() - { - IMethodInvocation invocation; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - invocation = null; - - instance.Test, List>(new ISet[0], new List()); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(KeyValuePair, IEnumerable>[]>), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(2, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(ISet[]), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - Assert.AreSame(typeof(List), invocation.MethodBase.GetParameters().ElementAt(1).ParameterType); - - invocation = null; - - instance.CompareTo((object)this); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(int), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(1, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(object), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - - invocation = null; - - ((IComparable)instance).CompareTo(Guid.Empty); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(int), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(1, invocation.MethodBase.GetParameters().Count()); - Assert.AreSame(typeof(Guid), invocation.MethodBase.GetParameters().ElementAt(0).ParameterType); - } - - public class ClassA1 : IComparable - { - public virtual KeyValuePair[]> Test(TA1[] p1, M2 p2) - where M1 : TA1 - where M2 : IEnumerable - { - return default(KeyValuePair[]>); - } - - public virtual int CompareTo(TB1 other) - { - return 0; - } - } - - public class ClassA2 : ClassA1, Guid>, IComparable - where TC2 : class, new() - { - public virtual int CompareTo(object obj) - { - return 0; - } - } - - [TestMethod] - public void CanInterceptVirtualMethodsOnGenericNestedClassInGenericClass() - { - IMethodInvocation invocation; - - var behavior = new DelegateInterceptionBehavior((inputs, getNext) => - { - invocation = inputs; - return getNext()(inputs, getNext); - }); - - var instance = - Intercept.NewInstance.GenericNestedClass>( - new VirtualMethodInterceptor(), - new[] { behavior }); - - invocation = null; - - instance.Test>(); - - Assert.IsNotNull(invocation); - Assert.AreSame(typeof(List[]), ((MethodInfo)invocation.MethodBase).ReturnType); - Assert.AreEqual(0, invocation.MethodBase.GetParameters().Count()); - } - - public class GenericClassWithNestedGenericClass - { - public class GenericNestedClass where U : T - { - public virtual X[] Test() where X : IEnumerable - { - return default(X[]); - } - } - } - } - - public partial class DerivedTypeCreator - { - public void CreateType(Type baseType) - { - new VirtualMethodInterceptor().CreateProxyType(baseType); - } - } - - public class ClassWithNonDefaultCtor - { - private string arg; - - public ClassWithNonDefaultCtor(string arg) - { - this.arg = arg; - } - - public virtual string GetArg() - { - return arg; - } - } - - public class ClassWithNoVirtuals - { - public void CannotOverrideMe() - { - } - } - - public sealed class CantOverride - { - } - - public class TwoOverrideableMethods - { - public bool DidSomething; - - public virtual void DoSomething() - { - DidSomething = true; - } - - public virtual string Swizzle(int a, float b, decimal c) - { - return ((decimal)(a * b) + c).ToString(); - } - } - - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - internal sealed class MultiAttribute : Attribute - { - private readonly string name; - - public MultiAttribute(string name) - { - this.name = name; - } - - public string Name - { - get { return this.name; } - } - } - - public class OverrideableProperies - { - private int intProperty; - private string stringProperty; - - public virtual int IntProperty - { - get { return intProperty; } - set { intProperty = value; } - } - - [Multi("One")] - [Multi("Two")] - public virtual string StringProperty - { - get { return stringProperty; } - set { stringProperty = value; } - } - } - - public class ClassWithEvent - { - public virtual event EventHandler MyEvent; - - public virtual void FireMyEvent() - { - EventHandler evt = MyEvent; - if (evt != null) - { - evt(this, EventArgs.Empty); - } - } - } - - public class OverriddenProperties : OverrideableProperies - { - public override string StringProperty - { - get - { - return base.StringProperty; - } - set - { - base.StringProperty = value; - } - } - - public override int IntProperty - { - get - { - return base.IntProperty; - } - set - { - base.IntProperty = value; - } - } - } - - public abstract class AbstractClassWithPublicConstructor - { - public AbstractClassWithPublicConstructor() - { - } - - public abstract int AbstractMethod(); - - public virtual int VirtualMethod() - { - return 10; - } - } - - public class DerivedFromAbstractClassWithPublicConstructor : AbstractClassWithPublicConstructor - { - public override int AbstractMethod() - { - return 200; - } - } - - public abstract class AbstractDerivedFromAbstractClassWithPublicConstructor : AbstractClassWithPublicConstructor - { - public override int AbstractMethod() - { - return 200; - } - } - - public abstract class AbstractClassWithProtectedConstructor - { - private int value; - - protected AbstractClassWithProtectedConstructor(int value) - { - this.value = value; - } - - public abstract int AbstractMethod(); - - public virtual int VirtualMethod() - { - return value; - } - } -} diff --git a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/WireupHelper.cs b/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/WireupHelper.cs deleted file mode 100644 index 2efc9430..00000000 --- a/source/Unity.Interception/Tests/Tests.Unity.Interception/VirtualMethodInterception/WireupHelper.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.InterceptionExtension.Tests.VirtualMethodInterception -{ - internal class WireupHelper - { - internal static T GetInterceptingInstance(params object[] ctorValues) - { - Type typeToIntercept = typeof(T); - if (typeToIntercept.IsGenericType) - { - typeToIntercept = typeToIntercept.GetGenericTypeDefinition(); - } - - InterceptingClassGenerator generator = new InterceptingClassGenerator(typeToIntercept); - Type generatedType = generator.GenerateType(); - - if (generatedType.IsGenericTypeDefinition) - { - generatedType = generatedType.MakeGenericType(typeof(T).GetGenericArguments()); - } - - return (T)Activator.CreateInstance(generatedType, ctorValues); - } - - internal static T GetInterceptedInstance(string methodName, ICallHandler handler) - { - MethodInfo method = typeof(T).GetMethod(methodName); - - T instance = GetInterceptingInstance(); - - PipelineManager manager = new PipelineManager(); - manager.SetPipeline(method, new HandlerPipeline(Sequence.Collect(handler))); - - IInterceptingProxy pm = (IInterceptingProxy)instance; - pm.AddInterceptionBehavior(new PolicyInjectionBehavior(manager)); - - return instance; - } - } -} diff --git a/source/Unity.Mvc/Src/GlobalSuppressions.cs b/source/Unity.Mvc/Src/GlobalSuppressions.cs deleted file mode 100644 index 6e20c283..00000000 --- a/source/Unity.Mvc/Src/GlobalSuppressions.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Mvc", Justification = "Consistent with MVC spelling")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Mvc", Scope = "namespace", Target = "Microsoft.Practices.Unity.Mvc", Justification = "Consistent with MVC spelling")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Microsoft.Practices.Unity.Mvc", Justification = "Reviewed")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Microsoft.Practices.Unity", Justification = "Reviewed")] diff --git a/source/Unity.Mvc/Src/NuGet/UnityConfig.cs.pp b/source/Unity.Mvc/Src/NuGet/UnityConfig.cs.pp deleted file mode 100644 index 664b7e1f..00000000 --- a/source/Unity.Mvc/Src/NuGet/UnityConfig.cs.pp +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.Configuration; - -namespace $rootnamespace$.App_Start -{ - /// - /// Specifies the Unity configuration for the main container. - /// - public class UnityConfig - { - #region Unity Container - private static Lazy container = new Lazy(() => - { - var container = new UnityContainer(); - RegisterTypes(container); - return container; - }); - - /// - /// Gets the configured Unity container. - /// - public static IUnityContainer GetConfiguredContainer() - { - return container.Value; - } - #endregion - - /// Registers the type mappings with the Unity container. - /// The unity container to configure. - /// There is no need to register concrete types such as controllers or API controllers (unless you want to - /// change the defaults), as Unity allows resolving a concrete type even if it was not previously registered. - public static void RegisterTypes(IUnityContainer container) - { - // NOTE: To load from web.config uncomment the line below. Make sure to add a Microsoft.Practices.Unity.Configuration to the using statements. - // container.LoadConfiguration(); - - // TODO: Register your types here - // container.RegisterType(); - } - } -} diff --git a/source/Unity.Mvc/Src/NuGet/UnityMvcActivator.cs.pp b/source/Unity.Mvc/Src/NuGet/UnityMvcActivator.cs.pp deleted file mode 100644 index a6ebdc3b..00000000 --- a/source/Unity.Mvc/Src/NuGet/UnityMvcActivator.cs.pp +++ /dev/null @@ -1,34 +0,0 @@ -using System.Linq; -using System.Web.Mvc; -using Microsoft.Practices.Unity.Mvc; - -[assembly: WebActivatorEx.PreApplicationStartMethod(typeof($rootnamespace$.App_Start.UnityWebActivator), "Start")] -[assembly: WebActivatorEx.ApplicationShutdownMethod(typeof($rootnamespace$.App_Start.UnityWebActivator), "Shutdown")] - -namespace $rootnamespace$.App_Start -{ - /// Provides the bootstrapping for integrating Unity with ASP.NET MVC. - public static class UnityWebActivator - { - /// Integrates Unity when the application starts. - public static void Start() - { - var container = UnityConfig.GetConfiguredContainer(); - - FilterProviders.Providers.Remove(FilterProviders.Providers.OfType().First()); - FilterProviders.Providers.Add(new UnityFilterAttributeFilterProvider(container)); - - DependencyResolver.SetResolver(new UnityDependencyResolver(container)); - - // TODO: Uncomment if you want to use PerRequestLifetimeManager - // Microsoft.Web.Infrastructure.DynamicModuleHelper.DynamicModuleUtility.RegisterModule(typeof(UnityPerRequestHttpModule)); - } - - /// Disposes the Unity container when the application is shut down. - public static void Shutdown() - { - var container = UnityConfig.GetConfiguredContainer(); - container.Dispose(); - } - } -} \ No newline at end of file diff --git a/source/Unity.Mvc/Src/PerRequestLifetimeManager.cs b/source/Unity.Mvc/Src/PerRequestLifetimeManager.cs deleted file mode 100644 index 9d99355d..00000000 --- a/source/Unity.Mvc/Src/PerRequestLifetimeManager.cs +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Mvc; - -namespace Microsoft.Practices.Unity -{ - /// - /// A that holds onto the instance given to it during - /// the lifetime of a single HTTP request. - /// This lifetime manager enables you to create instances of registered types that behave like - /// singletons within the scope of an HTTP request. - /// See remarks for important usage information. - /// - /// - /// - /// Although the lifetime manager works correctly and can help - /// in working with stateful or thread-unsafe dependencies within the scope of an HTTP request, it is - /// generally not a good idea to use it when it can be avoided, as it can often lead to bad practices or - /// hard to find bugs in the end-user's application code when used incorrectly. - /// It is recommended that the dependencies you register are stateless and if there is a need to share - /// common state between several objects during the lifetime of an HTTP request, then you can - /// have a stateless service that explicitly stores and retrieves this state using the - /// collection of the object. - /// - /// - /// For the instance of the registered type to be disposed automatically when the HTTP request completes, - /// make sure to register the with the web application. - /// To do this, invoke the following in the Unity bootstrapping class (typically UnityMvcActivator.cs): - /// DynamicModuleUtility.RegisterModule(typeof(UnityPerRequestHttpModule)); - /// - /// - public class PerRequestLifetimeManager : LifetimeManager - { - private readonly object lifetimeKey = new object(); - - /// - /// Retrieves a value from the backing store associated with this lifetime policy. - /// - /// The desired object, or null if no such object is currently stored. - public override object GetValue() - { - return UnityPerRequestHttpModule.GetValue(this.lifetimeKey); - } - - /// - /// Stores the given value into the backing store for retrieval later. - /// - /// The object being stored. - public override void SetValue(object newValue) - { - UnityPerRequestHttpModule.SetValue(this.lifetimeKey, newValue); - } - - /// - /// Removes the given object from the backing store. - /// - public override void RemoveValue() - { - var disposable = this.GetValue() as IDisposable; - - if (disposable != null) - { - disposable.Dispose(); - } - - UnityPerRequestHttpModule.SetValue(this.lifetimeKey, null); - } - } -} diff --git a/source/Unity.Mvc/Src/Properties/AssemblyInfo.cs b/source/Unity.Mvc/Src/Properties/AssemblyInfo.cs deleted file mode 100644 index 5f262f05..00000000 --- a/source/Unity.Mvc/Src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - -[assembly: CLSCompliant(true)] -[assembly: AssemblyTitle("Microsoft Unity Application Block integation for ASP.NET MVC")] -[assembly: AssemblyDescription("")] - -[assembly: AssemblyProduct("Microsoft Unity Application Block")] -[assembly: AssemblyCompany("Microsoft Corporation")] - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif -[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("4.0.0.0")] -[assembly: AssemblyFileVersion("4.0.1.0")] -[assembly: AssemblyInformationalVersion("4.0.1")] - -[assembly: ComVisible(false)] -[assembly: NeutralResourcesLanguage("en")] diff --git a/source/Unity.Mvc/Src/Properties/Resources.Designer.cs b/source/Unity.Mvc/Src/Properties/Resources.Designer.cs deleted file mode 100644 index 610610dd..00000000 --- a/source/Unity.Mvc/Src/Properties/Resources.Designer.cs +++ /dev/null @@ -1,72 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.34011 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.Practices.Unity.Mvc.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Practices.Unity.Mvc.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to The PerRequestLifetimeManager can only be used in the context of an HTTP request. Possible causes for this error are using the lifetime manager on a non-ASP.NET application, or using it in a thread that is not associated with the appropriate synchronization context.. - /// - internal static string ErrorHttpContextNotAvailable { - get { - return ResourceManager.GetString("ErrorHttpContextNotAvailable", resourceCulture); - } - } - } -} diff --git a/source/Unity.Mvc/Src/Properties/Resources.resx b/source/Unity.Mvc/Src/Properties/Resources.resx deleted file mode 100644 index e23b2738..00000000 --- a/source/Unity.Mvc/Src/Properties/Resources.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - The PerRequestLifetimeManager can only be used in the context of an HTTP request. Possible causes for this error are using the lifetime manager on a non-ASP.NET application, or using it in a thread that is not associated with the appropriate synchronization context. - - \ No newline at end of file diff --git a/source/Unity.Mvc/Src/Unity.Mvc.csproj b/source/Unity.Mvc/Src/Unity.Mvc.csproj deleted file mode 100644 index 5423b46c..00000000 --- a/source/Unity.Mvc/Src/Unity.Mvc.csproj +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Debug - AnyCPU - {1FB1A6FE-1898-4E72-906E-1C160AB50F2F} - Library - Properties - Microsoft.Practices.Unity.Mvc - Microsoft.Practices.Unity.Mvc - v4.5 - 512 - - - true - full - false - ..\..\bin\Desktop\Debug\ - TRACE;DEBUG;CODE_ANALYSIS - prompt - 4 - ..\..\bin\Desktop\Debug\Microsoft.Practices.Unity.Mvc.xml - true - ..\..\Unity.ruleset - - - pdbonly - true - ..\..\bin\Desktop\Release\ - TRACE - prompt - 4 - ..\..\bin\Desktop\Release\Microsoft.Practices.Unity.Mvc.XML - ..\..\Unity.ruleset - - - - False - ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - - - - - - True - ..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - - - True - ..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - - - True - ..\..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll - - - True - ..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - - - True - ..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - - - True - ..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll - - - - - - - - - True - True - Resources.resx - - - - - - - - Unity.licenseheader - - - - Always - - - Always - - - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - \ No newline at end of file diff --git a/source/Unity.Mvc/Src/Unity.Mvc.nuspec b/source/Unity.Mvc/Src/Unity.Mvc.nuspec deleted file mode 100644 index f91ad9bf..00000000 --- a/source/Unity.Mvc/Src/Unity.Mvc.nuspec +++ /dev/null @@ -1,29 +0,0 @@ - - - - Unity.Mvc - $Microsoft_Practices_Unity_WebApi_Version$ - Unity bootstrapper for ASP.NET MVC - Microsoft - Microsoft; patterns-and-practices - Unity is a lightweight extensible dependency injection container. This package is a Unity bootstrapper for ASP.NET MVC. - This package is a Unity bootstrapper for ASP.NET MVC - http://unity.codeplex.com - http://nuget.org/Media/Default/Packages/Unity/2.0/entlib_new_icon_100x100.png - http://opensource.org/licenses/Apache-2.0 - © Microsoft Corporation. All rights reserved. - true - - - - - - - - Unity Unity3 Unity35 EntLib EntLib6 IoC DI container dependency injection inversion control aspnet mvc aspnetmvc LOB OSS - - - - - - \ No newline at end of file diff --git a/source/Unity.Mvc/Src/UnityDependencyResolver.cs b/source/Unity.Mvc/Src/UnityDependencyResolver.cs deleted file mode 100644 index b242bca1..00000000 --- a/source/Unity.Mvc/Src/UnityDependencyResolver.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Web.Mvc; - -namespace Microsoft.Practices.Unity.Mvc -{ - /// - /// An implementation of that wraps a Unity container. - /// - public class UnityDependencyResolver : IDependencyResolver - { - private readonly IUnityContainer container; - - /// - /// Initializes a new instance of the class for a container. - /// - /// The to wrap with the - /// interface implementation. - public UnityDependencyResolver(IUnityContainer container) - { - this.container = container; - } - - /// - /// Resolves an instance of the default requested type from the container. - /// - /// The of the object to get from the container. - /// The requested object. - public object GetService(Type serviceType) - { - if (typeof(IController).IsAssignableFrom(serviceType)) - { - return this.container.Resolve(serviceType); - } - try - { - return this.container.Resolve(serviceType); - } - catch (ResolutionFailedException) - { - return null; - } - } - - /// - /// Resolves multiply registered services. - /// - /// The type of the requested services. - /// The requested services. - public IEnumerable GetServices(Type serviceType) - { - return this.container.ResolveAll(serviceType); - } - } -} diff --git a/source/Unity.Mvc/Src/UnityFilterAttributeFilterProvider.cs b/source/Unity.Mvc/Src/UnityFilterAttributeFilterProvider.cs deleted file mode 100644 index 5f789d83..00000000 --- a/source/Unity.Mvc/Src/UnityFilterAttributeFilterProvider.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Web.Mvc; - -namespace Microsoft.Practices.Unity.Mvc -{ - /// - /// Defines a filter provider for filter attributes that support injection of Unity dependencies. - /// - public class UnityFilterAttributeFilterProvider : FilterAttributeFilterProvider - { - private readonly IUnityContainer container; - - /// - /// Initializes a new instance of the class. - /// - /// The that will be used to inject the filters. - public UnityFilterAttributeFilterProvider(IUnityContainer container) - { - this.container = container; - } - - /// - /// Gets a collection of custom action attributes, and injects them using a Unity container. - /// - /// The controller context. - /// The action descriptor. - /// A collection of custom action attributes. - protected override IEnumerable GetActionAttributes(ControllerContext controllerContext, ActionDescriptor actionDescriptor) - { - var list = base.GetActionAttributes(controllerContext, actionDescriptor); - - foreach (var item in list) - { - this.container.BuildUp(item.GetType(), item); - } - - return list; - } - - /// - /// Gets a collection of controller attributes, and injects them using a Unity container. - /// - /// The controller context. - /// The action descriptor. - /// A collection of controller attributes. - protected override IEnumerable GetControllerAttributes(ControllerContext controllerContext, ActionDescriptor actionDescriptor) - { - var list = base.GetControllerAttributes(controllerContext, actionDescriptor); - - foreach (var item in list) - { - this.container.BuildUp(item.GetType(), item); - } - - return list; - } - } -} diff --git a/source/Unity.Mvc/Src/UnityPerRequestHttpModule.cs b/source/Unity.Mvc/Src/UnityPerRequestHttpModule.cs deleted file mode 100644 index 564487ed..00000000 --- a/source/Unity.Mvc/Src/UnityPerRequestHttpModule.cs +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Web; -using Microsoft.Practices.Unity.Mvc.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity.Mvc -{ - /// - /// Implementation of the interface that provides support for using the - /// lifetime manager, and enables it to - /// dispose the instances after the HTTP request ends. - /// - public class UnityPerRequestHttpModule : IHttpModule - { - private static readonly object ModuleKey = new object(); - - internal static object GetValue(object lifetimeManagerKey) - { - var dict = GetDictionary(HttpContext.Current); - - if (dict != null) - { - object obj = null; - - if (dict.TryGetValue(lifetimeManagerKey, out obj)) - { - return obj; - } - } - - return null; - } - - internal static void SetValue(object lifetimeManagerKey, object value) - { - var dict = GetDictionary(HttpContext.Current); - - if (dict == null) - { - dict = new Dictionary(); - - HttpContext.Current.Items[ModuleKey] = dict; - } - - dict[lifetimeManagerKey] = value; - } - - /// - /// Disposes the resources used by this module. - /// - public void Dispose() - { - } - - /// - /// Initializes a module and prepares it to handle requests. - /// - /// An that provides access to the methods, properties, - /// and events common to all application objects within an ASP.NET application. - [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Justification = "Validated with Guard class")] - public void Init(HttpApplication context) - { - Guard.ArgumentNotNull(context, "context"); - context.EndRequest += OnEndRequest; - } - - private void OnEndRequest(object sender, EventArgs e) - { - var app = (HttpApplication)sender; - - var dict = GetDictionary(app.Context); - - if (dict != null) - { - foreach (var disposable in dict.Values.OfType()) - { - disposable.Dispose(); - } - } - } - - private static Dictionary GetDictionary(HttpContext context) - { - if (context == null) - { - throw new InvalidOperationException(Resources.ErrorHttpContextNotAvailable); - } - - var dict = (Dictionary)context.Items[ModuleKey]; - - return dict; - } - } -} diff --git a/source/Unity.Mvc/Src/packages.config b/source/Unity.Mvc/Src/packages.config deleted file mode 100644 index dc15da0f..00000000 --- a/source/Unity.Mvc/Src/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/source/Unity.NetCore.sln b/source/Unity.NetCore.sln deleted file mode 100644 index 0e0bcf8e..00000000 --- a/source/Unity.NetCore.sln +++ /dev/null @@ -1,79 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Tests.NetCore", "Unity\Tests\Unity.NetCore.Tests\Unity.Tests.NetCore.csproj", "{D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}" - ProjectSection(ProjectDependencies) = postProject - {A2CF2916-F998-4C62-9743-11A7466FE57C} = {A2CF2916-F998-4C62-9743-11A7466FE57C} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssemblies", "TestAssemblies", "{5E75A0A8-C2ED-4DCF-A295-F9BCE70C5582}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MissingAssembly.NetCore", "Unity\Tests\TestAssemblies\MissingAssembly.NetCore\MissingAssembly.NetCore.csproj", "{4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestNetAssembly.NetCore", "Unity\Tests\TestAssemblies\TestNetAssembly.NetCore\TestNetAssembly.NetCore.csproj", "{A2CF2916-F998-4C62-9743-11A7466FE57C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity\Src\Unity.csproj", "{EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RegistrationByConvention.NetCore", "Unity\Src\RegistrationByConvention\Unity.RegistrationByConvention.NetCore.csproj", "{858426D0-79AB-4928-95B9-A1E1725D31D3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Debug|Any CPU.ActiveCfg = Debug|x86 - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Debug|Any CPU.Build.0 = Debug|x86 - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Debug|Any CPU.Deploy.0 = Debug|x86 - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Debug|ARM.ActiveCfg = Debug|ARM - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Debug|ARM.Build.0 = Debug|ARM - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Debug|ARM.Deploy.0 = Debug|ARM - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Release|Any CPU.ActiveCfg = Release|x86 - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Release|Any CPU.Build.0 = Release|x86 - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Release|Any CPU.Deploy.0 = Release|x86 - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Release|ARM.ActiveCfg = Release|ARM - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Release|ARM.Build.0 = Release|ARM - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8}.Release|ARM.Deploy.0 = Release|ARM - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Debug|ARM.Build.0 = Debug|Any CPU - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Release|Any CPU.Build.0 = Release|Any CPU - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Release|ARM.ActiveCfg = Release|Any CPU - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7}.Release|ARM.Build.0 = Release|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Debug|ARM.Build.0 = Debug|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Release|Any CPU.Build.0 = Release|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Release|ARM.ActiveCfg = Release|Any CPU - {A2CF2916-F998-4C62-9743-11A7466FE57C}.Release|ARM.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|ARM.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|ARM.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|ARM.Build.0 = Release|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Debug|ARM.ActiveCfg = Debug|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Debug|ARM.Build.0 = Debug|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Release|Any CPU.Build.0 = Release|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Release|ARM.ActiveCfg = Release|Any CPU - {858426D0-79AB-4928-95B9-A1E1725D31D3}.Release|ARM.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {4CB49AFB-6508-4AE9-A7A8-CBAEE81C51F7} = {5E75A0A8-C2ED-4DCF-A295-F9BCE70C5582} - {A2CF2916-F998-4C62-9743-11A7466FE57C} = {5E75A0A8-C2ED-4DCF-A295-F9BCE70C5582} - EndGlobalSection -EndGlobal diff --git a/source/Unity.WebApi/Src/GlobalSuppressions.cs b/source/Unity.WebApi/Src/GlobalSuppressions.cs deleted file mode 100644 index aadf9f95..00000000 --- a/source/Unity.WebApi/Src/GlobalSuppressions.cs +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Api", Justification = "Consistent with WebApi spelling")] -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Api", Scope = "namespace", Target = "Microsoft.Practices.Unity.WebApi", Justification = "Consistent with WebApi spelling")] diff --git a/source/Unity.WebApi/Src/NuGet/UnityWebApiActivator.cs.pp b/source/Unity.WebApi/Src/NuGet/UnityWebApiActivator.cs.pp deleted file mode 100644 index e00c63a0..00000000 --- a/source/Unity.WebApi/Src/NuGet/UnityWebApiActivator.cs.pp +++ /dev/null @@ -1,29 +0,0 @@ -using System.Web.Http; -using Microsoft.Practices.Unity.WebApi; - -[assembly: WebActivatorEx.PreApplicationStartMethod(typeof($rootnamespace$.App_Start.UnityWebApiActivator), "Start")] -[assembly: WebActivatorEx.ApplicationShutdownMethod(typeof($rootnamespace$.App_Start.UnityWebApiActivator), "Shutdown")] - -namespace $rootnamespace$.App_Start -{ - /// Provides the bootstrapping for integrating Unity with WebApi when it is hosted in ASP.NET - public static class UnityWebApiActivator - { - /// Integrates Unity when the application starts. - public static void Start() - { - // Use UnityHierarchicalDependencyResolver if you want to use a new child container for each IHttpController resolution. - // var resolver = new UnityHierarchicalDependencyResolver(UnityConfig.GetConfiguredContainer()); - var resolver = new UnityDependencyResolver(UnityConfig.GetConfiguredContainer()); - - GlobalConfiguration.Configuration.DependencyResolver = resolver; - } - - /// Disposes the Unity container when the application is shut down. - public static void Shutdown() - { - var container = UnityConfig.GetConfiguredContainer(); - container.Dispose(); - } - } -} diff --git a/source/Unity.WebApi/Src/Properties/AssemblyInfo.cs b/source/Unity.WebApi/Src/Properties/AssemblyInfo.cs deleted file mode 100644 index 0aa47cc3..00000000 --- a/source/Unity.WebApi/Src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - -[assembly: CLSCompliant(true)] -[assembly: AssemblyTitle("Microsoft Unity Application Block integation for ASP.NET WebApi")] -[assembly: AssemblyDescription("")] - -[assembly: AssemblyProduct("Microsoft Unity Application Block")] -[assembly: AssemblyCompany("Microsoft Corporation")] - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif -[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("4.0.0.0")] -[assembly: AssemblyFileVersion("4.0.1.0")] -[assembly: AssemblyInformationalVersion("4.0.1")] - -[assembly: ComVisible(false)] -[assembly: NeutralResourcesLanguage("en")] diff --git a/source/Unity.WebApi/Src/Unity.WebApi.csproj b/source/Unity.WebApi/Src/Unity.WebApi.csproj deleted file mode 100644 index 277b0548..00000000 --- a/source/Unity.WebApi/Src/Unity.WebApi.csproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - - Debug - AnyCPU - {E6A503F3-1B1D-4008-98EE-7EACA66DFB05} - Library - Properties - Microsoft.Practices.Unity.WebApi - Microsoft.Practices.Unity.WebApi - v4.5 - 512 - - - true - full - false - ..\..\bin\Desktop\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\bin\Desktop\Debug\Microsoft.Practices.Unity.WebApi.XML - ..\..\Unity.ruleset - - - pdbonly - true - ..\..\bin\Desktop\Release\ - TRACE - prompt - 4 - ..\..\bin\Desktop\Release\Microsoft.Practices.Unity.WebApi.XML - ..\..\Unity.ruleset - - - - False - ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - False - ..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll - - - - - - - - ..\..\packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll - - - - ..\..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll - - - - - - - - - - - - Unity.licenseheader - - - NuGet\UnityConfig.cs.pp - Always - - - Always - - - Designer - - - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - - - \ No newline at end of file diff --git a/source/Unity.WebApi/Src/Unity.WebApi.nuspec b/source/Unity.WebApi/Src/Unity.WebApi.nuspec deleted file mode 100644 index fc4faa29..00000000 --- a/source/Unity.WebApi/Src/Unity.WebApi.nuspec +++ /dev/null @@ -1,27 +0,0 @@ - - - - Unity.AspNet.WebApi - $Microsoft_Practices_Unity_Mvc_Version$ - Unity bootstrapper for ASP.NET Web API - Microsoft - Microsoft; patterns-and-practices - Unity is a lightweight extensible dependency injection container. This package is a Unity bootstrapper for ASP.NET Web API. - This package is a Unity bootstrapper for ASP.NET Web API - http://unity.codeplex.com - http://nuget.org/Media/Default/Packages/Unity/2.0/entlib_new_icon_100x100.png - http://opensource.org/licenses/Apache-2.0 - © Microsoft Corporation. All rights reserved. - true - - - - - - Unity Unity3 Unity35 EntLib EntLib6 IoC DI container dependency injection inversion control aspnet webapi web api aspnetwebapi LOB OSS - - - - - - \ No newline at end of file diff --git a/source/Unity.WebApi/Src/UnityDependencyResolver.cs b/source/Unity.WebApi/Src/UnityDependencyResolver.cs deleted file mode 100644 index 6f31f9dc..00000000 --- a/source/Unity.WebApi/Src/UnityDependencyResolver.cs +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Web.Http.Controllers; -using System.Web.Http.Dependencies; - -namespace Microsoft.Practices.Unity.WebApi -{ - /// - /// An implementation of the interface that wraps a Unity container. - /// - public sealed class UnityDependencyResolver : IDependencyResolver - { - private IUnityContainer container; - private SharedDependencyScope sharedScope; - - /// - /// Initializes a new instance of the class for a container. - /// - /// The to wrap with the - /// interface implementation. - public UnityDependencyResolver(IUnityContainer container) - { - if (container == null) - { - throw new ArgumentNullException("container"); - } - this.container = container; - this.sharedScope = new SharedDependencyScope(container); - } - - /// - /// Reuses the same scope to resolve all the instances. - /// - /// The shared dependency scope. - public IDependencyScope BeginScope() - { - return this.sharedScope; - } - - /// - /// Disposes the wrapped . - /// - public void Dispose() - { - this.container.Dispose(); - this.sharedScope.Dispose(); - } - - /// - /// Resolves an instance of the default requested type from the container. - /// - /// The of the object to get from the container. - /// The requested object. - public object GetService(Type serviceType) - { - try - { - return this.container.Resolve(serviceType); - } - catch (ResolutionFailedException) - { - return null; - } - } - - /// - /// Resolves multiply registered services. - /// - /// The type of the requested services. - /// The requested services. - public IEnumerable GetServices(Type serviceType) - { - try - { - return this.container.ResolveAll(serviceType); - } - catch (ResolutionFailedException) - { - return null; - } - } - - private sealed class SharedDependencyScope : IDependencyScope - { - private IUnityContainer container; - - public SharedDependencyScope(IUnityContainer container) - { - this.container = container; - } - - public object GetService(Type serviceType) - { - return this.container.Resolve(serviceType); - } - - public IEnumerable GetServices(Type serviceType) - { - return this.container.ResolveAll(serviceType); - } - - public void Dispose() - { - // NO-OP, as the container is shared. - } - } - } -} diff --git a/source/Unity.WebApi/Src/UnityHierarchicalDependencyResolver.cs b/source/Unity.WebApi/Src/UnityHierarchicalDependencyResolver.cs deleted file mode 100644 index fbd36074..00000000 --- a/source/Unity.WebApi/Src/UnityHierarchicalDependencyResolver.cs +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Web.Http.Controllers; -using System.Web.Http.Dependencies; - -namespace Microsoft.Practices.Unity.WebApi -{ - /// - /// An implementation of that wraps a Unity container and creates a new child container - /// when is invoked. - /// - /// - /// Because each scope creates a new child Unity container, you can benefit from using the - /// lifetime manager. - /// - public sealed class UnityHierarchicalDependencyResolver : IDependencyResolver - { - private IUnityContainer container; - - /// - /// Initializes a new instance of the class for a container. - /// - /// The to wrap with the - /// interface implementation. - public UnityHierarchicalDependencyResolver(IUnityContainer container) - { - if (container == null) - { - throw new ArgumentNullException("container"); - } - this.container = container; - } - - /// - /// Starts a resolution scope by creating a new child Unity container. - /// - /// The dependency scope. - public IDependencyScope BeginScope() - { - return new UnityHierarchicalDependencyScope(this.container); - } - - /// - /// Disposes the wrapped . - /// - public void Dispose() - { - this.container.Dispose(); - } - - /// - /// Resolves an instance of the default requested type from the container. - /// - /// The of the object to get from the container. - /// The retrieved object. - public object GetService(Type serviceType) - { - try - { - return this.container.Resolve(serviceType); - } - catch (ResolutionFailedException) - { - return null; - } - } - - /// - /// Resolves multiply registered services. - /// - /// The type of the requested services. - /// The requested services. - public IEnumerable GetServices(Type serviceType) - { - try - { - return this.container.ResolveAll(serviceType); - } - catch (ResolutionFailedException) - { - return null; - } - } - - private sealed class UnityHierarchicalDependencyScope : IDependencyScope - { - private IUnityContainer container; - - public UnityHierarchicalDependencyScope(IUnityContainer parentContainer) - { - this.container = parentContainer.CreateChildContainer(); - } - - public object GetService(Type serviceType) - { - return this.container.Resolve(serviceType); - } - - public IEnumerable GetServices(Type serviceType) - { - return this.container.ResolveAll(serviceType); - } - - public void Dispose() - { - this.container.Dispose(); - } - } - } -} diff --git a/source/Unity.WebApi/Src/packages.config b/source/Unity.WebApi/Src/packages.config deleted file mode 100644 index b14cf7d1..00000000 --- a/source/Unity.WebApi/Src/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/source/Unity.WindowsPhone.8.1.sln b/source/Unity.WindowsPhone.8.1.sln deleted file mode 100644 index 688dd573..00000000 --- a/source/Unity.WindowsPhone.8.1.sln +++ /dev/null @@ -1,62 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30324.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity\Src\Unity.csproj", "{EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Tests.WindowsPhone.8.1", "Unity\Tests\Unity.Tests.WindowsPhone.8.1\Unity.Tests.WindowsPhone.8.1.csproj", "{F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|ARM.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|x86.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|x86.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|ARM.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|ARM.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|x86.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|x86.Build.0 = Release|Any CPU - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|ARM.ActiveCfg = Debug|ARM - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|ARM.Build.0 = Debug|ARM - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|ARM.Deploy.0 = Debug|ARM - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|Mixed Platforms.Deploy.0 = Debug|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|x86.ActiveCfg = Debug|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|x86.Build.0 = Debug|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Debug|x86.Deploy.0 = Debug|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|Any CPU.ActiveCfg = Release|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|ARM.ActiveCfg = Release|ARM - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|ARM.Build.0 = Release|ARM - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|ARM.Deploy.0 = Release|ARM - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|Mixed Platforms.Build.0 = Release|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|Mixed Platforms.Deploy.0 = Release|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|x86.ActiveCfg = Release|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|x86.Build.0 = Release|x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9}.Release|x86.Deploy.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/source/Unity.WindowsPhone.sln b/source/Unity.WindowsPhone.sln deleted file mode 100644 index aef73f3a..00000000 --- a/source/Unity.WindowsPhone.sln +++ /dev/null @@ -1,122 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Tests.WindowsPhone", "Unity\Tests\Unity.Tests.WindowsPhone\Unity.Tests.WindowsPhone.csproj", "{E2867882-DECA-4E8B-8979-655700D6F550}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssemblies", "TestAssemblies", "{1B8DEF40-DB88-4B72-93B6-962C4C997A1A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestNetAssembly.WindowsPhone", "Unity\Tests\TestAssemblies\TestNetAssembly.WindowsPhone\TestNetAssembly.WindowsPhone.csproj", "{4C459835-2E73-4266-AFED-F88F052F7337}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MissingAssembly.WindowsPhone", "Unity\Tests\TestAssemblies\MissingAssembly.WindowsPhone\MissingAssembly.WindowsPhone.csproj", "{1036D963-0360-41A8-8B34-7FC71193DDA5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity\Src\Unity.csproj", "{EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RegistrationByConvention.WindowsPhone", "Unity\Src\RegistrationByConvention\Unity.RegistrationByConvention.WindowsPhone.csproj", "{119A2045-4C28-48FF-A828-D7F711B844F2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|Any CPU.ActiveCfg = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|Any CPU.Build.0 = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|ARM.ActiveCfg = Debug|ARM - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|ARM.Build.0 = Debug|ARM - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|ARM.Deploy.0 = Debug|ARM - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|Mixed Platforms.Deploy.0 = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|x86.ActiveCfg = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|x86.Build.0 = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Debug|x86.Deploy.0 = Debug|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|Any CPU.ActiveCfg = Release|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|Any CPU.Build.0 = Release|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|ARM.ActiveCfg = Release|ARM - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|ARM.Build.0 = Release|ARM - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|ARM.Deploy.0 = Release|ARM - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|Mixed Platforms.Build.0 = Release|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|Mixed Platforms.Deploy.0 = Release|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|x86.ActiveCfg = Release|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|x86.Build.0 = Release|x86 - {E2867882-DECA-4E8B-8979-655700D6F550}.Release|x86.Deploy.0 = Release|x86 - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|ARM.Build.0 = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|x86.ActiveCfg = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Debug|x86.Build.0 = Debug|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|Any CPU.Build.0 = Release|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|ARM.ActiveCfg = Release|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|ARM.Build.0 = Release|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|x86.ActiveCfg = Release|Any CPU - {4C459835-2E73-4266-AFED-F88F052F7337}.Release|x86.Build.0 = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|ARM.Build.0 = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|x86.ActiveCfg = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Debug|x86.Build.0 = Debug|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|Any CPU.Build.0 = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|ARM.ActiveCfg = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|ARM.Build.0 = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|x86.ActiveCfg = Release|Any CPU - {1036D963-0360-41A8-8B34-7FC71193DDA5}.Release|x86.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|ARM.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|x86.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|x86.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|ARM.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|ARM.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|x86.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|x86.Build.0 = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|ARM.Build.0 = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|x86.ActiveCfg = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Debug|x86.Build.0 = Debug|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|Any CPU.Build.0 = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|ARM.ActiveCfg = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|ARM.Build.0 = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|x86.ActiveCfg = Release|Any CPU - {119A2045-4C28-48FF-A828-D7F711B844F2}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {4C459835-2E73-4266-AFED-F88F052F7337} = {1B8DEF40-DB88-4B72-93B6-962C4C997A1A} - {1036D963-0360-41A8-8B34-7FC71193DDA5} = {1B8DEF40-DB88-4B72-93B6-962C4C997A1A} - EndGlobalSection -EndGlobal diff --git a/source/Unity.Xamarin.sln b/source/Unity.Xamarin.sln deleted file mode 100644 index 4157423c..00000000 --- a/source/Unity.Xamarin.sln +++ /dev/null @@ -1,119 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{25EB396B-2527-4B42-8037-C364A038856B}" - ProjectSection(FolderStartupServices) = postProject - {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{36634874-C16A-4F0C-9717-51C1D3D1FEBE}" - ProjectSection(FolderStartupServices) = postProject - {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E6EC67DC-CF5A-4A46-B600-658CFBC85C76}" - ProjectSection(FolderStartupServices) = postProject - {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity\Src\Unity.csproj", "{EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Tests.Xamarin.iOS", "Unity\Tests\Unity.Tests.Xamarin.iOS\Unity.Tests.Xamarin.iOS.csproj", "{0CC1CB09-3FB0-400C-BC40-F13F0488D164}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Ad-Hoc|Any CPU = Ad-Hoc|Any CPU - Ad-Hoc|iPhone = Ad-Hoc|iPhone - Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator - Ad-Hoc|Mixed Platforms = Ad-Hoc|Mixed Platforms - AppStore|Any CPU = AppStore|Any CPU - AppStore|iPhone = AppStore|iPhone - AppStore|iPhoneSimulator = AppStore|iPhoneSimulator - AppStore|Mixed Platforms = AppStore|Mixed Platforms - Debug|Any CPU = Debug|Any CPU - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Debug|Mixed Platforms = Debug|Mixed Platforms - Release|Any CPU = Release|Any CPU - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator - Release|Mixed Platforms = Release|Mixed Platforms - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.AppStore|Any CPU.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.Build.0 = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|iPhone.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|iPhone.Deploy.0 = Ad-Hoc|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Ad-Hoc|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|Mixed Platforms.ActiveCfg = Ad-Hoc|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|Mixed Platforms.Build.0 = Ad-Hoc|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Ad-Hoc|Mixed Platforms.Deploy.0 = Ad-Hoc|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|iPhone.Build.0 = AppStore|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|iPhone.Deploy.0 = AppStore|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|iPhoneSimulator.Deploy.0 = AppStore|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|Mixed Platforms.ActiveCfg = AppStore|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|Mixed Platforms.Build.0 = AppStore|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.AppStore|Mixed Platforms.Deploy.0 = AppStore|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|iPhone.ActiveCfg = Debug|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|iPhone.Build.0 = Debug|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|iPhone.Deploy.0 = Debug|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|Mixed Platforms.ActiveCfg = Debug|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|Mixed Platforms.Build.0 = Debug|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Debug|Mixed Platforms.Deploy.0 = Debug|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|Any CPU.ActiveCfg = Release|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|iPhone.ActiveCfg = Release|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|iPhone.Build.0 = Release|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|iPhone.Deploy.0 = Release|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|Mixed Platforms.ActiveCfg = Release|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|Mixed Platforms.Build.0 = Release|iPhone - {0CC1CB09-3FB0-400C-BC40-F13F0488D164}.Release|Mixed Platforms.Deploy.0 = Release|iPhone - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} = {25EB396B-2527-4B42-8037-C364A038856B} - {0CC1CB09-3FB0-400C-BC40-F13F0488D164} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - EndGlobalSection - GlobalSection(TextTemplating) = postSolution - TextTemplating = 1 - EndGlobalSection -EndGlobal diff --git a/source/Unity.sln b/source/Unity.sln deleted file mode 100644 index 58c9ea82..00000000 --- a/source/Unity.sln +++ /dev/null @@ -1,163 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{25EB396B-2527-4B42-8037-C364A038856B}" - ProjectSection(FolderStartupServices) = postProject - {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{36634874-C16A-4F0C-9717-51C1D3D1FEBE}" - ProjectSection(FolderStartupServices) = postProject - {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E6EC67DC-CF5A-4A46-B600-658CFBC85C76}" - ProjectSection(FolderStartupServices) = postProject - {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity\Src\Unity.csproj", "{EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Interception", "Unity.Interception\Src\Unity.Interception.csproj", "{F8186B23-B0E1-4646-B5F3-14357841E2BA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TestSupport", "Unity\Tests\TestSupport.Unity\Unity.TestSupport.csproj", "{E979857E-CDE5-4D36-9AE8-8FFF4F75AE89}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Tests", "Unity\Tests\Unity.Tests\Unity.Tests.csproj", "{25E09D23-F407-4A61-8446-E5FBD6F689B8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Interception.Tests", "Unity.Interception\Tests\Tests.Unity.Interception\Unity.Interception.Tests.csproj", "{3FC0084C-6077-4F87-8A51-2F755C83D7C8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectBuilder.Tests", "Unity\Tests\ObjectBuilder\ObjectBuilder.Tests.csproj", "{02BDF798-A924-4F07-A607-75B3C20EDA6E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Configuration", "Unity.Configuration\Src\Unity.Configuration.csproj", "{AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Configuration.Tests", "Unity.Configuration\Tests\Unity.Configuration.Tests\Unity.Configuration.Tests.csproj", "{190A49C4-CE38-4E32-ACD6-4A0B3F92DB03}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Interception.Configuration", "Unity.Interception.Configuration\Src\Unity.Interception.Configuration.csproj", "{80F7399F-B221-465F-97C9-4B9FC0E2F67F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Interception.Configuration.Tests", "Unity.Interception.Configuration\Tests\Tests.Unity.Interception.Configuration\Unity.Interception.Configuration.Tests.csproj", "{BE0A991A-8C3E-4CDC-8DA4-2664D1BBD01D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ServiceLocation.Tests", "Unity\Tests\Unity.ServiceLocation.Tests\Unity.ServiceLocation.Tests.csproj", "{43C01B41-785A-43F1-B7F1-0D6AB093A6B1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssemblies", "TestAssemblies", "{897BE377-FB20-4C9E-998B-71521C0743A3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MissingAssembly", "Unity\Tests\TestAssemblies\MissingAssembly\MissingAssembly.csproj", "{D5986F12-55BB-47FC-8A96-E8E8BBF1278F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestNetAssembly", "Unity\Tests\TestAssemblies\TestNetAssembly\TestNetAssembly.csproj", "{F877EDF4-DC1F-4700-939D-8F425554C971}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotReferencedTestNetAssembly", "Unity\Tests\TestAssemblies\NotReferencedTestNetAssembly\NotReferencedTestNetAssembly.csproj", "{9EB77C40-393C-497B-996B-8745A122F369}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mvc", "Unity.Mvc\Src\Unity.Mvc.csproj", "{1FB1A6FE-1898-4E72-906E-1C160AB50F2F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.WebApi", "Unity.WebApi\Src\Unity.WebApi.csproj", "{E6A503F3-1B1D-4008-98EE-7EACA66DFB05}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.WebIntegration.Tests", "Unity\Tests\Unity.WebIntegration.Tests\Unity.WebIntegration.Tests.csproj", "{60FBCE14-8B46-468A-9C67-3F7445B37455}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RegistrationByConvention", "Unity\Src\RegistrationByConvention\Unity.RegistrationByConvention.csproj", "{10CFF71B-A9D4-44D2-B5CB-B363E5E15976}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B}.Release|Any CPU.Build.0 = Release|Any CPU - {F8186B23-B0E1-4646-B5F3-14357841E2BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8186B23-B0E1-4646-B5F3-14357841E2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8186B23-B0E1-4646-B5F3-14357841E2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8186B23-B0E1-4646-B5F3-14357841E2BA}.Release|Any CPU.Build.0 = Release|Any CPU - {E979857E-CDE5-4D36-9AE8-8FFF4F75AE89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E979857E-CDE5-4D36-9AE8-8FFF4F75AE89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E979857E-CDE5-4D36-9AE8-8FFF4F75AE89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E979857E-CDE5-4D36-9AE8-8FFF4F75AE89}.Release|Any CPU.Build.0 = Release|Any CPU - {25E09D23-F407-4A61-8446-E5FBD6F689B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25E09D23-F407-4A61-8446-E5FBD6F689B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25E09D23-F407-4A61-8446-E5FBD6F689B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25E09D23-F407-4A61-8446-E5FBD6F689B8}.Release|Any CPU.Build.0 = Release|Any CPU - {3FC0084C-6077-4F87-8A51-2F755C83D7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FC0084C-6077-4F87-8A51-2F755C83D7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FC0084C-6077-4F87-8A51-2F755C83D7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FC0084C-6077-4F87-8A51-2F755C83D7C8}.Release|Any CPU.Build.0 = Release|Any CPU - {02BDF798-A924-4F07-A607-75B3C20EDA6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02BDF798-A924-4F07-A607-75B3C20EDA6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02BDF798-A924-4F07-A607-75B3C20EDA6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02BDF798-A924-4F07-A607-75B3C20EDA6E}.Release|Any CPU.Build.0 = Release|Any CPU - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE}.Release|Any CPU.Build.0 = Release|Any CPU - {190A49C4-CE38-4E32-ACD6-4A0B3F92DB03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {190A49C4-CE38-4E32-ACD6-4A0B3F92DB03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {190A49C4-CE38-4E32-ACD6-4A0B3F92DB03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {190A49C4-CE38-4E32-ACD6-4A0B3F92DB03}.Release|Any CPU.Build.0 = Release|Any CPU - {80F7399F-B221-465F-97C9-4B9FC0E2F67F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80F7399F-B221-465F-97C9-4B9FC0E2F67F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80F7399F-B221-465F-97C9-4B9FC0E2F67F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80F7399F-B221-465F-97C9-4B9FC0E2F67F}.Release|Any CPU.Build.0 = Release|Any CPU - {BE0A991A-8C3E-4CDC-8DA4-2664D1BBD01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE0A991A-8C3E-4CDC-8DA4-2664D1BBD01D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE0A991A-8C3E-4CDC-8DA4-2664D1BBD01D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE0A991A-8C3E-4CDC-8DA4-2664D1BBD01D}.Release|Any CPU.Build.0 = Release|Any CPU - {43C01B41-785A-43F1-B7F1-0D6AB093A6B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43C01B41-785A-43F1-B7F1-0D6AB093A6B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43C01B41-785A-43F1-B7F1-0D6AB093A6B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43C01B41-785A-43F1-B7F1-0D6AB093A6B1}.Release|Any CPU.Build.0 = Release|Any CPU - {D5986F12-55BB-47FC-8A96-E8E8BBF1278F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5986F12-55BB-47FC-8A96-E8E8BBF1278F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5986F12-55BB-47FC-8A96-E8E8BBF1278F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5986F12-55BB-47FC-8A96-E8E8BBF1278F}.Release|Any CPU.Build.0 = Release|Any CPU - {F877EDF4-DC1F-4700-939D-8F425554C971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F877EDF4-DC1F-4700-939D-8F425554C971}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F877EDF4-DC1F-4700-939D-8F425554C971}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F877EDF4-DC1F-4700-939D-8F425554C971}.Release|Any CPU.Build.0 = Release|Any CPU - {9EB77C40-393C-497B-996B-8745A122F369}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EB77C40-393C-497B-996B-8745A122F369}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EB77C40-393C-497B-996B-8745A122F369}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EB77C40-393C-497B-996B-8745A122F369}.Release|Any CPU.Build.0 = Release|Any CPU - {1FB1A6FE-1898-4E72-906E-1C160AB50F2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FB1A6FE-1898-4E72-906E-1C160AB50F2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FB1A6FE-1898-4E72-906E-1C160AB50F2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FB1A6FE-1898-4E72-906E-1C160AB50F2F}.Release|Any CPU.Build.0 = Release|Any CPU - {E6A503F3-1B1D-4008-98EE-7EACA66DFB05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6A503F3-1B1D-4008-98EE-7EACA66DFB05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6A503F3-1B1D-4008-98EE-7EACA66DFB05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6A503F3-1B1D-4008-98EE-7EACA66DFB05}.Release|Any CPU.Build.0 = Release|Any CPU - {60FBCE14-8B46-468A-9C67-3F7445B37455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60FBCE14-8B46-468A-9C67-3F7445B37455}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60FBCE14-8B46-468A-9C67-3F7445B37455}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60FBCE14-8B46-468A-9C67-3F7445B37455}.Release|Any CPU.Build.0 = Release|Any CPU - {10CFF71B-A9D4-44D2-B5CB-B363E5E15976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10CFF71B-A9D4-44D2-B5CB-B363E5E15976}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10CFF71B-A9D4-44D2-B5CB-B363E5E15976}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10CFF71B-A9D4-44D2-B5CB-B363E5E15976}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} = {25EB396B-2527-4B42-8037-C364A038856B} - {F8186B23-B0E1-4646-B5F3-14357841E2BA} = {25EB396B-2527-4B42-8037-C364A038856B} - {AEF45ED2-3E7F-4AA5-9001-A4D1BAC12EBE} = {25EB396B-2527-4B42-8037-C364A038856B} - {80F7399F-B221-465F-97C9-4B9FC0E2F67F} = {25EB396B-2527-4B42-8037-C364A038856B} - {1FB1A6FE-1898-4E72-906E-1C160AB50F2F} = {25EB396B-2527-4B42-8037-C364A038856B} - {E6A503F3-1B1D-4008-98EE-7EACA66DFB05} = {25EB396B-2527-4B42-8037-C364A038856B} - {10CFF71B-A9D4-44D2-B5CB-B363E5E15976} = {25EB396B-2527-4B42-8037-C364A038856B} - {E979857E-CDE5-4D36-9AE8-8FFF4F75AE89} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {25E09D23-F407-4A61-8446-E5FBD6F689B8} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {3FC0084C-6077-4F87-8A51-2F755C83D7C8} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {02BDF798-A924-4F07-A607-75B3C20EDA6E} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {190A49C4-CE38-4E32-ACD6-4A0B3F92DB03} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {BE0A991A-8C3E-4CDC-8DA4-2664D1BBD01D} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {43C01B41-785A-43F1-B7F1-0D6AB093A6B1} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {897BE377-FB20-4C9E-998B-71521C0743A3} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {60FBCE14-8B46-468A-9C67-3F7445B37455} = {36634874-C16A-4F0C-9717-51C1D3D1FEBE} - {D5986F12-55BB-47FC-8A96-E8E8BBF1278F} = {897BE377-FB20-4C9E-998B-71521C0743A3} - {F877EDF4-DC1F-4700-939D-8F425554C971} = {897BE377-FB20-4C9E-998B-71521C0743A3} - {9EB77C40-393C-497B-996B-8745A122F369} = {897BE377-FB20-4C9E-998B-71521C0743A3} - EndGlobalSection - GlobalSection(TextTemplating) = postSolution - TextTemplating = 1 - EndGlobalSection -EndGlobal diff --git a/source/Unity/Src/Properties/ResourcesSL.Designer.cs b/source/Unity/Src/Properties/ResourcesSL.Designer.cs deleted file mode 100644 index 84d91115..00000000 --- a/source/Unity/Src/Properties/ResourcesSL.Designer.cs +++ /dev/null @@ -1,511 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.4927 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.Practices.Unity.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Practices.Unity.Unity.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to The type {0} has multiple constructors of length {1}. Unable to disambiguate.. - /// - internal static string AmbiguousInjectionConstructor { - get { - return ResourceManager.GetString("AmbiguousInjectionConstructor", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The provided string argument must not be empty.. - /// - internal static string ArgumentMustNotBeEmpty { - get { - return ResourceManager.GetString("ArgumentMustNotBeEmpty", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The current build operation (build key {2}) failed: {3} (Strategy type {0}, index {1}). - /// - internal static string BuildFailedException { - get { - return ResourceManager.GetString("BuildFailedException", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The current type, {0}, is an interface and cannot be constructed. Are you missing a type mapping?. - /// - internal static string CannotConstructInterface { - get { - return ResourceManager.GetString("CannotConstructInterface", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cannot extract type from build key {0}.. - /// - internal static string CannotExtractTypeFromBuildKey { - get { - return ResourceManager.GetString("CannotExtractTypeFromBuildKey", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The method {0}.{1}({2}) is an open generic method. Open generic methods cannot be injected.. - /// - internal static string CannotInjectGenericMethod { - get { - return ResourceManager.GetString("CannotInjectGenericMethod", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The property {0} on type {1} is an indexer. Indexed properties cannot be injected.. - /// - internal static string CannotInjectIndexer { - get { - return ResourceManager.GetString("CannotInjectIndexer", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The method {1} on type {0} has an out parameter. Injection cannot be performed.. - /// - internal static string CannotInjectMethodWithOutParam { - get { - return ResourceManager.GetString("CannotInjectMethodWithOutParam", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The method {0}.{1}({2}) has at least one out parameter. Methods with out parameters cannot be injected.. - /// - internal static string CannotInjectMethodWithOutParams { - get { - return ResourceManager.GetString("CannotInjectMethodWithOutParams", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The method {0}.{1}({2}) has at least one ref parameter.Methods with ref parameters cannot be injected.. - /// - internal static string CannotInjectMethodWithRefParams { - get { - return ResourceManager.GetString("CannotInjectMethodWithRefParams", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The method {1} on type {0} is marked for injection, but it is an open generic method. Injection cannot be performed.. - /// - internal static string CannotInjectOpenGenericMethod { - get { - return ResourceManager.GetString("CannotInjectOpenGenericMethod", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The method {0}.{1}({2}) is static. Static methods cannot be injected.. - /// - internal static string CannotInjectStaticMethod { - get { - return ResourceManager.GetString("CannotInjectStaticMethod", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} is an open generic type. An open generic type cannot be resolved.. - /// - internal static string CannotResolveOpenGenericType { - get { - return ResourceManager.GetString("CannotResolveOpenGenericType", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resolving parameter "{0}" of constructor {1}. - /// - internal static string ConstructorArgumentResolveOperation { - get { - return ResourceManager.GetString("ConstructorArgumentResolveOperation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The parameter {0} could not be resolved when attempting to call constructor {1}.. - /// - internal static string ConstructorParameterResolutionFailed { - get { - return ResourceManager.GetString("ConstructorParameterResolutionFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Parameter type inference does not work for null values. Indicate the parameter type explicitly using a properly configured instance of the InjectionParameter or InjectionParameter<T> classes.. - /// - internal static string ExceptionNullParameterValue { - get { - return ResourceManager.GetString("ExceptionNullParameterValue", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Calling constructor {0}. - /// - internal static string InvokingConstructorOperation { - get { - return ResourceManager.GetString("InvokingConstructorOperation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Calling method {0}.{1}. - /// - internal static string InvokingMethodOperation { - get { - return ResourceManager.GetString("InvokingMethodOperation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to An item with the given key is already present in the dictionary.. - /// - internal static string KeyAlreadyPresent { - get { - return ResourceManager.GetString("KeyAlreadyPresent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The lifetime manager is already registered. Lifetime managers cannot be reused, please create a new one.. - /// - internal static string LifetimeManagerInUse { - get { - return ResourceManager.GetString("LifetimeManagerInUse", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The override marker build plan policy has been invoked. This should never happen, looks like a bug in the container.. - /// - internal static string MarkerBuildPlanInvoked { - get { - return ResourceManager.GetString("MarkerBuildPlanInvoked", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resolving parameter "{0}" of method {1}.{2}. - /// - internal static string MethodArgumentResolveOperation { - get { - return ResourceManager.GetString("MethodArgumentResolveOperation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The value for parameter "{1}" of method {0} could not be resolved. . - /// - internal static string MethodParameterResolutionFailed { - get { - return ResourceManager.GetString("MethodParameterResolutionFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Could not resolve dependency for build key {0}.. - /// - internal static string MissingDependency { - get { - return ResourceManager.GetString("MissingDependency", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} has multiple constructors marked with the InjectionConstructor attribute. Unable to disambiguate.. - /// - internal static string MultipleInjectionConstructors { - get { - return ResourceManager.GetString("MultipleInjectionConstructors", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The supplied type {0} must be an open generic type.. - /// - internal static string MustHaveOpenGenericType { - get { - return ResourceManager.GetString("MustHaveOpenGenericType", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The supplied type {0} does not have the same number of generic arguments as the target type {1}.. - /// - internal static string MustHaveSameNumberOfGenericArguments { - get { - return ResourceManager.GetString("MustHaveSameNumberOfGenericArguments", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} does not have an accessible constructor.. - /// - internal static string NoConstructorFound { - get { - return ResourceManager.GetString("NoConstructorFound", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} does not have a generic argument named "{1}". - /// - internal static string NoMatchingGenericArgument { - get { - return ResourceManager.GetString("NoMatchingGenericArgument", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to while resolving. - /// - internal static string NoOperationExceptionReason { - get { - return ResourceManager.GetString("NoOperationExceptionReason", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} does not have a constructor that takes the parameters ({1}).. - /// - internal static string NoSuchConstructor { - get { - return ResourceManager.GetString("NoSuchConstructor", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} does not have a public method named {1} that takes the parameters ({2}).. - /// - internal static string NoSuchMethod { - get { - return ResourceManager.GetString("NoSuchMethod", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} does not contain an instance property named {1}.. - /// - internal static string NoSuchProperty { - get { - return ResourceManager.GetString("NoSuchProperty", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} is not a generic type, and you are attempting to inject a generic parameter named "{1}".. - /// - internal static string NotAGenericType { - get { - return ResourceManager.GetString("NotAGenericType", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} is not an array type with rank 1, and you are attempting to use a [DependencyArray] attribute on a parameter or property with this type.. - /// - internal static string NotAnArrayTypeWithRankOne { - get { - return ResourceManager.GetString("NotAnArrayTypeWithRankOne", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Optional dependencies must be reference types. The type {0} is a value type.. - /// - internal static string OptionalDependenciesMustBeReferenceTypes { - get { - return ResourceManager.GetString("OptionalDependenciesMustBeReferenceTypes", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The property {0} on type {1} is not settable.. - /// - internal static string PropertyNotSettable { - get { - return ResourceManager.GetString("PropertyNotSettable", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The property {0} on type {1} is of type {2}, and cannot be injected with a value of type {3}.. - /// - internal static string PropertyTypeMismatch { - get { - return ResourceManager.GetString("PropertyTypeMismatch", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The value for the property "{0}" could not be resolved.. - /// - internal static string PropertyValueResolutionFailed { - get { - return ResourceManager.GetString("PropertyValueResolutionFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The provided string argument must not be empty.. - /// - internal static string ProvidedStringArgMustNotBeEmpty { - get { - return ResourceManager.GetString("ProvidedStringArgMustNotBeEmpty", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resolution of the dependency failed, type = "{0}", name = "{1}". - ///Exception occurred while: {2}. - ///Exception is: {3} - {4} - ///----------------------------------------------- - ///At the time of the exception, the container was: - ///. - /// - internal static string ResolutionFailed { - get { - return ResourceManager.GetString("ResolutionFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resolving {0},{1}. - /// - internal static string ResolutionTraceDetail { - get { - return ResourceManager.GetString("ResolutionTraceDetail", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resolving {0},{1} (mapped from {2}, {3}). - /// - internal static string ResolutionWithMappingTraceDetail { - get { - return ResourceManager.GetString("ResolutionWithMappingTraceDetail", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resolving value for property {0}.{1}. - /// - internal static string ResolvingPropertyValueOperation { - get { - return ResourceManager.GetString("ResolvingPropertyValueOperation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The constructor {1} selected for type {0} has ref or out parameters. Such parameters are not supported for constructor injection.. - /// - internal static string SelectedConstructorHasRefParameters { - get { - return ResourceManager.GetString("SelectedConstructorHasRefParameters", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Setting value for property {0}.{1}. - /// - internal static string SettingPropertyOperation { - get { - return ResourceManager.GetString("SettingPropertyOperation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {0} cannot be constructed. You must configure the container to supply this value.. - /// - internal static string TypeIsNotConstructable { - get { - return ResourceManager.GetString("TypeIsNotConstructable", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The type {1} cannot be assigned to variables of type {0}.. - /// - internal static string TypesAreNotAssignable { - get { - return ResourceManager.GetString("TypesAreNotAssignable", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <unknown>. - /// - internal static string UnknownType { - get { - return ResourceManager.GetString("UnknownType", resourceCulture); - } - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/AllClasses.Desktop.cs b/source/Unity/Src/RegistrationByConvention/AllClasses.Desktop.cs deleted file mode 100644 index c7378d49..00000000 --- a/source/Unity/Src/RegistrationByConvention/AllClasses.Desktop.cs +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Security; - -namespace Microsoft.Practices.Unity -{ - public partial class AllClasses - { - /// - /// Returns all visible, non-abstract classes from all assemblies that are loaded in the current application domain. - /// - /// to include system assemblies; otherwise, . Defaults to . - /// to include the Unity assemblies; otherwise, . Defaults to . - /// to include dynamic assemblies; otherwise, . Defaults to . - /// to skip errors; otherwise, . - /// - /// All visible, non-abstract classes in the loaded assemblies. - /// - /// - /// If is , all exceptions thrown while getting types from the assemblies are ignored, and the types - /// that can be retrieved are returned; otherwise, the original exception is thrown. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Justification = "Simplify API")] - public static IEnumerable FromLoadedAssemblies(bool includeSystemAssemblies = false, bool includeUnityAssemblies = false, bool includeDynamicAssemblies = false, bool skipOnError = true) - { - return FromCheckedAssemblies(GetLoadedAssemblies(includeSystemAssemblies, includeUnityAssemblies, includeDynamicAssemblies), skipOnError); - } - - /// - /// Returns all visible, non-abstract classes from all assemblies that are located in the base folder of the current application domain. - /// - /// to include system assemblies; otherwise, . Defaults to . - /// to include the Unity assemblies; otherwise, . Defaults to . - /// to skip errors; otherwise, . - /// - /// All visible, non-abstract classes. - /// - /// - /// If is , all exceptions thrown while loading assemblies or getting types from the assemblies are ignored, and the types - /// that can be retrieved are returned; otherwise, the original exception is thrown. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Justification = "Simplify API")] - public static IEnumerable FromAssembliesInBasePath(bool includeSystemAssemblies = false, bool includeUnityAssemblies = false, bool skipOnError = true) - { - return FromCheckedAssemblies(GetAssembliesInBasePath(includeSystemAssemblies, includeUnityAssemblies, skipOnError), skipOnError); - } - - private static IEnumerable GetAssembliesInBasePath(bool includeSystemAssemblies, bool includeUnityAssemblies, bool skipOnError) - { - string basePath; - - try - { - basePath = AppDomain.CurrentDomain.BaseDirectory; - } - catch (SecurityException) - { - if (!skipOnError) - { - throw; - } - - return new Assembly[0]; - } - - return GetAssemblyNames(basePath, skipOnError) - .Select(an => LoadAssembly(Path.GetFileNameWithoutExtension(an), skipOnError)) - .Where(a => a != null && (includeSystemAssemblies || !IsSystemAssembly(a)) && (includeUnityAssemblies || !IsUnityAssembly(a))); - } - - private static IEnumerable GetAssemblyNames(string path, bool skipOnError) - { - try - { - return Directory.EnumerateFiles(path, "*.dll").Concat(Directory.EnumerateFiles(path, "*.exe")); - } - catch (Exception e) - { - if (!(skipOnError && (e is DirectoryNotFoundException || e is IOException || e is SecurityException || e is UnauthorizedAccessException))) - { - throw; - } - - return new string[0]; - } - } - - private static Assembly LoadAssembly(string assemblyName, bool skipOnError) - { - try - { - return Assembly.Load(assemblyName); - } - catch (Exception e) - { - if (!(skipOnError && (e is FileNotFoundException || e is FileLoadException || e is BadImageFormatException))) - { - throw; - } - - return null; - } - } - - private static IEnumerable GetLoadedAssemblies(bool includeSystemAssemblies, bool includeUnityAssemblies, bool includeDynamicAssemblies) - { - var assemblies = AppDomain.CurrentDomain.GetAssemblies(); - - if (includeSystemAssemblies && includeDynamicAssemblies) - { - return assemblies; - } - - return assemblies.Where(a => (includeDynamicAssemblies || !a.IsDynamic) && (includeSystemAssemblies || !IsSystemAssembly(a)) && (includeUnityAssemblies || !IsUnityAssembly(a))); - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/AllClasses.NetCore.cs b/source/Unity/Src/RegistrationByConvention/AllClasses.NetCore.cs deleted file mode 100644 index c85564b2..00000000 --- a/source/Unity/Src/RegistrationByConvention/AllClasses.NetCore.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using Windows.Storage; - -namespace Microsoft.Practices.Unity -{ - public partial class AllClasses - { - /// - /// Returns all visible, non-abstract classes from all assemblies located where the application is installed. - /// - /// to include the Unity assemblies; otherwise, . Defaults to . - /// to skip errors; otherwise, . - /// - /// All visible, non-abstract classes. - /// - /// - /// If is , all exceptions thrown while loading assemblies or getting types from the assemblies - /// are ignored, and the types that can be retrieved are returned; otherwise, the original exception is thrown. These exceptions might be wrapped in a - /// . - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Justification = "Simplify API")] - public static IEnumerable FromApplication(bool includeUnityAssemblies = false, bool skipOnError = true) - { - return FromCheckedAssemblies(GetAssembliesApplicationAsync(includeUnityAssemblies, skipOnError).Result, skipOnError); - } - - private static async Task> GetAssembliesApplicationAsync(bool includeUnityAssemblies, bool skipOnError) - { - var folder = Windows.ApplicationModel.Package.Current.InstalledLocation; - var assemblies = new List(); - - foreach (var file in await folder.GetFilesAsync().AsTask().ConfigureAwait(false)) - { - var fileType = Path.GetExtension(file.Name); - - if (fileType == ".dll" || fileType == ".exe") - { - var name = new AssemblyName() { Name = Path.GetFileNameWithoutExtension(file.Name) }; - Assembly assembly; - - try - { - assembly = Assembly.Load(name); - } - catch (Exception e) - { - if (!(skipOnError && (e is FileNotFoundException || e is BadImageFormatException))) - { - throw; - } - - continue; - } - - if (includeUnityAssemblies || !IsUnityAssembly(assembly)) - { - assemblies.Add(assembly); - } - } - } - - return assemblies; - } - } -} \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/AllClasses.cs b/source/Unity/Src/RegistrationByConvention/AllClasses.cs deleted file mode 100644 index f9ac25a7..00000000 --- a/source/Unity/Src/RegistrationByConvention/AllClasses.cs +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity -{ - /// - /// Provides helper methods to retrieve classes from assemblies. - /// - public static partial class AllClasses - { - private static readonly string NetFrameworkProductName = GetNetFrameworkProductName(); - private static readonly string UnityProductName = GetUnityProductName(); - - /// - /// Returns all visible, non-abstract classes from . - /// - /// The assemblies. - /// All visible, non-abstract classes found in the assemblies. - /// is . - /// contains elements. - /// All exceptions thrown while getting types from the assemblies are ignored, and the types that can be retrieved are returned. - public static IEnumerable FromAssemblies(params Assembly[] assemblies) - { - return FromAssemblies(true, assemblies); - } - - /// - /// Returns all visible, non-abstract classes from , and optionally skips errors. - /// - /// to skip errors; otherwise, . - /// The assemblies. - /// - /// All visible, non-abstract classes. - /// - /// is . - /// contains elements. - /// - /// If is , all exceptions thrown while getting types from the assemblies are ignored, and the types - /// that can be retrieved are returned; otherwise, the original exception is thrown. - /// - public static IEnumerable FromAssemblies(bool skipOnError, params Assembly[] assemblies) - { - return FromAssemblies(assemblies, skipOnError); - } - - /// - /// Returns all visible, non-abstract classes from . - /// - /// to skip errors; otherwise, . - /// The assemblies. - /// - /// All visible, non-abstract classes. - /// - /// is . - /// contains elements. - /// - /// If is , all exceptions thrown while getting types from the assemblies are ignored, and the types - /// that can be retrieved are returned; otherwise, the original exception is thrown. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Justification = "Simplify API")] - public static IEnumerable FromAssemblies(IEnumerable assemblies, bool skipOnError = true) - { - Guard.ArgumentNotNull(assemblies, "assemblies"); - - return FromCheckedAssemblies(CheckAssemblies(assemblies), skipOnError); - } - - private static IEnumerable FromCheckedAssemblies(IEnumerable assemblies, bool skipOnError) - { - return assemblies - .SelectMany(a => - { - IEnumerable types; - - try - { - types = a.DefinedTypes; - } - catch (ReflectionTypeLoadException e) - { - if (!skipOnError) - { - throw; - } - - types = e.Types.TakeWhile(t => t != null).Select(t => t.GetTypeInfo()); - } - - return types.Where(ti => ti.IsClass & !ti.IsAbstract && !ti.IsValueType && ti.IsVisible).Select(ti => ti.AsType()); - }); - } - - private static IEnumerable CheckAssemblies(IEnumerable assemblies) - { - foreach (var assembly in assemblies) - { - if (assembly == null) - { - throw new ArgumentException(Resources.ExceptionNullAssembly, "assemblies"); - } - } - - return assemblies; - } - - private static bool IsSystemAssembly(Assembly a) - { - if (NetFrameworkProductName != null) - { - var productAttribute = a.GetCustomAttribute(); - return productAttribute != null && string.Compare(NetFrameworkProductName, productAttribute.Product, StringComparison.Ordinal) == 0; - } - else - { - return false; - } - } - - private static bool IsUnityAssembly(Assembly a) - { - if (UnityProductName != null) - { - var productAttribute = a.GetCustomAttribute(); - return productAttribute != null && string.Compare(UnityProductName, productAttribute.Product, StringComparison.Ordinal) == 0; - } - else - { - return false; - } - } - - private static string GetNetFrameworkProductName() - { - var productAttribute = typeof(object).GetTypeInfo().Assembly.GetCustomAttribute(); - return productAttribute != null ? productAttribute.Product : null; - } - - private static string GetUnityProductName() - { - var productAttribute = typeof(AllClasses).GetTypeInfo().Assembly.GetCustomAttribute(); - return productAttribute != null ? productAttribute.Product : null; - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/DuplicateTypeMappingException.Desktop.cs b/source/Unity/Src/RegistrationByConvention/DuplicateTypeMappingException.Desktop.cs deleted file mode 100644 index 1d7d731a..00000000 --- a/source/Unity/Src/RegistrationByConvention/DuplicateTypeMappingException.Desktop.cs +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Runtime.Serialization; - -namespace Microsoft.Practices.Unity -{ - [SuppressMessage("Microsoft.Usage", "CA2240:ImplementISerializableCorrectly", Justification = "Implementing serialization with the new transparent approach")] - [Serializable] - public partial class DuplicateTypeMappingException - { - #region Serialization Support - - partial void RegisterSerializationHandler() - { - this.SerializeObjectState += (s, e) => - { - e.AddSerializedState(new DuplicateTypeMappingExceptionSerializationData(this.name, this.mappedFromType, this.currentMappedToType, this.newMappedToType)); - }; - } - - [Serializable] - private struct DuplicateTypeMappingExceptionSerializationData : ISafeSerializationData - { - private string name; - private string mappedFromType; - private string currentMappedToType; - private string newMappedToType; - - public DuplicateTypeMappingExceptionSerializationData(string name, string mappedFromType, string currentMappedToType, string newMappedToType) - { - this.name = name; - this.mappedFromType = mappedFromType; - this.currentMappedToType = currentMappedToType; - this.newMappedToType = newMappedToType; - } - - public void CompleteDeserialization(object deserialized) - { - var exception = (DuplicateTypeMappingException)deserialized; - exception.name = this.name; - exception.mappedFromType = this.mappedFromType; - exception.currentMappedToType = this.currentMappedToType; - exception.newMappedToType = this.newMappedToType; - } - } - - #endregion - } -} \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/DuplicateTypeMappingException.cs b/source/Unity/Src/RegistrationByConvention/DuplicateTypeMappingException.cs deleted file mode 100644 index 7c15871b..00000000 --- a/source/Unity/Src/RegistrationByConvention/DuplicateTypeMappingException.cs +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using Microsoft.Practices.Unity.Properties; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity -{ - /// - /// The exception that is thrown when registering multiple types would result in an type mapping being overwritten. - /// - // FxCop suppression: The standard constructors don't make sense for this exception, - // as calling them will leave out the information that makes the exception useful - // in the first place. - [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors", - Justification = "The standard constructors don't make sense for this exception, as calling them will leave out the information that makes the exception useful in the first place.")] - public partial class DuplicateTypeMappingException : Exception - { - private string name; - private string mappedFromType; - private string currentMappedToType; - private string newMappedToType; - - /// - /// Initializes a new instance of the class. - /// - /// The name for the mapping. - /// The source type for the mapping. - /// The type currently mapped. - /// The new type to map. - [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public DuplicateTypeMappingException(string name, Type mappedFromType, Type currentMappedToType, Type newMappedToType) - : base(CreateMessage(name, mappedFromType, currentMappedToType, newMappedToType)) - { - Guard.ArgumentNotNull(mappedFromType, "mappedFromType"); - Guard.ArgumentNotNull(currentMappedToType, "currentMappedToType"); - Guard.ArgumentNotNull(newMappedToType, "newMappedToType"); - - this.name = name; - this.mappedFromType = mappedFromType.AssemblyQualifiedName; - this.currentMappedToType = currentMappedToType.AssemblyQualifiedName; - this.newMappedToType = newMappedToType.AssemblyQualifiedName; - - this.RegisterSerializationHandler(); - } - - private static string CreateMessage(string name, Type mappedFromType, Type currentMappedToType, Type newMappedToType) - { - return string.Format(CultureInfo.CurrentCulture, Resources.DuplicateTypeMappingException, name, mappedFromType, currentMappedToType, newMappedToType); - } - - partial void RegisterSerializationHandler(); - - /// - /// Gets the name for the mapping. - /// - public string Name - { - get - { - return this.name; - } - } - - /// - /// Gets the source type for the mapping. - /// - public string MappedFromType - { - get - { - return this.mappedFromType; - } - } - - /// - /// Gets the type currently mapped. - /// - public string CurrentMappedToType - { - get - { - return this.currentMappedToType; - } - } - - /// - /// Gets the new type to map. - /// - public string NewMappedToType - { - get - { - return this.newMappedToType; - } - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/Properties/AssemblyInfo.cs b/source/Unity/Src/RegistrationByConvention/Properties/AssemblyInfo.cs deleted file mode 100644 index f731ffc5..00000000 --- a/source/Unity/Src/RegistrationByConvention/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("")] -[assembly: AssemblyDescription("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -[assembly: NeutralResourcesLanguage("en")] diff --git a/source/Unity/Src/RegistrationByConvention/Properties/Resources.Designer.cs b/source/Unity/Src/RegistrationByConvention/Properties/Resources.Designer.cs deleted file mode 100644 index d53e4beb..00000000 --- a/source/Unity/Src/RegistrationByConvention/Properties/Resources.Designer.cs +++ /dev/null @@ -1,81 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.34011 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.Practices.Unity.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Practices.Unity.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to An attempt to override an existing mapping was detected for type {1} with name "{0}", currently mapped to type {2}, to type {3}.. - /// - internal static string DuplicateTypeMappingException { - get { - return ResourceManager.GetString("DuplicateTypeMappingException", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The set of assemblies contains a null element.. - /// - internal static string ExceptionNullAssembly { - get { - return ResourceManager.GetString("ExceptionNullAssembly", resourceCulture); - } - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/Properties/Resources.resx b/source/Unity/Src/RegistrationByConvention/Properties/Resources.resx deleted file mode 100644 index 94657c41..00000000 --- a/source/Unity/Src/RegistrationByConvention/Properties/Resources.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An attempt to override an existing mapping was detected for type {1} with name "{0}", currently mapped to type {2}, to type {3}. - - - The set of assemblies contains a null element. - - \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/RegistrationConvention.cs b/source/Unity/Src/RegistrationByConvention/RegistrationConvention.cs deleted file mode 100644 index 7f95cfdc..00000000 --- a/source/Unity/Src/RegistrationByConvention/RegistrationConvention.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; - -namespace Microsoft.Practices.Unity -{ - /// - /// Represents a set of types to register and their registration settings. - /// - public abstract class RegistrationConvention - { - /// - /// Gets types to register. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Could require computations")] - public abstract IEnumerable GetTypes(); - - /// - /// Gets a function to get the types that will be requested for each type to configure. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "API is easier to use with nested generics")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Could require computations")] - public abstract Func> GetFromTypes(); - - /// - /// Gets a function to get the name to use for the registration of each type. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Could require computations")] - public abstract Func GetName(); - - /// - /// Gets a function to get the for the registration of each type. Defaults to no lifetime management. - /// - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Could require computations")] - public abstract Func GetLifetimeManager(); - - /// - /// Gets a function to get the additional objects for the registration of each type. Defaults to no injection members. - /// - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Could require computations")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "API is easier to use with nested generics")] - public abstract Func> GetInjectionMembers(); - } -} diff --git a/source/Unity/Src/RegistrationByConvention/Resources.NetCore.Designer.cs b/source/Unity/Src/RegistrationByConvention/Resources.NetCore.Designer.cs deleted file mode 100644 index 25f7cf6d..00000000 --- a/source/Unity/Src/RegistrationByConvention/Resources.NetCore.Designer.cs +++ /dev/null @@ -1,69 +0,0 @@ - -// This output was generated based on a format similar to the one used by resx resource generation. -namespace Microsoft.Practices.Unity -{ - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like or ResGen Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.Security.SecuritySafeCriticalAttribute()] - internal class Resources - { - - private static global::Windows.ApplicationModel.Resources.ResourceLoader resourceMan; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Using resx generated code as template")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::Windows.ApplicationModel.Resources.ResourceLoader ResourceManager - { - get - { - if (object.ReferenceEquals(resourceMan, null)) - { - global::Windows.ApplicationModel.Resources.ResourceLoader temp = new global::Windows.ApplicationModel.Resources.ResourceLoader("Microsoft.Practices.Unity.RegistrationByConvention/Resources"); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// An attempt to override an existing mapping was detected for type {1} wit... - /// - internal static string DuplicateTypeMappingException - { - get - { - return ResourceManager.GetString("DuplicateTypeMappingException"); - } - } - - /// - /// The set of assemblies contains a null element. - /// - internal static string ExceptionNullAssembly - { - get - { - return ResourceManager.GetString("ExceptionNullAssembly"); - } - } - } -} - diff --git a/source/Unity/Src/RegistrationByConvention/Resources.NetCore.tt b/source/Unity/Src/RegistrationByConvention/Resources.NetCore.tt deleted file mode 100644 index 58ff8de8..00000000 --- a/source/Unity/Src/RegistrationByConvention/Resources.NetCore.tt +++ /dev/null @@ -1,96 +0,0 @@ -<#@ template debug="true" hostspecific="true" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ assembly name="System.Xml" #> -<#@ assembly name="System.Xml.Linq" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Xml.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Text.RegularExpressions" #> -<#@ import namespace="System.Collections.Generic" #> -<#@ output extension=".Designer.cs" #> -<# - var resourceFile = this.Host.ResolvePath("strings\\en-US\\Resources.resw"); - XDocument document = XDocument.Load(resourceFile); - - string suggestedNamespace = (string)System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint"); -#> - -// This output was generated based on a format similar to the one used by resx resource generation. -namespace <#= suggestedNamespace #> -{ - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like or ResGen Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.Security.SecuritySafeCriticalAttribute()] - internal class Resources - { - - private static global::Windows.ApplicationModel.Resources.ResourceLoader resourceMan; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Using resx generated code as template")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::Windows.ApplicationModel.Resources.ResourceLoader ResourceManager - { - get - { - if (object.ReferenceEquals(resourceMan, null)) - { - global::Windows.ApplicationModel.Resources.ResourceLoader temp = new global::Windows.ApplicationModel.Resources.ResourceLoader("Microsoft.Practices.Unity.RegistrationByConvention/Resources"); - resourceMan = temp; - } - return resourceMan; - } - } - <# - var resourceNames = document.Descendants("data") - .Select(d => new { Name = d.Attribute("name").Value, - Message= d.Value} ); - foreach(var entry in resourceNames) - { - #> - - /// - /// <#= CommentizeMessage(entry.Message) #> - /// - internal static string <#= entry.Name #> - { - get - { - return ResourceManager.GetString("<#= entry.Name #>"); - } - } - <# } #>} -} - -<#+ - const int MAX_COMMENT_LENGTH = 80; - - private string CommentizeMessage(string message) - { - var scrubbed = Regex.Replace(message, "[\r,\n]",""); - var xmlConverted = System.Security.SecurityElement.Escape(scrubbed); // quick and non-obvious way to xml escape a string for most characters. - - if (xmlConverted.Length > MAX_COMMENT_LENGTH) { - xmlConverted = xmlConverted.Substring(0,MAX_COMMENT_LENGTH-4) + "..."; - } - - return xmlConverted.Trim(); - } -#> diff --git a/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.NetCore.csproj b/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.NetCore.csproj deleted file mode 100644 index c27c0e99..00000000 --- a/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.NetCore.csproj +++ /dev/null @@ -1,94 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {858426D0-79AB-4928-95B9-A1E1725D31D3} - Library - Properties - Microsoft.Practices.Unity - Microsoft.Practices.Unity.RegistrationByConvention - en-US - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - obj\NetCore - - - true - full - false - ..\..\..\bin\NetCore\Debug\ - DEBUG;TRACE;NETFX_CORE - prompt - 4 - ..\..\..\bin\NetCore\Debug\Microsoft.Practices.Unity.RegistrationByConvention.XML - true - - - pdbonly - true - ..\..\..\bin\NetCore\Release\ - TRACE;NETFX_CORE - prompt - 4 - true - ..\..\..\bin\NetCore\Release\Microsoft.Practices.Unity.RegistrationByConvention.XML - - - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - - GlobalAssemblyInfo.cs - - - - - - - - True - True - Resources.NetCore.tt - - - - - - - - - - - TextTemplatingFileGenerator - Resources.NetCore.Designer.cs - - - - - - - - - ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - 12.0 - - - - diff --git a/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.WindowsPhone.csproj b/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.WindowsPhone.csproj deleted file mode 100644 index fde31f33..00000000 --- a/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.WindowsPhone.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - Debug - AnyCPU - 10.0.20506 - 2.0 - {119A2045-4C28-48FF-A828-D7F711B844F2} - {C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Microsoft.Practices.Unity - Microsoft.Practices.Unity.RegistrationByConvention - WindowsPhone - v8.0 - $(TargetFrameworkVersion) - false - true - 12.0 - true - obj\WindowsPhone - - - true - full - false - ..\..\..\bin\WindowsPhone\Debug\ - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - ..\..\..\bin\WindowsPhone\Debug\Microsoft.Practices.Unity.RegistrationByConvention.XML - true - ..\..\..\Unity.ruleset - - - pdbonly - true - ..\..\..\bin\WindowsPhone\Release\ - TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - ..\..\..\bin\WindowsPhone\Release\Microsoft.Practices.Unity.RegistrationByConvention.XML - true - ..\..\..\Unity.ruleset - - - - GlobalAssemblyInfo.cs - - - - - - - True - True - Resources.resx - - - - - - - - - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - False - ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - - - - - - - diff --git a/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.csproj b/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.csproj deleted file mode 100644 index 140ff86e..00000000 --- a/source/Unity/Src/RegistrationByConvention/Unity.RegistrationByConvention.csproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - - Debug - AnyCPU - {10CFF71B-A9D4-44D2-B5CB-B363E5E15976} - Library - Properties - Microsoft.Practices.Unity - Microsoft.Practices.Unity.RegistrationByConvention - v4.5 - 512 - - - true - full - false - ..\..\..\bin\Desktop\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\..\bin\Desktop\Debug\Microsoft.Practices.Unity.RegistrationByConvention.XML - ..\..\..\Unity.ruleset - - - pdbonly - true - ..\..\..\bin\Desktop\Release\ - TRACE - prompt - 4 - ..\..\..\bin\Desktop\Release\Microsoft.Practices.Unity.RegistrationByConvention.XML - true - - - - False - ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - - - - - - - - - GlobalAssemblyInfo.cs - - - - - - - - True - True - Resources.resx - - - - - - - - - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/UnityContainerRegistrationByConventionExtensions.cs b/source/Unity/Src/RegistrationByConvention/UnityContainerRegistrationByConventionExtensions.cs deleted file mode 100644 index c3f29058..00000000 --- a/source/Unity/Src/RegistrationByConvention/UnityContainerRegistrationByConventionExtensions.cs +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity -{ - /// - /// Provides a set of convenience overloads to the - /// interface to support registration of multiple types. - /// - public static class UnityContainerRegistrationByConventionExtensions - { - private static readonly Type[] EmptyTypes = new Type[0]; - - /// - /// Registers the supplied types by using the specified rules for name, lifetime manager, injection members, and registration types. - /// - /// The container to configure. - /// The types to register. The methods in the class can be used to scan assemblies to get types, and further filtering can be performed using LINQ queries. - /// A function that gets the types that will be requested for each type to configure. It can be a method from the class or a custom function. Defaults to no registration types, and registers only the supplied types. - /// A function that gets the name to use for the registration of each type. It can be a method from the or a custom function. Defaults to no name. - /// A function that gets the for the registration of each type. It can be a method from the class or a custom function. Defaults to no lifetime management. - /// A function that gets the additional objects for the registration of each type. Defaults to no injection members. - /// to overwrite existing mappings; otherwise, . Defaults to . - /// - /// The container that this method was called on. - /// - /// A new registration would overwrite an existing mapping and is . - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Justification = "Simplify API")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "API is easier to use with nested generics")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", Justification = "Validation done by Guard class")] - public static IUnityContainer RegisterTypes( - this IUnityContainer container, - IEnumerable types, - Func> getFromTypes = null, - Func getName = null, - Func getLifetimeManager = null, - Func> getInjectionMembers = null, - bool overwriteExistingMappings = false) - { - Guard.ArgumentNotNull(container, "container"); - Guard.ArgumentNotNull(types, "types"); - - if (getFromTypes == null) - { - getFromTypes = t => EmptyTypes; - } - - if (getName == null) - { - getName = t => null; - } - - if (getLifetimeManager == null) - { - getLifetimeManager = t => null; - } - - if (getInjectionMembers == null) - { - getInjectionMembers = t => Enumerable.Empty(); - } - - // capture the existing mappings in a dictionary - // the collection of registrations in a container is computed on the fly so it should not be queried multiple times - var mappings = - !overwriteExistingMappings - ? container.Registrations.Where(r => r.RegisteredType != r.MappedToType).ToDictionary(r => new NamedTypeBuildKey(r.RegisteredType, r.Name), r => r.MappedToType) - : null; - - foreach (var type in types) - { - var fromTypes = getFromTypes(type); - var name = getName(type); - var lifetimeManager = getLifetimeManager(type); - var injectionMembers = getInjectionMembers(type).ToArray(); - - RegisterTypeMappings(container, overwriteExistingMappings, type, name, fromTypes, mappings); - - if (lifetimeManager != null || injectionMembers.Length > 0) - { - container.RegisterType(type, name, lifetimeManager, injectionMembers); - } - } - - return container; - } - - /// - /// Registers the types according to the . - /// - /// The container to configure. - /// The convention to determine which types will be registered and how. - /// to overwrite existing mappings; otherwise, . Defaults to . - /// - /// The container that this method was called on. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "1", Justification = "Validated with Guard class")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Justification = "Simplify API")] - public static IUnityContainer RegisterTypes(this IUnityContainer container, RegistrationConvention convention, bool overwriteExistingMappings = false) - { - Guard.ArgumentNotNull(convention, "convention"); - - container.RegisterTypes(convention.GetTypes(), convention.GetFromTypes(), convention.GetName(), convention.GetLifetimeManager(), convention.GetInjectionMembers(), overwriteExistingMappings); - - return container; - } - - private static void RegisterTypeMappings(IUnityContainer container, bool overwriteExistingMappings, Type type, string name, IEnumerable fromTypes, Dictionary mappings) - { - foreach (var fromType in fromTypes.Where(t => t != typeof(IDisposable))) - { - if (!overwriteExistingMappings) - { - var key = new NamedTypeBuildKey(fromType, name); - Type currentMappedToType; - if (mappings.TryGetValue(key, out currentMappedToType) && (type != currentMappedToType)) - { - throw new DuplicateTypeMappingException(name, fromType, currentMappedToType, type); - } - - mappings[key] = type; - } - - container.RegisterType(fromType, type, name); - } - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/WithLifetime.Desktop.cs b/source/Unity/Src/RegistrationByConvention/WithLifetime.Desktop.cs deleted file mode 100644 index b0336fc1..00000000 --- a/source/Unity/Src/RegistrationByConvention/WithLifetime.Desktop.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity -{ - public partial class WithLifetime - { - /// - /// Returns a . - /// - /// The type. - /// A per thread lifetime manager. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager PerThread(Type type) - { - return new PerThreadLifetimeManager(); - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/WithLifetime.cs b/source/Unity/Src/RegistrationByConvention/WithLifetime.cs deleted file mode 100644 index 1230d50c..00000000 --- a/source/Unity/Src/RegistrationByConvention/WithLifetime.cs +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Practices.Unity -{ - /// - /// Provides helper methods to specify the lifetime for a type with registration by convention. - /// - public static partial class WithLifetime - { - /// - /// Returns a . - /// - /// The type. - /// A lifetime manager - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager None(Type type) - { - return null; - } - - /// - /// Returns a . - /// - /// The type. - /// A container controlled lifetime manager. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The purpose of the method is to return a new instance")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager ContainerControlled(Type type) - { - return new ContainerControlledLifetimeManager(); - } - - /// - /// Returns a . - /// - /// The type. - /// An externally controlled lifetime manager. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager ExternallyControlled(Type type) - { - return new ExternallyControlledLifetimeManager(); - } - - /// - /// Returns a . - /// - /// The type. - /// A hierarchical lifetime manager. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The purpose of the method is to return a new instance")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager Hierarchical(Type type) - { - return new HierarchicalLifetimeManager(); - } - - /// - /// Returns a . - /// - /// The type. - /// A per resolve lifetime manager. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager PerResolve(Type type) - { - return new PerResolveLifetimeManager(); - } - - /// - /// Returns a . - /// - /// The type. - /// A transient lifetime manager. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager Transient(Type type) - { - return new TransientLifetimeManager(); - } - - /// - /// Returns a . - /// - /// The custom type. - /// The type. - /// - /// A lifetime manager. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static LifetimeManager Custom(Type type) - where T : LifetimeManager, new() - { - return new T(); - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/WithMappings.cs b/source/Unity/Src/RegistrationByConvention/WithMappings.cs deleted file mode 100644 index e1f63c2d..00000000 --- a/source/Unity/Src/RegistrationByConvention/WithMappings.cs +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity -{ - /// - /// Provides helper methods to map types to the types interfaces to which register them. - /// - public static class WithMappings - { - private static readonly Type[] EmptyTypes = new Type[0]; - - /// - /// Returns no types. - /// - /// The type to register. - /// An empty enumeration. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "implementationType", Justification = "Need to match signature Func>")] - public static IEnumerable None(Type implementationType) - { - return EmptyTypes; - } - - /// - /// Returns an enumeration with the interface that matches the name of . - /// - /// The type to register. - /// An enumeration with the first interface matching the name of (for example, if type is MyType, a matching interface is IMyType), - /// or an empty enumeration if no such interface is found. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static IEnumerable FromMatchingInterface(Type implementationType) - { - Guard.ArgumentNotNull(implementationType, "implementationType"); - - var matchingInterfaceName = "I" + implementationType.Name; - - var @interface = GetImplementedInterfacesToMap(implementationType).FirstOrDefault(i => string.Equals(i.Name, matchingInterfaceName, StringComparison.Ordinal)); - - if (@interface != null) - { - return new[] { @interface }; - } - else - { - return EmptyTypes; - } - } - - /// - /// Returns an enumeration with all the interfaces implemented by . - /// - /// The type to register. - /// An enumeration with all the interfaces implemented by the implementation type except . - public static IEnumerable FromAllInterfaces(Type implementationType) - { - Guard.ArgumentNotNull(implementationType, "implementationType"); - - return GetImplementedInterfacesToMap(implementationType).Where(i => i != typeof(IDisposable)); - } - - /// - /// Returns an enumeration with all the interfaces implemented by that belong to the same assembly as implementationType. - /// - /// The type to register. - /// An enumeration with all the interfaces implemented by the implementation type that belong to the same assembly. - public static IEnumerable FromAllInterfacesInSameAssembly(Type implementationType) - { - Guard.ArgumentNotNull(implementationType, "implementationType"); - - var implementationTypeAssembly = implementationType.GetTypeInfo().Assembly; - return GetImplementedInterfacesToMap(implementationType).Where(i => i.GetTypeInfo().Assembly == implementationTypeAssembly); - } - - private static IEnumerable GetImplementedInterfacesToMap(Type type) - { - var typeInfo = type.GetTypeInfo(); - - if (!typeInfo.IsGenericType) - { - return typeInfo.ImplementedInterfaces; - } - else if (!typeInfo.IsGenericTypeDefinition) - { - return typeInfo.ImplementedInterfaces; - } - else - { - return FilterMatchingGenericInterfaces(typeInfo); - } - } - - private static IEnumerable FilterMatchingGenericInterfaces(TypeInfo typeInfo) - { - var parameters = typeInfo.GenericTypeParameters; - - foreach (var @interface in typeInfo.ImplementedInterfaces) - { - var interfaceTypeInfo = @interface.GetTypeInfo(); - - if (!(interfaceTypeInfo.IsGenericType && interfaceTypeInfo.ContainsGenericParameters)) - { - // skip non generic interfaces, or interfaces without generic parameters - continue; - } - - if (GenericParametersMatch(parameters, interfaceTypeInfo.GenericTypeArguments)) - { - yield return interfaceTypeInfo.GetGenericTypeDefinition(); - } - } - } - - private static bool GenericParametersMatch(Type[] parameters, Type[] interfaceArguments) - { - if (parameters.Length != interfaceArguments.Length) - { - return false; - } - - for (int i = 0; i < parameters.Length; i++) - { - if (parameters[i] != interfaceArguments[i]) - { - return false; - } - } - - return true; - } - } -} \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/WithName.cs b/source/Unity/Src/RegistrationByConvention/WithName.cs deleted file mode 100644 index 5adfd2ab..00000000 --- a/source/Unity/Src/RegistrationByConvention/WithName.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Practices.Unity.Utility; - -namespace Microsoft.Practices.Unity -{ - /// - /// Provides helper methods to get type names. - /// - public static class WithName - { - /// - /// Returns the type name. - /// - /// The type. - /// The type name. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Justification = "Validated with Guard class")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "Need to match signature Func")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", - Justification = "Validation done by Guard class")] - public static string TypeName(Type type) - { - Guard.ArgumentNotNull(type, "type"); - - return type.Name; - } - - /// - /// Returns null for the registration name. - /// - /// The type. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type", Justification = "Need to match signature Func")] - public static string Default(Type type) - { - return null; - } - } -} diff --git a/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.NetCore.config b/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.NetCore.config deleted file mode 100644 index 16e6db6d..00000000 --- a/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.NetCore.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.WindowsPhone.config b/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.WindowsPhone.config deleted file mode 100644 index 8d68e849..00000000 --- a/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.WindowsPhone.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.config b/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.config deleted file mode 100644 index 50e40955..00000000 --- a/source/Unity/Src/RegistrationByConvention/packages.Unity.RegistrationByConvention.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Src/RegistrationByConvention/strings/en-US/Resources.resw b/source/Unity/Src/RegistrationByConvention/strings/en-US/Resources.resw deleted file mode 100644 index 94657c41..00000000 --- a/source/Unity/Src/RegistrationByConvention/strings/en-US/Resources.resw +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An attempt to override an existing mapping was detected for type {1} with name "{0}", currently mapped to type {2}, to type {3}. - - - The set of assemblies contains a null element. - - \ No newline at end of file diff --git a/source/Unity/Src/packages.config b/source/Unity/Src/packages.config deleted file mode 100644 index cd801033..00000000 --- a/source/Unity/Src/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Tests/ObjectBuilder/TestObjects/DynamicBuilderMethodCreatorFactory.Silverlight.cs b/source/Unity/Tests/ObjectBuilder/TestObjects/DynamicBuilderMethodCreatorFactory.Silverlight.cs deleted file mode 100644 index 6d91382d..00000000 --- a/source/Unity/Tests/ObjectBuilder/TestObjects/DynamicBuilderMethodCreatorFactory.Silverlight.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Microsoft.Practices.ObjectBuilder2.Tests.TestObjects -{ - class DynamicBuilderMethodCreatorFactory - { - internal static IDynamicBuilderMethodCreatorPolicy CreatePolicy() - { - return new AnonymousHostedDynamicBuilderMethodCreatorPolicy(); - } - } -} diff --git a/source/Unity/Tests/TestAssemblies/TestNetAssembly/PublicClassWithMissingReference.cs b/source/Unity/Tests/TestAssemblies/TestNetAssembly/PublicClassWithMissingReference.cs deleted file mode 100644 index 9258d4ba..00000000 --- a/source/Unity/Tests/TestAssemblies/TestNetAssembly/PublicClassWithMissingReference.cs +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.Tests.TestNetAssembly -{ - public class PublicClassWithMissingReference : Microsoft.Practices.Unity.Tests.MissingAssembly.BaseClass - { - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/AdditionalInterfaceBehavior.cs b/source/Unity/Tests/TestSupport.Unity/AdditionalInterfaceBehavior.cs deleted file mode 100644 index 38df8368..00000000 --- a/source/Unity/Tests/TestSupport.Unity/AdditionalInterfaceBehavior.cs +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.TestSupport -{ - public class AdditionalInterfaceBehavior : IInterceptionBehavior - { - private static readonly MethodInfo DoNothingMethod = typeof(IAdditionalInterface).GetMethod("DoNothing"); - private bool implicitlyAddInterface = true; - - public AdditionalInterfaceBehavior() - { - implicitlyAddInterface = true; - } - - public AdditionalInterfaceBehavior(bool implicitlyAddInterface) - { - this.implicitlyAddInterface = implicitlyAddInterface; - } - - /// - /// Implement this method to execute your behavior processing. - /// - /// Inputs to the current call to the target. - /// Delegate to execute to get the next delegate in the behavior chain. - /// Return value from the target. - public IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - if (input.MethodBase == DoNothingMethod) - { - return ExecuteDoNothing(input); - } - return getNext()(input, getNext); - } - - private IMethodReturn ExecuteDoNothing(IMethodInvocation input) - { - IMethodReturn returnValue = input.CreateMethodReturn(10); - return returnValue; - } - - /// - /// Returns the interfaces required by the behavior for the objects it intercepts. - /// - /// The required interfaces. - public IEnumerable GetRequiredInterfaces() - { - if (implicitlyAddInterface) - { - return new[] { typeof(IAdditionalInterface) }; - } - return Type.EmptyTypes; - } - - /// - /// Returns a flag indicating if this behavior will actually do anything when invoked. - /// - /// This is used to optimize interception. If the behaviors won't actually - /// do anything (for example, PIAB where no policies match) then the interception - /// mechanism can be skipped completely. - public bool WillExecute - { - get { return true; } - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/AlwaysMatchingRule.cs b/source/Unity/Tests/TestSupport.Unity/AlwaysMatchingRule.cs deleted file mode 100644 index 46809a1c..00000000 --- a/source/Unity/Tests/TestSupport.Unity/AlwaysMatchingRule.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.TestSupport -{ - /// - /// A simple matching rule class that always matches. Useful when you want - /// a policy to apply across the board. - /// - public class AlwaysMatchingRule : IMatchingRule - { - [InjectionConstructor] - public AlwaysMatchingRule() - { - } - - public bool Matches(MethodBase member) - { - return true; - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/CallCountHandler.cs b/source/Unity/Tests/TestSupport.Unity/CallCountHandler.cs deleted file mode 100644 index f38dafcd..00000000 --- a/source/Unity/Tests/TestSupport.Unity/CallCountHandler.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.TestSupport -{ - public class CallCountHandler : ICallHandler - { - private int callCount; - private int order = 0; - - [InjectionConstructor] - public CallCountHandler() - { - } - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get - { - return order; - } - set - { - order = value; - } - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - ++callCount; - return getNext()(input, getNext); - } - - public int CallCount - { - get { return callCount; } - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/CallCountInterceptionBehavior.cs b/source/Unity/Tests/TestSupport.Unity/CallCountInterceptionBehavior.cs deleted file mode 100644 index 404209c3..00000000 --- a/source/Unity/Tests/TestSupport.Unity/CallCountInterceptionBehavior.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.TestSupport -{ - public class CallCountInterceptionBehavior : IInterceptionBehavior - { - private int callCount; - - [InjectionConstructor] - public CallCountInterceptionBehavior() - { - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - ++callCount; - return getNext()(input, getNext); - } - - public int CallCount - { - get { return callCount; } - } - - public IEnumerable GetRequiredInterfaces() - { - return Type.EmptyTypes; - } - - public bool WillExecute - { - get { return true; } - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/Configuration/ConfigFileLoader.cs b/source/Unity/Tests/TestSupport.Unity/Configuration/ConfigFileLoader.cs deleted file mode 100644 index ccfef35f..00000000 --- a/source/Unity/Tests/TestSupport.Unity/Configuration/ConfigFileLoader.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using System.IO; -using Microsoft.Practices.ObjectBuilder2; - -namespace Microsoft.Practices.Unity.TestSupport.Configuration -{ - public class ConfigFileLoader - { - private System.Configuration.Configuration configuration; - - public ConfigFileLoader(string configFileName) - { - DumpResourceFileToDisk(configFileName); - LoadConfigFromFile(configFileName); - } - - public TSection GetSection(string sectionName) - where TSection : ConfigurationSection - { - return (TSection)configuration.GetSection(sectionName); - } - - private void LoadConfigFromFile(string configFileName) - { - if (!configFileName.EndsWith(".config")) - { - configFileName += ".config"; - } - - var fileMap = new ExeConfigurationFileMap - { - ExeConfigFilename = configFileName - }; - - configuration = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None); - } - - private static void DumpResourceFileToDisk(string configFileName) - { - using (Stream resourceStream = GetResourceStream(configFileName)) - using (Stream outputStream = GetOutputStream(configFileName)) - { - CopyStream(resourceStream, outputStream); - } - } - - private static Stream GetResourceStream(string configFileName) - { - string resourceName = Sequence.Collect(GetResourceNamespace(), configFileName, "config").JoinStrings("."); - - var currentAssembly = typeof(TResourceLocator).Assembly; - return currentAssembly.GetManifestResourceStream(resourceName); - } - - private static string GetResourceNamespace() - { - return typeof(TResourceLocator).Namespace; - } - - private static Stream GetOutputStream(string configFileName) - { - string configFileDir = AppDomain.CurrentDomain.BaseDirectory; - string configFilePath = Path.Combine(configFileDir, configFileName + ".config"); - - return new FileStream(configFilePath, FileMode.Create, FileAccess.Write); - } - - private static void CopyStream(Stream inputStream, Stream outputStream) - { - var buffer = new byte[4096]; - int numRead = inputStream.Read(buffer, 0, buffer.Length); - while (numRead > 0) - { - outputStream.Write(buffer, 0, numRead); - numRead = inputStream.Read(buffer, 0, buffer.Length); - } - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/Configuration/ConfigSerializer.cs b/source/Unity/Tests/TestSupport.Unity/Configuration/ConfigSerializer.cs deleted file mode 100644 index 85816509..00000000 --- a/source/Unity/Tests/TestSupport.Unity/Configuration/ConfigSerializer.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Configuration; -using System.IO; -using SysConfiguration = System.Configuration.Configuration; - -namespace Microsoft.Practices.Unity.TestSupport.Configuration -{ - public class ConfigSerializer - { - private readonly string filename; - - public ConfigSerializer(string filename) - { - this.filename = filename; - } - - public void Save(string sectionName, ConfigurationSection section) - { - DeleteFileIfExists(); - - var filemap = new ExeConfigurationFileMap() - { - ExeConfigFilename = filename - }; - SysConfiguration configuration = ConfigurationManager.OpenMappedExeConfiguration(filemap, - ConfigurationUserLevel.None); - - if (configuration.GetSection(sectionName) != null) - { - configuration.Sections.Remove(sectionName); - } - configuration.Sections.Add(sectionName, section); - configuration.Save(); - } - - public SysConfiguration Load() - { - var filemap = new ExeConfigurationFileMap { ExeConfigFilename = filename }; - return ConfigurationManager.OpenMappedExeConfiguration(filemap, ConfigurationUserLevel.None); - } - - private void DeleteFileIfExists() - { - string fullName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filename); - File.Delete(fullName); - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/Configuration/ContainerConfiguringFixture.cs b/source/Unity/Tests/TestSupport.Unity/Configuration/ContainerConfiguringFixture.cs deleted file mode 100644 index 6a579e43..00000000 --- a/source/Unity/Tests/TestSupport.Unity/Configuration/ContainerConfiguringFixture.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -namespace Microsoft.Practices.Unity.TestSupport.Configuration -{ - public abstract class ContainerConfiguringFixture : SectionLoadingFixture - { - private readonly string containerName; - - protected ContainerConfiguringFixture(string configFileName, string containerName) - : base(configFileName) - { - this.containerName = containerName; - } - - protected ContainerConfiguringFixture(string configFileName, string sectionName, string containerName) - : base(configFileName, sectionName) - { - this.containerName = containerName; - } - - protected IUnityContainer Container { get; private set; } - - protected override void Arrange() - { - base.Arrange(); - this.Container = new UnityContainer(); - } - - protected override void Act() - { - base.Act(); - this.section.Configure(this.Container, this.containerName); - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/Configuration/SectionLoadingFixture.cs b/source/Unity/Tests/TestSupport.Unity/Configuration/SectionLoadingFixture.cs deleted file mode 100644 index e97c78fe..00000000 --- a/source/Unity/Tests/TestSupport.Unity/Configuration/SectionLoadingFixture.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using Microsoft.Practices.Unity.Configuration; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.TestSupport.Configuration -{ - public abstract class SectionLoadingFixture - { - protected UnityConfigurationSection section; - private readonly string configFileName; - protected string SectionName { get; private set; } - - protected SectionLoadingFixture(string configFileName) - : this(configFileName, "unity") - { - } - - protected SectionLoadingFixture(string configFileName, string sectionName) - { - this.configFileName = configFileName; - this.SectionName = sectionName; - } - - protected virtual void Arrange() - { - var loader = new ConfigFileLoader(configFileName); - section = loader.GetSection(SectionName); - } - - protected virtual void Act() - { - } - - protected virtual void Teardown() - { - } - - [TestInitialize] - public void MainSetup() - { - Arrange(); - Act(); - } - - [TestCleanup] - public void MainTeardown() - { - Teardown(); - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/DelegateInterceptionBehavior.cs b/source/Unity/Tests/TestSupport.Unity/DelegateInterceptionBehavior.cs deleted file mode 100644 index f074eb84..00000000 --- a/source/Unity/Tests/TestSupport.Unity/DelegateInterceptionBehavior.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.TestSupport -{ - public class DelegateInterceptionBehavior : IInterceptionBehavior - { - public static readonly Func> NoRequiredInterfaces = () => Type.EmptyTypes; - - private readonly Func invoke; - private readonly Func> requiredInterfaces; - - public DelegateInterceptionBehavior(Func invoke) - : this(invoke, NoRequiredInterfaces) - { } - - public DelegateInterceptionBehavior( - Func invoke, - Func> requiredInterfaces) - { - this.invoke = invoke; - this.requiredInterfaces = requiredInterfaces; - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - return this.invoke(input, getNext); - } - - public IEnumerable GetRequiredInterfaces() - { - return this.requiredInterfaces(); - } - - /// - /// Returns a flag indicating if this behavior will actually do anything when invoked. - /// - /// This is used to optimize interception. If the behaviors won't actually - /// do anything (for example, PIAB where no policies match) then the interception - /// mechanism can be skipped completely. - public bool WillExecute - { - get { return true; } - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/GlobalCountCallHandler.cs b/source/Unity/Tests/TestSupport.Unity/GlobalCountCallHandler.cs deleted file mode 100644 index d2d9ce86..00000000 --- a/source/Unity/Tests/TestSupport.Unity/GlobalCountCallHandler.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Collections.Specialized; -using Microsoft.Practices.Unity.InterceptionExtension; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.TestSupport -{ - public class GlobalCountCallHandler : ICallHandler - { - public static Dictionary Calls = new Dictionary(); - private string callHandlerName; - private int order = 0; - - [InjectionConstructor] - public GlobalCountCallHandler() - : this("default") - { - } - - public GlobalCountCallHandler(string callHandlerName) - { - this.callHandlerName = callHandlerName; - } - - #region ICallHandler Members - - /// - /// Gets or sets the order in which the handler will be executed - /// - public int Order - { - get - { - return order; - } - set - { - order = value; - } - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextHandlerDelegate getNext) - { - if (!Calls.ContainsKey(callHandlerName)) - { - Calls.Add(callHandlerName, 0); - } - Calls[callHandlerName]++; - - return getNext().Invoke(input, getNext); - } - - #endregion - } - - public class GlobalCountCallHandlerAttribute : HandlerAttribute - { - public override ICallHandler CreateHandler(IUnityContainer ignored) - { - return new GlobalCountCallHandler(this.handlerName); - } - - private string handlerName; - - public string HandlerName - { - get { return this.handlerName; } - set { this.handlerName = value; } - } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/GlobalCountInterceptionBehavior.cs b/source/Unity/Tests/TestSupport.Unity/GlobalCountInterceptionBehavior.cs deleted file mode 100644 index 543cae35..00000000 --- a/source/Unity/Tests/TestSupport.Unity/GlobalCountInterceptionBehavior.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.TestSupport -{ - public class GlobalCountInterceptionBehavior : IInterceptionBehavior - { - public static Dictionary Calls = new Dictionary(); - private string callHandlerName; - - [InjectionConstructor] - public GlobalCountInterceptionBehavior() - : this("default") - { - } - - public GlobalCountInterceptionBehavior(string callHandlerName) - { - this.callHandlerName = callHandlerName; - } - - public IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - if (!Calls.ContainsKey(callHandlerName)) - { - Calls.Add(callHandlerName, 0); - } - Calls[callHandlerName]++; - - return getNext().Invoke(input, getNext); - } - - public IEnumerable GetRequiredInterfaces() - { - return Type.EmptyTypes; - } - - public bool WillExecute { get { return true; } } - } -} diff --git a/source/Unity/Tests/TestSupport.Unity/NaiveINotifyPropertyChangedInterceptionBehavior.cs b/source/Unity/Tests/TestSupport.Unity/NaiveINotifyPropertyChangedInterceptionBehavior.cs deleted file mode 100644 index 9738e30b..00000000 --- a/source/Unity/Tests/TestSupport.Unity/NaiveINotifyPropertyChangedInterceptionBehavior.cs +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Reflection; -using Microsoft.Practices.Unity.InterceptionExtension; - -namespace Microsoft.Practices.Unity.TestSupport -{ - public class NaiveINotifyPropertyChangedInterceptionBehavior : IInterceptionBehavior - { - private readonly object handlerLock = new object(); - private PropertyChangedEventHandler handler; - - public IMethodReturn Invoke(IMethodInvocation input, GetNextInterceptionBehaviorDelegate getNext) - { - var methodReturn = InvokeINotifyPropertyChangedMethod(input); - - if (methodReturn != null) - { - return methodReturn; - } - - methodReturn = getNext()(input, getNext); - - if (methodReturn.Exception == null && input.MethodBase.IsSpecialName) - { - var property = GetPropertyInfoForSetMethod(input); - - if (property != null) - { - var currentHandler = this.handler; - if (currentHandler != null) - { - try - { - currentHandler(input.Target, new PropertyChangedEventArgs(property.Name)); - } - catch (Exception e) - { - return input.CreateExceptionMethodReturn(e); - } - } - } - } - - return methodReturn; - } - - private IMethodReturn InvokeINotifyPropertyChangedMethod(IMethodInvocation input) - { - if (input.MethodBase.DeclaringType == typeof(INotifyPropertyChanged)) - { - switch (input.MethodBase.Name) - { - case "add_PropertyChanged": - lock (handlerLock) - { - handler = (PropertyChangedEventHandler)Delegate.Combine(handler, (Delegate)input.Arguments[0]); - } - break; - - case "remove_PropertyChanged": - lock (handlerLock) - { - handler = (PropertyChangedEventHandler)Delegate.Remove(handler, (Delegate)input.Arguments[0]); - } - break; - - default: - return input.CreateExceptionMethodReturn(new InvalidOperationException()); - } - - return input.CreateMethodReturn(null); - } - - return null; - } - - private static PropertyInfo GetPropertyInfoForSetMethod(IMethodInvocation input) - { - foreach (var property in input.MethodBase.DeclaringType.GetProperties()) - { - if (input.MethodBase == property.GetSetMethod()) - { - return property; - } - } - - return null; - } - - public IEnumerable GetRequiredInterfaces() - { - return new[] { typeof(INotifyPropertyChanged) }; - } - - public bool WillExecute { get { return true; } } - } -} diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestLogo.png b/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestLogo.png deleted file mode 100644 index ebd735aa..00000000 Binary files a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestLogo.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestSmallLogo.png b/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestSmallLogo.png deleted file mode 100644 index 92dd1058..00000000 Binary files a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestSmallLogo.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestSplashScreen.png b/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestSplashScreen.png deleted file mode 100644 index 193187f1..00000000 Binary files a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestSplashScreen.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestStoreLogo.png b/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestStoreLogo.png deleted file mode 100644 index 3765186d..00000000 Binary files a/source/Unity/Tests/Unity.NetCore.Tests/Images/UnitTestStoreLogo.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodCallFixture.NetCore.cs b/source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodCallFixture.NetCore.cs deleted file mode 100644 index f1db1386..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodCallFixture.NetCore.cs +++ /dev/null @@ -1,336 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles; -using Microsoft.Practices.ObjectBuilder2.Tests.TestObjects; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.TestSupport; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute; -using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute; -using InjectionMethodAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionMethodAttribute; -#elif __IOS__ -using NUnit.Framework; -using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute; -using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute; -using InjectionMethodAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionMethodAttribute; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -#else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute; -using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute; -using InjectionMethodAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionMethodAttribute; -#endif - -namespace Microsoft.Practices.ObjectBuilder2.Tests -{ - [TestClass] - public class DynamicMethodCallFixture - { - [TestMethod] - public void CallsMethodsMarkedWithInjectionAttribute() - { - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - object intValue = 42; - object stringValue = "Hello world"; - - SetSingleton(context, typeof(int), intValue); - SetSingleton(context, typeof(string), stringValue); - - IBuildPlanPolicy plan = - GetPlanCreator(context).CreatePlan(context, key); - - ObjectWithInjectionMethod existing = new ObjectWithInjectionMethod(); - - context.BuildKey = key; - context.Existing = existing; - plan.BuildUp(context); - - GC.KeepAlive(intValue); - GC.KeepAlive(stringValue); - - Assert.IsTrue(existing.WasInjected); - Assert.AreEqual(intValue, existing.IntValue); - Assert.AreEqual(stringValue, existing.StringValue); - } - - [TestMethod] - public void ThrowsWhenBuildingPlanWithGenericInjectionMethod() - { - try - { - MockBuilderContext context = GetContext(); - GetPlanCreator(context).CreatePlan(context, new NamedTypeBuildKey(typeof(ObjectWithGenericInjectionMethod))); - Assert.Fail(); - } - catch (IllegalInjectionMethodException) - { - // This is what we want - } - } - - [TestMethod] - public void ThrowsWhenBuildingPlanWithMethodWithOutParam() - { - try - { - MockBuilderContext context = GetContext(); - GetPlanCreator(context).CreatePlan(context, new NamedTypeBuildKey(typeof(ObjectWithOutParamMethod))); - Assert.Fail(); - } - catch (IllegalInjectionMethodException) - { - } - } - - [TestMethod] - public void ThrowsWhenBuildingPlanWithMethodWithRefParam() - { - try - { - MockBuilderContext context = GetContext(); - GetPlanCreator(context).CreatePlan(context, new NamedTypeBuildKey(typeof(ObjectWithRefParamMethod))); - Assert.Fail(); - } - catch (IllegalInjectionMethodException) - { - } - } - - [TestMethod] - public void TheCurrentOperationIsNullAfterSuccessfullyExecutingTheBuildPlan() - { - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new ObjectWithSingleInjectionMethod(); - - IBuildPlanPolicy plan = GetPlanCreator(context).CreatePlan(context, key); - plan.BuildUp(context); - - Assert.IsNull(context.CurrentOperation); - } - - [TestMethod] - public void ExceptionThrownWhileInvokingTheInjectionMethodIsBubbledUpAndTheCurrentOperationIsNotCleared() - { - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new ObjectWithSingleThrowingInjectionMethod(); - - IBuildPlanPolicy plan = - GetPlanCreator(context).CreatePlan(context, key); - - try - { - plan.BuildUp(context); - Assert.Fail("failure expected"); - } - catch (Exception e) - { - Assert.AreSame(ObjectWithSingleThrowingInjectionMethod.InjectionMethodException, e); - var operation = (InvokingMethodOperation)context.CurrentOperation; - Assert.IsNotNull(operation); - - Assert.AreSame(typeof(ObjectWithSingleThrowingInjectionMethod), operation.TypeBeingConstructed); - } - } - - [TestMethod] - public void ResolvingAParameterSetsTheCurrentOperation() - { - var resolverPolicy = new CurrentOperationSensingResolverPolicy(); - - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new ObjectWithSingleInjectionMethod(); - - context.Policies.Set( - new TestSingleArgumentMethodSelectorPolicy(resolverPolicy), - key); - - IBuildPlanPolicy plan = GetPlanCreator(context).CreatePlan(context, key); - - plan.BuildUp(context); - - Assert.IsNotNull(resolverPolicy.CurrentOperation); - } - - [TestMethod] - public void ExceptionThrownWhileResolvingAParameterIsBubbledUpAndTheCurrentOperationIsNotCleared() - { - var exception = new ArgumentException(); - var resolverPolicy = new ExceptionThrowingTestResolverPolicy(exception); - - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new ObjectWithSingleInjectionMethod(); - - context.Policies.Set( - new TestSingleArgumentMethodSelectorPolicy(resolverPolicy), - key); - - IBuildPlanPolicy plan = GetPlanCreator(context).CreatePlan(context, key); - - try - { - plan.BuildUp(context); - Assert.Fail("failure expected"); - } - catch (Exception e) - { - Assert.AreSame(exception, e); - var operation = (MethodArgumentResolveOperation)context.CurrentOperation; - Assert.IsNotNull(operation); - - Assert.AreSame(typeof(ObjectWithSingleInjectionMethod), operation.TypeBeingConstructed); - Assert.AreEqual("parameter", operation.ParameterName); - } - } - - private MockBuilderContext GetContext() - { - StagedStrategyChain chain = new StagedStrategyChain(); - chain.AddNew(BuilderStage.Initialization); - - DynamicMethodBuildPlanCreatorPolicy policy = - new DynamicMethodBuildPlanCreatorPolicy(chain); - - MockBuilderContext context = new MockBuilderContext(); - - context.Strategies.Add(new LifetimeStrategy()); - - // Not used in Win8 - //context.PersistentPolicies.SetDefault( - // DynamicBuilderMethodCreatorFactory.CreatePolicy()); - context.PersistentPolicies.SetDefault( - new ConstructorSelectorPolicy()); - context.PersistentPolicies.SetDefault( - new PropertySelectorPolicy()); - context.PersistentPolicies.SetDefault( - new MethodSelectorPolicy()); - - context.PersistentPolicies.SetDefault(policy); - - return context; - } - - private IBuildPlanCreatorPolicy GetPlanCreator(IBuilderContext context) - { - return context.Policies.Get(null); - } - - private void SetSingleton(IBuilderContext context, Type t, object value) - { - var policy = new ContainerControlledLifetimeManager(); - policy.SetValue(value); - context.PersistentPolicies.Set(policy, new NamedTypeBuildKey(t)); - } - - public class ObjectWithInjectionMethod - { - private int intValue; - private string stringValue; - private bool wasInjected = false; - - [InjectionMethod] - public void DoSomething(int intParam, string stringParam) - { - intValue = intParam; - stringValue = stringParam; - wasInjected = true; - } - - public int IntValue - { - get { return intValue; } - } - - public string StringValue - { - get { return stringValue; } - } - - public bool WasInjected - { - get { return wasInjected; } - } - } - - public class ObjectWithGenericInjectionMethod - { - [InjectionMethod] - public void DoSomethingGeneric(T input) - { - } - } - - public class ObjectWithOutParamMethod - { - [InjectionMethod] - public void DoSomething(out int result) - { - result = 42; - } - } - - public class ObjectWithRefParamMethod - { - [InjectionMethod] - public void DoSomething(ref int result) - { - result *= 2; - } - } - - public class ObjectWithSingleInjectionMethod - { - [InjectionMethod] - public void InjectionMethod(object parameter) - { - } - } - - public class ObjectWithSingleThrowingInjectionMethod - { - public static Exception InjectionMethodException = new ArgumentException(); - - [InjectionMethod] - public void InjectionMethod(object parameter) - { - throw InjectionMethodException; - } - } - - public class TestSingleArgumentMethodSelectorPolicy : IMethodSelectorPolicy - { - private IDependencyResolverPolicy resolverPolicy; - - public TestSingleArgumentMethodSelectorPolicy(IDependencyResolverPolicy resolverPolicy) - { - this.resolverPolicy = resolverPolicy; - } - - public IEnumerable SelectMethods(IBuilderContext context, IPolicyList resolverPolicyDestination) - { - var method = - new SelectedMethod( - // .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)[0] - typeof(T).GetTypeInfo().DeclaredMethods.First(m => m.IsPublic && !m.IsStatic)); - method.AddParameterResolver(this.resolverPolicy); - - yield return method; - } - } - } -} diff --git a/source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodPropertySetterFixture.NetCore.cs b/source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodPropertySetterFixture.NetCore.cs deleted file mode 100644 index 89fa5c80..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodPropertySetterFixture.NetCore.cs +++ /dev/null @@ -1,233 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles; -using Microsoft.Practices.ObjectBuilder2.Tests.TestObjects; -using Microsoft.Practices.Unity; -using Microsoft.Practices.Unity.TestSupport; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute; -using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute; -#elif __IOS__ -using NUnit.Framework; -using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute; -using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -#else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute; -using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute; -#endif - -namespace Microsoft.Practices.ObjectBuilder2.Tests -{ - [TestClass] - public class DynamicMethodPropertySetterFixture - { - [TestMethod] - public void CanInjectProperties() - { - MockBuilderContext context = GetContext(); - object existingObject = new object(); - var lifetimePolicy = new ContainerControlledLifetimeManager(); - lifetimePolicy.SetValue(existingObject); - context.Policies.Set(lifetimePolicy, new NamedTypeBuildKey()); - - IBuildPlanPolicy plan = - GetPlanCreator(context).CreatePlan(context, new NamedTypeBuildKey(typeof(OnePropertyClass))); - - OnePropertyClass existing = new OnePropertyClass(); - context.Existing = existing; - context.BuildKey = new NamedTypeBuildKey(typeof(OnePropertyClass)); - plan.BuildUp(context); - - Assert.IsNotNull(existing.Key); - Assert.AreSame(existingObject, existing.Key); - } - - [TestMethod] - public void TheCurrentOperationIsNullAfterSuccessfullyExecutingTheBuildPlan() - { - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new OnePropertyClass(); - - IBuildPlanPolicy plan = GetPlanCreator(context).CreatePlan(context, key); - plan.BuildUp(context); - - Assert.IsNull(context.CurrentOperation); - } - - [TestMethod] - public void ResolvingAPropertyValueSetsTheCurrentOperation() - { - var resolverPolicy = new CurrentOperationSensingResolverPolicy(); - - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new OnePropertyClass(); - - context.Policies.Set( - new TestSinglePropertySelectorPolicy(resolverPolicy), - key); - - IBuildPlanPolicy plan = GetPlanCreator(context).CreatePlan(context, key); - plan.BuildUp(context); - - Assert.IsNotNull(resolverPolicy.CurrentOperation); - } - - [TestMethod] - public void ExceptionThrownWhileResolvingAPropertyValueIsBubbledUpAndTheCurrentOperationIsNotCleared() - { - var exception = new ArgumentException(); - var resolverPolicy = new ExceptionThrowingTestResolverPolicy(exception); - - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new OnePropertyClass(); - - context.Policies.Set( - new TestSinglePropertySelectorPolicy(resolverPolicy), - key); - - IBuildPlanPolicy plan = GetPlanCreator(context).CreatePlan(context, key); - - try - { - plan.BuildUp(context); - Assert.Fail("failure expected"); - } - catch (Exception e) - { - Assert.AreSame(exception, e); - - var operation = (ResolvingPropertyValueOperation)context.CurrentOperation; - Assert.IsNotNull(operation); - Assert.AreSame(typeof(OnePropertyClass), operation.TypeBeingConstructed); - Assert.AreEqual("Key", operation.PropertyName); - } - } - - [TestMethod] - public void ExceptionThrownWhileSettingAPropertyIsBubbledUpAndTheCurrentOperationIsNotCleared() - { - MockBuilderContext context = GetContext(); - var key = new NamedTypeBuildKey(); - context.BuildKey = key; - context.Existing = new OneExceptionThrowingPropertyClass(); - - IBuildPlanPolicy plan = - GetPlanCreator(context).CreatePlan(context, key); - - try - { - plan.BuildUp(context); - Assert.Fail("failure expected"); - } - catch (Exception e) - { - Assert.AreSame(OneExceptionThrowingPropertyClass.PropertySetterException, e); - var operation = (SettingPropertyOperation)context.CurrentOperation; - Assert.IsNotNull(operation); - - Assert.AreSame(typeof(OneExceptionThrowingPropertyClass), operation.TypeBeingConstructed); - Assert.AreEqual("Key", operation.PropertyName); - } - } - - private MockBuilderContext GetContext() - { - StagedStrategyChain chain = new StagedStrategyChain(); - chain.AddNew(BuilderStage.Initialization); - - DynamicMethodBuildPlanCreatorPolicy policy = - new DynamicMethodBuildPlanCreatorPolicy(chain); - - MockBuilderContext context = new MockBuilderContext(); - - context.Strategies.Add(new LifetimeStrategy()); - - // Not on Win8 - //context.PersistentPolicies.SetDefault( - // DynamicBuilderMethodCreatorFactory.CreatePolicy()); - - context.Policies.SetDefault( - new ConstructorSelectorPolicy()); - context.Policies.SetDefault( - new PropertySelectorPolicy()); - context.Policies.SetDefault(policy); - - return context; - } - - private IBuildPlanCreatorPolicy GetPlanCreator(IBuilderContext context) - { - return context.Policies.Get(null); - } - - public class TestSinglePropertySelectorPolicy : IPropertySelectorPolicy - { - private IDependencyResolverPolicy resolverPolicy; - - public TestSinglePropertySelectorPolicy(IDependencyResolverPolicy resolverPolicy) - { - this.resolverPolicy = resolverPolicy; - } - - public IEnumerable SelectProperties(IBuilderContext context, IPolicyList resolverPolicyDestination) - { - yield return - new SelectedProperty( - typeof(T).GetTypeInfo().DeclaredProperties.First(), - this.resolverPolicy); - } - } - - public class OnePropertyClass - { - private object key; - - [Dependency] - public object Key - { - get { return key; } - set { key = value; } - } - } - - public class OneExceptionThrowingPropertyClass - { - public static Exception PropertySetterException = new ArgumentException(); - - [Dependency] - public object Key - { - set { throw PropertySetterException; } - } - } - - public interface IStillAnotherInterface - { - } - - public class ClassThatTakesInterface - { - [Dependency] - public IStillAnotherInterface StillAnotherInterface - { - get { return null; } - set { } - } - } - } -} diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Package.appxmanifest b/source/Unity/Tests/Unity.NetCore.Tests/Package.appxmanifest deleted file mode 100644 index 4cb39220..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/Package.appxmanifest +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Unity.Tests.NetCore - PatternsAndPractices - Images\UnitTestStoreLogo.png - Unity.Tests.NetCore - - - 6.2 - 6.2 - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Unity.TestSupport/TypeReflectionExtensions.NetCore.cs b/source/Unity/Tests/Unity.NetCore.Tests/Unity.TestSupport/TypeReflectionExtensions.NetCore.cs deleted file mode 100644 index ab20ffd7..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/Unity.TestSupport/TypeReflectionExtensions.NetCore.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; - -namespace Microsoft.Practices.Unity.TestSupport -{ - internal static class TypeReflectionExtensions - { - public static ConstructorInfo GetMatchingConstructor(this Type type, Type[] constructorParamTypes) - { - return type.GetTypeInfo().DeclaredConstructors - .Where(c => c.GetParameters().Select(p => p.ParameterType).SequenceEqual(constructorParamTypes)) - .FirstOrDefault(); - } - } -} diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests.NetCore.csproj b/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests.NetCore.csproj deleted file mode 100644 index bb0e96dd..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests.NetCore.csproj +++ /dev/null @@ -1,560 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {D8DE13B0-238A-4B1F-8B05-2A54E612E8E8} - Library - Properties - Microsoft.Practices.Unity.Tests - Microsoft.Practices.Unity.Tests.NetCore - en-US - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 3A7CCED917D4A560F94A1197A997AB6F80E0ED56 - Unity.Tests.NetCore_TemporaryKey.pfx - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - ARM - false - prompt - ExpressRules.ruleset - true - ..\..\..\Tests.ruleset - - - bin\ARM\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - ARM - false - prompt - ExpressRules.ruleset - true - ..\..\..\Tests.ruleset - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - x86 - false - prompt - ExpressRules.ruleset - true - ..\..\..\Tests.ruleset - - - bin\x86\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - x86 - false - prompt - ExpressRules.ruleset - true - ..\..\..\Tests.ruleset - - - True - - - - - MSTest for Managed Projects - - - - - - ObjectBuilder\BuilderAwareStrategyTest.cs - - - ObjectBuilder\BuilderContextTest.cs - - - ObjectBuilder\BuildKeyMappingPolicyTest.cs - - - ObjectBuilder\BuildKeyMappingStrategyTest.cs - - - ObjectBuilder\BuildPlanStrategyFixture.cs - - - ObjectBuilder\ConstructorSelectorFixture.cs - - - ObjectBuilder\DynamicMethodConstructionFixture.cs - - - ObjectBuilder\GenericTypeMappingTest.cs - - - ObjectBuilder\InternalAndPrivatePlanFixture.Desktop.cs - - - ObjectBuilder\LifetimeContainerTest.cs - - - ObjectBuilder\LifetimeStrategyTest.cs - - - ObjectBuilder\PolicyListTest.cs - - - ObjectBuilder\PropertySelectorFixture.cs - - - ObjectBuilder\RecoveryFixture.cs - - - ObjectBuilder\SingletonThreadingFixture.cs - - - ObjectBuilder\StagedStrategyChainTest.cs - - - ObjectBuilder\TestDoubles\CurrentOperationSensingResolverPolicy.cs - - - ObjectBuilder\TestDoubles\DependencyAttribute.cs - - - ObjectBuilder\TestDoubles\ExceptionThrowingTestResolverPolicy.cs - - - ObjectBuilder\TestDoubles\InjectionConstructorAttribute.cs - - - ObjectBuilder\TestDoubles\InjectionMethodAttribute.cs - - - ObjectBuilder\TestObjects\FileLogger.cs - - - ObjectBuilder\TestObjects\NullLogger.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousConstructors.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMultipleConstructors.cs - - - ObjectBuilder\TestObjects\OptionalLogger.cs - - - ObjectBuilder\Utility\ActivatorCreationStrategy.cs - - - ObjectBuilder\Utility\AssertActualExpectedException.cs - - - ObjectBuilder\Utility\AssertHelper.cs - - - Unity.TestSupport\AssertExtensions.cs - - - Unity.TestSupport\CollectionAssertExtensions.cs - - - Unity.TestSupport\EnumerableAssertionExtensions.cs - - - Unity.TestSupport\ILogger.cs - - - Unity.TestSupport\MockBuilderContext.cs - - - Unity.TestSupport\MockContainerExtension.cs - - - Unity.TestSupport\MockDatabase.cs - - - Unity.TestSupport\MockLogger.cs - - - Unity.TestSupport\ObjectUsingLogger.cs - - - Unity.TestSupport\ObjectWithInjectionMethod.cs - - - Unity.TestSupport\ObjectWithOneConstructorDependency.cs - - - Unity.TestSupport\ObjectWithTwoConstructorParameters.cs - - - Unity.TestSupport\ObjectWithTwoProperties.cs - - - Unity.TestSupport\SpecialLogger.cs - - - - Unity.ServiceLocation.Tests\Components\AdvancedLogger.cs - - - Unity.ServiceLocation.Tests\Components\ILogger.cs - - - Unity.ServiceLocation.Tests\Components\SimpleLogger.cs - - - Unity.ServiceLocation.Tests\ServiceLocatorFixture.cs - - - Unity.ServiceLocation.Tests\UnityServiceLocatorAdapterFixture.cs - - - Unity.Tests\AssemblyScanningFixture.cs - - - Unity.Tests\BuildPlanAndChildContainerFixture.cs - - - Unity.Tests\CodeGenBugFixture.cs - - - Unity.Tests\CodeplexIssuesFixture.cs - - - Unity.Tests\ConstructorWithOutParametersFixture.cs - - - Unity.Tests\ContainerRegistrationsFixture.cs - - - Unity.Tests\DeferredResolveFixture.cs - - - Unity.Tests\DependencyArrayAttributeFixture.cs - - - Unity.Tests\DisposableExtensionFixture.cs - - - Unity.Tests\GenericChainingFixture.cs - - - - Unity.Tests\GenericParameterFixture.cs - - - Unity.Tests\GenericResolvedArrayParameterFixture.cs - - - Unity.Tests\GenericsReflectionExperimentsFixture.cs - - - Unity.Tests\HierarchicalLifetimeFixture.cs - - - Unity.Tests\InjectedMembersFixture.cs - - - Unity.Tests\InjectingArraysFixture.cs - - - Unity.Tests\InjectionConstructorFixture.cs - - - Unity.Tests\InjectionMethodFixture.cs - - - Unity.Tests\InjectionParameterValueFixture.cs - - - Unity.Tests\LazyResolveFixture.cs - - - Unity.Tests\MethodInjectionFixture.cs - - - Unity.Tests\OptionalDependencyAPIConfigurationFixture.cs - - - Unity.Tests\OptionalDependencyAttributeFixture.cs - - - Unity.Tests\OptionalDependencyResolverPolicyFixture.cs - - - Unity.Tests\OptionalGenericParameterFixture.cs - - - Unity.Tests\ParameterMatcherFixture.cs - - - Unity.Tests\PerResolveLifetimeFixture.cs - - - Unity.Tests\PerThreadLifetimeManagerFixture.cs - - - Unity.Tests\ReflectionHelperFixture.cs - - - - Unity.Tests\RegistrationByConventionFixture.cs - - - Unity.Tests\RegistrationByConventionHelpersFixture.cs - - - Unity.Tests\ResolvingArraysFixture.cs - - - Unity.Tests\ServiceOverrideFixture.cs - - - Unity.Tests\SpecifiedConstructorSelectorPolicyFixture.cs - - - Unity.Tests\StaticFactoryFixture.cs - - - Unity.Tests\TestDoubles\MockContainerExtensionWithNonDefaultConstructor.cs - - - Unity.Tests\TestDoubles\SpyExtension.cs - - - Unity.Tests\TestDoubles\SpyPolicy.cs - - - Unity.Tests\TestDoubles\SpyStrategy.cs - - - Unity.Tests\TestObjects\DisposableObject.cs - - - Unity.Tests\TestObjects\ObjectWithExplicitInterface.cs - - - Unity.Tests\TestObjects\ObjectWithIndexer.cs - - - Unity.Tests\TestObjects\ObjectWithInjectionConstructor.cs - - - Unity.Tests\TestObjects\ObjectWithLotsOfDependencies.cs - - - Unity.Tests\TestObjects\ObjectWithOneDependency.cs - - - Unity.Tests\TestObjects\ObjectWithStaticAndInstanceProperties.cs - - - Unity.Tests\TestObjects\ObjectWithTwoConstructorDependencies.cs - - - - Unity.Tests\UnityContainerFixture.cs - - - Unity.Tests\UnityExtensionFixture.cs - - - - Unity.Tests\UnityHierarchyFixture.cs - - - - - - - - Designer - - - - - NotADll.dll - PreserveNewest - - - PreserveNewest - false - - - - PreserveNewest - false - - - - PreserveNewest - false - - - - PreserveNewest - false - - - - - - - - - - - - - - - - - ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - False - ..\TestAssemblies\TestNetAssembly.NetCore\bin\$(Configuration)\TestNetAssembly.NetCore.dll - - - - - {858426d0-79ab-4928-95b9-a1e1725d31d3} - Unity.RegistrationByConvention.NetCore - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - 12.0 - - - - - diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests.NetCore_TemporaryKey.pfx b/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests.NetCore_TemporaryKey.pfx deleted file mode 100644 index dbcb823a..00000000 Binary files a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests.NetCore_TemporaryKey.pfx and /dev/null differ diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/AssemblyScanningFixture.NetCore.cs b/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/AssemblyScanningFixture.NetCore.cs deleted file mode 100644 index 6e4731a1..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/AssemblyScanningFixture.NetCore.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.TestSupport; -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; - -namespace Microsoft.Practices.Unity.Tests -{ - public partial class AssemblyScanningFixture - { - [TestMethod] - public void GetsTypesFromAssembliesLoadedFromApplicationFolderSkippingUnityAssembliesByDefault() - { - var typesByAssembly = AllClasses.FromApplication().GroupBy(t => t.GetTypeInfo().Assembly).ToDictionary(g => g.Key); - - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).GetTypeInfo().Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(AssemblyScanningFixture).GetTypeInfo().Assembly)); - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(IUnityContainer).GetTypeInfo().Assembly)); - } - - [TestMethod] - public void GetsTypesFromAssembliesLoadedFromApplicationFolderIncludingUnityAssembliesIfOverridden() - { - var typesByAssembly = AllClasses.FromApplication(includeUnityAssemblies: true).GroupBy(t => t.GetTypeInfo().Assembly).ToDictionary(g => g.Key); - - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).GetTypeInfo().Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(AssemblyScanningFixture).GetTypeInfo().Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(IUnityContainer).GetTypeInfo().Assembly)); - } - - [TestMethod] - public void GettigTypesFromAssembliesLoadedFromApplicationFolderWithoutSkippingErrorsThrows() - { - AssertExtensions.AssertException( - () => AllClasses.FromApplication(skipOnError: false), - ae => Assert.IsTrue(ae.InnerException is BadImageFormatException || ae.InnerException is System.IO.FileNotFoundException)); - } - } -} diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.NetCore.cs b/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.NetCore.cs deleted file mode 100644 index 1c671bc9..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.NetCore.cs +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Tests.TestDoubles; -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; - -namespace Microsoft.Practices.Unity.Tests -{ - // Test for a race condition in the ContainerControlledLifetime - // class. - [TestClass] - public class ContainerControlledLifetimeThreadingFixture - { - [TestMethod] - public void ContainerControlledLifetimeReturnsSameInstanceFromMultipleThreads() - { - IUnityContainer container = new UnityContainer() - .AddExtension(new SpyExtension(new DelayStrategy(), UnityBuildStage.Lifetime)) - .RegisterType(new ContainerControlledLifetimeManager()); - - object result1 = null; - object result2 = null; - - Task task1 = new Task(delegate() - { - result1 = container.Resolve(); - }); - - Task task2 = new Task(delegate() - { - result2 = container.Resolve(); - }); - - task1.Start(); - task2.Start(); - - Task.WaitAll(task1, task2); - - Assert.IsNotNull(result1); - Assert.AreSame(result1, result2); - } - - [TestMethod] - public void ContainerControlledLifetimeDoesNotLeaveHangingLockIfBuildThrowsException() - { - IUnityContainer container = new UnityContainer() - .AddExtension(new SpyExtension(new ThrowingStrategy(), UnityBuildStage.PostInitialization)) - .RegisterType(new ContainerControlledLifetimeManager()); - - object result1 = null; - object result2 = null; - bool thread2Finished = false; - - Task task1 = new Task( - delegate() - { - try - { - result1 = container.Resolve(); - } - catch (ResolutionFailedException) - { - } - }); - - Task task2 = new Task( - delegate() - { - result2 = container.Resolve(); - thread2Finished = true; - }); - - task1.Start(); - task1.Wait(); - - // Thread1 threw an exception. However, lock should be correctly freed. - // Run thread2, and if it finished, we're ok. - - task2.Start(); - task2.Wait(1000); - - Assert.IsTrue(thread2Finished); - Assert.IsNull(result1); - Assert.IsNotNull(result2); - } - - // A test strategy that introduces a variable delay in - // the strategy chain to work out - private class DelayStrategy : BuilderStrategy - { - private int delayMS = 500; - private static object @lock = new object(); - - public override void PreBuildUp(IBuilderContext context) - { - lock (DelayStrategy.@lock) - { - SpinWait.SpinUntil(() => false, this.delayMS); - } - - this.delayMS = this.delayMS == 0 ? 500 : 0; - } - } - - // Another test strategy that throws an exeception the - // first time it is executed. - private class ThrowingStrategy : BuilderStrategy - { - private bool shouldThrow = true; - - public override void PreBuildUp(IBuilderContext context) - { - if (this.shouldThrow) - { - this.shouldThrow = false; - throw new Exception("Throwing from buildup chain"); - } - } - } - } -} diff --git a/source/Unity/Tests/Unity.NetCore.Tests/packages.config b/source/Unity/Tests/Unity.NetCore.Tests/packages.config deleted file mode 100644 index 16e6db6d..00000000 --- a/source/Unity/Tests/Unity.NetCore.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.ServiceLocation.Tests/packages.config b/source/Unity/Tests/Unity.ServiceLocation.Tests/packages.config deleted file mode 100644 index 50e40955..00000000 --- a/source/Unity/Tests/Unity.ServiceLocation.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/Logo.scale-240.png b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/Logo.scale-240.png deleted file mode 100644 index 76921ca9..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/Logo.scale-240.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/SmallLogo.scale-240.png b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/SmallLogo.scale-240.png deleted file mode 100644 index 31663012..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/SmallLogo.scale-240.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/SplashScreen.scale-240.png b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/SplashScreen.scale-240.png deleted file mode 100644 index 33f26b33..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/SplashScreen.scale-240.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/Square71x71Logo.scale-240.png b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/Square71x71Logo.scale-240.png deleted file mode 100644 index cfa54bee..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/Square71x71Logo.scale-240.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/StoreLogo.scale-240.png b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/StoreLogo.scale-240.png deleted file mode 100644 index 47e084b5..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/StoreLogo.scale-240.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/WideLogo.scale-240.png b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/WideLogo.scale-240.png deleted file mode 100644 index 6249d29d..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Assets/WideLogo.scale-240.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Package.appxmanifest b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Package.appxmanifest deleted file mode 100644 index 57e734a4..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Package.appxmanifest +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - Unity.Tests.WindowsPhone.8.1 - Microsoft.Practices.Unity - Assets\StoreLogo.png - - - - 6.3.1 - 6.3.1 - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Properties/AssemblyInfo.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Properties/AssemblyInfo.cs deleted file mode 100644 index 6b30f218..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Unity.Tests.WindowsPhone.8.1")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Unity.Tests.WindowsPhone.8.1")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Unity.Tests.WindowsPhone.8.1.csproj b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Unity.Tests.WindowsPhone.8.1.csproj deleted file mode 100644 index c0b45378..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/Unity.Tests.WindowsPhone.8.1.csproj +++ /dev/null @@ -1,531 +0,0 @@ - - - - - Debug - x86 - {F36089DA-D2EF-46F5-88EA-ADD81A0D3FA9} - Library - Properties - Microsoft.Practices.Unity.Tests - Unity.Tests.WindowsPhone.8.1 - en-US - 8.1 - 12 - 512 - {76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Unity.Tests.WindowsPhone.8.1_TemporaryKey.pfx - Never - true - False - - - True - true - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP - ;2008 - full - x86 - false - prompt - true - ..\..\..\Tests.ruleset - false - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP - true - ;2008 - pdbonly - x86 - false - prompt - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP - true - ;2008 - pdbonly - ARM - false - prompt - true - - - - - - - - - Unity.TestSupport\CollectionAssertExtensions.cs - - - Unity.ServiceLocation.Tests\Components\AdvancedLogger.cs - - - Unity.ServiceLocation.Tests\Components\ILogger.cs - - - Unity.ServiceLocation.Tests\Components\SimpleLogger.cs - - - Unity.ServiceLocation.Tests\ServiceLocatorFixture.cs - - - Unity.ServiceLocation.Tests\UnityServiceLocatorAdapterFixture.cs - - - Unity.Tests\PerThreadLifetimeManagerFixture.cs - - - - - - ObjectBuilder\BuilderAwareStrategyTest.cs - - - ObjectBuilder\BuilderContextTest.cs - - - ObjectBuilder\BuildKeyMappingPolicyTest.cs - - - ObjectBuilder\BuildKeyMappingStrategyTest.cs - - - ObjectBuilder\BuildPlanStrategyFixture.cs - - - ObjectBuilder\ConstructorSelectorFixture.cs - - - ObjectBuilder\DynamicMethodConstructionFixture.cs - - - ObjectBuilder\GenericTypeMappingTest.cs - - - ObjectBuilder\InternalAndPrivatePlanFixture.Desktop.cs - - - ObjectBuilder\LifetimeContainerTest.cs - - - ObjectBuilder\LifetimeStrategyTest.cs - - - ObjectBuilder\PolicyListTest.cs - - - ObjectBuilder\PropertySelectorFixture.cs - - - ObjectBuilder\RecoveryFixture.cs - - - ObjectBuilder\SingletonThreadingFixture.cs - - - ObjectBuilder\StagedStrategyChainTest.cs - - - ObjectBuilder\TestDoubles\CurrentOperationSensingResolverPolicy.cs - - - ObjectBuilder\TestDoubles\DependencyAttribute.cs - - - ObjectBuilder\TestDoubles\ExceptionThrowingTestResolverPolicy.cs - - - ObjectBuilder\TestDoubles\InjectionConstructorAttribute.cs - - - ObjectBuilder\TestDoubles\InjectionMethodAttribute.cs - - - ObjectBuilder\TestObjects\FileLogger.cs - - - ObjectBuilder\TestObjects\NullLogger.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousConstructors.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMultipleConstructors.cs - - - ObjectBuilder\TestObjects\OptionalLogger.cs - - - ObjectBuilder\Utility\ActivatorCreationStrategy.cs - - - ObjectBuilder\Utility\AssertActualExpectedException.cs - - - ObjectBuilder\Utility\AssertHelper.cs - - - Unity.TestSupport\AssertExtensions.cs - - - Unity.TestSupport\EnumerableAssertionExtensions.cs - - - Unity.TestSupport\ILogger.cs - - - Unity.TestSupport\MockBuilderContext.cs - - - Unity.TestSupport\MockContainerExtension.cs - - - Unity.TestSupport\MockDatabase.cs - - - Unity.TestSupport\MockLogger.cs - - - Unity.TestSupport\ObjectUsingLogger.cs - - - Unity.TestSupport\ObjectWithInjectionMethod.cs - - - Unity.TestSupport\ObjectWithOneConstructorDependency.cs - - - Unity.TestSupport\ObjectWithTwoConstructorParameters.cs - - - Unity.TestSupport\ObjectWithTwoProperties.cs - - - Unity.TestSupport\SpecialLogger.cs - - - - Unity.Tests\BuildPlanAndChildContainerFixture.cs - - - Unity.Tests\CodeGenBugFixture.cs - - - Unity.Tests\CodeplexIssuesFixture.cs - - - Unity.Tests\ConstructorWithOutParametersFixture.cs - - - Unity.Tests\ContainerRegistrationsFixture.cs - - - Unity.Tests\DeferredResolveFixture.cs - - - Unity.Tests\DependencyArrayAttributeFixture.cs - - - Unity.Tests\DisposableExtensionFixture.cs - - - Unity.Tests\GenericChainingFixture.cs - - - - Unity.Tests\GenericParameterFixture.cs - - - Unity.Tests\GenericResolvedArrayParameterFixture.cs - - - Unity.Tests\GenericsReflectionExperimentsFixture.cs - - - Unity.Tests\HierarchicalLifetimeFixture.cs - - - Unity.Tests\InjectedMembersFixture.cs - - - Unity.Tests\InjectingArraysFixture.cs - - - Unity.Tests\InjectionConstructorFixture.cs - - - Unity.Tests\InjectionMethodFixture.cs - - - Unity.Tests\InjectionParameterValueFixture.cs - - - Unity.Tests\LazyResolveFixture.cs - - - Unity.Tests\MethodInjectionFixture.cs - - - Unity.Tests\OptionalDependencyAPIConfigurationFixture.cs - - - Unity.Tests\OptionalDependencyAttributeFixture.cs - - - Unity.Tests\OptionalDependencyResolverPolicyFixture.cs - - - Unity.Tests\OptionalGenericParameterFixture.cs - - - Unity.Tests\ParameterMatcherFixture.cs - - - Unity.Tests\PerResolveLifetimeFixture.cs - - - Unity.Tests\ReflectionHelperFixture.cs - - - - Unity.Tests\ResolvingArraysFixture.cs - - - Unity.Tests\ServiceOverrideFixture.cs - - - Unity.Tests\SpecifiedConstructorSelectorPolicyFixture.cs - - - Unity.Tests\StaticFactoryFixture.cs - - - Unity.Tests\TestDoubles\MockContainerExtensionWithNonDefaultConstructor.cs - - - Unity.Tests\TestDoubles\SpyExtension.cs - - - Unity.Tests\TestDoubles\SpyPolicy.cs - - - Unity.Tests\TestDoubles\SpyStrategy.cs - - - Unity.Tests\TestObjects\DisposableObject.cs - - - Unity.Tests\TestObjects\ObjectWithExplicitInterface.cs - - - Unity.Tests\TestObjects\ObjectWithIndexer.cs - - - Unity.Tests\TestObjects\ObjectWithInjectionConstructor.cs - - - Unity.Tests\TestObjects\ObjectWithLotsOfDependencies.cs - - - Unity.Tests\TestObjects\ObjectWithOneDependency.cs - - - Unity.Tests\TestObjects\ObjectWithStaticAndInstanceProperties.cs - - - Unity.Tests\TestObjects\ObjectWithTwoConstructorDependencies.cs - - - - Unity.Tests\UnityContainerFixture.cs - - - Unity.Tests\UnityExtensionFixture.cs - - - - Unity.Tests\UnityHierarchyFixture.cs - - - ObjectBuilder\DynamicMethodCallFixture.NetCore.cs - - - ObjectBuilder\DynamicMethodPropertySetterFixture.NetCore.cs - - - Unity.TestSupport\TypeReflectionExtensions.NetCore.cs - - - - - Unity.Tests\UnityHierarchyFixture.cs - - - - - Designer - - - - - - - - - - - - - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - - False - ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - - - - 12.0 - - - WindowsPhoneApp - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/packages.config b/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/packages.config deleted file mode 100644 index 6da91b9b..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone.8.1/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml b/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml deleted file mode 100644 index 5fa99d3b..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml.cs deleted file mode 100644 index 63872920..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml.cs +++ /dev/null @@ -1,229 +0,0 @@ -using System; -using System.Diagnostics; -using System.Resources; -using System.Windows; -using System.Windows.Markup; -using System.Windows.Navigation; -using Microsoft.Phone.Controls; -using Microsoft.Phone.Shell; -using Microsoft.Practices.Unity.Tests.Resources; - -namespace Microsoft.Practices.Unity.Tests -{ - public partial class App : Application - { - /// - /// Provides easy access to the root frame of the Phone Application. - /// - /// The root frame of the Phone Application. - public static PhoneApplicationFrame RootFrame { get; private set; } - - /// - /// Constructor for the Application object. - /// - public App() - { - // Global handler for uncaught exceptions. - this.UnhandledException += this.Application_UnhandledException; - - // Standard XAML initialization - this.InitializeComponent(); - - // Phone-specific initialization - this.InitializePhoneApplication(); - - // Language display initialization - this.InitializeLanguage(); - - // Show graphics profiling information while debugging. - if (Debugger.IsAttached) - { - // Display the current frame rate counters. - Application.Current.Host.Settings.EnableFrameRateCounter = true; - - // Show the areas of the app that are being redrawn in each frame. - //Application.Current.Host.Settings.EnableRedrawRegions = true; - - // Enable non-production analysis visualization mode, - // which shows areas of a page that are handed off to GPU with a colored overlay. - //Application.Current.Host.Settings.EnableCacheVisualization = true; - - // Prevent the screen from turning off while under the debugger by disabling - // the application's idle detection. - // Caution:- Use this under debug mode only. Application that disables user idle detection will continue to run - // and consume battery power when the user is not using the phone. - PhoneApplicationService.Current.UserIdleDetectionMode = IdleDetectionMode.Disabled; - } - } - - // Code to execute when the application is launching (eg, from Start) - // This code will not execute when the application is reactivated - private void Application_Launching(object sender, LaunchingEventArgs e) - { - } - - // Code to execute when the application is activated (brought to foreground) - // This code will not execute when the application is first launched - private void Application_Activated(object sender, ActivatedEventArgs e) - { - } - - // Code to execute when the application is deactivated (sent to background) - // This code will not execute when the application is closing - private void Application_Deactivated(object sender, DeactivatedEventArgs e) - { - } - - // Code to execute when the application is closing (eg, user hit Back) - // This code will not execute when the application is deactivated - private void Application_Closing(object sender, ClosingEventArgs e) - { - } - - // Code to execute if a navigation fails - private void RootFrame_NavigationFailed(object sender, NavigationFailedEventArgs e) - { - if (Debugger.IsAttached) - { - // A navigation has failed; break into the debugger - Debugger.Break(); - } - } - - // Code to execute on Unhandled Exceptions - private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e) - { - if (Debugger.IsAttached) - { - // An unhandled exception has occurred; break into the debugger - Debugger.Break(); - } - } - - #region Phone application initialization - - // Avoid double-initialization - private bool phoneApplicationInitialized = false; - - // Do not add any additional code to this method - private void InitializePhoneApplication() - { - if (this.phoneApplicationInitialized) - { - return; - } - - // Create the frame but don't set it as RootVisual yet; this allows the splash - // screen to remain active until the application is ready to render. - RootFrame = new PhoneApplicationFrame(); - RootFrame.Navigated += this.CompleteInitializePhoneApplication; - - // Handle navigation failures - RootFrame.NavigationFailed += this.RootFrame_NavigationFailed; - - // Handle reset requests for clearing the backstack - RootFrame.Navigated += this.CheckForResetNavigation; - - // Ensure we don't initialize again - this.phoneApplicationInitialized = true; - } - - // Do not add any additional code to this method - private void CompleteInitializePhoneApplication(object sender, NavigationEventArgs e) - { - // Set the root visual to allow the application to render - if (this.RootVisual != RootFrame) - { - this.RootVisual = RootFrame; - } - - // Remove this handler since it is no longer needed - RootFrame.Navigated -= this.CompleteInitializePhoneApplication; - } - - private void CheckForResetNavigation(object sender, NavigationEventArgs e) - { - // If the app has received a 'reset' navigation, then we need to check - // on the next navigation to see if the page stack should be reset - if (e.NavigationMode == NavigationMode.Reset) - { - RootFrame.Navigated += this.ClearBackStackAfterReset; - } - } - - private void ClearBackStackAfterReset(object sender, NavigationEventArgs e) - { - // Unregister the event so it doesn't get called again - RootFrame.Navigated -= this.ClearBackStackAfterReset; - - // Only clear the stack for 'new' (forward) and 'refresh' navigations - if (e.NavigationMode != NavigationMode.New && e.NavigationMode != NavigationMode.Refresh) - { - return; - } - - // For UI consistency, clear the entire page stack - while (RootFrame.RemoveBackEntry() != null) - { - // do nothing - } - } - - #endregion - - // Initialize the app's font and flow direction as defined in its localized resource strings. - // - // To ensure that the font of your application is aligned with its supported languages and that the - // FlowDirection for each of those languages follows its traditional direction, ResourceLanguage - // and ResourceFlowDirection should be initialized in each resx file to match these values with that - // file's culture. For example: - // - // AppResources.es-ES.resx - // ResourceLanguage's value should be "es-ES" - // ResourceFlowDirection's value should be "LeftToRight" - // - // AppResources.ar-SA.resx - // ResourceLanguage's value should be "ar-SA" - // ResourceFlowDirection's value should be "RightToLeft" - // - // For more info on localizing Windows Phone apps see http://go.microsoft.com/fwlink/?LinkId=262072. - private void InitializeLanguage() - { - try - { - // Set the font to match the display language defined by the - // ResourceLanguage resource string for each supported language. - // - // Fall back to the font of the neutral language if the Display - // language of the phone is not supported. - // - // If a compiler error is hit then ResourceLanguage is missing from - // the resource file. - RootFrame.Language = XmlLanguage.GetLanguage(AppResources.ResourceLanguage); - - // Set the FlowDirection of all elements under the root frame based - // on the ResourceFlowDirection resource string for each - // supported language. - // - // If a compiler error is hit then ResourceFlowDirection is missing from - // the resource file. - FlowDirection flow = (FlowDirection)Enum.Parse(typeof(FlowDirection), AppResources.ResourceFlowDirection); - RootFrame.FlowDirection = flow; - } - catch - { - // If an exception is caught here it is most likely due to either - // ResourceLangauge not being correctly set to a supported language - // code or ResourceFlowDirection is set to a value other than LeftToRight - // or RightToLeft. - - if (Debugger.IsAttached) - { - Debugger.Break(); - } - - throw; - } - } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/AlignmentGrid.png b/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/AlignmentGrid.png deleted file mode 100644 index f7d2e978..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/AlignmentGrid.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/ApplicationIcon.png b/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/ApplicationIcon.png deleted file mode 100644 index 7d95d4e0..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/ApplicationIcon.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileLarge.png b/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileLarge.png deleted file mode 100644 index e0c59ac0..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileLarge.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileMedium.png b/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileMedium.png deleted file mode 100644 index e93b89d6..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileMedium.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileSmall.png b/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileSmall.png deleted file mode 100644 index 550b1b5e..00000000 Binary files a/source/Unity/Tests/Unity.Tests.WindowsPhone/Assets/Tiles/FlipCycleTileSmall.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/LocalizedStrings.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone/LocalizedStrings.cs deleted file mode 100644 index d149ddf8..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/LocalizedStrings.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Microsoft.Practices.Unity.Tests.Resources; - -namespace Microsoft.Practices.Unity.Tests -{ - /// - /// Provides access to string resources. - /// - public class LocalizedStrings - { - private static AppResources _localizedResources = new AppResources(); - - public AppResources LocalizedResources { get { return _localizedResources; } } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml b/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml deleted file mode 100644 index 85371fc4..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml.cs deleted file mode 100644 index 1d46f4c8..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Microsoft.Phone.Controls; -using Microsoft.Phone.Shell; -using Microsoft.Practices.Unity.Tests.Resources; -using Microsoft.VisualStudio.TestPlatform.Core; -using Microsoft.VisualStudio.TestPlatform.TestExecutor; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Reflection; -using System.Threading; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Navigation; -using vstest_executionengine_platformbridge; - -namespace Microsoft.Practices.Unity.Tests -{ - public partial class MainPage : PhoneApplicationPage - { - // Constructor - public MainPage() - { - this.InitializeComponent(); - - var wrapper = new TestExecutorServiceWrapper(); - new Thread(new ServiceMain((param0, param1) => wrapper.SendMessage((ContractName)param0, param1)).Run).Start(); - } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/AppManifest.xml b/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/AppManifest.xml deleted file mode 100644 index 6712a117..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/AppManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/AssemblyInfo.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/AssemblyInfo.cs deleted file mode 100644 index fffa5b70..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Resources; -using System.Runtime.InteropServices; - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ea95111a-ea11-4052-8145-210e5d0a3f2b")] - -[assembly: NeutralResourcesLanguageAttribute("en-US")] diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/WMAppManifest.xml b/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/WMAppManifest.xml deleted file mode 100644 index 70dfa93f..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/WMAppManifest.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - Assets\ApplicationIcon.png - - - - - - - - - - - - - - Assets\Tiles\FlipCycleTileSmall.png - 0 - Assets\Tiles\FlipCycleTileMedium.png - Microsoft.Practices.Unity.Tests - - - - - - - - - - - vstest_executionengine_platformbridge.dll - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Resources/AppResources.Designer.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone/Resources/AppResources.Designer.cs deleted file mode 100644 index 0a1213f9..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/Resources/AppResources.Designer.cs +++ /dev/null @@ -1,127 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17626 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.Practices.Unity.Tests.Resources -{ - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class AppResources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal AppResources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager - { - get - { - if (object.ReferenceEquals(resourceMan, null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Practices.Unity.Tests.Resources.AppResources", typeof(AppResources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to LeftToRight. - /// - public static string ResourceFlowDirection - { - get - { - return ResourceManager.GetString("ResourceFlowDirection", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to us-EN. - /// - public static string ResourceLanguage - { - get - { - return ResourceManager.GetString("ResourceLanguage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to MY APPLICATION. - /// - public static string ApplicationTitle - { - get - { - return ResourceManager.GetString("ApplicationTitle", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to button. - /// - public static string AppBarButtonText - { - get - { - return ResourceManager.GetString("AppBarButtonText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to menu item. - /// - public static string AppBarMenuItemText - { - get - { - return ResourceManager.GetString("AppBarMenuItemText", resourceCulture); - } - } - } -} diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Resources/AppResources.resx b/source/Unity/Tests/Unity.Tests.WindowsPhone/Resources/AppResources.resx deleted file mode 100644 index 529a1943..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/Resources/AppResources.resx +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LeftToRight - Controls the FlowDirection for all elements in the RootFrame. Set to the traditional direction of this resource file's language - - - en-US - Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language. - - - MY APPLICATION - - - add - - - Menu Item - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/Unity.Tests.WindowsPhone.csproj b/source/Unity/Tests/Unity.Tests.WindowsPhone/Unity.Tests.WindowsPhone.csproj deleted file mode 100644 index 0590fa39..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/Unity.Tests.WindowsPhone.csproj +++ /dev/null @@ -1,592 +0,0 @@ - - - - Debug - x86 - 10.0.20506 - 2.0 - {E2867882-DECA-4E8B-8979-655700D6F550} - {C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Microsoft.Practices.Unity.Tests - Microsoft.Practices.Unity.Tests.WindowsPhone - WindowsPhone - v8.0 - $(TargetFrameworkVersion) - true - true - - - true - true - Microsoft.Practices.Unity.Tests_$(Configuration)_$(Platform).xap - Properties\AppManifest.xml - Microsoft.Practices.Unity.Tests.App - false - 11.0 - true - - - true - full - false - Bin\x86\Debug - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE;NETFX_CORE - true - true - prompt - 4 - ..\..\..\Tests.ruleset - - - pdbonly - true - Bin\x86\Release - TRACE;SILVERLIGHT;WINDOWS_PHONE;NETFX_CORE - true - true - prompt - 4 - ..\..\..\Tests.ruleset - - - true - full - false - Bin\ARM\Debug - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE;NETFX_CORE - true - true - prompt - 4 - ..\..\..\Tests.ruleset - - - pdbonly - true - Bin\ARM\Release - TRACE;SILVERLIGHT;WINDOWS_PHONE;NETFX_CORE - true - true - prompt - 4 - ..\..\..\Tests.ruleset - - - - Unity.TestSupport\CollectionAssertExtensions.cs - - - Unity.Tests\AssemblyScanningFixture.NetCore.cs - - - Unity.ServiceLocation.Tests\Components\AdvancedLogger.cs - - - Unity.ServiceLocation.Tests\Components\ILogger.cs - - - Unity.ServiceLocation.Tests\Components\SimpleLogger.cs - - - Unity.ServiceLocation.Tests\ServiceLocatorFixture.cs - - - Unity.ServiceLocation.Tests\UnityServiceLocatorAdapterFixture.cs - - - Unity.Tests\PerThreadLifetimeManagerFixture.cs - - - App.xaml - - - - MainPage.xaml - - - - True - True - AppResources.resx - - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - - - Designer - - - - - - - - - NotADll.dll - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - PublicResXFileCodeGenerator - AppResources.Designer.cs - - - - - {119A2045-4C28-48FF-A828-D7F711B844F2} - Unity.RegistrationByConvention.WindowsPhone - - - {EE1F752C-1FAB-41AD-AD63-857D0E62AB6B} - Unity - - - {4C459835-2E73-4266-AFED-F88F052F7337} - TestNetAssembly.WindowsPhone - - - - - ObjectBuilder\BuilderAwareStrategyTest.cs - - - ObjectBuilder\BuilderContextTest.cs - - - ObjectBuilder\BuildKeyMappingPolicyTest.cs - - - ObjectBuilder\BuildKeyMappingStrategyTest.cs - - - ObjectBuilder\BuildPlanStrategyFixture.cs - - - ObjectBuilder\ConstructorSelectorFixture.cs - - - ObjectBuilder\DynamicMethodConstructionFixture.cs - - - ObjectBuilder\GenericTypeMappingTest.cs - - - ObjectBuilder\InternalAndPrivatePlanFixture.Desktop.cs - - - ObjectBuilder\LifetimeContainerTest.cs - - - ObjectBuilder\LifetimeStrategyTest.cs - - - ObjectBuilder\PolicyListTest.cs - - - ObjectBuilder\PropertySelectorFixture.cs - - - ObjectBuilder\RecoveryFixture.cs - - - ObjectBuilder\SingletonThreadingFixture.cs - - - ObjectBuilder\StagedStrategyChainTest.cs - - - ObjectBuilder\TestDoubles\CurrentOperationSensingResolverPolicy.cs - - - ObjectBuilder\TestDoubles\DependencyAttribute.cs - - - ObjectBuilder\TestDoubles\ExceptionThrowingTestResolverPolicy.cs - - - ObjectBuilder\TestDoubles\InjectionConstructorAttribute.cs - - - ObjectBuilder\TestDoubles\InjectionMethodAttribute.cs - - - ObjectBuilder\TestObjects\FileLogger.cs - - - ObjectBuilder\TestObjects\NullLogger.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousConstructors.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMultipleConstructors.cs - - - ObjectBuilder\TestObjects\OptionalLogger.cs - - - ObjectBuilder\Utility\ActivatorCreationStrategy.cs - - - ObjectBuilder\Utility\AssertActualExpectedException.cs - - - ObjectBuilder\Utility\AssertHelper.cs - - - Unity.TestSupport\AssertExtensions.cs - - - Unity.TestSupport\EnumerableAssertionExtensions.cs - - - Unity.TestSupport\ILogger.cs - - - Unity.TestSupport\MockBuilderContext.cs - - - Unity.TestSupport\MockContainerExtension.cs - - - Unity.TestSupport\MockDatabase.cs - - - Unity.TestSupport\MockLogger.cs - - - Unity.TestSupport\ObjectUsingLogger.cs - - - Unity.TestSupport\ObjectWithInjectionMethod.cs - - - Unity.TestSupport\ObjectWithOneConstructorDependency.cs - - - Unity.TestSupport\ObjectWithTwoConstructorParameters.cs - - - Unity.TestSupport\ObjectWithTwoProperties.cs - - - Unity.TestSupport\SpecialLogger.cs - - - - Unity.Tests\AssemblyScanningFixture.cs - - - Unity.Tests\BuildPlanAndChildContainerFixture.cs - - - Unity.Tests\CodeGenBugFixture.cs - - - Unity.Tests\CodeplexIssuesFixture.cs - - - Unity.Tests\ConstructorWithOutParametersFixture.cs - - - Unity.Tests\ContainerRegistrationsFixture.cs - - - Unity.Tests\DeferredResolveFixture.cs - - - Unity.Tests\DependencyArrayAttributeFixture.cs - - - Unity.Tests\DisposableExtensionFixture.cs - - - Unity.Tests\GenericChainingFixture.cs - - - - Unity.Tests\GenericParameterFixture.cs - - - Unity.Tests\GenericResolvedArrayParameterFixture.cs - - - Unity.Tests\GenericsReflectionExperimentsFixture.cs - - - Unity.Tests\HierarchicalLifetimeFixture.cs - - - Unity.Tests\InjectedMembersFixture.cs - - - Unity.Tests\InjectingArraysFixture.cs - - - Unity.Tests\InjectionConstructorFixture.cs - - - Unity.Tests\InjectionMethodFixture.cs - - - Unity.Tests\InjectionParameterValueFixture.cs - - - Unity.Tests\LazyResolveFixture.cs - - - Unity.Tests\MethodInjectionFixture.cs - - - Unity.Tests\OptionalDependencyAPIConfigurationFixture.cs - - - Unity.Tests\OptionalDependencyAttributeFixture.cs - - - Unity.Tests\OptionalDependencyResolverPolicyFixture.cs - - - Unity.Tests\OptionalGenericParameterFixture.cs - - - Unity.Tests\ParameterMatcherFixture.cs - - - Unity.Tests\PerResolveLifetimeFixture.cs - - - Unity.Tests\ReflectionHelperFixture.cs - - - - Unity.Tests\RegistrationByConventionFixture.cs - - - Unity.Tests\RegistrationByConventionHelpersFixture.cs - - - Unity.Tests\ResolvingArraysFixture.cs - - - Unity.Tests\ServiceOverrideFixture.cs - - - Unity.Tests\SpecifiedConstructorSelectorPolicyFixture.cs - - - Unity.Tests\StaticFactoryFixture.cs - - - Unity.Tests\TestDoubles\MockContainerExtensionWithNonDefaultConstructor.cs - - - Unity.Tests\TestDoubles\SpyExtension.cs - - - Unity.Tests\TestDoubles\SpyPolicy.cs - - - Unity.Tests\TestDoubles\SpyStrategy.cs - - - Unity.Tests\TestObjects\DisposableObject.cs - - - Unity.Tests\TestObjects\ObjectWithExplicitInterface.cs - - - Unity.Tests\TestObjects\ObjectWithIndexer.cs - - - Unity.Tests\TestObjects\ObjectWithInjectionConstructor.cs - - - Unity.Tests\TestObjects\ObjectWithLotsOfDependencies.cs - - - Unity.Tests\TestObjects\ObjectWithOneDependency.cs - - - Unity.Tests\TestObjects\ObjectWithStaticAndInstanceProperties.cs - - - Unity.Tests\TestObjects\ObjectWithTwoConstructorDependencies.cs - - - - Unity.Tests\UnityContainerFixture.cs - - - Unity.Tests\UnityExtensionFixture.cs - - - - Unity.Tests\UnityHierarchyFixture.cs - - - ObjectBuilder\DynamicMethodCallFixture.NetCore.cs - - - ObjectBuilder\DynamicMethodPropertySetterFixture.NetCore.cs - - - Unity.TestSupport\TypeReflectionExtensions.NetCore.cs - - - - - Unity.Tests\UnityHierarchyFixture.cs - - - - - ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - - - - - - - <_XapFilesInputCollectionBackup Include="@(XapFilesInputCollection)" Condition=" !$([System.Text.RegularExpressions.Regex]::IsMatch(%(FullPath), 'MissingAssembly.WindowsPhone.dll')) " /> - - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/packages.config b/source/Unity/Tests/Unity.Tests.WindowsPhone/packages.config deleted file mode 100644 index 8d68e849..00000000 --- a/source/Unity/Tests/Unity.Tests.WindowsPhone/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/AppDelegate.cs b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/AppDelegate.cs deleted file mode 100644 index 60aba952..00000000 --- a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/AppDelegate.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; - -using MonoTouch.Foundation; -using MonoTouch.NUnit.UI; -using MonoTouch.UIKit; - -namespace Microsoft.Practices.Unity.Tests.Xamarin.iOS -{ - // The UIApplicationDelegate for the application. This class is responsible for launching the - // User Interface of the application, as well as listening (and optionally responding) to - // application events from iOS. - [Register("AppDelegate")] - public partial class AppDelegate : UIApplicationDelegate - { - // class-level declarations - private UIWindow window; - private TouchRunner runner; - - // This method is invoked when the application has loaded and is ready to run. In this - // method you should instantiate the window, load the UI into it and then make the window - // visible. - // - // You have 17 seconds to return from this method, or iOS will terminate your application. - public override bool FinishedLaunching(UIApplication app, NSDictionary options) - { - // create a new window instance based on the screen size - this.window = new UIWindow(UIScreen.MainScreen.Bounds); - this.runner = new TouchRunner(this.window); - - // register every tests included in the main application/assembly - this.runner.Add(System.Reflection.Assembly.GetExecutingAssembly()); - - this.window.RootViewController = new UINavigationController(this.runner.GetViewController()); - - // make the window visible - this.window.MakeKeyAndVisible(); - - return true; - } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Info.plist b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Info.plist deleted file mode 100644 index 32dc2009..00000000 --- a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Info.plist +++ /dev/null @@ -1,37 +0,0 @@ - - - - - UIDeviceFamily - - 1 - 2 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - MinimumOSVersion - 7.0 - CFBundleDisplayName - UnityTests - CFBundleIdentifier - unity.tests - CFBundleVersion - 3.5 - NSMainNibFile - - NSMainNibFile~ipad - - CFBundleIconFiles - - Default.png - Default@2x.png - Default-568h@2x.png - - - diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Main.cs b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Main.cs deleted file mode 100644 index 94414a80..00000000 --- a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Main.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; - -using MonoTouch.Foundation; -using MonoTouch.UIKit; - -namespace Microsoft.Practices.Unity.Tests.Xamarin.iOS -{ - public class Application - { - // This is the main entry point of the application. - [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1400:AccessModifierMustBeDeclared", Justification = "Reviewed.")] - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, "AppDelegate"); - } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Properties/AssemblyInfo.cs b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 7258224d..00000000 --- a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Unity.Tests.Xamarin.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Unity.Tests.Xamarin.iOS")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ed1b0286-65fa-46f4-9e6b-eebaffaf7f52")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default-568h@2x.png b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default-568h@2x.png deleted file mode 100644 index b3f66780..00000000 Binary files a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default-568h@2x.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default.png b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default.png deleted file mode 100644 index 7ad63b04..00000000 Binary files a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default@2x.png b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default@2x.png deleted file mode 100644 index 8d59426f..00000000 Binary files a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Resources/Default@2x.png and /dev/null differ diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Unity.Tests.Xamarin.iOS.csproj b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Unity.Tests.Xamarin.iOS.csproj deleted file mode 100644 index 822a5be8..00000000 --- a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/Unity.Tests.Xamarin.iOS.csproj +++ /dev/null @@ -1,515 +0,0 @@ - - - - Debug - iPhoneSimulator - 8.0.30703 - 2.0 - {0CC1CB09-3FB0-400C-BC40-F13F0488D164} - {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - Microsoft.Practices.Unity.Tests.Xamarin.iOS - Resources - UnityTestsXamariniOS - - - true - full - false - bin\iPhoneSimulator\Debug - DEBUG - prompt - 4 - false - None - true - ..\..\..\Tests.ruleset - - - none - true - bin\iPhoneSimulator\Release - prompt - 4 - false - None - ..\..\..\Tests.ruleset - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - true - iPhone Developer - ..\..\..\Tests.ruleset - - - none - true - bin\iPhone\Release - prompt - 4 - false - iPhone Developer - ..\..\..\Tests.ruleset - - - none - True - bin\iPhone\Ad-Hoc - prompt - 4 - False - iPhone Distribution - True - ..\..\..\Tests.ruleset - - - none - True - bin\iPhone\AppStore - prompt - 4 - False - iPhone Distribution - ..\..\..\Tests.ruleset - - - - Unity.TestSupport\CollectionAssertExtensions.cs - - - - Unity.ServiceLocation.Tests\Components\AdvancedLogger.cs - - - Unity.ServiceLocation.Tests\Components\ILogger.cs - - - Unity.ServiceLocation.Tests\Components\SimpleLogger.cs - - - Unity.ServiceLocation.Tests\ServiceLocatorFixture.cs - - - Unity.ServiceLocation.Tests\UnityServiceLocatorAdapterFixture.cs - - - Unity.Tests\PerThreadLifetimeManagerFixture.cs - - - - - - - - - - - - - - ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - - - - - - - - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - - ObjectBuilder\BuilderAwareStrategyTest.cs - - - ObjectBuilder\BuilderContextTest.cs - - - ObjectBuilder\BuildKeyMappingPolicyTest.cs - - - ObjectBuilder\BuildKeyMappingStrategyTest.cs - - - ObjectBuilder\BuildPlanStrategyFixture.cs - - - ObjectBuilder\ConstructorSelectorFixture.cs - - - ObjectBuilder\DynamicMethodConstructionFixture.cs - - - ObjectBuilder\GenericTypeMappingTest.cs - - - ObjectBuilder\InternalAndPrivatePlanFixture.Desktop.cs - - - ObjectBuilder\LifetimeContainerTest.cs - - - ObjectBuilder\LifetimeStrategyTest.cs - - - ObjectBuilder\PolicyListTest.cs - - - ObjectBuilder\PropertySelectorFixture.cs - - - ObjectBuilder\RecoveryFixture.cs - - - ObjectBuilder\SingletonThreadingFixture.cs - - - ObjectBuilder\StagedStrategyChainTest.cs - - - ObjectBuilder\TestDoubles\CurrentOperationSensingResolverPolicy.cs - - - ObjectBuilder\TestDoubles\DependencyAttribute.cs - - - ObjectBuilder\TestDoubles\ExceptionThrowingTestResolverPolicy.cs - - - ObjectBuilder\TestDoubles\InjectionConstructorAttribute.cs - - - ObjectBuilder\TestDoubles\InjectionMethodAttribute.cs - - - ObjectBuilder\TestObjects\FileLogger.cs - - - ObjectBuilder\TestObjects\NullLogger.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousConstructors.cs - - - ObjectBuilder\TestObjects\ObjectWithAmbiguousMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMarkedConstructor.cs - - - ObjectBuilder\TestObjects\ObjectWithMultipleConstructors.cs - - - ObjectBuilder\TestObjects\OptionalLogger.cs - - - ObjectBuilder\Utility\ActivatorCreationStrategy.cs - - - ObjectBuilder\Utility\AssertActualExpectedException.cs - - - ObjectBuilder\Utility\AssertHelper.cs - - - Unity.TestSupport\AssertExtensions.cs - - - Unity.TestSupport\EnumerableAssertionExtensions.cs - - - Unity.TestSupport\ILogger.cs - - - Unity.TestSupport\MockBuilderContext.cs - - - Unity.TestSupport\MockContainerExtension.cs - - - Unity.TestSupport\MockDatabase.cs - - - Unity.TestSupport\MockLogger.cs - - - Unity.TestSupport\ObjectUsingLogger.cs - - - Unity.TestSupport\ObjectWithInjectionMethod.cs - - - Unity.TestSupport\ObjectWithOneConstructorDependency.cs - - - Unity.TestSupport\ObjectWithTwoConstructorParameters.cs - - - Unity.TestSupport\ObjectWithTwoProperties.cs - - - Unity.TestSupport\SpecialLogger.cs - - - - Unity.Tests\BuildPlanAndChildContainerFixture.cs - - - Unity.Tests\CodeGenBugFixture.cs - - - Unity.Tests\CodeplexIssuesFixture.cs - - - Unity.Tests\ConstructorWithOutParametersFixture.cs - - - Unity.Tests\ContainerRegistrationsFixture.cs - - - Unity.Tests\DeferredResolveFixture.cs - - - Unity.Tests\DependencyArrayAttributeFixture.cs - - - Unity.Tests\DisposableExtensionFixture.cs - - - Unity.Tests\GenericChainingFixture.cs - - - - Unity.Tests\GenericParameterFixture.cs - - - Unity.Tests\GenericResolvedArrayParameterFixture.cs - - - Unity.Tests\GenericsReflectionExperimentsFixture.cs - - - Unity.Tests\HierarchicalLifetimeFixture.cs - - - Unity.Tests\InjectedMembersFixture.cs - - - Unity.Tests\InjectingArraysFixture.cs - - - Unity.Tests\InjectionConstructorFixture.cs - - - Unity.Tests\InjectionMethodFixture.cs - - - Unity.Tests\InjectionParameterValueFixture.cs - - - Unity.Tests\LazyResolveFixture.cs - - - Unity.Tests\MethodInjectionFixture.cs - - - Unity.Tests\OptionalDependencyAPIConfigurationFixture.cs - - - Unity.Tests\OptionalDependencyAttributeFixture.cs - - - Unity.Tests\OptionalDependencyResolverPolicyFixture.cs - - - Unity.Tests\OptionalGenericParameterFixture.cs - - - Unity.Tests\ParameterMatcherFixture.cs - - - Unity.Tests\PerResolveLifetimeFixture.cs - - - Unity.Tests\ReflectionHelperFixture.cs - - - - Unity.Tests\ResolvingArraysFixture.cs - - - Unity.Tests\ServiceOverrideFixture.cs - - - Unity.Tests\SpecifiedConstructorSelectorPolicyFixture.cs - - - Unity.Tests\StaticFactoryFixture.cs - - - Unity.Tests\TestDoubles\MockContainerExtensionWithNonDefaultConstructor.cs - - - Unity.Tests\TestDoubles\SpyExtension.cs - - - Unity.Tests\TestDoubles\SpyPolicy.cs - - - Unity.Tests\TestDoubles\SpyStrategy.cs - - - Unity.Tests\TestObjects\DisposableObject.cs - - - Unity.Tests\TestObjects\ObjectWithExplicitInterface.cs - - - Unity.Tests\TestObjects\ObjectWithIndexer.cs - - - Unity.Tests\TestObjects\ObjectWithInjectionConstructor.cs - - - Unity.Tests\TestObjects\ObjectWithLotsOfDependencies.cs - - - Unity.Tests\TestObjects\ObjectWithOneDependency.cs - - - Unity.Tests\TestObjects\ObjectWithStaticAndInstanceProperties.cs - - - Unity.Tests\TestObjects\ObjectWithTwoConstructorDependencies.cs - - - - Unity.Tests\UnityContainerFixture.cs - - - Unity.Tests\UnityExtensionFixture.cs - - - - Unity.Tests\UnityHierarchyFixture.cs - - - ObjectBuilder\DynamicMethodCallFixture.NetCore.cs - - - ObjectBuilder\DynamicMethodPropertySetterFixture.NetCore.cs - - - Unity.TestSupport\TypeReflectionExtensions.NetCore.cs - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/packages.config b/source/Unity/Tests/Unity.Tests.Xamarin.iOS/packages.config deleted file mode 100644 index 5fde9172..00000000 --- a/source/Unity/Tests/Unity.Tests.Xamarin.iOS/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests/AssemblyScanningFixture.Desktop.cs b/source/Unity/Tests/Unity.Tests/AssemblyScanningFixture.Desktop.cs deleted file mode 100644 index 73749866..00000000 --- a/source/Unity/Tests/Unity.Tests/AssemblyScanningFixture.Desktop.cs +++ /dev/null @@ -1,168 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Tests -{ - public partial class AssemblyScanningFixture - { - [TestMethod] - public void GetsTypesFromLoadedAssembliesExcludingSystemAndUnityByDefault() - { - // ensure type is loaded - var ignore = new Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1(); - - var typesByAssembly = AllClasses.FromLoadedAssemblies().GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly)); - } - - [TestMethod] - public void GetsTypesFromLoadedAssembliesIncludingSystemIfOverridden() - { - // ensure type is loaded - var ignore = new Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1(); - - var typesByAssembly = AllClasses.FromLoadedAssemblies(includeSystemAssemblies: true).GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly)); - } - - [TestMethod] - public void GetsTypesFromLoadedAssembliesIncludingUnityIfOverridden() - { - // ensure type is loaded - var ignore = new Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1(); - - var typesByAssembly = AllClasses.FromLoadedAssemblies(includeUnityAssemblies: true).GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly)); - } - - [TestMethod] - public void GetsTypesFromLoadedAssembliesIncludingUnityAndSystemIfOverridden() - { - // ensure type is loaded - var ignore = new Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1(); - - var typesByAssembly = AllClasses.FromLoadedAssemblies(includeSystemAssemblies: true, includeUnityAssemblies: true).GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly)); - } - - [TestMethod] - public void GettingTypesFromLoadedAssembliesWithErrorsThrows() - { - // ensure type is loaded - var ignore = new Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1(); - - try - { - var types = AllClasses.FromLoadedAssemblies(skipOnError: false).ToArray(); - Assert.Fail("should have thrown"); - } - catch (Exception e) - { - if (e is AssertFailedException) - { - throw; - } - } - } - - [TestMethod] - [Priority(-1)] - public void GetsTypesFromAssembliesLoadedFromBaseFolderExcludingSystemAndUnityByDefault() - { - if (!File.Exists("NotReferencedTestNetAssembly.dll")) - { - Assert.Inconclusive("The assembly was not found. Run this test without deployment"); - } - - var typesByAssembly = AllClasses.FromAssembliesInBasePath().GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.Any(g => g.Key.GetName().Name == "NotReferencedTestNetAssembly"), "No types for NotReferencedTestNetAssembly"); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly), "No types for TestNetAssembly"); - } - - [TestMethod] - [Priority(-1)] - public void GetsTypesFromAssembliesLoadedFromBaseFolderIncludingSystemIfOverridden() - { - if (!File.Exists("NotReferencedTestNetAssembly.dll")) - { - Assert.Inconclusive("The assembly was not found. Run this test without deployment"); - } - - var typesByAssembly = AllClasses.FromAssembliesInBasePath(includeSystemAssemblies: true).GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.Any(g => g.Key.GetName().Name == "NotReferencedTestNetAssembly"), "No types for NotReferencedTestNetAssembly"); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly), "No types for TestNetAssembly"); - } - - [TestMethod] - [Priority(-1)] - public void GetsTypesFromAssembliesLoadedFromBaseFolderIncludingUnityIfOverridden() - { - if (!File.Exists("NotReferencedTestNetAssembly.dll")) - { - Assert.Inconclusive("The assembly was not found. Run this test without deployment"); - } - - var typesByAssembly = AllClasses.FromAssembliesInBasePath(includeUnityAssemblies: true).GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsFalse(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.Any(g => g.Key.GetName().Name == "NotReferencedTestNetAssembly"), "No types for NotReferencedTestNetAssembly"); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly), "No types for TestNetAssembly"); - } - - [TestMethod] - [Priority(-1)] - public void GetsTypesFromAssembliesLoadedFromBaseFolderIncludingSystemAndUnityIfOverridden() - { - if (!File.Exists("NotReferencedTestNetAssembly.dll")) - { - Assert.Inconclusive("The assembly was not found. Run this test without deployment"); - } - - var typesByAssembly = AllClasses.FromAssembliesInBasePath(includeSystemAssemblies: true, includeUnityAssemblies: true).GroupBy(t => t.Assembly).ToDictionary(g => g.Key); - - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Uri).Assembly)); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(IUnityContainer).Assembly)); - Assert.IsTrue(typesByAssembly.Any(g => g.Key.GetName().Name == "NotReferencedTestNetAssembly"), "No types for NotReferencedTestNetAssembly"); - Assert.IsTrue(typesByAssembly.ContainsKey(typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).Assembly), "No types for TestNetAssembly"); - } - - [TestMethod] - public void GettingTypesFromAssembliesLoadedFromBaseFolderWithErrorsThrows() - { - try - { - var types = AllClasses.FromAssembliesInBasePath(skipOnError: false).ToArray(); - } - catch (Exception e) - { - if (e is AssertFailedException) - { - throw; - } - } - } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests/AssemblyScanningFixture.cs b/source/Unity/Tests/Unity.Tests/AssemblyScanningFixture.cs deleted file mode 100644 index b90a8d20..00000000 --- a/source/Unity/Tests/Unity.Tests/AssemblyScanningFixture.cs +++ /dev/null @@ -1,155 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.TestSupport; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -#elif __IOS__ -using NUnit.Framework; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -using TestInitializeAttribute = NUnit.Framework.TestFixtureSetUpAttribute; -#else -using Microsoft.VisualStudio.TestTools.UnitTesting; -#endif - -namespace Microsoft.Practices.Unity.Tests -{ - [TestClass] - public partial class AssemblyScanningFixture - { - [TestMethod] - public void DoesNotRegisterTypeWithNoLifetimeOrInjectionMembers() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name"); - - Assert.IsFalse(container.Registrations.Any(r => r.MappedToType == typeof(MockLogger))); - } - - [TestMethod] - public void RegisteringNullAssembliesListThrows() - { - AssertExtensions.AssertException(() => - { - AllClasses.FromAssemblies(null, true); - }); - } - - [TestMethod] - public void RegisteringNullAssembliesArrayThrows() - { - AssertExtensions.AssertException(() => - { - AllClasses.FromAssemblies(true, (Assembly[])null); - }); - } - - [TestMethod] - public void RegisteringNullAssemblyThrows() - { - AssertExtensions.AssertException(() => - { - AllClasses.FromAssemblies(true, typeof(object).GetTypeInfo().Assembly, (Assembly)null); - }); - } - - [TestMethod] - public void RegistersTypeWithLifetime() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getLifetimeManager: t => new ContainerControlledLifetimeManager()); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(1, registrations.Length); - Assert.AreSame(typeof(MockLogger), registrations[0].MappedToType); - Assert.AreEqual("name", registrations[0].Name); - Assert.IsInstanceOfType(registrations[0].LifetimeManager, typeof(ContainerControlledLifetimeManager)); - } - - [TestMethod] - public void RegistersTypeWithInjectionMembers() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getInjectionMembers: t => new InjectionMember[] { new InjectionConstructor() }); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(1, registrations.Length); - Assert.AreSame(typeof(MockLogger), registrations[0].RegisteredType); - Assert.AreSame(typeof(MockLogger), registrations[0].MappedToType); - Assert.AreEqual("name", registrations[0].Name); - Assert.IsNull(registrations[0].LifetimeManager); - } - - [TestMethod] - public void RegistersMappingOnlyWithNoLifetimeOrInjectionMembers() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getFromTypes: t => t.GetTypeInfo().ImplementedInterfaces); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(1, registrations.Length); - Assert.AreSame(typeof(ILogger), registrations[0].RegisteredType); - Assert.AreSame(typeof(MockLogger), registrations[0].MappedToType); - Assert.AreEqual("name", registrations[0].Name); - Assert.IsNull(registrations[0].LifetimeManager); - } - - [TestMethod] - public void RegistersMappingAndImplementationTypeWithLifetime() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getFromTypes: t => t.GetTypeInfo().ImplementedInterfaces, getLifetimeManager: t => new ContainerControlledLifetimeManager()); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(2, registrations.Length); - - var mappingRegistration = registrations.Single(r => r.RegisteredType == typeof(ILogger)); - var implementationRegistration = registrations.Single(r => r.RegisteredType == typeof(MockLogger)); - - Assert.AreSame(typeof(ILogger), mappingRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), mappingRegistration.MappedToType); - Assert.AreEqual("name", mappingRegistration.Name); - Assert.IsInstanceOfType(mappingRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - - Assert.AreSame(typeof(MockLogger), implementationRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), implementationRegistration.MappedToType); - Assert.AreEqual("name", implementationRegistration.Name); - Assert.IsInstanceOfType(implementationRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - } - - [TestMethod] - public void GetsTypesFromAssembliesWithErrorsIfSkippingErrors() - { - var types = AllClasses.FromAssemblies(true, typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).GetTypeInfo().Assembly).ToArray(); - - Assert.AreEqual(2, types.Length); - types.AssertContainsInAnyOrder( - typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1), - typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.DisposableClass)); - } - - [TestMethod] - public void GettingTypesFromAssembliesWithErrorsThrowsIfNotIfNotSkippingErrors() - { - try - { - AllClasses.FromAssemblies(false, typeof(Microsoft.Practices.Unity.Tests.TestNetAssembly.PublicClass1).GetTypeInfo().Assembly).ToArray(); - Assert.Fail("should have failed"); - } - catch (Exception e) - { - if (e is AssertFailedException) - { - throw; - } - } - } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests/CodeplexIssuesFixture.cs b/source/Unity/Tests/Unity.Tests/CodeplexIssuesFixture.cs deleted file mode 100644 index d19447d5..00000000 --- a/source/Unity/Tests/Unity.Tests/CodeplexIssuesFixture.cs +++ /dev/null @@ -1,394 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Practices.Unity.TestSupport; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -#elif __IOS__ -using NUnit.Framework; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -#else -using Microsoft.VisualStudio.TestTools.UnitTesting; -#endif - -namespace Microsoft.Practices.Unity.Tests -{ - /// - /// Tests for issues reported on Codeplex - /// - [TestClass] - public class CodeplexIssuesFixture - { - // http://www.codeplex.com/unity/WorkItem/View.aspx?WorkItemId=1307 - [TestMethod] - public void InjectionConstructorWorksIfItIsFirstConstructor() - { - UnityContainer container = new UnityContainer(); - container.RegisterType(); - IBasicInterface result = container.Resolve(); - } - - // https://www.codeplex.com/Thread/View.aspx?ProjectName=unity&ThreadId=25301 - [TestMethod] - public void CanUseNonDefaultLifetimeManagerWithOpenGenericRegistration() - { - IUnityContainer container = new UnityContainer(); - container.RegisterType(typeof(ISomeInterface<>), - typeof(MyTypeImplementingSomeInterface<>), - new ContainerControlledLifetimeManager()); - ISomeInterface intSomeInterface = container.Resolve>(); - ISomeInterface stringObj1 = container.Resolve>(); - ISomeInterface stringObj2 = container.Resolve>(); - - Assert.AreSame(stringObj1, stringObj2); - } - - // https://www.codeplex.com/Thread/View.aspx?ProjectName=unity&ThreadId=25301 - [TestMethod] - public void CanOverrideGenericLifetimeManagerWithSpecificOne() - { - IUnityContainer container = new UnityContainer() - .RegisterType(typeof(ISomeInterface<>), - typeof(MyTypeImplementingSomeInterface<>), - new ContainerControlledLifetimeManager()) - .RegisterType(typeof(MyTypeImplementingSomeInterface), new TransientLifetimeManager()); - - ISomeInterface string1 = container.Resolve>(); - ISomeInterface string2 = container.Resolve>(); - - ISomeInterface double1 = container.Resolve>(); - ISomeInterface double2 = container.Resolve>(); - - Assert.AreSame(string1, string2); - Assert.AreNotSame(double1, double2); - } - - // https://www.codeplex.com/Thread/View.aspx?ProjectName=unity&ThreadId=26318 - [TestMethod] - public void RegisteringInstanceInChildOverridesRegisterTypeInParent() - { - IUnityContainer container = new UnityContainer() - .RegisterType(new ContainerControlledLifetimeManager()); - - IUnityContainer child = container.CreateChildContainer() - .RegisterInstance(new MockBasic()); - - IBasicInterface result = child.Resolve(); - - AssertExtensions.IsInstanceOfType(result, typeof(MockBasic)); - } - - // http://www.codeplex.com/unity/Thread/View.aspx?ThreadId=30292 - [TestMethod] - public void CanConfigureGenericDictionaryForInjectionUsingRegisterType() - { - IUnityContainer container = new UnityContainer() - .RegisterType(typeof(IDictionary<,>), typeof(Dictionary<,>), - new InjectionConstructor()); - - IDictionary result = container.Resolve>(); - } - - // http://unity.codeplex.com/WorkItem/View.aspx?WorkItemId=6431 - [TestMethod] - public void AccessViolationExceptionOnx64() - { - var container1 = new UnityContainer(); - container1.RegisterType(); - // SomeProperty is static, this should throw here - AssertExtensions.AssertException(() => - { - container1.RegisterType(new InjectionProperty("SomeProperty")); - }); - } - - // http://unity.codeplex.com/WorkItem/View.aspx?WorkItemId=6491 - [TestMethod] - public void CanResolveTimespan() - { - var container = new UnityContainer() - .RegisterType(new ExternallyControlledLifetimeManager(), - new InjectionConstructor(0L)); - var expected = new TimeSpan(); - var result = container.Resolve(); - - Assert.AreEqual(expected, result); - } - - // http://unity.codeplex.com/WorkItem/View.aspx?WorkItemId=6053 - [TestMethod] - public void ResolveAllWithChildDoesNotRepeatOverriddenRegistrations() - { - var parent = new UnityContainer() - .RegisterInstance("str1", "string1") - .RegisterInstance("str2", "string2"); - - var child = parent.CreateChildContainer() - .RegisterInstance("str2", "string20") - .RegisterInstance("str3", "string30"); - - var result = child.ResolveAll(); - - result.AssertContainsInAnyOrder("string1", "string20", "string30"); - } - - // http://unity.codeplex.com/WorkItem/View.aspx?WorkItemId=6997 - [TestMethod] - public void IsRegisteredReturnsCorrectValue() - { - IUnityContainer container = new UnityContainer(); - container.RegisterType(new InjectionConstructor("Name")); - var inst = container.Resolve(); - Assert.IsTrue(container.IsRegistered()); - } - - // http://unity.codeplex.com/WorkItem/View.aspx?WorkItemId=3392 - [TestMethod] - public void ResolveAllResolvesOpenGeneric() - { - IUnityContainer container = new UnityContainer() - .RegisterType(typeof(ISomeInterface<>), typeof(MyTypeImplementingSomeInterface<>), "open") - .RegisterType, MyTypeImplementingSomeInterfaceOfString>("string"); - - var results = container.ResolveAll>().ToList(); - - Assert.AreEqual(2, results.Count()); - results.Select(o => o.GetType()) - .AssertContainsInAnyOrder(typeof(MyTypeImplementingSomeInterface), typeof(MyTypeImplementingSomeInterfaceOfString)); - } - - // http://unity.codeplex.com/WorkItem/View.aspx?WorkItemId=6999 - [TestMethod] - public void ContainerControlledOpenGenericInParentResolvesProperlyInChild() - { - IUnityContainer parentContainer = new UnityContainer() - .RegisterType(typeof(ISomeInterface<>), typeof(MyTypeImplementingSomeInterface<>), new ContainerControlledLifetimeManager()); - - var childOneObject = parentContainer.CreateChildContainer().Resolve>(); - var childTwoObject = parentContainer.CreateChildContainer().Resolve>(); - - Assert.AreSame(childOneObject, childTwoObject); - } - - // http://unity.codeplex.com/discussions/328841 - [TestMethod] - public void MultipleResolvesAtTheSameTimeCauseConcurrencyException() - { - var container = new UnityContainer(); - container.RegisterInstance("a value"); - - const int Threads = 40; - var barrier = new System.Threading.Barrier(Threads); - var countdown = new CountdownEvent(Threads); - var random = new Random(); - var errors = false; - - for (int i = 0; i < Threads; i++) - { - Task.Factory.StartNew( - wait => - { - barrier.SignalAndWait(); - - Task.Delay((int)wait).Wait(); - try - { - container.Resolve(); - } - catch - { - errors = true; - } - - countdown.Signal(); - }, - random.Next(0, 3), - TaskCreationOptions.LongRunning); - } - - countdown.Wait(); - Assert.IsFalse(errors); - } - - // https://unity.codeplex.com/workitem/11899 - [TestMethod] - public void ResolveDelegateThrowsExplicitException() - { - using (var container = new UnityContainer()) - { - try - { - var func = container.Resolve>(); - } - catch (ResolutionFailedException e) - { - AssertExtensions.IsInstanceOfType(e.InnerException, typeof(InvalidOperationException)); - } - } - } - - // https://unity.codeplex.com/workitem/12745 - [TestMethod] - public void ResolveInterfaceThrowsExplicitException() - { - using (var container = new UnityContainer()) - { - try - { - var func = container.Resolve>(); - } - catch (ResolutionFailedException e) - { - AssertExtensions.IsInstanceOfType(e.InnerException, typeof(InvalidOperationException)); - } - } - } - - // https://unity.codeplex.com/workitem/12745 - [TestMethod] - public void ResolveAbstractClassThrowsExplicitException() - { - using (var container = new UnityContainer()) - { - try - { - var func = container.Resolve(); - } - catch (ResolutionFailedException e) - { - AssertExtensions.IsInstanceOfType(e.InnerException, typeof(InvalidOperationException)); - } - } - } - - // https://unity.codeplex.com/workitem/8777 - [TestMethod] - public void PerResolveLifetimeIsHonoredWhenResolvingArrays() - { - using (var container = new UnityContainer()) - { - container.RegisterType("instance1"); - container.RegisterType("instance2"); - container.RegisterType(new PerResolveLifetimeManager()); - - var instances = container.ResolveAll(); - - Assert.AreEqual(2, instances.Count()); - Assert.AreSame(instances.ElementAt(0).Dependency, instances.ElementAt(1).Dependency); - } - } - - // https://unity.codeplex.com/workitem/8777 - [TestMethod] - public void ResolverOverridesAreUsedWhenResolvingArrayElements() - { - using (var container = new UnityContainer()) - { - var overrideInstance = new ClassWithPerResolveLifetime(); - container.RegisterType("instance1"); - container.RegisterType("instance2"); - - var instance = - container.Resolve(new DependencyOverride(overrideInstance).OnType()); - - Assert.AreEqual(2, instance.Elements.Length); - Assert.AreSame(overrideInstance, instance.Elements[0].Dependency); - Assert.AreSame(overrideInstance, instance.Elements[1].Dependency); - } - } - - public interface IBasicInterface - { - } - - public class ClassWithDoubleConstructor : IBasicInterface - { - private string myString = String.Empty; - - [InjectionConstructor] - public ClassWithDoubleConstructor() - : this(string.Empty) - { - } - - public ClassWithDoubleConstructor(string myString) - { - this.myString = myString; - } - } - - public interface ISomeInterface - { - } - - public class MyTypeImplementingSomeInterface : ISomeInterface - { - } - - public class MyTypeImplementingSomeInterfaceOfString : ISomeInterface - { - } - - public class MockBasic : IBasicInterface - { - } - - public class InnerX64Class - { - } - - public class OuterX64Class - { - public static InnerX64Class SomeProperty { get; set; } - } - - public class MyClass - { - public string Name { get; set; } - public MyClass() - { - } - public MyClass(string name) - { - Name = name; - } - } - - public class ClassWithMultipleConstructorParameters - { - public ClassWithMultipleConstructorParameters(string parameterA, string parameterB, string parameterC, string parameterD) - { - } - } - - public class ClassWithDependency - { - public ClassWithDependency(ClassWithPerResolveLifetime dependency) - { - this.Dependency = dependency; - } - - public ClassWithPerResolveLifetime Dependency { get; private set; } - } - - public class ClassWithPerResolveLifetime - { - } - - public class ClassWithDependencyOnArray - { - public ClassWithDependencyOnArray(ClassWithDependency[] elements) - { - this.Elements = elements; - } - - public ClassWithDependency[] Elements { get; private set; } - } - } -} diff --git a/source/Unity/Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.cs b/source/Unity/Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.cs deleted file mode 100644 index 857f9e26..00000000 --- a/source/Unity/Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.cs +++ /dev/null @@ -1,120 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Threading; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.Practices.Unity.ObjectBuilder; -using Microsoft.Practices.Unity.Tests.TestDoubles; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.Tests -{ - // Test for a race condition in the ContainerControlledLifetime - // class. - [TestClass] - public class ContainerControlledLifetimeThreadingFixture - { - [TestMethod] - public void ContainerControlledLifetimeReturnsSameInstanceFromMultipleThreads() - { - IUnityContainer container = new UnityContainer() - .AddExtension(new SpyExtension(new DelayStrategy(), UnityBuildStage.Lifetime)) - .RegisterType(new ContainerControlledLifetimeManager()); - - object result1 = null; - object result2 = null; - - Thread thread1 = new Thread(delegate() - { - result1 = container.Resolve(); - }); - - Thread thread2 = new Thread(delegate() - { - result2 = container.Resolve(); - }); - - thread1.Start(); - thread2.Start(); - - thread2.Join(); - thread1.Join(); - - Assert.IsNotNull(result1); - Assert.AreSame(result1, result2); - } - - [TestMethod] - public void ContainerControlledLifetimeDoesNotLeaveHangingLockIfBuildThrowsException() - { - IUnityContainer container = new UnityContainer() - .AddExtension(new SpyExtension(new ThrowingStrategy(), UnityBuildStage.PostInitialization)) - .RegisterType(new ContainerControlledLifetimeManager()); - - object result1 = null; - object result2 = null; - bool thread2Finished = false; - - Thread thread1 = new Thread( - delegate() - { - try - { - result1 = container.Resolve(); - } - catch (ResolutionFailedException) - { - } - }); - - Thread thread2 = new Thread( - delegate() - { - result2 = container.Resolve(); - thread2Finished = true; - }); - - thread1.Start(); - thread1.Join(); - - // Thread1 threw an exception. However, lock should be correctly freed. - // Run thread2, and if it finished, we're ok. - - thread2.Start(); - thread2.Join(1000); - - Assert.IsTrue(thread2Finished); - Assert.IsNull(result1); - Assert.IsNotNull(result2); - } - - // A test strategy that introduces a variable delay in - // the strategy chain to work out - private class DelayStrategy : BuilderStrategy - { - private int delayMS = 500; - - public override void PreBuildUp(IBuilderContext context) - { - Thread.Sleep(this.delayMS); - this.delayMS = this.delayMS == 0 ? 500 : 0; - } - } - - // Another test strategy that throws an exeception the - // first time it is executed. - private class ThrowingStrategy : BuilderStrategy - { - private bool shouldThrow = true; - - public override void PreBuildUp(IBuilderContext context) - { - if (this.shouldThrow) - { - this.shouldThrow = false; - throw new Exception("Throwing from buildup chain"); - } - } - } - } -} diff --git a/source/Unity/Tests/Unity.Tests/LazyResolveFixture.cs b/source/Unity/Tests/Unity.Tests/LazyResolveFixture.cs deleted file mode 100644 index d193902d..00000000 --- a/source/Unity/Tests/Unity.Tests/LazyResolveFixture.cs +++ /dev/null @@ -1,172 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.Practices.Unity.TestSupport; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -#elif __IOS__ -using NUnit.Framework; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -#else -using Microsoft.VisualStudio.TestTools.UnitTesting; -#endif - -namespace Microsoft.Practices.Unity.Tests -{ - /// - /// Summary description for DeferredResolveFixture - /// - [TestClass] - public class LazyResolveFixture - { - [TestMethod] - public void CanResolveALazy() - { - var container = new UnityContainer() - .RegisterType(); - - var lazy = container.Resolve>(); - Assert.IsNotNull(lazy); - } - - [TestMethod] - public void ResolvedLazyHasNoValue() - { - var container = new UnityContainer() - .RegisterType(); - - var lazy = container.Resolve>(); - Assert.IsFalse(lazy.IsValueCreated); - } - - [TestMethod] - public void ResolvedLazyResolvesThroughContainer() - { - var container = new UnityContainer() - .RegisterType(); - - var lazy = container.Resolve>(); - var logger = lazy.Value; - - AssertExtensions.IsInstanceOfType(logger, typeof(MockLogger)); - } - - [TestMethod] - public void ResolvedLazyGetsInjectedAsADependency() - { - var container = new UnityContainer() - .RegisterType(); - - var result = container.Resolve(); - - Assert.IsNotNull(result.LoggerLazy); - AssertExtensions.IsInstanceOfType(result.LoggerLazy.Value, typeof(MockLogger)); - } - - [TestMethod] - public void CanResolveLazyWithName() - { - var container = new UnityContainer() - .RegisterType() - .RegisterType("special"); - - var lazy = container.Resolve>("special"); - - Assert.IsNotNull(lazy); - } - - [TestMethod] - public void ResolvedLazyWithNameResolvedThroughContainerWithName() - { - var container = new UnityContainer(); - - var lazy = container.Resolve>("special"); - - container - .RegisterType() - .RegisterType("special"); - - var result = lazy.Value; - - Assert.IsNotNull(result); - AssertExtensions.IsInstanceOfType(result, typeof(SpecialLogger)); - } - - [TestMethod] - public void DifferentResolveCallsReturnDifferentLazyInstances() - { - var container = new UnityContainer() - .RegisterType(); - - var lazy1 = container.Resolve>(); - var lazy2 = container.Resolve>(); - - Assert.AreNotSame(lazy1.Value, lazy2.Value); - } - - [TestMethod] - public void DifferentLazyGenericsGetTheirOwnBuildPlan() - { - var container = new UnityContainer() - .RegisterType() - .RegisterInstance("the instance"); - - var lazy1 = container.Resolve>(); - var lazy2 = container.Resolve>(); - - AssertExtensions.IsInstanceOfType(lazy1.Value, typeof(ILogger)); - Assert.AreEqual("the instance", lazy2.Value); - } - - [TestMethod] - public void ObservesPerResolveSingleton() - { - var container = new UnityContainer() - .RegisterType() - .RegisterType(typeof(Lazy<>), new PerResolveLifetimeManager()); - - var result = container.Resolve(); - - Assert.IsNotNull(result.LoggerLazy1); - Assert.IsNotNull(result.LoggerLazy2); - Assert.AreSame(result.LoggerLazy1, result.LoggerLazy2); - AssertExtensions.IsInstanceOfType(result.LoggerLazy1.Value, typeof(MockLogger)); - AssertExtensions.IsInstanceOfType(result.LoggerLazy2.Value, typeof(MockLogger)); - Assert.AreSame(result.LoggerLazy1.Value, result.LoggerLazy2.Value); - - Assert.AreNotSame(result.LoggerLazy1.Value, container.Resolve>().Value); - } - - [TestMethod] - public void ResolvingLazyOfIEnumerableCallsResolveAll() - { - var container = new UnityContainer() - .RegisterInstance("one", "first") - .RegisterInstance("two", "second") - .RegisterInstance("three", "third"); - - var lazy = container.Resolve>>(); - var result = lazy.Value; - - result.AssertContainsInAnyOrder("first", "second", "third"); - } - - public class ObjectThatGetsALazy - { - [Dependency] - public Lazy LoggerLazy { get; set; } - } - - public class ObjectThatGetsMultipleLazy - { - [Dependency] - public Lazy LoggerLazy1 { get; set; } - - [Dependency] - public Lazy LoggerLazy2 { get; set; } - } - } -} diff --git a/source/Unity/Tests/Unity.Tests/PerThreadLifetimeManagerFixture.cs b/source/Unity/Tests/Unity.Tests/PerThreadLifetimeManagerFixture.cs deleted file mode 100644 index e862478a..00000000 --- a/source/Unity/Tests/Unity.Tests/PerThreadLifetimeManagerFixture.cs +++ /dev/null @@ -1,246 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -// Duplicate using statements to avoid ordering using warning SA1210. -// ifdefs seem to be confusing stylecop -#if NETFX_CORE -#if !WINDOWS_PHONE -using System; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using Windows.System.Threading; -#else -using System.Linq; -using System.Threading; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -#endif -#elif __IOS__ -using System.Linq; -using System.Threading; -using Microsoft.Practices.ObjectBuilder2; -using NUnit.Framework; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestInitializeAttribute = NUnit.Framework.SetUpAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -#else -using System.Linq; -using System.Threading; -using Microsoft.Practices.ObjectBuilder2; -using Microsoft.VisualStudio.TestTools.UnitTesting; -#endif - -namespace Microsoft.Practices.Unity.Tests -{ - [TestClass] - public class PerThreadLifetimeManagerFixture - { - [TestMethod] - public void CanCreateLifetimeManager() - { - new PerThreadLifetimeManager(); - } - - [TestMethod] - public void NewLifetimeManagerReturnsNullForObject() - { - LifetimeManager ltm = new PerThreadLifetimeManager(); - Assert.IsNull(ltm.GetValue()); - } - - [TestMethod] - public void LifetimeManagerReturnsValueThatWasSetOnSameThread() - { - LifetimeManager ltm = new PerThreadLifetimeManager(); - string expected = "Here's the value"; - - ltm.SetValue(expected); - object result = ltm.GetValue(); - Assert.AreSame(expected, result); - } - - [TestMethod] - public void DifferentLifetimeContainerInstancesHoldDifferentObjects() - { - LifetimeManager ltm1 = new PerThreadLifetimeManager(); - LifetimeManager ltm2 = new PerThreadLifetimeManager(); - string expected1 = "Here's the first value"; - string expected2 = "Here's the second value"; - - ltm1.SetValue(expected1); - ltm2.SetValue(expected2); - - object result1 = ltm1.GetValue(); - object result2 = ltm2.GetValue(); - Assert.AreSame(expected1, result1); - Assert.AreSame(expected2, result2); - } - - [TestMethod] - public void LifetimeManagerReturnsNullIfCalledOnADifferentThreadFromTheOneThatSetTheValue() - { - LifetimeManager ltm = new PerThreadLifetimeManager(); - string expected = "Here's the value"; - - ltm.SetValue(expected); - - // Providing dummy initializers so we can prove the values are different coming out of the LTM - var otherThreadResult = new object(); - - RunInParallel(() => { otherThreadResult = ltm.GetValue(); }); - - Assert.AreSame(expected, ltm.GetValue()); - Assert.IsNull(otherThreadResult); - } - - [TestMethod] - public void LifetimeManagerReturnsDifferentValuesForEachThread() - { - LifetimeManager ltm = new PerThreadLifetimeManager(); - string one = "one"; - string two = "two"; - string three = "three"; - - object valueOne = null; - object valueTwo = null; - object valueThree = null; - - var barrier = new Barrier(3); - RunInParallel( - delegate - { - ltm.SetValue(one); - barrier.SignalAndWait(); - valueOne = ltm.GetValue(); - }, - delegate - { - ltm.SetValue(three); - barrier.SignalAndWait(); - valueThree = ltm.GetValue(); - }, - delegate - { - ltm.SetValue(two); - barrier.SignalAndWait(); - valueTwo = ltm.GetValue(); - }); - - Assert.AreSame(one, valueOne); - Assert.AreSame(two, valueTwo); - Assert.AreSame(three, valueThree); - } - - [TestMethod] - public void CanRegisterLifetimeManagerInContainerAndUseItOnOneThread() - { - IUnityContainer container = new UnityContainer() - .RegisterType(new PerThreadLifetimeManager()); - - object result1 = container.Resolve(); - object result2 = container.Resolve(); - - Assert.AreSame(result1, result2); - } - - [TestMethod] - public void ReturnsDifferentObjectsOnDifferentThreadsFromContainer() - { - IUnityContainer container = new UnityContainer() - .RegisterType(new PerThreadLifetimeManager()); - - object result1 = null; - object result2 = null; - - RunInParallel( - delegate { result1 = container.Resolve(); }, - delegate { result2 = container.Resolve(); }); - - Assert.IsNotNull(result1); - Assert.IsNotNull(result2); - - Assert.AreNotSame(result1, result2); - } - - [TestMethod] - public void RegisteringAnInstanceInAThreadSetsPerThreadLifetimeManagerWhenResolvingInOtherThreads() - { - IUnityContainer container = new UnityContainer() - .RegisterType(new PerThreadLifetimeManager()); - LifetimeManager manager = new PerThreadLifetimeManager(); - - object registered = new object(); - object result1A = null; - object result1B = null; - object result2A = null; - object result2B = null; - - container.RegisterInstance(registered, manager); - - var barrier = new Barrier(2); - RunInParallel( - delegate - { - result1A = container.Resolve(); - barrier.SignalAndWait(); - result1B = container.Resolve(); - }, - delegate - { - result2A = container.Resolve(); - barrier.SignalAndWait(); - result2B = container.Resolve(); - }); - object result = container.Resolve(); - - Assert.IsNotNull(result1A); - Assert.IsNotNull(result2A); - Assert.IsNotNull(result); - - Assert.AreNotSame(result1A, result2A); - Assert.AreNotSame(registered, result1A); - Assert.AreNotSame(registered, result2A); - Assert.AreSame(result1A, result1B); - Assert.AreSame(result2A, result2B); - Assert.AreSame(registered, result); - } - -#if NETFX_CORE && !WINDOWS_PHONE - // Helper method to run a bunch of delegates, each on a separate thread. - // It runs them and then waits for them all to complete. - private static void RunInParallel(params System.Action[] actions) - { - var barrier = new Barrier(actions.Length); - var tasks = actions.Select(a => - ThreadPool.RunAsync( - _ => - { - barrier.SignalAndWait(); - a(); - }).AsTask()).ToArray(); - - Task.WaitAll(tasks); - } -#else - // Helper method to run a bunch of delegates, each on a separate thread. - // It runs them and then waits for them all to complete. - private static void RunInParallel(params ThreadStart[] actions) - { - // We use explicit threads here rather than delegate.BeginInvoke - // because the latter uses the threadpool, and could reuse thread - // pool threads depending on timing. We want to guarantee different - // threads for these tests. - - Thread[] threads = actions.Select(a => new Thread(a)).ToArray(); - - // Start them all... - threads.ForEach(t => t.Start()); - - // And wait for them all to finish - threads.ForEach(t => t.Join()); - } -#endif - } -} diff --git a/source/Unity/Tests/Unity.Tests/Properties/AssemblyInfo.cs b/source/Unity/Tests/Unity.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index e446a43d..00000000 --- a/source/Unity/Tests/Unity.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using System.Runtime.InteropServices; -using System.Security; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Unity.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Unity.Tests")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011,2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM componenets. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b0ff7fbf-85c6-4f47-9547-cac7c5efa367")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -//[assembly: AllowPartiallyTrustedCallers()] diff --git a/source/Unity/Tests/Unity.Tests/RegistrationByConventionFixture.cs b/source/Unity/Tests/Unity.Tests/RegistrationByConventionFixture.cs deleted file mode 100644 index 077f2fe3..00000000 --- a/source/Unity/Tests/Unity.Tests/RegistrationByConventionFixture.cs +++ /dev/null @@ -1,305 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Microsoft.Practices.Unity.TestSupport; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -#elif __IOS__ -using NUnit.Framework; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -using TestInitializeAttribute = NUnit.Framework.TestFixtureSetUpAttribute; -#else -using Microsoft.VisualStudio.TestTools.UnitTesting; -#endif - -namespace Microsoft.Practices.Unity.Tests -{ - [TestClass] - public partial class RegistrationByConventionFixture - { - [TestMethod] - public void DoesNotRegisterTypeWithNoLifetimeOrInjectionMembers() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name"); - - Assert.IsFalse(container.Registrations.Any(r => r.MappedToType == typeof(MockLogger))); - } - - [TestMethod] - public void RegistersTypeWithLifetime() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getLifetimeManager: t => new ContainerControlledLifetimeManager()); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(1, registrations.Length); - Assert.AreSame(typeof(MockLogger), registrations[0].MappedToType); - Assert.AreEqual("name", registrations[0].Name); - Assert.IsInstanceOfType(registrations[0].LifetimeManager, typeof(ContainerControlledLifetimeManager)); - } - - [TestMethod] - public void RegistersTypeWithInjectionMembers() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getInjectionMembers: t => new InjectionMember[] { new InjectionConstructor() }); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(1, registrations.Length); - Assert.AreSame(typeof(MockLogger), registrations[0].RegisteredType); - Assert.AreSame(typeof(MockLogger), registrations[0].MappedToType); - Assert.AreEqual("name", registrations[0].Name); - Assert.IsNull(registrations[0].LifetimeManager); - } - - [TestMethod] - public void RegistersMappingOnlyWithNoLifetimeOrInjectionMembers() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getFromTypes: t => t.GetTypeInfo().ImplementedInterfaces); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(1, registrations.Length); - Assert.AreSame(typeof(ILogger), registrations[0].RegisteredType); - Assert.AreSame(typeof(MockLogger), registrations[0].MappedToType); - Assert.AreEqual("name", registrations[0].Name); - Assert.IsNull(registrations[0].LifetimeManager); - } - - [TestMethod] - public void RegistersMappingAndImplementationTypeWithLifetimeAndMixedInjectionMembers() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getFromTypes: t => t.GetTypeInfo().ImplementedInterfaces, getLifetimeManager: t => new ContainerControlledLifetimeManager()); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(2, registrations.Length); - - var mappingRegistration = registrations.Single(r => r.RegisteredType == typeof(ILogger)); - var implementationRegistration = registrations.Single(r => r.RegisteredType == typeof(MockLogger)); - - Assert.AreSame(typeof(ILogger), mappingRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), mappingRegistration.MappedToType); - Assert.AreEqual("name", mappingRegistration.Name); - Assert.IsInstanceOfType(mappingRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - - Assert.AreSame(typeof(MockLogger), implementationRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), implementationRegistration.MappedToType); - Assert.AreEqual("name", implementationRegistration.Name); - Assert.IsInstanceOfType(implementationRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - } - - [TestMethod] - public void RegistersMappingAndImplementationTypeWithLifetime() - { - var container = new UnityContainer(); - container.RegisterTypes(new[] { typeof(MockLogger) }, getName: t => "name", getFromTypes: t => t.GetTypeInfo().ImplementedInterfaces, getLifetimeManager: t => new ContainerControlledLifetimeManager()); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(2, registrations.Length); - - var mappingRegistration = registrations.Single(r => r.RegisteredType == typeof(ILogger)); - var implementationRegistration = registrations.Single(r => r.RegisteredType == typeof(MockLogger)); - - Assert.AreSame(typeof(ILogger), mappingRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), mappingRegistration.MappedToType); - Assert.AreEqual("name", mappingRegistration.Name); - Assert.IsInstanceOfType(mappingRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - - Assert.AreSame(typeof(MockLogger), implementationRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), implementationRegistration.MappedToType); - Assert.AreEqual("name", implementationRegistration.Name); - Assert.IsInstanceOfType(implementationRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - } - - [TestMethod] - public void RegistersUsingTheHelperMethods() - { - var container = new UnityContainer(); - container.RegisterTypes(AllClasses.FromAssemblies(typeof(MockLogger).GetTypeInfo().Assembly).Where(t => t == typeof(MockLogger)), WithMappings.FromAllInterfaces, WithName.Default, WithLifetime.ContainerControlled); - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(2, registrations.Length); - - var mappingRegistration = registrations.Single(r => r.RegisteredType == typeof(ILogger)); - var implementationRegistration = registrations.Single(r => r.RegisteredType == typeof(MockLogger)); - - Assert.AreSame(typeof(ILogger), mappingRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), mappingRegistration.MappedToType); - Assert.AreEqual(null, mappingRegistration.Name); - Assert.IsInstanceOfType(mappingRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - - Assert.AreSame(typeof(MockLogger), implementationRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), implementationRegistration.MappedToType); - Assert.AreEqual(null, implementationRegistration.Name); - Assert.IsInstanceOfType(implementationRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - } - -#if !NETFX_CORE - - [TestMethod] - public void RegistersAllTypesWithHelperMethods() - { - var container = new UnityContainer(); - container.RegisterTypes(AllClasses.FromLoadedAssemblies(), WithMappings.FromAllInterfaces, WithName.TypeName, WithLifetime.ContainerControlled, overwriteExistingMappings: true); - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger)).ToArray(); - - Assert.AreEqual(2, registrations.Length); - - var mappingRegistration = registrations.Single(r => r.RegisteredType == typeof(ILogger)); - var implementationRegistration = registrations.Single(r => r.RegisteredType == typeof(MockLogger)); - - Assert.AreSame(typeof(ILogger), mappingRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), mappingRegistration.MappedToType); - Assert.AreEqual("MockLogger", mappingRegistration.Name); - Assert.IsInstanceOfType(mappingRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - - Assert.AreSame(typeof(MockLogger), implementationRegistration.RegisteredType); - Assert.AreSame(typeof(MockLogger), implementationRegistration.MappedToType); - Assert.AreEqual("MockLogger", implementationRegistration.Name); - Assert.IsInstanceOfType(implementationRegistration.LifetimeManager, typeof(ContainerControlledLifetimeManager)); - } -#endif - - public void CanResolveTypeRegisteredWithAllInterfaces() - { - var container = new UnityContainer(); - container.RegisterTypes(AllClasses.FromAssemblies(typeof(MockLogger).GetTypeInfo().Assembly).Where(t => t == typeof(MockLogger)), WithMappings.FromAllInterfaces, WithName.Default, WithLifetime.ContainerControlled); - - var logger1 = container.Resolve(); - var logger2 = container.Resolve(); - - Assert.IsInstanceOfType(logger1, typeof(MockLogger)); - Assert.AreSame(logger1, logger2); - } - - public void CanResolveGenericTypeMappedWithMatchingInterface() - { - var container = new UnityContainer(); - container.RegisterTypes(AllClasses.FromAssemblies(typeof(IList<>).GetTypeInfo().Assembly), WithMappings.FromMatchingInterface, WithName.Default, WithLifetime.None); - - var list = container.Resolve>(); - - Assert.IsInstanceOfType(list, typeof(List)); - } - - [TestMethod] - public void RegistersTypeAccordingToConvention() - { - var container = new UnityContainer(); - container.RegisterTypes(new TestConventionWithAllInterfaces()); - - var registrations = container.Registrations.Where(r => r.MappedToType == typeof(MockLogger) || r.MappedToType == typeof(SpecialLogger)).ToArray(); - - Assert.AreEqual(4, registrations.Length); - } - - [TestMethod] - public void OverridingExistingMappingWithDifferentMappingThrowsByDefault() - { - var container = new UnityContainer(); - container.RegisterType(); - - AssertExtensions.AssertException( - () => container.RegisterTypes(new[] { typeof(int) }, t => new[] { typeof(object) })); - } - - [TestMethod] - public void OverridingNewMappingWithDifferentMappingThrowsByDefault() - { - var container = new UnityContainer(); - - AssertExtensions.AssertException( - () => container.RegisterTypes(new[] { typeof(string), typeof(int) }, t => new[] { typeof(object) })); - } - - [TestMethod] - public void OverridingExistingMappingWithSameMappingDoesNotThrow() - { - var container = new UnityContainer(); - container.RegisterInstance("a string"); - container.RegisterType(); - - container.RegisterTypes(new[] { typeof(string) }, t => new[] { typeof(object) }); - - Assert.AreEqual("a string", container.Resolve()); - } - - [TestMethod] - public void CanOverrideExistingMappingWithMappingForDifferentName() - { - var container = new UnityContainer(); - container.RegisterType("string"); - container.RegisterInstance("string", "a string"); - container.RegisterInstance("int", 42); - - container.RegisterTypes(new[] { typeof(int) }, t => new[] { typeof(object) }, t => "int"); - - Assert.AreEqual("a string", container.Resolve("string")); - Assert.AreEqual(42, container.Resolve("int")); - } - - [TestMethod] - public void OverridingExistingMappingWithDifferentMappingReplacesMappingIfAllowed() - { - var container = new UnityContainer(); - container.RegisterType(); - container.RegisterInstance("a string"); - container.RegisterInstance(42); - - container.RegisterTypes(new[] { typeof(int) }, t => new[] { typeof(object) }, overwriteExistingMappings: true); - - Assert.AreEqual(42, container.Resolve()); - } - - [TestMethod] - public void OverridingNewMappingWithDifferentMappingReplacesMappingIfAllowed() - { - var container = new UnityContainer(); - container.RegisterInstance("a string"); - container.RegisterInstance(42); - - container.RegisterTypes(new[] { typeof(string), typeof(int) }, t => new[] { typeof(object) }, overwriteExistingMappings: true); - - Assert.AreEqual(42, container.Resolve()); - } - - public class TestConventionWithAllInterfaces : RegistrationConvention - { - public override System.Collections.Generic.IEnumerable GetTypes() - { - yield return typeof(MockLogger); - yield return typeof(SpecialLogger); - } - - public override System.Func> GetFromTypes() - { - return t => t.GetTypeInfo().ImplementedInterfaces; - } - - public override System.Func GetName() - { - return t => t.Name; - } - - public override System.Func GetLifetimeManager() - { - return t => new ContainerControlledLifetimeManager(); - } - - public override System.Func> GetInjectionMembers() - { - return null; - } - } - } -} \ No newline at end of file diff --git a/source/Unity/Tests/Unity.Tests/RegistrationByConventionHelpersFixture.cs b/source/Unity/Tests/Unity.Tests/RegistrationByConventionHelpersFixture.cs deleted file mode 100644 index e6280e60..00000000 --- a/source/Unity/Tests/Unity.Tests/RegistrationByConventionHelpersFixture.cs +++ /dev/null @@ -1,225 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Collections; -using System.Collections.Generic; -using Microsoft.Practices.Unity.TestSupport; -#if NETFX_CORE -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -#elif __IOS__ -using NUnit.Framework; -using TestClassAttribute = NUnit.Framework.TestFixtureAttribute; -using TestMethodAttribute = NUnit.Framework.TestAttribute; -using TestInitializeAttribute = NUnit.Framework.TestFixtureSetUpAttribute; -#else -using Microsoft.VisualStudio.TestTools.UnitTesting; -#endif - -namespace Microsoft.Practices.Unity.Tests -{ - [TestClass] - public class RegistrationByConventionHelpersFixture - { - [TestMethod] - public void GetsNoTypes() - { - WithMappings.None(typeof(TypeWithoutInterfaces)).AssertHasNoItems(); - WithMappings.None(typeof(DisposableType)).AssertHasNoItems(); - WithMappings.None(typeof(TestObject)).AssertHasNoItems(); - WithMappings.None(typeof(AnotherTestObject)).AssertHasNoItems(); - } - - [TestMethod] - public void GetsAllInterfaces() - { - WithMappings.FromAllInterfaces(typeof(TypeWithoutInterfaces)).AssertHasNoItems(); - WithMappings.FromAllInterfaces(typeof(DisposableType)).AssertHasNoItems(); - WithMappings.FromAllInterfaces(typeof(TestObject)).AssertContainsInAnyOrder(typeof(IAnotherInterface), typeof(ITestObject), typeof(IComparable)); - WithMappings.FromAllInterfaces(typeof(AnotherTestObject)).AssertContainsInAnyOrder(typeof(IAnotherInterface), typeof(ITestObject), typeof(IComparable)); - - // Generics - WithMappings.FromAllInterfaces(typeof(GenericTestObject<,>)).AssertContainsInAnyOrder(typeof(IGenericTestObject<,>)); - WithMappings.FromAllInterfaces(typeof(GenericTestObjectAlt<,>)).AssertHasNoItems(); - WithMappings.FromAllInterfaces(typeof(GenericTestObject<>)).AssertContainsInAnyOrder(typeof(IComparable<>)); - WithMappings.FromAllInterfaces(typeof(GenericTestObject)).AssertContainsInAnyOrder(typeof(IGenericTestObject), typeof(IComparable), typeof(IEnumerable>), typeof(IEnumerable)); - } - - [TestMethod] - public void GetsMatchingInterface() - { - WithMappings.FromMatchingInterface(typeof(TypeWithoutInterfaces)).AssertHasNoItems(); - WithMappings.FromMatchingInterface(typeof(DisposableType)).AssertHasNoItems(); - WithMappings.FromMatchingInterface(typeof(TestObject)).AssertContainsInAnyOrder(typeof(ITestObject)); - WithMappings.FromMatchingInterface(typeof(AnotherTestObject)).AssertHasNoItems(); - - // Generics - WithMappings.FromMatchingInterface(typeof(GenericTestObject<,>)).AssertContainsExactly(typeof(IGenericTestObject<,>)); - WithMappings.FromMatchingInterface(typeof(GenericTestObjectAlt<,>)).AssertHasNoItems(); - WithMappings.FromMatchingInterface(typeof(GenericTestObject<>)).AssertHasNoItems(); - WithMappings.FromMatchingInterface(typeof(GenericTestObject)).AssertHasNoItems(); - } - - [TestMethod] - public void GetsAllInterfacesInSameAssembly() - { - WithMappings.FromAllInterfacesInSameAssembly(typeof(TypeWithoutInterfaces)).AssertHasNoItems(); - WithMappings.FromAllInterfacesInSameAssembly(typeof(DisposableType)).AssertHasNoItems(); - WithMappings.FromAllInterfacesInSameAssembly(typeof(TestObject)).AssertContainsInAnyOrder(typeof(ITestObject), typeof(IAnotherInterface)); - WithMappings.FromAllInterfacesInSameAssembly(typeof(AnotherTestObject)).AssertContainsInAnyOrder(typeof(ITestObject), typeof(IAnotherInterface)); - - // Generics - WithMappings.FromAllInterfacesInSameAssembly(typeof(GenericTestObject<,>)).AssertContainsExactly(typeof(IGenericTestObject<,>)); - WithMappings.FromAllInterfacesInSameAssembly(typeof(GenericTestObjectAlt<,>)).AssertHasNoItems(); - WithMappings.FromAllInterfacesInSameAssembly(typeof(GenericTestObject<>)).AssertHasNoItems(); - WithMappings.FromAllInterfacesInSameAssembly(typeof(GenericTestObject)).AssertContainsExactly(typeof(IGenericTestObject)); - } - - [TestMethod] - public void GetsNames() - { - Assert.AreEqual("MockLogger", WithName.TypeName(typeof(MockLogger))); - Assert.AreEqual("List`1", WithName.TypeName(typeof(List<>))); - Assert.IsNull(WithName.Default(typeof(MockLogger))); - Assert.IsNull(WithName.Default(typeof(List<>))); - } - - [TestMethod] - public void GetsLifetimeManagers() - { - Assert.IsInstanceOfType(WithLifetime.ContainerControlled(typeof(MockLogger)), typeof(ContainerControlledLifetimeManager)); - Assert.IsInstanceOfType(WithLifetime.ExternallyControlled(typeof(MockLogger)), typeof(ExternallyControlledLifetimeManager)); - Assert.IsInstanceOfType(WithLifetime.Hierarchical(typeof(MockLogger)), typeof(HierarchicalLifetimeManager)); - Assert.IsNull(WithLifetime.None(typeof(MockLogger))); - Assert.IsInstanceOfType(WithLifetime.PerResolve(typeof(MockLogger)), typeof(PerResolveLifetimeManager)); - Assert.IsInstanceOfType(WithLifetime.Transient(typeof(MockLogger)), typeof(TransientLifetimeManager)); - Assert.IsInstanceOfType(WithLifetime.Custom(typeof(MockLogger)), typeof(CustomLifetimeManager)); - -#if !NETFX_CORE - Assert.IsInstanceOfType(WithLifetime.PerThread(typeof(MockLogger)), typeof(PerThreadLifetimeManager)); -#endif - } - - public class CustomLifetimeManager : LifetimeManager - { - public override object GetValue() - { - throw new NotImplementedException(); - } - - public override void SetValue(object newValue) - { - throw new NotImplementedException(); - } - - public override void RemoveValue() - { - throw new NotImplementedException(); - } - } - - public class TypeWithoutInterfaces { } - - public class DisposableType : IDisposable - { - public void Dispose() - { - throw new NotImplementedException(); - } - } - - public class TestObject : IAnotherInterface, ITestObject, IDisposable, IComparable - { - public void Dispose() - { - throw new NotImplementedException(); - } - - public int CompareTo(object obj) - { - throw new NotImplementedException(); - } - } - - public class AnotherTestObject : IAnotherInterface, ITestObject, IDisposable, IComparable - { - public void Dispose() - { - throw new NotImplementedException(); - } - - public int CompareTo(object obj) - { - throw new NotImplementedException(); - } - } - - public interface ITestObject { } - - public interface IAnotherInterface { } - - public interface IGenericTestObject { } - - public class GenericTestObject : IGenericTestObject, IComparable, IEnumerable> - { - public int CompareTo(T other) - { - throw new NotImplementedException(); - } - - public IEnumerator> GetEnumerator() - { - throw new NotImplementedException(); - } - - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { - throw new NotImplementedException(); - } - } - - public class GenericTestObjectAlt : IGenericTestObject - { - } - - public class GenericTestObject : IGenericTestObject, IComparable, IEnumerable>, IComparable - { - public int CompareTo(object obj) - { - throw new NotImplementedException(); - } - - public int CompareTo(T other) - { - throw new NotImplementedException(); - } - - public IEnumerator> GetEnumerator() - { - throw new NotImplementedException(); - } - - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { - throw new NotImplementedException(); - } - } - - public class GenericTestObject : IGenericTestObject, IComparable, IEnumerable> - { - public int CompareTo(int other) - { - throw new NotImplementedException(); - } - - public IEnumerator> GetEnumerator() - { - throw new NotImplementedException(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - throw new NotImplementedException(); - } - } - } -} diff --git a/source/Unity/Tests/Unity.WebIntegration.Tests/MvcUnityDependencyResolverFixture.cs b/source/Unity/Tests/Unity.WebIntegration.Tests/MvcUnityDependencyResolverFixture.cs deleted file mode 100644 index 073e1656..00000000 --- a/source/Unity/Tests/Unity.WebIntegration.Tests/MvcUnityDependencyResolverFixture.cs +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Web.Mvc; -using Microsoft.Practices.Unity.Mvc; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.WebIntegation.Tests -{ - [TestClass] - public class MvcUnityDependencyResolverFixture - { - [TestMethod] - public void When_resolving_then_returns_registered_instance() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - var resolver = new UnityDependencyResolver(container); - - var actual = (IFoo)resolver.GetService(typeof(IFoo)); - Assert.AreEqual("value", actual.TestProperty); - } - } - - [TestMethod] - public void When_resolving_multiple_then_returns_all_registered_instances() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance("instance1", new Foo { TestProperty = "value1" }); - container.RegisterInstance("instance2", new Foo { TestProperty = "value2" }); - var resolver = new UnityDependencyResolver(container); - - var actual = resolver.GetServices(typeof(IFoo)).Cast().ToList(); - Assert.IsTrue(actual.Any(x => x.TestProperty == "value1")); - Assert.IsTrue(actual.Any(x => x.TestProperty == "value2")); - } - } - - [TestMethod] - public void When_resolving_unregistered_type_then_returns_null() - { - using (var container = new UnityContainer()) - { - var resolver = new UnityDependencyResolver(container); - - Assert.IsNull(resolver.GetService(typeof(IFoo))); - } - } - - [TestMethod] - public void When_resolving_concrete_controller_then_returns_injected_instance() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - var resolver = new UnityDependencyResolver(container); - - var actual = (TestController)resolver.GetService(typeof(TestController)); - Assert.AreEqual("value", actual.Foo.TestProperty); - } - } - - [TestMethod] - public void When_resolving_controller_with_unregistered_dependencies_then_throws() - { - using (var container = new UnityContainer()) - { - var resolver = new UnityDependencyResolver(container); - - AssertThrows(() => resolver.GetService(typeof(TestController))); - } - } - - [TestMethod] - public void When_resolving_type_with_container_controlled_lifetime_then_returns_same_instance_every_time() - { - using (var container = new UnityContainer()) - { - container.RegisterType(new ContainerControlledLifetimeManager()); - var resolver = new UnityDependencyResolver(container); - IFoo resolve1 = (IFoo)resolver.GetService(typeof(IFoo)); - IFoo resolve2 = (IFoo)resolver.GetService(typeof(IFoo)); - - Assert.IsNotNull(resolve1); - Assert.AreSame(resolve1, resolve2); - } - } - - public interface IFoo - { - string TestProperty { get; set; } - } - - public class Foo : IFoo - { - public string TestProperty { get; set; } - } - - public class TestController : IController - { - public TestController(IFoo foo) - { - this.Foo = foo; - } - - public IFoo Foo { get; set; } - - void IController.Execute(System.Web.Routing.RequestContext requestContext) - { - throw new System.NotImplementedException(); - } - } - - private static void AssertThrows(Action action) - where TException : Exception - { - try - { - action(); - } - catch (TException) - { - return; - } - catch (Exception ex) - { - Assert.Fail("Expected exception {0}, but instead exception {1} was thrown", - typeof(TException).Name, - ex.GetType().Name); - } - Assert.Fail("Expected exception {0}, no exception thrown", typeof(TException).Name); - } - } -} diff --git a/source/Unity/Tests/Unity.WebIntegration.Tests/MvcUnityFilterAttributeFilterProviderFixture.cs b/source/Unity/Tests/Unity.WebIntegration.Tests/MvcUnityFilterAttributeFilterProviderFixture.cs deleted file mode 100644 index 95bdb2e9..00000000 --- a/source/Unity/Tests/Unity.WebIntegration.Tests/MvcUnityFilterAttributeFilterProviderFixture.cs +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Web.Mvc; -using Microsoft.Practices.Unity.Mvc; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.WebIntegation.Tests -{ - [TestClass] - public class MvcUnityFilterAttributeFilterProviderFixture - { - [TestMethod] - public void When_getting_action_attributes_then_builds_up_instance() - { - using (var container = new UnityContainer()) - { - // Arrange - var someInstance = new SomeClass(); - container.RegisterInstance(someInstance); - container.RegisterType(new InjectionProperty("Some")); - - var context = new ControllerContext { Controller = new ControllerWithActionAttribute() }; - var controllerDescriptor = new ReflectedControllerDescriptor(context.Controller.GetType()); - var action = context.Controller.GetType().GetMethod("MyActionMethod"); - var actionDescriptor = new ReflectedActionDescriptor(action, "MyActionMethod", controllerDescriptor); - var provider = new UnityFilterAttributeFilterProvider(container); - - // Act - Filter filter = provider.GetFilters(context, actionDescriptor).Single(); - - // Assert - TestFilterAttribute attrib = filter.Instance as TestFilterAttribute; - Assert.IsNotNull(attrib); - Assert.AreEqual(FilterScope.Action, filter.Scope); - Assert.AreEqual(1234, filter.Order); - Assert.AreSame(someInstance, attrib.Some); - } - } - - [TestMethod] - public void When_getting_controller_attributes_then_builds_up_instance() - { - using (var container = new UnityContainer()) - { - // Arrange - var someInstance = new SomeClass(); - container.RegisterInstance(someInstance); - container.RegisterType(new InjectionProperty("Some")); - - var context = new ControllerContext { Controller = new ControllerWithTypeAttribute() }; - var controllerDescriptor = new ReflectedControllerDescriptor(context.Controller.GetType()); - var action = context.Controller.GetType().GetMethod("MyActionMethod"); - var actionDescriptor = new ReflectedActionDescriptor(action, "MyActionMethod", controllerDescriptor); - var provider = new UnityFilterAttributeFilterProvider(container); - - // Act - Filter filter = provider.GetFilters(context, actionDescriptor).Single(); - - // Assert - TestFilterAttribute attrib = filter.Instance as TestFilterAttribute; - Assert.IsNotNull(attrib); - Assert.AreEqual(FilterScope.Controller, filter.Scope); - Assert.AreEqual(1234, filter.Order); - Assert.AreSame(someInstance, attrib.Some); - } - } - - private class TestFilterAttribute : FilterAttribute - { - public ISomeInterface Some { get; set; } - } - - [TestFilter(Order = 1234)] - private class ControllerWithTypeAttribute : Controller - { - public ActionResult MyActionMethod() - { - return null; - } - } - - private class ControllerWithActionAttribute : Controller - { - [TestFilter(Order = 1234)] - public ActionResult MyActionMethod() - { - return null; - } - } - - public interface ISomeInterface - { - } - - public class SomeClass : ISomeInterface - { - } - } -} diff --git a/source/Unity/Tests/Unity.WebIntegration.Tests/Properties/AssemblyInfo.cs b/source/Unity/Tests/Unity.WebIntegration.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 085932a1..00000000 --- a/source/Unity/Tests/Unity.WebIntegration.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Unity.WebIntegration.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Unity.WebIntegration.Tests")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("429cd630-8e52-44ff-9d2c-ac6f29980692")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/source/Unity/Tests/Unity.WebIntegration.Tests/Unity.WebIntegration.Tests.csproj b/source/Unity/Tests/Unity.WebIntegration.Tests/Unity.WebIntegration.Tests.csproj deleted file mode 100644 index 8d7d69e9..00000000 --- a/source/Unity/Tests/Unity.WebIntegration.Tests/Unity.WebIntegration.Tests.csproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - Debug - AnyCPU - {60FBCE14-8B46-468A-9C67-3F7445B37455} - Library - Properties - Microsoft.Practices.Unity.WebIntegration.Tests - Microsoft.Practices.Unity.WebIntegration.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 12.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - /assemblyCompareMode:StrongNameIgnoringVersion - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\..\Tests.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\..\Tests.ruleset - - - - True - ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll - - - - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll - - - - - True - ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - - - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll - - - True - ..\..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - - - True - ..\..\..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll - - - - True - ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - - - True - ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - - - True - ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll - - - - - - - - - - - - - - - - - - - - - - - - {1fb1a6fe-1898-4e72-906e-1c160ab50f2f} - Unity.Mvc - - - {e6a503f3-1b1d-4008-98ee-7eaca66dfb05} - Unity.WebApi - - - {ee1f752c-1fab-41ad-ad63-857d0e62ab6b} - Unity - - - - - Unity.licenseheader - - - - - - - - False - - - False - - - False - - - False - - - - - - - - - diff --git a/source/Unity/Tests/Unity.WebIntegration.Tests/WebApiUnityDependencyResolverFixture.cs b/source/Unity/Tests/Unity.WebIntegration.Tests/WebApiUnityDependencyResolverFixture.cs deleted file mode 100644 index fc1fa109..00000000 --- a/source/Unity/Tests/Unity.WebIntegration.Tests/WebApiUnityDependencyResolverFixture.cs +++ /dev/null @@ -1,237 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Web.Http.Controllers; -using Microsoft.Practices.Unity.WebApi; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.WebIntegation.Tests -{ - [TestClass] - public class WebApiUnityDependencyResolverFixture - { - [TestMethod] - public void When_resolving_then_returns_registered_instance() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - using (var resolver = new UnityDependencyResolver(container)) - { - var actual = (IFoo)resolver.GetService(typeof(IFoo)); - Assert.AreEqual("value", actual.TestProperty); - } - } - } - - [TestMethod] - public void When_resolving_multiple_then_returns_all_registered_instances() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance("instance1", new Foo { TestProperty = "value1" }); - container.RegisterInstance("instance2", new Foo { TestProperty = "value2" }); - using (var resolver = new UnityDependencyResolver(container)) - { - var actual = resolver.GetServices(typeof(IFoo)).Cast().ToList(); - Assert.IsTrue(actual.Any(x => x.TestProperty == "value1")); - Assert.IsTrue(actual.Any(x => x.TestProperty == "value2")); - } - } - } - - [TestMethod] - public void When_resolving_unregistered_type_then_returns_null() - { - using (var container = new UnityContainer()) - { - using (var resolver = new UnityDependencyResolver(container)) - { - Assert.IsNull(resolver.GetService(typeof(IFoo))); - } - } - } - - [TestMethod] - public void When_resolving_concrete_controller_inside_scope_then_returns_injected_instance() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - using (var resolver = new UnityDependencyResolver(container)) - { - using (var scope = resolver.BeginScope()) - { - var actual = (TestController)scope.GetService(typeof(TestController)); - Assert.AreEqual("value", actual.Foo.TestProperty); - } - } - } - } - - [TestMethod] - public void When_resolving_controller_inside_scope_with_unregistered_dependencies_then_throws() - { - using (var container = new UnityContainer()) - { - using (var resolver = new UnityDependencyResolver(container)) - { - using (var scope = resolver.BeginScope()) - { - AssertThrows(() => scope.GetService(typeof(TestController))); - } - } - } - } - - [TestMethod] - public void When_resolving_unregistered_type_inside_scope_then_throws() - { - using (var container = new UnityContainer()) - { - using (var resolver = new UnityDependencyResolver(container)) - { - using (var scope = resolver.BeginScope()) - { - AssertThrows(() => scope.GetService(typeof(IFoo))); - } - } - } - } - - [TestMethod] - public void When_disposing_resolver_then_disposes_container() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - var resolver = new UnityDependencyResolver(container); - resolver.Dispose(); - - // ObjectDisposedException? - AssertThrows(() => container.Resolve(typeof(IFoo))); - } - } - - [TestMethod] - public void When_disposing_scope_then_does_not_dispose_container() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - using (var resolver = new UnityDependencyResolver(container)) - { - resolver.BeginScope().Dispose(); - - var actual = (IFoo)resolver.GetService(typeof(IFoo)); - - Assert.AreEqual("value", actual.TestProperty); - } - } - } - - [TestMethod] - public void When_resolving_type_with_container_controlled_lifetime_then_returns_same_instance_every_time() - { - using (var container = new UnityContainer()) - { - container.RegisterType(new ContainerControlledLifetimeManager()); - using (var resolver = new UnityDependencyResolver(container)) - { - IFoo parentResolve = (IFoo)resolver.GetService(typeof(IFoo)); - IFoo scope1Resolve; - IFoo scope2Resolve; - - using (var scope = resolver.BeginScope()) - { - scope1Resolve = (IFoo)scope.GetService(typeof(IFoo)); - } - - using (var scope = resolver.BeginScope()) - { - scope2Resolve = (IFoo)scope.GetService(typeof(IFoo)); - } - - Assert.IsNotNull(parentResolve); - Assert.AreSame(parentResolve, scope1Resolve); - Assert.AreSame(parentResolve, scope2Resolve); - } - } - } - - [TestMethod] - public void When_resolving_type_with_hierarchical_lifetime_then_returns_same_instance_every_time() - { - using (var container = new UnityContainer()) - { - container.RegisterType(new HierarchicalLifetimeManager()); - using (var resolver = new UnityDependencyResolver(container)) - { - IFoo parentResolve = (IFoo)resolver.GetService(typeof(IFoo)); - IFoo scope1Resolve; - IFoo scope2Resolve; - - using (var scope = resolver.BeginScope()) - { - scope1Resolve = (IFoo)scope.GetService(typeof(IFoo)); - } - - using (var scope = resolver.BeginScope()) - { - scope2Resolve = (IFoo)scope.GetService(typeof(IFoo)); - } - - Assert.IsNotNull(parentResolve); - Assert.AreSame(parentResolve, scope1Resolve); - Assert.AreSame(parentResolve, scope2Resolve); - } - } - } - - public interface IFoo - { - string TestProperty { get; set; } - } - - public class Foo : IFoo - { - public string TestProperty { get; set; } - } - - public class TestController : IHttpController - { - public TestController(IFoo foo) - { - this.Foo = foo; - } - - public IFoo Foo { get; set; } - - System.Threading.Tasks.Task IHttpController.ExecuteAsync(HttpControllerContext controllerContext, System.Threading.CancellationToken cancellationToken) - { - throw new NotImplementedException(); - } - } - - private static void AssertThrows(Action action) - where TException : Exception - { - try - { - action(); - } - catch (TException) - { - return; - } - catch (Exception ex) - { - Assert.Fail("Expected exception {0}, but instead exception {1} was thrown", - typeof(TException).Name, - ex.GetType().Name); - } - Assert.Fail("Expected exception {0}, no exception thrown", typeof(TException).Name); - } - } -} diff --git a/source/Unity/Tests/Unity.WebIntegration.Tests/WebApiUnityHierarchicalDependencyResolverFixture.cs b/source/Unity/Tests/Unity.WebIntegration.Tests/WebApiUnityHierarchicalDependencyResolverFixture.cs deleted file mode 100644 index 28b77450..00000000 --- a/source/Unity/Tests/Unity.WebIntegration.Tests/WebApiUnityHierarchicalDependencyResolverFixture.cs +++ /dev/null @@ -1,252 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Web.Http.Controllers; -using Microsoft.Practices.Unity.WebApi; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Practices.Unity.WebIntegation.Tests -{ - [TestClass] - public class WebApiUnityHierarchicalDependencyResolverFixture - { - [TestMethod] - public void When_resolving_then_returns_registered_instance() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - var actual = (IFoo)resolver.GetService(typeof(IFoo)); - Assert.AreEqual("value", actual.TestProperty); - } - } - } - - [TestMethod] - public void When_resolving_multiple_then_returns_all_registered_instances() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance("instance1", new Foo { TestProperty = "value1" }); - container.RegisterInstance("instance2", new Foo { TestProperty = "value2" }); - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - var actual = resolver.GetServices(typeof(IFoo)).Cast().ToList(); - Assert.IsTrue(actual.Any(x => x.TestProperty == "value1")); - Assert.IsTrue(actual.Any(x => x.TestProperty == "value2")); - } - } - } - - [TestMethod] - public void When_resolving_unregistered_type_then_returns_null() - { - using (var container = new UnityContainer()) - { - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - Assert.IsNull(resolver.GetService(typeof(IFoo))); - } - } - } - - [TestMethod] - public void When_resolving_concrete_controller_inside_scope_then_returns_injected_instance() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - using (var scope = resolver.BeginScope()) - { - var actual = (TestController)scope.GetService(typeof(TestController)); - Assert.AreEqual("value", actual.Foo.TestProperty); - } - } - } - } - - [TestMethod] - public void When_resolving_controller_inside_scope_with_unregistered_dependencies_then_throws() - { - using (var container = new UnityContainer()) - { - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - using (var scope = resolver.BeginScope()) - { - AssertThrows(() => scope.GetService(typeof(TestController))); - } - } - } - } - - [TestMethod] - public void When_resolving_unregistered_type_inside_scope_then_throws() - { - using (var container = new UnityContainer()) - { - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - using (var scope = resolver.BeginScope()) - { - AssertThrows(() => scope.GetService(typeof(IFoo))); - } - } - } - } - - [TestMethod] - public void When_disposing_resolver_then_disposes_container() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - var resolver = new UnityHierarchicalDependencyResolver(container); - resolver.Dispose(); - - // ObjectDisposedException? - AssertThrows(() => container.Resolve(typeof(IFoo))); - } - } - - [TestMethod] - public void When_disposing_scope_then_does_not_dispose_container() - { - using (var container = new UnityContainer()) - { - container.RegisterInstance(new Foo { TestProperty = "value" }); - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - resolver.BeginScope().Dispose(); - - var actual = (IFoo)resolver.GetService(typeof(IFoo)); - - Assert.AreEqual("value", actual.TestProperty); - } - } - } - - [TestMethod] - public void When_resolving_type_with_container_controlled_lifetime_then_returns_same_instance_every_time() - { - using (var container = new UnityContainer()) - { - container.RegisterType(new ContainerControlledLifetimeManager()); - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - IFoo parentResolve = (IFoo)resolver.GetService(typeof(IFoo)); - IFoo scope1Resolve; - IFoo scope2Resolve; - - using (var scope = resolver.BeginScope()) - { - scope1Resolve = (IFoo)scope.GetService(typeof(IFoo)); - } - - using (var scope = resolver.BeginScope()) - { - scope2Resolve = (IFoo)scope.GetService(typeof(IFoo)); - } - - Assert.IsNotNull(parentResolve); - Assert.AreSame(parentResolve, scope1Resolve); - Assert.AreSame(parentResolve, scope2Resolve); - } - } - } - - [TestMethod] - public void When_resolving_type_with_hierarchical_lifetime_then_returns_different_instance_in_each_scope() - { - using (var container = new UnityContainer()) - { - container.RegisterType(new HierarchicalLifetimeManager()); - using (var resolver = new UnityHierarchicalDependencyResolver(container)) - { - IFoo parentResolve = (IFoo)resolver.GetService(typeof(IFoo)); - IFoo scope1Resolve1; - IFoo scope1Resolve2; - IFoo scope2Resolve1; - IFoo scope2Resolve2; - - using (var scope = resolver.BeginScope()) - { - scope1Resolve1 = (IFoo)scope.GetService(typeof(IFoo)); - scope1Resolve2 = (IFoo)scope.GetService(typeof(IFoo)); - } - - using (var scope = resolver.BeginScope()) - { - scope2Resolve1 = (IFoo)scope.GetService(typeof(IFoo)); - scope2Resolve2 = (IFoo)scope.GetService(typeof(IFoo)); - } - - Assert.IsNotNull(parentResolve); - Assert.IsNotNull(scope1Resolve1); - Assert.IsNotNull(scope1Resolve2); - Assert.IsNotNull(scope2Resolve1); - Assert.IsNotNull(scope2Resolve2); - - Assert.AreNotSame(parentResolve, scope1Resolve1); - Assert.AreNotSame(parentResolve, scope2Resolve1); - - Assert.AreNotSame(scope1Resolve1, scope2Resolve1); - - Assert.AreSame(scope1Resolve1, scope1Resolve2); - - Assert.AreSame(scope2Resolve1, scope2Resolve2); - } - } - } - - public interface IFoo - { - string TestProperty { get; set; } - } - - public class Foo : IFoo - { - public string TestProperty { get; set; } - } - - public class TestController : IHttpController - { - public TestController(IFoo foo) - { - this.Foo = foo; - } - - public IFoo Foo { get; set; } - - System.Threading.Tasks.Task IHttpController.ExecuteAsync(HttpControllerContext controllerContext, System.Threading.CancellationToken cancellationToken) - { - throw new NotImplementedException(); - } - } - - private static void AssertThrows(Action action) - where TException : Exception - { - try - { - action(); - } - catch (TException) - { - return; - } - catch (Exception ex) - { - Assert.Fail("Expected exception {0}, but instead exception {1} was thrown", - typeof(TException).Name, - ex.GetType().Name); - } - Assert.Fail("Expected exception {0}, no exception thrown", typeof(TException).Name); - } - } -} diff --git a/source/Unity/Tests/Unity.WebIntegration.Tests/packages.config b/source/Unity/Tests/Unity.WebIntegration.Tests/packages.config deleted file mode 100644 index 356fa83f..00000000 --- a/source/Unity/Tests/Unity.WebIntegration.Tests/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/source/appveyor.yml b/source/appveyor.yml new file mode 100644 index 00000000..e5d00568 --- /dev/null +++ b/source/appveyor.yml @@ -0,0 +1,38 @@ +version: 4.1.0.{build} +os: Visual Studio 2015 +configuration: Release +install: +- ps: >- + dnvm install 1.0.0-beta8 + + cd source\Unity + + dnu restore + + cd.. + + cd.. +build: + project: source\Unity.dnx.sln + publish_nuget: true + verbosity: minimal +test_script: +- ps: >- + dnvm install 1.0.0-beta8 -r coreclr -arch x86 + + dnvm use 1.0.0-beta8 -r coreclr -arch x86 + + cd C:\projects\unity\source\Unity\Tests\Unity.Tests + + dnx test + + cd C:\projects\unity\source\Unity\Tests\ObjectBuilder + + dnx test + + cd C:\projects\unity\source\Unity\Tests\ObjectBuilder + + dnx test +artifacts: +- path: '**\*.nupkg' + name: Unity \ No newline at end of file diff --git a/source/global.json b/source/global.json new file mode 100644 index 00000000..618f749d --- /dev/null +++ b/source/global.json @@ -0,0 +1,6 @@ +{ + "projects": [ "Tests", "Src", "." ], + "sdk": { + "version": "1.0.0-rc1-update1" + } +} \ No newline at end of file