Merge pull request #116 from Tasteful/feature/upgrade-automapper8

jbogard · web-flow · commit 79126e370e5f · 2018-11-18T11:45:47.000+02:00
Upgrade AutoMapper 8
diff --git a/src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj b/src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Collection updating support for EntityFramework with AutoMapper. Extends DBSet&lt;T&gt; with Persist&lt;TDto&gt;().InsertUpdate(dto) and Persist&lt;TDto&gt;().Delete(dto).  Will find the matching object and will Insert/Update/Delete.</Description>
     <Authors>Tyler Carlson</Authors>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <AssemblyName>AutoMapper.Collection.EntityFramework</AssemblyName>
     <PackageId>AutoMapper.Collection.EntityFramework</PackageId>
     <PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
diff --git a/src/AutoMapper.Collection.EntityFramework/GenerateEntityFrameworkPrimaryKeyPropertyMaps.cs b/src/AutoMapper.Collection.EntityFramework/GenerateEntityFrameworkPrimaryKeyPropertyMaps.cs
@@ -17,14 +17,14 @@ public class GenerateEntityFrameworkPrimaryKeyPropertyMaps<TDatabaseContext> : I
         
         public IEnumerable<PropertyMap> GeneratePropertyMaps(TypeMap typeMap)
         {
-            var propertyMaps = typeMap.GetPropertyMaps();
+            var propertyMaps = typeMap.PropertyMaps;
             try
             {
                 var createObjectSetMethod = _createObjectSetMethodInfo.MakeGenericMethod(typeMap.DestinationType);
                 dynamic objectSet = createObjectSetMethod.Invoke(_context.ObjectContext, null);
 
                 IEnumerable<EdmMember> keyMembers = objectSet.EntitySet.ElementType.KeyMembers;
-                var primaryKeyPropertyMatches = keyMembers.Select(m => propertyMaps.FirstOrDefault(p => p.DestinationProperty.Name == m.Name));
+                var primaryKeyPropertyMatches = keyMembers.Select(m => propertyMaps.FirstOrDefault(p => p.DestinationMember.Name == m.Name));
 
                 return primaryKeyPropertyMatches;
             }
diff --git a/src/AutoMapper.Collection.LinqToSQL/AutoMapper.Collection.LinqToSQL.csproj b/src/AutoMapper.Collection.LinqToSQL/AutoMapper.Collection.LinqToSQL.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Collection updating support for LinqToSQL with AutoMapper. Extends Table&lt;T&gt; with Persist&lt;TDto&gt;().InsertUpdate(dto) and Persist&lt;TDto&gt;().Delete(dto).  Will find the matching object and will Insert/Update/Delete.</Description>
     <Authors>Tyler Carlson</Authors>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <AssemblyName>AutoMapper.Collection.LinqToSQL</AssemblyName>
     <PackageId>AutoMapper.Collection.LinqToSQL</PackageId>
     <PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
@@ -22,7 +22,7 @@
     <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="1.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup>
     <Reference Include="System.Data" />
     <Reference Include="System.Data.Linq" />
     <Reference Include="System" />
diff --git a/src/AutoMapper.Collection.LinqToSQL/GetLinqToSQLPrimaryKeyProperties.cs b/src/AutoMapper.Collection.LinqToSQL/GetLinqToSQLPrimaryKeyProperties.cs
@@ -10,11 +10,11 @@ public class GetLinqToSQLPrimaryKeyProperties : IGeneratePropertyMaps
     {
         public IEnumerable<PropertyMap> GeneratePropertyMaps(TypeMap typeMap)
         {
-            var propertyMaps = typeMap.GetPropertyMaps();
+            var propertyMaps = typeMap.PropertyMaps;
 
             var primaryKeyPropertyMatches = typeMap.DestinationType.GetProperties()
                 .Where(IsPrimaryKey)
-                .Select(m => propertyMaps.FirstOrDefault(p => p.DestinationProperty.Name == m.Name))
+                .Select(m => propertyMaps.FirstOrDefault(p => p.DestinationMember.Name == m.Name))
                 .ToList();
 
             return primaryKeyPropertyMatches;
diff --git a/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj b/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj
@@ -1,16 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection.Tests</AssemblyName>
     <RootNamespace>AutoMapper.Collection</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AutoMapper.Collection\AutoMapper.Collection.csproj" />
   </ItemGroup>
diff --git a/src/AutoMapper.Collection.Tests/InheritanceWithCollectionTests.cs b/src/AutoMapper.Collection.Tests/InheritanceWithCollectionTests.cs
@@ -200,7 +200,7 @@ protected override void Create(IMapperConfigurationExpression cfg)
 
                 //DOMAIN --> EF
                 cfg.CreateMap<RootDomain, RootEf>()
-                    .ForMember(rootEf => rootEf.Orders, opt => opt.ResolveUsing<MergeDomainOrdersToEfOrdersValueResolver>())
+                    .ForMember(rootEf => rootEf.Orders, opt => opt.MapFrom<MergeDomainOrdersToEfOrdersValueResolver>())
                     ;
 
                 //collection type
@@ -245,7 +245,7 @@ protected override void Create(IMapperConfigurationExpression cfg)
 
                 //DOMAIN --> EF
                 cfg.CreateMap<RootDomain, RootEf>()
-                    .ForMember(rootEf => rootEf.Orders, opt => opt.ResolveUsing<MergeDomainOrdersToEfOrdersValueResolver>())
+                    .ForMember(rootEf => rootEf.Orders, opt => opt.MapFrom<MergeDomainOrdersToEfOrdersValueResolver>())
                     ;
 
                 //collection type
diff --git a/src/AutoMapper.Collection/AutoMapper.Collection.csproj b/src/AutoMapper.Collection/AutoMapper.Collection.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Collection Add/Remove/Update support for AutoMapper. AutoMapper.Collection adds EqualityComparison Expressions for TypeMaps to determine if Source and Destination type are equivalent to each other when mapping collections.</Description>
     <Authors>Tyler Carlson</Authors>
-    <TargetFrameworks>netstandard2.0;netstandard1.3;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection</AssemblyName>
     <PackageId>AutoMapper.Collection</PackageId>
     <PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="7.0.0" />
+    <PackageReference Include="AutoMapper" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
diff --git a/src/AutoMapper.Collection/EquivalencyExpression/CustomExpressionVisitor.cs b/src/AutoMapper.Collection/EquivalencyExpression/CustomExpressionVisitor.cs
@@ -26,7 +26,7 @@ protected override Expression VisitMember(MemberExpression node)
         {
             if (node.Member is PropertyInfo)
             {
-                var matchPM = _propertyMaps.FirstOrDefault(pm => pm.DestinationProperty == node.Member);
+                var matchPM = _propertyMaps.FirstOrDefault(pm => pm.DestinationMember == node.Member);
                 if (matchPM == null)
                     throw new Exception("No matching PropertyMap");
                 var memberGetters = matchPM.SourceMembers;
diff --git a/src/AutoMapper.Collection/EquivalencyExpression/EquivalentExpressions.cs b/src/AutoMapper.Collection/EquivalencyExpression/EquivalentExpressions.cs
@@ -127,7 +127,7 @@ public static void SetGeneratePropertyMaps(this IMapperConfigurationExpression c
 
         private static IEquivalentComparer CreateEquivalentExpression(this IEnumerable<PropertyMap> propertyMaps)
         {
-            if (!propertyMaps.Any() || propertyMaps.Any(pm => pm.DestinationProperty.GetMemberType() != pm.SourceMember.GetMemberType()))
+            if (!propertyMaps.Any() || propertyMaps.Any(pm => pm.DestinationMember.GetMemberType() != pm.SourceMember.GetMemberType()))
             {
                 return null;
             }
@@ -154,7 +154,7 @@ private static IEquivalentComparer CreateEquivalentExpression(this IEnumerable<P
         private static BinaryExpression SourceEqualsDestinationExpression(PropertyMap propertyMap, Expression srcExpr, Expression destExpr)
         {
             var srcPropExpr = Expression.Property(srcExpr, propertyMap.SourceMember as PropertyInfo);
-            var destPropExpr = Expression.Property(destExpr, propertyMap.DestinationProperty as PropertyInfo);
+            var destPropExpr = Expression.Property(destExpr, propertyMap.DestinationMember as PropertyInfo);
             return Expression.Equal(srcPropExpr, destPropExpr);
         }
     }
diff --git a/src/AutoMapper.Collection/EquivalencyExpression/GenerateEquivilentExpressionFromTypeMap.cs b/src/AutoMapper.Collection/EquivalencyExpression/GenerateEquivilentExpressionFromTypeMap.cs
@@ -25,7 +25,7 @@ private Expression CreateEquivalentExpression(object value)
             var express = value as LambdaExpression;
             var destExpr = Expression.Parameter(_typeMap.SourceType, express.Parameters[0].Name);
 
-            var result = new CustomExpressionVisitor(destExpr, _typeMap.GetPropertyMaps()).Visit(express.Body);
+            var result = new CustomExpressionVisitor(destExpr, _typeMap.PropertyMaps).Visit(express.Body);
 
             return Expression.Lambda(result, destExpr);
         }
diff --git a/src/AutoMapper.Collection/Mappers/EquivalentExpressionAddRemoveCollectionMapper.cs b/src/AutoMapper.Collection/Mappers/EquivalentExpressionAddRemoveCollectionMapper.cs
@@ -71,7 +71,7 @@ public bool IsMatch(TypePair typePair)
                    && this.GetEquivalentExpression(TypeHelper.GetElementType(typePair.SourceType), TypeHelper.GetElementType(typePair.DestinationType)) != null;
         }
 
-        public Expression MapExpression(IConfigurationProvider configurationProvider, ProfileMap profileMap, PropertyMap propertyMap,
+        public Expression MapExpression(IConfigurationProvider configurationProvider, ProfileMap profileMap, IMemberMap memberMap,
             Expression sourceExpression, Expression destExpression, Expression contextExpression)
         {
             var sourceType = TypeHelper.GetElementType(sourceExpression.Type);
@@ -84,7 +84,7 @@ public Expression MapExpression(IConfigurationProvider configurationProvider, Pr
             var map = Call(null, method, sourceExpression, destExpression, contextExpression, equivalencyExpressionConst);
 
             var notNull = NotEqual(destExpression, Constant(null));
-            var collectionMap = CollectionMapper.MapExpression(configurationProvider, profileMap, propertyMap, sourceExpression, destExpression, contextExpression);
+            var collectionMap = CollectionMapper.MapExpression(configurationProvider, profileMap, memberMap, sourceExpression, destExpression, contextExpression);
             return Condition(notNull, map, Convert(collectionMap, destExpression.Type));
         }
     }
diff --git a/src/AutoMapper.Collection/Mappers/ObjectToEquivalencyExpressionByEquivalencyExistingMapper.cs b/src/AutoMapper.Collection/Mappers/ObjectToEquivalencyExpressionByEquivalencyExistingMapper.cs
@@ -26,7 +26,7 @@ public bool IsMatch(TypePair typePair)
             return this.GetEquivalentExpression(typePair.SourceType, destExpressArgType) != null;
         }
 
-        public Expression MapExpression(IConfigurationProvider configurationProvider, ProfileMap profileMap, PropertyMap propertyMap,
+        public Expression MapExpression(IConfigurationProvider configurationProvider, ProfileMap profileMap, IMemberMap memberMap,
             Expression sourceExpression, Expression destExpression, Expression contextExpression)
         {
             var destExpressArgType = destExpression.Type.GetSinglePredicateExpressionArgumentType();
diff --git a/version.props b/version.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>4.1.0</VersionPrefix>
+    <VersionPrefix>5.0.0</VersionPrefix>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ public class GenerateEntityFrameworkPrimaryKeyPropertyMaps<TDatabaseContext> : I`
`17`	`17`
`18`	`18`	`public IEnumerable<PropertyMap> GeneratePropertyMaps(TypeMap typeMap)`
`19`	`19`	`{`
`20`		`- var propertyMaps = typeMap.GetPropertyMaps();`
	`20`	`+ var propertyMaps = typeMap.PropertyMaps;`
`21`	`21`	`try`
`22`	`22`	`{`
`23`	`23`	`var createObjectSetMethod = _createObjectSetMethodInfo.MakeGenericMethod(typeMap.DestinationType);`
`24`	`24`	`dynamic objectSet = createObjectSetMethod.Invoke(_context.ObjectContext, null);`
`25`	`25`
`26`	`26`	`IEnumerable<EdmMember> keyMembers = objectSet.EntitySet.ElementType.KeyMembers;`
`27`		`- var primaryKeyPropertyMatches = keyMembers.Select(m => propertyMaps.FirstOrDefault(p => p.DestinationProperty.Name == m.Name));`
	`27`	`+ var primaryKeyPropertyMatches = keyMembers.Select(m => propertyMaps.FirstOrDefault(p => p.DestinationMember.Name == m.Name));`
`28`	`28`
`29`	`29`	`return primaryKeyPropertyMatches;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ public class GetLinqToSQLPrimaryKeyProperties : IGeneratePropertyMaps`
`10`	`10`	`{`
`11`	`11`	`public IEnumerable<PropertyMap> GeneratePropertyMaps(TypeMap typeMap)`
`12`	`12`	`{`
`13`		`- var propertyMaps = typeMap.GetPropertyMaps();`
	`13`	`+ var propertyMaps = typeMap.PropertyMaps;`
`14`	`14`
`15`	`15`	`var primaryKeyPropertyMatches = typeMap.DestinationType.GetProperties()`
`16`	`16`	`.Where(IsPrimaryKey)`
`17`		`- .Select(m => propertyMaps.FirstOrDefault(p => p.DestinationProperty.Name == m.Name))`
	`17`	`+ .Select(m => propertyMaps.FirstOrDefault(p => p.DestinationMember.Name == m.Name))`
`18`	`18`	`.ToList();`
`19`	`19`
`20`	`20`	`return primaryKeyPropertyMatches;`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ protected override void Create(IMapperConfigurationExpression cfg)`
`200`	`200`
`201`	`201`	`//DOMAIN --> EF`
`202`	`202`	`cfg.CreateMap<RootDomain, RootEf>()`
`203`		`- .ForMember(rootEf => rootEf.Orders, opt => opt.ResolveUsing<MergeDomainOrdersToEfOrdersValueResolver>())`
	`203`	`+ .ForMember(rootEf => rootEf.Orders, opt => opt.MapFrom<MergeDomainOrdersToEfOrdersValueResolver>())`
`204`	`204`	`;`
`205`	`205`
`206`	`206`	`//collection type`
`@@ -245,7 +245,7 @@ protected override void Create(IMapperConfigurationExpression cfg)`
`245`	`245`
`246`	`246`	`//DOMAIN --> EF`
`247`	`247`	`cfg.CreateMap<RootDomain, RootEf>()`
`248`		`- .ForMember(rootEf => rootEf.Orders, opt => opt.ResolveUsing<MergeDomainOrdersToEfOrdersValueResolver>())`
	`248`	`+ .ForMember(rootEf => rootEf.Orders, opt => opt.MapFrom<MergeDomainOrdersToEfOrdersValueResolver>())`
`249`	`249`	`;`
`250`	`250`
`251`	`251`	`//collection type`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected override Expression VisitMember(MemberExpression node)`
`26`	`26`	`{`
`27`	`27`	`if (node.Member is PropertyInfo)`
`28`	`28`	`{`
`29`		`- var matchPM = _propertyMaps.FirstOrDefault(pm => pm.DestinationProperty == node.Member);`
	`29`	`+ var matchPM = _propertyMaps.FirstOrDefault(pm => pm.DestinationMember == node.Member);`
`30`	`30`	`if (matchPM == null)`
`31`	`31`	`throw new Exception("No matching PropertyMap");`
`32`	`32`	`var memberGetters = matchPM.SourceMembers;`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public static void SetGeneratePropertyMaps(this IMapperConfigurationExpression c`
`127`	`127`
`128`	`128`	`private static IEquivalentComparer CreateEquivalentExpression(this IEnumerable<PropertyMap> propertyMaps)`
`129`	`129`	`{`
`130`		`- if (!propertyMaps.Any() \|\| propertyMaps.Any(pm => pm.DestinationProperty.GetMemberType() != pm.SourceMember.GetMemberType()))`
	`130`	`+ if (!propertyMaps.Any() \|\| propertyMaps.Any(pm => pm.DestinationMember.GetMemberType() != pm.SourceMember.GetMemberType()))`
`131`	`131`	`{`
`132`	`132`	`return null;`
`133`	`133`	`}`
`@@ -154,7 +154,7 @@ private static IEquivalentComparer CreateEquivalentExpression(this IEnumerable<P`
`154`	`154`	`private static BinaryExpression SourceEqualsDestinationExpression(PropertyMap propertyMap, Expression srcExpr, Expression destExpr)`
`155`	`155`	`{`
`156`	`156`	`var srcPropExpr = Expression.Property(srcExpr, propertyMap.SourceMember as PropertyInfo);`
`157`		`- var destPropExpr = Expression.Property(destExpr, propertyMap.DestinationProperty as PropertyInfo);`
	`157`	`+ var destPropExpr = Expression.Property(destExpr, propertyMap.DestinationMember as PropertyInfo);`
`158`	`158`	`return Expression.Equal(srcPropExpr, destPropExpr);`
`159`	`159`	`}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ private Expression CreateEquivalentExpression(object value)`
`25`	`25`	`var express = value as LambdaExpression;`
`26`	`26`	`var destExpr = Expression.Parameter(_typeMap.SourceType, express.Parameters[0].Name);`
`27`	`27`
`28`		`- var result = new CustomExpressionVisitor(destExpr, _typeMap.GetPropertyMaps()).Visit(express.Body);`
	`28`	`+ var result = new CustomExpressionVisitor(destExpr, _typeMap.PropertyMaps).Visit(express.Body);`
`29`	`29`
`30`	`30`	`return Expression.Lambda(result, destExpr);`
`31`	`31`	`}`