Supporting Automapper v15.

README.md

@@ -9,7 +9,7 @@ To use, configure using the configuration helper method:
 var mapper = new Mapper(new MapperConfiguration(cfg => {
     cfg.AddExpressionMapping();
 	// Rest of your configuration
-}));
+}, loggerFactory));
 
 // or if using the MS Ext DI:
 

src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Summary>Expression mapping (OData) extensions for AutoMapper</Summary>
     <Description>Expression mapping (OData) extensions for AutoMapper</Description>
-    <TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -29,7 +29,7 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="[14.0.0,15.0.0)" />
+    <PackageReference Include="AutoMapper" Version="[15.0.0,16.0.0)" />
     <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/AutoMapper.Extensions.ExpressionMapping/ConfigurationHelper.cs

@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Logging.Abstractions;
+using System;
+
+namespace AutoMapper.Extensions.ExpressionMapping
+{
+    public static class ConfigurationHelper
+    {
+        public static MapperConfiguration GetMapperConfiguration(Action<IMapperConfigurationExpression> configure)
+        {
+            return new MapperConfiguration(configure, new NullLoggerFactory());
+        }
+
+        public static MapperConfiguration GetMapperConfiguration(MapperConfigurationExpression configurationExpression)
+        {
+            return new MapperConfiguration(configurationExpression, new NullLoggerFactory());
+        }
+    }
+}

src/AutoMapper.Extensions.ExpressionMapping/ExpressionMapper.cs

@@ -32,6 +32,11 @@ public Expression MapExpression(IGlobalConfiguration configurationProvider, Prof
                 Constant(configurationProvider)
             );
 
+        public TypePair? GetAssociatedTypes(TypePair initialTypes)
+        {
+            return null;
+        }
+
         internal class MappingVisitor : ExpressionVisitor
         {
             private IList<Type> _destSubTypes = new Type[0];

src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs

@@ -286,7 +286,7 @@ private void ConfigureAnonymousTypeMaps(Type oldType, Type newAnonymousType)
                     }
                 });
 
-            anonymousTypesConfigurationProvider = new MapperConfiguration(anonymousTypesBaseMappings);
+            anonymousTypesConfigurationProvider = ConfigurationHelper.GetMapperConfiguration(anonymousTypesBaseMappings);
         }
 
         private MemberInitExpression GetAnonymousTypeMemberInitExpression(Dictionary<string, Expression> bindingExpressions, Type oldType)

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

