Merge branch 'master' into feature/upgrade-automapper8

Author: jbogard

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs

@@ -635,6 +635,19 @@ void CallSomeAction<T>(T val)
         {
             this.val = val;
         }
+
+        [Fact]
+        public void Can_map_expression_when_mapped_properties_have_a_different_generic_argument_counts()
+        {
+            //Arrange
+            Expression<Func<ListParent, bool>> src = x => x.List.Count == 0;
+
+            //Act
+            Expression<Func<ListParentExtension, bool>> dest = mapper.Map<Expression<Func<ListParentExtension, bool>>>(src);
+
+            //Assert
+            Assert.NotNull(dest);
+        }
         #endregion Tests
 
         private static void SetupAutoMapper()
@@ -1018,6 +1031,20 @@ class ItemEntity
         public string Name { get; set; }
     }
 
+    class ListParentExtension 
+    {
+        public ListExtension List { get; set; }
+    }
+
+    class ListParent : List<string>
+    {
+        public List<string> List { get; set; }
+    }
+
+    class ListExtension : List<string>
+    {
+    }
+
     public class OrganizationProfile : Profile
     {
         public OrganizationProfile()
@@ -1112,6 +1139,13 @@ public OrganizationProfile()
 
             CreateMap<OptionT, OptionS>();
 
+            CreateMap<ListParentExtension, ListParent>()
+                .ReverseMap();
+            CreateMap<ListExtension, List<string>>()
+                .ForMember(d => d.Count, opt => opt.MapFrom(s => s.Count))
+                .ReverseMap()
+                .ForMember(d => d.Count, opt => opt.MapFrom(s => s.Count));
+
             CreateMissingTypeMaps = true;
         }
     }