diff --git a/.gitignore b/.gitignore index ee9d6c9..f502b03 100644 --- a/.gitignore +++ b/.gitignore @@ -161,3 +161,4 @@ pip-log.txt # Mac crap .DS_Store +/Assets/Lydian.Unity.Automapper.1.3.2.nupkg diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..f8b4888 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..235b4cd Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/Assets/Lydian.Unity.Automapper.1.3.2.nupkg b/Assets/Lydian.Unity.Automapper.1.3.2.nupkg new file mode 100644 index 0000000..1653e3e Binary files /dev/null and b/Assets/Lydian.Unity.Automapper.1.3.2.nupkg differ diff --git a/BuildPackage.bat b/BuildPackage.bat index 1c1da81..b71b853 100644 --- a/BuildPackage.bat +++ b/BuildPackage.bat @@ -1,3 +1,3 @@ -CD "C:\Users\Isaac\Documents\Visual Studio 2010\Projects\Unity Automapper\Source\Trunk\Lydian.Unity.Automapper\Lydian.Unity.Automapper" -"C:\Users\Isaac\Documents\Visual Studio 2010\NuGet.exe" pack -Prop Configuration=Publish -move *.nupkg ..\..\..\..\..\..\Packages\ \ No newline at end of file +CD ".\Lydian.Unity.Automapper" +"..\.nuget\NuGet.exe" pack -Prop Configuration=Publish +move *.nupkg ..\Packages\ \ No newline at end of file diff --git a/ConfigProviderAssembly/ConfigProviderAssembly.csproj b/ConfigProviderAssembly/ConfigProviderAssembly.csproj index b159c8f..fbc253c 100644 --- a/ConfigProviderAssembly/ConfigProviderAssembly.csproj +++ b/ConfigProviderAssembly/ConfigProviderAssembly.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ConfigProviderAssembly ConfigProviderAssembly - v4.0 + v4.6.1 512 ..\ @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,6 +32,7 @@ TRACE prompt 4 + false bin\Publish\ @@ -40,18 +42,20 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false - - False - ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + + ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - False - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll - - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll + + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll diff --git a/ConfigProviderAssembly/packages.config b/ConfigProviderAssembly/packages.config index d437344..61fa780 100644 --- a/ConfigProviderAssembly/packages.config +++ b/ConfigProviderAssembly/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Lydian.Unity.Automapper.Console/Lydian.Unity.Automapper.Console.csproj b/Lydian.Unity.Automapper.Console/Lydian.Unity.Automapper.Console.csproj index b7d52fb..76184ef 100644 --- a/Lydian.Unity.Automapper.Console/Lydian.Unity.Automapper.Console.csproj +++ b/Lydian.Unity.Automapper.Console/Lydian.Unity.Automapper.Console.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties Lydian.Unity.Automapper.Console Lydian.Unity.Automapper.Console - v4.0 + v4.6.1 512 @@ -67,6 +67,7 @@ True False False + false x86 @@ -101,6 +102,7 @@ Full %28none%29 0 + false bin\x86\Publish\ @@ -149,6 +151,7 @@ Full DoNotBuild 0 + false bin\x86\Team Build\ @@ -165,26 +168,26 @@ true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false - - ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + + ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - False - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll - - False - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll - - False - ..\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.dll + + ..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll - - False - ..\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll + + ..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll + + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll diff --git a/Lydian.Unity.Automapper.Console/app.config b/Lydian.Unity.Automapper.Console/app.config index afe6f91..733c258 100644 --- a/Lydian.Unity.Automapper.Console/app.config +++ b/Lydian.Unity.Automapper.Console/app.config @@ -8,4 +8,4 @@ - + diff --git a/Lydian.Unity.Automapper.Console/packages.config b/Lydian.Unity.Automapper.Console/packages.config index 0739b46..bfccd7a 100644 --- a/Lydian.Unity.Automapper.Console/packages.config +++ b/Lydian.Unity.Automapper.Console/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Lydian.Unity.Automapper.Test.OtherTestAssembly/Lydian.Unity.Automapper.Test.TestAssemblyTwo.csproj b/Lydian.Unity.Automapper.Test.OtherTestAssembly/Lydian.Unity.Automapper.Test.TestAssemblyTwo.csproj index 7df4a28..6060b79 100644 --- a/Lydian.Unity.Automapper.Test.OtherTestAssembly/Lydian.Unity.Automapper.Test.TestAssemblyTwo.csproj +++ b/Lydian.Unity.Automapper.Test.OtherTestAssembly/Lydian.Unity.Automapper.Test.TestAssemblyTwo.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,13 +11,14 @@ Properties Lydian.Unity.Automapper.Test.TestAssemblyTwo Lydian.Unity.Automapper.Test.TestAssemblyTwo - v4.0 + v4.6.1 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} SAK SAK SAK SAK + true @@ -27,6 +28,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -35,6 +37,7 @@ TRACE prompt 4 + false bin\Publish\ @@ -51,6 +54,7 @@ true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false bin\Team Build\ @@ -67,6 +71,7 @@ true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false false diff --git a/Lydian.Unity.Automapper.Test/Core/UnityCollectionFacadeTests.cs b/Lydian.Unity.Automapper.Test/Core/UnityCollectionFacadeTests.cs index 7184f15..43ce550 100644 --- a/Lydian.Unity.Automapper.Test/Core/UnityCollectionFacadeTests.cs +++ b/Lydian.Unity.Automapper.Test/Core/UnityCollectionFacadeTests.cs @@ -5,7 +5,7 @@ namespace Lydian.Unity.Automapper.Test.Core { - [TestClass] + [TestClass] public class UnityCollectionFacadeTests { [TestMethod] diff --git a/Lydian.Unity.Automapper.Test/Lydian.Unity.Automapper.Test.csproj b/Lydian.Unity.Automapper.Test/Lydian.Unity.Automapper.Test.csproj index d03e574..d255046 100644 --- a/Lydian.Unity.Automapper.Test/Lydian.Unity.Automapper.Test.csproj +++ b/Lydian.Unity.Automapper.Test/Lydian.Unity.Automapper.Test.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ Properties Lydian.Unity.Automapper.Test Lydian.Unity.Automapper.Test - v4.0 + v4.6.1 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 1 @@ -21,6 +21,7 @@ SAK ..\ true + true @@ -55,6 +56,7 @@ Full Build 0 + false pdbonly @@ -63,6 +65,7 @@ TRACE prompt 4 + false bin\Publish\ @@ -79,6 +82,7 @@ true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false bin\Team Build\ @@ -95,6 +99,7 @@ true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false false @@ -104,28 +109,30 @@ - - ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + + ..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll - - False - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll + + ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - False - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll - - False - ..\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll - - False - ..\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll + + ..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll + + + ..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll + + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\packages\Moq.4.7.99\lib\net45\Moq.dll diff --git a/Lydian.Unity.Automapper.Test/app.config b/Lydian.Unity.Automapper.Test/app.config index 1e44e99..f36d8a2 100644 --- a/Lydian.Unity.Automapper.Test/app.config +++ b/Lydian.Unity.Automapper.Test/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/Lydian.Unity.Automapper.Test/packages.config b/Lydian.Unity.Automapper.Test/packages.config index dc7fc38..d7b59d9 100644 --- a/Lydian.Unity.Automapper.Test/packages.config +++ b/Lydian.Unity.Automapper.Test/packages.config @@ -1,7 +1,8 @@  - - - - + + + + + \ No newline at end of file diff --git a/Lydian.Unity.Automapper/Core/UnityCollectionFacade.cs b/Lydian.Unity.Automapper/Core/UnityCollectionFacade.cs index 6d34b5e..f07c99e 100644 --- a/Lydian.Unity.Automapper/Core/UnityCollectionFacade.cs +++ b/Lydian.Unity.Automapper/Core/UnityCollectionFacade.cs @@ -4,25 +4,25 @@ namespace Lydian.Unity.Automapper.Core { - /// - /// A facade on top of a Unity call to ResolveAll for a particular type. - /// - /// - internal sealed class UnityCollectionFacade : IEnumerable + /// + /// A facade on top of a Unity call to ResolveAll for a particular type. + /// + /// + internal sealed class UnityCollectionFacade : IEnumerable { - private readonly IEnumerable resolvedTypes; - - /// + private readonly IUnityContainer _container; + + /// /// Initializes a new instance of the CollectionFacade class. /// public UnityCollectionFacade(IUnityContainer target) { - resolvedTypes = target.ResolveAll(); + _container = target; } public IEnumerator GetEnumerator() { - foreach (var resolvedType in resolvedTypes) + foreach (var resolvedType in _container.ResolveAll()) yield return resolvedType; } diff --git a/Lydian.Unity.Automapper/Lydian.Unity.Automapper.csproj b/Lydian.Unity.Automapper/Lydian.Unity.Automapper.csproj index 0c755fd..b12d108 100644 --- a/Lydian.Unity.Automapper/Lydian.Unity.Automapper.csproj +++ b/Lydian.Unity.Automapper/Lydian.Unity.Automapper.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Lydian.Unity.Automapper Lydian.Unity.Automapper - v4.0 + v4.6.1 512 1 SAK @@ -19,6 +19,7 @@ SAK ..\ true + true @@ -64,6 +65,7 @@ True False False + false pdbonly @@ -107,6 +109,7 @@ True False False + false bin\Publish\ @@ -158,6 +161,7 @@ True False False + false bin\Team Build\ @@ -208,6 +212,7 @@ Full DoNotBuild 0 + false false @@ -217,24 +222,23 @@ - - ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + + ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - False - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll - - False - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll - - False - ..\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.dll + + ..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll - - False - ..\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll + + ..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll + + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll diff --git a/Lydian.Unity.Automapper/Mapper.cs b/Lydian.Unity.Automapper/Mapper.cs index 349446a..107444e 100644 --- a/Lydian.Unity.Automapper/Mapper.cs +++ b/Lydian.Unity.Automapper/Mapper.cs @@ -7,10 +7,10 @@ namespace Lydian.Unity.Automapper { - /// - /// Contains extension method entry points to the Unity Auto-mapper. - /// - public static class Mapper + /// + /// Contains extension method entry points to the Unity Auto-mapper. + /// + public static class Mapper { private readonly static MappingOptions NULL_MAPPING_OPTIONS = new MappingOptions(); @@ -21,8 +21,8 @@ public static class Mapper /// The array of interfaces and concretes to map up and register. public static void AutomapTypes(this IUnityContainer container, params Type[] types) { - Contract.Requires(container != null, "container"); - Contract.Requires(types != null, "types"); + Contract.Requires(container != null, "container"); + Contract.Requires(types != null, "types"); container.AutomapTypes(NULL_MAPPING_OPTIONS, types); } @@ -36,9 +36,9 @@ public static void AutomapTypes(this IUnityContainer container, params Type[] ty [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Code Contracts", MessageId = "1")] public static void AutomapTypes(this IUnityContainer container, MappingOptions options, params Type[] types) { - Contract.Requires(container != null, "container"); - Contract.Requires(options != null, "options"); - Contract.Requires(types != null, "types"); + Contract.Requires(container != null, "container"); + Contract.Requires(options != null, "options"); + Contract.Requires(types != null, "types"); var controller = CreateController(container); controller.RegisterTypes(options.Behaviors, types); @@ -51,8 +51,8 @@ public static void AutomapTypes(this IUnityContainer container, MappingOptions o /// The list of full assembly names to register types from. public static void AutomapAssemblies(this IUnityContainer container, params String[] assemblyNames) { - Contract.Requires(container != null, "container"); - Contract.Requires(assemblyNames != null, "assemblyNames"); + Contract.Requires(container != null, "container"); + Contract.Requires(assemblyNames != null, "assemblyNames"); container.AutomapAssemblies(NULL_MAPPING_OPTIONS, assemblyNames); } @@ -66,9 +66,9 @@ public static void AutomapAssemblies(this IUnityContainer container, params Stri [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Code Contracts", MessageId = "1")] public static void AutomapAssemblies(this IUnityContainer container, MappingOptions options, params String[] assemblyNames) { - Contract.Requires(container != null, "container"); - Contract.Requires(options != null, "options"); - Contract.Requires(assemblyNames != null, "assemblyNames"); + Contract.Requires(container != null, "container"); + Contract.Requires(options != null, "options"); + Contract.Requires(assemblyNames != null, "assemblyNames"); var controller = CreateController(container); controller.RegisterAssemblies(options.Behaviors, assemblyNames); diff --git a/Lydian.Unity.Automapper/packages.config b/Lydian.Unity.Automapper/packages.config index 0739b46..bfccd7a 100644 --- a/Lydian.Unity.Automapper/packages.config +++ b/Lydian.Unity.Automapper/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index d3de963..251f8d8 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -12,6 +12,6 @@ [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] [assembly: Guid("2bbbee4d-e391-4182-a1f6-e73ace76bff8")] -[assembly: AssemblyVersion("1.3.2.0")] -[assembly: AssemblyFileVersion("1.3.2.0")] -[assembly: AssemblyInformationalVersionAttribute("1.3.2")] +[assembly: AssemblyVersion("1.3.3.0")] +[assembly: AssemblyFileVersion("1.3.3.0")] +[assembly: AssemblyInformationalVersionAttribute("1.3.3")]