Upgrade auto mapper to 12.0.0 (#68)

* Upgrade AutoMapper to 12.0.0

* proper version range

* Upgrade AutoMapper to 12.0.0

* Fix build Build.ps1

Co-authored-by: Lucian Bargaoanu <lbargaoanu@users.noreply.github.com>

Author: mettolen

AutoMapper.Data.Tests/DataReaderMappingTests.cs

@@ -5,7 +5,6 @@
     using System.Data;
     using System.Linq;
     using AutoMapper.Internal;
-    using Configuration.Conventions;
     using Mappers;
     using Shouldly;
     using Xunit;

AutoMapper.Data.Tests/ProfileTests.cs

@@ -3,8 +3,6 @@
     using System.Collections.Generic;
     using System.Data;
     using System.Linq;
-    using System.Reflection;
-    using AutoMapper.Data.Configuration.Conventions;
     using Shouldly;
     using Xunit;
 

AutoMapper.Data/AutoMapper.Data.csproj

@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="[11.0.1, 12.0.0)" />
+    <PackageReference Include="AutoMapper" Version="[12.0.0, 13.0.0)" />
     <None Include="..\README.md" Pack="true" PackagePath="" />
    </ItemGroup>
 

AutoMapper.Data/Configuration/Conventions/DataRecordMemberConfiguration.cs

@@ -1,12 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using System.Reflection.Emit;
 
 using AutoMapper.Configuration.Conventions;
 using AutoMapper.Data.Utils;
-using AutoMapper.Internal;
+using AutoMapper.Internal;
 using AutoMapper.Utils;
 
 using static System.Reflection.Emit.OpCodes;
@@ -15,11 +14,11 @@
 
 namespace AutoMapper.Data.Configuration.Conventions
 {
-    public class DataRecordMemberConfiguration : IChildMemberConfiguration
-    {
-        public bool MapDestinationPropertyToSource(ProfileMap options, TypeDetails sourceType, Type destType, Type destMemberType, string nameToSearch, List<MemberInfo> resolvers, IMemberConfiguration parent, bool isReverseMap)
-        {
-            if (TypeExtensions.IsAssignableFrom(typeof(IDataRecord), sourceType.Type))
+    public class DataRecordMemberConfiguration : ISourceToDestinationNameMapper
+    {
+        public MemberInfo GetSourceMember(TypeDetails sourceTypeDetails, Type destType, Type destMemberType, string nameToSearch)
+        {
+            if (TypeExtensions.IsAssignableFrom(typeof(IDataRecord), sourceTypeDetails.Type))
             {
                 var returnType = destMemberType;
                 // TODO: The return type really should be the type of the field in the reader.
@@ -31,13 +30,15 @@ public bool MapDestinationPropertyToSource(ProfileMap options, TypeDetails sourc
                 EmitPropertyMapping(il, destType, destMemberType, nameToSearch);
                 il.Emit(Ret);
 
-                resolvers.Add(method);
-
-                return true;
+                return method;
             }
-            return false;
-        }
-
+            return null;
+        }
+
+        public void Merge(ISourceToDestinationNameMapper otherNamedMapper)
+        {
+        }
+
         private void EmitPropertyMapping(ILGenerator il, Type destType, Type destMemberType, string nameToSearch)
         {
             var returnType = destMemberType;

AutoMapper.Data/ConfigurationExtensions.cs

@@ -1,7 +1,7 @@
 using AutoMapper.Data.Configuration.Conventions;
 using AutoMapper.Data.Mappers;
-using AutoMapper.Internal;
-
+using AutoMapper.Internal;
+
 namespace AutoMapper.Data
 {
     public static class ConfigurationExtensions
@@ -23,6 +23,6 @@ public static void AddDataReaderMapping(this IMapperConfigurationExpression conf
         }
 
         public static void AddDataRecordMember(this IProfileExpression profile) => 
-            profile.Internal().AddMemberConfiguration().AddMember<DataRecordMemberConfiguration>();
+            profile.Internal().MemberConfiguration.NameToMemberMappers.Add(new DataRecordMemberConfiguration());
     }
 }

AutoMapper.Data/Utils/CollectionMapper.cs

@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Linq;
 using System.Linq.Expressions;
 using AutoMapper.Execution;
 using static System.Linq.Expressions.Expression;
 using static AutoMapper.Utils.ExpressionExtensions;
 
 namespace AutoMapper.Utils
-{
-    using AutoMapper.Internal;
-    using AutoMapper.Internal.Mappers;
-    using System.Collections.Generic;
-
+{
+    using AutoMapper.Internal;
+    using AutoMapper.Internal.Mappers;
+    using System.Collections.Generic;
+
     public static class CollectionMapperExtensions
     {
         internal static Expression MapCollectionExpression(this IGlobalConfiguration configurationProvider, 
@@ -40,7 +40,7 @@ internal static Expression MapCollectionExpression(this IGlobalConfiguration con
                     Assign(passedDestination, destExpression),
                     IfThenElse(condition ?? Constant(false),
                                     Block(Assign(newExpression, passedDestination), Call(newExpression, clearMethod)),
-                                    Assign(newExpression, passedDestination.Type.NewExpr(ifInterfaceType))),
+                                    Assign(newExpression, passedDestination.Type.NewExpr(ifInterfaceType, configurationProvider))),
                     Condition(Equal(sourceExpression, Constant(null)), ToType(ifNullExpr, passedDestination.Type), ToType(mapExpr, passedDestination.Type))
                 );
             if(memberMap != null)
@@ -60,16 +60,16 @@ internal static Expression MapCollectionExpression(this IGlobalConfiguration con
             return Block(checkContext, checkNull);
         }
 
-        internal static Delegate Constructor(Type type)
+        internal static Delegate Constructor(Type type, IGlobalConfiguration configuration)
         {
-            return Lambda(ToType(ObjectFactory.GenerateConstructorExpression(type), type)).Compile();
+            return Lambda(ToType(ObjectFactory.GenerateConstructorExpression(type, configuration), type)).Compile();
         }
 
-        internal static Expression NewExpr(this Type baseType, Type ifInterfaceType)
+        internal static Expression NewExpr(this Type baseType, Type ifInterfaceType, IGlobalConfiguration configuration)
         {
             var newExpr = baseType.IsInterface()
                 ? New(ifInterfaceType.MakeGenericType(TypeHelper.GetElementTypes(baseType, ElementTypeFlags.BreakKeyValuePair)))
-                : ObjectFactory.GenerateConstructorExpression(baseType);
+                : ObjectFactory.GenerateConstructorExpression(baseType, configuration);
             return ToType(newExpr, baseType);
         }
 
@@ -117,8 +117,8 @@ internal static BinaryExpression IfNotNull(Expression destExpression)
     public class CollectionMapper : IObjectMapper
     {
         public bool IsMatch(TypePair context) => context.SourceType.IsEnumerableType() && context.DestinationType.IsCollectionType();
-
-        public Expression MapExpression(IGlobalConfiguration configurationProvider, ProfileMap profileMap, MemberMap memberMap, Expression sourceExpression, Expression destExpression)
-            => configurationProvider.MapCollectionExpression(profileMap, memberMap, sourceExpression, destExpression, CollectionMapperExtensions.IfNotNull, typeof(List<>), CollectionMapperExtensions.MapItemExpr);
+
+        public Expression MapExpression(IGlobalConfiguration configurationProvider, ProfileMap profileMap, MemberMap memberMap, Expression sourceExpression, Expression destExpression)
+            => configurationProvider.MapCollectionExpression(profileMap, memberMap, sourceExpression, destExpression, CollectionMapperExtensions.IfNotNull, typeof(List<>), CollectionMapperExtensions.MapItemExpr);
     }
 }

Build.ps1

@@ -29,6 +29,6 @@ exec { & dotnet clean -c Release }
 exec { & dotnet restore }
 
 exec { & dotnet build AutoMapper.Data.sln -c Release -v q /nologo }
-exec { & dotnet test -c Release -r $artifacts --no-build -l trx --verbosity=normal }
+exec { & dotnet test -c Release --no-build -l trx --verbosity=normal }
 
-exec { & dotnet pack .\AutoMapper.Data -c Release -o artifacts --include-symbols --no-build }
+exec { & dotnet pack .\AutoMapper.Data -c Release -o $artifacts --include-symbols --no-build }