Upgrade usings regarding the AutoMapper 8.0 Upgrade Guide

Author: Tasteful

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;
             }

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;

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

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;

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);
         }
     }

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);
         }

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));
         }
     }

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();