From 35c08039872c9df39892ead7f38d4d9eddb1660a Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <drcolombo@gmail.com>
Date: Fri, 30 Oct 2015 13:48:34 +0100
Subject: [PATCH 1/2] Restoring service constructor in RegisterProfiles in case
 if AutoMapper is used with a DI framework like Ninject

---
 AutoAutoMapper/AutoAutoMapper.csproj | 27 +++++++++++++++++++++++----
 AutoAutoMapper/AutoProfiler.cs       |  8 ++++++++
 AutoAutoMapper/packages.config       |  4 +++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/AutoAutoMapper/AutoAutoMapper.csproj b/AutoAutoMapper/AutoAutoMapper.csproj
index 9f500b8..e8cb37b 100644
--- a/AutoAutoMapper/AutoAutoMapper.csproj
+++ b/AutoAutoMapper/AutoAutoMapper.csproj
@@ -33,12 +33,24 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=2.1.267.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.2.1.267\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.4.1.1\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -54,10 +66,17 @@
     <None Include="AutoAutoMapper.nuspec">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/AutoAutoMapper/AutoProfiler.cs b/AutoAutoMapper/AutoProfiler.cs
index 4c7e5ac..dbe2d3f 100644
--- a/AutoAutoMapper/AutoProfiler.cs
+++ b/AutoAutoMapper/AutoProfiler.cs
@@ -35,8 +35,16 @@ public static void RegisterProfiles(params Assembly[] assemblies)
         /// </param>
         public static void RegisterProfiles(IEnumerable<Assembly> assemblies)
         {
+            // store service constructor if any
+            var serviceCtor = ((ConfigurationStore)Mapper.Configuration).ServiceCtor;
             Mapper.Initialize(configuration =>
                 GetConfiguration(Mapper.Configuration, EnsureAssembly(assemblies, Assembly.GetCallingAssembly())));
+
+            // restore service constructor if any
+            if (serviceCtor.Target != null)
+            {
+                Mapper.Configuration.ConstructServicesUsing(serviceCtor);
+            }
         }
 
         /// <summary>
diff --git a/AutoAutoMapper/packages.config b/AutoAutoMapper/packages.config
index 594774b..468990f 100644
--- a/AutoAutoMapper/packages.config
+++ b/AutoAutoMapper/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="2.1.267" targetFramework="net40" />
+  <package id="AutoMapper" version="4.1.1" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
 </packages>
\ No newline at end of file

From 90edf5e7a846dfe2034f1b02e61bbc0a63aeff5e Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <drcolombo@gmail.com>
Date: Fri, 30 Oct 2015 13:48:34 +0100
Subject: [PATCH 2/2] Restoring service constructor in RegisterProfiles in case
 if AutoMapper is used with a DI framework like Ninject. Updated AutoMapper
 NuGet package to 4.1.1

---
 AutoAutoMapper/AutoAutoMapper.csproj | 27 +++++++++++++++++++++++----
 AutoAutoMapper/AutoProfiler.cs       |  8 ++++++++
 AutoAutoMapper/packages.config       |  4 +++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/AutoAutoMapper/AutoAutoMapper.csproj b/AutoAutoMapper/AutoAutoMapper.csproj
index 9f500b8..e8cb37b 100644
--- a/AutoAutoMapper/AutoAutoMapper.csproj
+++ b/AutoAutoMapper/AutoAutoMapper.csproj
@@ -33,12 +33,24 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=2.1.267.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.2.1.267\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.4.1.1\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -54,10 +66,17 @@
     <None Include="AutoAutoMapper.nuspec">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/AutoAutoMapper/AutoProfiler.cs b/AutoAutoMapper/AutoProfiler.cs
index 4c7e5ac..dbe2d3f 100644
--- a/AutoAutoMapper/AutoProfiler.cs
+++ b/AutoAutoMapper/AutoProfiler.cs
@@ -35,8 +35,16 @@ public static void RegisterProfiles(params Assembly[] assemblies)
         /// </param>
         public static void RegisterProfiles(IEnumerable<Assembly> assemblies)
         {
+            // store service constructor if any
+            var serviceCtor = ((ConfigurationStore)Mapper.Configuration).ServiceCtor;
             Mapper.Initialize(configuration =>
                 GetConfiguration(Mapper.Configuration, EnsureAssembly(assemblies, Assembly.GetCallingAssembly())));
+
+            // restore service constructor if any
+            if (serviceCtor.Target != null)
+            {
+                Mapper.Configuration.ConstructServicesUsing(serviceCtor);
+            }
         }
 
         /// <summary>
diff --git a/AutoAutoMapper/packages.config b/AutoAutoMapper/packages.config
index 594774b..468990f 100644
--- a/AutoAutoMapper/packages.config
+++ b/AutoAutoMapper/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="2.1.267" targetFramework="net40" />
+  <package id="AutoMapper" version="4.1.1" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
 </packages>
\ No newline at end of file