Merge branch 'develop'

Author: jbogard

.gitignore

@@ -14,4 +14,5 @@ TestResult.xml
 AppPackages/
 *.bak
 packages
-*.orig
+*.orig
+*.DotSettings

src/AutoMapper/AutoMapper.WinRT.csproj

@@ -131,7 +131,7 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\AutoMapper.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <Import Project="..\..\tools\MSBuild\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- 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">

src/AutoMapper/AutoMapper.csproj

@@ -76,6 +76,7 @@
     <Compile Include="Internal\PlatformAdapter.cs" />
     <Compile Include="Internal\ProbingAdapterResolver.cs" />
     <Compile Include="Mapper.cs" />
+    <Compile Include="Mappers\AssignableArrayMapper.cs" />
     <Compile Include="Mappers\ExplicitConversionOperatorMapper.cs" />
     <Compile Include="Mappers\ImplicitConversionOperatorMapper.cs" />
     <Compile Include="Mappers\IPlatformSpecificMapperRegistry.cs" />

src/AutoMapper/Mappers/AssignableArrayMapper.cs

@@ -0,0 +1,22 @@
+namespace AutoMapper.Mappers
+{
+    public class AssignableArrayMapper : IObjectMapper
+    {
+        public object Map(ResolutionContext context, IMappingEngineRunner mapper)
+        {
+            if (context.SourceValue == null && !mapper.ShouldMapSourceValueAsNull(context))
+            {
+                return mapper.CreateObject(context);
+            }
+
+            return context.SourceValue;
+        }
+
+        public bool IsMatch(ResolutionContext context)
+        {
+            return context.DestinationType.IsAssignableFrom(context.SourceType)
+                   && context.DestinationType.IsArray
+                   && context.SourceType.IsArray;
+        }
+    }
+}

src/AutoMapper/Mappers/AssignableMapper.cs

@@ -1,6 +1,6 @@
 namespace AutoMapper.Mappers
 {
-	public class AssignableMapper : IObjectMapper
+    public class AssignableMapper : IObjectMapper
 	{
 		public object Map(ResolutionContext context, IMappingEngineRunner mapper)
 		{

src/AutoMapper/Mappers/MapperRegistry.cs

@@ -8,7 +8,7 @@ public static class MapperRegistry
         {
             new TypeMapMapper(TypeMapObjectMapperRegistry.Mappers),
             new StringMapper(),
-            new AssignableMapper(),
+            new AssignableArrayMapper(), 
             new FlagsEnumMapper(),
             new EnumMapper(),
             new PrimitiveArrayMapper(),
@@ -18,6 +18,7 @@ public static class MapperRegistry
             new ReadOnlyCollectionMapper(),
             new CollectionMapper(),
             new EnumerableMapper(),
+            new AssignableMapper(),
             new NullableSourceMapper(),
             new NullableMapper(),
             new ImplicitConversionOperatorMapper(),

src/Install.ps1

@@ -11,7 +11,7 @@ param($installPath, $toolsPath, $package, $project)
 
 	if ($platformSpecificRef)
 	{
-		$refPath = $platformSpecificRef.Metadata.Where({ $_.Name -eq "HintPath" }).Value
+		$refPath = ($platformSpecificRef.Metadata | Where-Object { $_.Name -eq "HintPath" } | Select-Object -First 1).Value
 
 		$item = $msbuild.Xml.AddItem("Content", $refPath)
 		$item.AddMetadata("Link", [System.IO.Path]::GetFileName($refPath))

src/UnitTests/Bug/AssignableCollectionBug.cs

@@ -109,7 +109,7 @@ protected override void Establish_context()
 
             protected override void Because_of()
             {
-                _source = new Picture {ImageData = new byte[1000000]};
+                _source = new Picture {ImageData = new byte[100]};
                 _dest = Mapper.Map<Picture, PictureDto>(_source);
             }
 
@@ -120,4 +120,37 @@ public void Should_copy_array()
             }
         }
     }
+
+    namespace AssignableLists
+    {
+        public class AutoMapperTests
+        {
+            [Fact]
+            public void ListShouldNotMapAsReference()
+            {
+                // arrange
+                Mapper.Reset();
+                Mapper.CreateMap<A, B>();
+                var source = new A { Images = new List<string>() };
+
+                // act
+                var destination = Mapper.Map<B>(source);
+                destination.Images.Add("test");
+
+                // assert
+                destination.Images.Count.ShouldEqual(1);
+                source.Images.Count.ShouldEqual(0); // in 3.1.0 source.Images.Count is 1
+            }
+        }
+
+        public class A
+        {
+            public IList<string> Images { get; set; }
+        }
+
+        public class B
+        {
+            public IList<string> Images { get; set; }
+        }
+    }
 }

src/UnitTests/UnitTests.WinRT.csproj

@@ -296,15 +296,15 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>
   </PropertyGroup>
-  <Import Project="..\..\tools\MSBuild\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <PropertyGroup>
     <SDKReferenceDirectoryRoot>$(ProjectDir)\libs;$(SDKReferenceDirectoryRoot)</SDKReferenceDirectoryRoot>
   </PropertyGroup>
-  <!-- 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">
-  </Target>  
-  <Target Name="AfterBuild">
-  </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">
+  </Target>  
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>