@@ -12,7 +12,7 @@ public class CanMapExpressionWithListConstants
         public void Map_expression_with_constant_array()
         {
             //Arrange
-            var config = new MapperConfiguration
+            var config = ConfigurationHelper.GetMapperConfiguration
             (
                 cfg =>
                 {
@@ -43,7 +43,7 @@ public void Map_expression_with_constant_array()
         public void Map_expression_with_constant_list_using_generic_list_dot_contains()
         {
             //Arrange
-            var config = new MapperConfiguration
+            var config = ConfigurationHelper.GetMapperConfiguration
             (
                 cfg =>
                 {
@@ -73,7 +73,7 @@ public void Map_expression_with_constant_list_using_generic_list_dot_contains()
         public void Map_expression_with_constant_list_using_generic_enumerable_dot_contains()
         {
             //Arrange
-            var config = new MapperConfiguration
+            var config = ConfigurationHelper.GetMapperConfiguration
             (
                 cfg =>
                 {
@@ -103,7 +103,7 @@ public void Map_expression_with_constant_list_using_generic_enumerable_dot_conta
         public void Map_expression_with_constant_dictionary()
         {
             //Arrange
-            var config = new MapperConfiguration
+            var config = ConfigurationHelper.GetMapperConfiguration
             (
                 cfg =>
                 {
@@ -133,7 +133,7 @@ public void Map_expression_with_constant_dictionary()
         public void Map_expression_with_constant_dictionary_mapping_both_Key_and_value()
         {
             //Arrange
-            var config = new MapperConfiguration
+            var config = ConfigurationHelper.GetMapperConfiguration
             (
                 cfg =>
                 {

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

@@ -12,7 +12,7 @@ public class CanMapExpressionWithLocalExpressionConstant
         public void Map_expression_wchich_includes_local_constant()
         {
             //Arrange
-            var config = new MapperConfiguration
+            var config = ConfigurationHelper.GetMapperConfiguration
             (
                 cfg =>
                 {

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

@@ -12,7 +12,7 @@ public class CanMapMemberFromTypeBinaryExpression
         public void Can_map_using_type_binary_expression_to_test_the_parameter_expression()
         {
             //arrange
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
 
@@ -41,7 +41,7 @@ public void Can_map_using_type_binary_expression_to_test_the_parameter_expressio
         public void Can_map_using_type_binary_expression_to_test_a_member_expression()
         {
             //arrange
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
 
@@ -77,7 +77,7 @@ public void Can_map_using_type_binary_expression_to_test_a_member_expression()
         public void Can_map_using_instance_method_call_to_test_the_parameter_expression()
         {
             //arrange
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
 
@@ -101,7 +101,7 @@ public void Can_map_using_instance_method_call_to_test_the_parameter_expression(
         public void Can_map_using_static_method_call_to_test_the_parameter_expression()
         {
             //arrange
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
 
@@ -129,7 +129,7 @@ public void Can_map_using_static_method_call_to_test_the_parameter_expression()
         public void Can_map_using_static_generic_method_call_to_test_the_parameter_expression()
         {
             //arrange
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
 

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

@@ -198,7 +198,7 @@ public void CanMapNullableSelectorToNonNullableelectorWithoutCustomExpression(st
 
         private static IMapper GetModelToDataMapper()
         {
-            var config = new MapperConfiguration(c =>
+            var config = ConfigurationHelper.GetMapperConfiguration(c =>
             {
                 c.CreateMap<ProductModel, Product>();
             });
@@ -208,7 +208,7 @@ private static IMapper GetModelToDataMapper()
 
         private static IMapper GetDataToModelMapper()
         {
-            var config = new MapperConfiguration(c =>
+            var config = ConfigurationHelper.GetMapperConfiguration(c =>
             {
                 c.CreateMap<Product, ProductModel>();
             });

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

@@ -12,7 +12,7 @@ public class CanMapParameterBodyFromChildReferenceWithoutMemberExpression
         public void Can_map_parameter_body_from_child_reference_without_member_expression()
         {
             // Arrange
-            var config = new MapperConfiguration(c =>
+            var config = ConfigurationHelper.GetMapperConfiguration(c =>
             {
                 c.CreateMap<TestCategory, TestProductDTO>()
                    .ForMember(p => p.Brand, c => c.MapFrom(p => EF.Property<int>(p, "BrandId"))); ;
@@ -42,7 +42,7 @@ public class TestCategory
         }
         public class TestProduct
         {
-            public TestCategory? Category { get; set; }
+            public TestCategory Category { get; set; }
         }
 
         public class TestProductDTO

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

@@ -12,7 +12,7 @@ public class CanMapParameterBodyWithoutMemberExpression
         public void Can_map_parameter_body_without_member_expression()
         {
             // Arrange
-            var config = new MapperConfiguration(c =>
+            var config = ConfigurationHelper.GetMapperConfiguration(c =>
             {
                 c.CreateMap<TestProduct, TestProductDTO>()
                   .ForMember(p => p.Brand, c => c.MapFrom(p => EF.Property<int>(p, "BrandId")));

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

@@ -12,7 +12,7 @@ public class EnumerableDotContainsWorksOnLocalVariables
         [Fact]
         public void Issue87()
         {
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
 

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

@@ -44,7 +44,7 @@ public class GrandChildDest
 
         }
 
-        protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg =>
+        protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg =>
         {
 
             cfg.CreateMap<Source, Dest>()
@@ -145,7 +145,7 @@ public class GrandChildDest
 
         }
 
-        protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg =>
+        protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg =>
         {
             cfg.CreateMap<Source, Dest>()
                 .ForMember(m => m.Child1, opt => opt.ExplicitExpansion())

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

@@ -53,7 +53,7 @@ public class DestWithEnum : Dest
         [Fact]
         public void Can_map_unary_expression_converting_enum_to_int()
         {
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
                 cfg.CreateMap<SourceEnum, DestEnum>();
@@ -77,7 +77,7 @@ public void Can_map_unary_expression_converting_enum_to_int()
         [Fact]
         public void Can_map_single_properties()
         {
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
                 cfg.CreateMap<Source, Dest>();
@@ -100,7 +100,7 @@ public void Can_map_single_properties()
         [Fact]
         public void Can_map_flattened_properties()
         {
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
                 cfg.CreateMap<Source, Dest>();
@@ -123,7 +123,7 @@ public void Can_map_flattened_properties()
         [Fact]
         public void Can_map_custom_mapped_properties()
         {
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
                 cfg.CreateMap<Source, Dest>().ForMember(d => d.Bar, opt => opt.MapFrom(src => src.Foo));
@@ -146,7 +146,7 @@ public void Can_map_custom_mapped_properties()
         [Fact]
         public void Throw_AutoMapperMappingException_if_expression_types_dont_match()
         {
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
                 cfg.CreateMap<Source, Dest>();
@@ -160,7 +160,7 @@ public void Throw_AutoMapperMappingException_if_expression_types_dont_match()
         [Fact]
         public void Can_map_with_different_destination_types()
         {
-            var config = new MapperConfiguration(cfg =>
+            var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
                 cfg.CreateMap<Source, Dest>().ForMember(d => d.Bar, opt => opt.MapFrom(src => src.Foo));

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

@@ -23,7 +23,7 @@ public class DestExpressionHolder
             public Expression<Func<ExpressionMapping.Parent, bool>> Expression { get; set; }
         }
 
-        protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg =>
+        protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg =>
         {
             cfg.AddExpressionMapping();
             cfg.CreateMap<SourceExpressionHolder, DestExpressionHolder>().ReverseMap();
@@ -109,7 +109,7 @@ public Parent Parent
         private Expression<Func<ParentDTO, bool>> _predicateExpression;
         private Parent _valid;
 
-        protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg =>
+        protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(cfg =>
         {
             cfg.AddExpressionMapping();
             cfg.CreateMap<GrandParent, GrandParentDTO>().ReverseMap();
@@ -319,7 +319,7 @@ public class TestModel
             public string Code { get; set; }
         }
 
-        protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(config => config.CreateMap<TestModel, TestData>());
+        protected override MapperConfiguration Configuration { get; } = ConfigurationHelper.GetMapperConfiguration(config => config.CreateMap<TestModel, TestData>());
 
         public void Should_map_with_closures()
         {

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

@@ -69,7 +69,7 @@ protected override MapperConfiguration Configuration
         {
             get
             {
-                return new MapperConfiguration(config =>
+                return ConfigurationHelper.GetMapperConfiguration(config =>
                 {
                     config.AddExpressionMapping();
                     config.CreateMap<Entity<byte>, EntityDto<SimpleEnumByte>>()
@@ -169,7 +169,6 @@ protected override MapperConfiguration Configuration
         [InlineData(SimpleEnumUInt.Value3, 1U)]
         [InlineData(SimpleEnumLong.Value3, 1L)]
         [InlineData(SimpleEnumULong.Value3, 1UL)]
-        [InlineData(SimpleEnumSByte.Value3, (sbyte)3)]
         [InlineData(SimpleEnumByte.Value3, (byte)3)]
         [InlineData(SimpleEnumShort.Value3, (short)3)]
         [InlineData(SimpleEnumUShort.Value3, (ushort)3)]

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

@@ -39,7 +39,7 @@ protected override MapperConfiguration Configuration
         {
             get
             {
-                var config = new MapperConfiguration(cfg =>
+                var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
                 {
                     cfg.AddExpressionMapping();
                     // issue #1886

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

@@ -17,7 +17,7 @@ protected override MapperConfiguration Configuration
         {
             get
             {
-                var config = new MapperConfiguration(cfg =>
+                var config = ConfigurationHelper.GetMapperConfiguration(cfg =>
                 {
                     cfg.AddExpressionMapping();
                     cfg.AddProfile(typeof(DerivedTypeProfile));

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

@@ -73,7 +73,7 @@ public void Should_Map_From_Generic_Type()
 
         private static IMapper CreateMapper()
         {
-            var mapperConfig = new MapperConfiguration(cfg =>
+            var mapperConfig = ConfigurationHelper.GetMapperConfiguration(cfg =>
             {
                 cfg.CreateMap<Model, DTO>()
                     .ForMember(d => d.Nested, opt => opt.MapFrom(s => s));