Merge pull request #35 from AutoMapper/automapper-9-0

AutoMapper 9.0 upgrade

Author: BlaiseD

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Authors>Jimmy Bogard</Authors>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>2.0.2</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <WarningsAsErrors>true</WarningsAsErrors>
     <NoWarn>$(NoWarn);1701;1702;1591</NoWarn>
   </PropertyGroup>

README.md

@@ -4,10 +4,10 @@ AutoMapper extentions for mapping expressions (OData)
 To use, configure using the configuration helper method:
 
 ```c#
-Mapper.Initialize(cfg => {
+var mapper = new Mapper(new MapperConfiguration(cfg => {
     cfg.AddExpressionMapping();
 	// Rest of your configuration
-});
+}));
 
 // or if using the MS Ext DI:
 

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

@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="8.1.0" />
+    <PackageReference Include="AutoMapper" Version="9.0.0" />
   </ItemGroup>
 
 </Project>

src/AutoMapper.Extensions.ExpressionMapping/MapperExtensions.cs

@@ -36,8 +36,8 @@ private static TDestDelegate MapExpression<TDestDelegate>(this IMapper mapper, L
         {
             return MapExpression<TDestDelegate>
             (
-                mapper ?? Mapper.Instance,
-                mapper == null ? Mapper.Configuration : mapper.ConfigurationProvider,
+                mapper,
+                mapper.ConfigurationProvider,
                 expression,
                 expression.GetType().GetGenericArguments()[0],
                 typeof(TDestDelegate).GetGenericArguments()[0],

src/AutoMapper.Extensions.ExpressionMapping/QueryableExtensions.cs

@@ -5,9 +5,6 @@ namespace AutoMapper.Extensions.ExpressionMapping
 {
     public static class QueryableExtensions
     {
-        public static IQueryDataSourceInjection<TSource> UseAsDataSource<TSource>(this IQueryable<TSource> dataSource)
-            => dataSource.UseAsDataSource(Mapper.Configuration?.CreateMapper());
-
         public static IQueryDataSourceInjection<TSource> UseAsDataSource<TSource>(this IQueryable<TSource> dataSource, IConfigurationProvider config)
             => dataSource.UseAsDataSource(config.CreateMapper());
 

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

@@ -111,7 +111,6 @@ public Parent Parent
         protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg =>
         {
             cfg.AddExpressionMapping();
-            cfg.CreateMissingTypeMaps = false;
             cfg.CreateMap<GrandParent, GrandParentDTO>().ReverseMap();
             cfg.CreateMap<Parent, ParentDTO>().ReverseMap();
             cfg.CreateMap<Child, ChildDTO>()

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

@@ -607,26 +607,25 @@ public void Shoud_convert_type_changes()
             destItem.DestValue.ShouldBe(sourceItem.SrcValue);
         }
 
-        [Fact]
+        [Fact(Skip="Conventions not available like this.")]
         public void Shoud_work_with_conventions()
         {
-            var mapper = new MapperConfiguration(cfg => cfg.AddConditionalObjectMapper()
-                .Where((s, d) => s.Name == d.Name + "Model" || s.Name + "Model" == d.Name)).CreateMapper();
+            //var mapper = new MapperConfiguration(cfg => cfg.AddConditionalObjectMapper()
+            //    .Where((s, d) => s.Name == d.Name + "Model" || s.Name + "Model" == d.Name)).CreateMapper();
 
 
-            IQueryable<Destination> result = _source.AsQueryable()
-                .UseAsDataSource(Mapper).For<Destination>()
-                .Where(s => s.DestValue > 6);
+            //IQueryable<Destination> result = _source.AsQueryable()
+            //    .UseAsDataSource(Mapper).For<Destination>()
+            //    .Where(s => s.DestValue > 6);
 
-            result.Count().ShouldBe(1);
-            result.Any(s => s.DestValue > 6).ShouldBeTrue();
+            //result.Count().ShouldBe(1);
+            //result.Any(s => s.DestValue > 6).ShouldBeTrue();
         }
 
         private static IMapper SetupAutoMapper()
         {
             var config = new MapperConfiguration(cfg =>
             {
-                cfg.CreateMissingTypeMaps = false;
                 cfg.CreateMap<User, UserModel>()
                 .ForMember(d => d.Id, opt => opt.MapFrom(s => s.UserId))
                 .ForMember(d => d.FullName, opt => opt.MapFrom(s => s.Name))

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.ForPath.Tests.cs

@@ -139,7 +139,7 @@ private void SetupAutoMapper()
             var config = new MapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
-                cfg.AddProfiles(typeof(ForPathCustomerProfile));
+                cfg.AddMaps(typeof(ForPathCustomerProfile));
             });
 
             mapper = config.CreateMapper();

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.Structs.Tests.cs

@@ -19,6 +19,8 @@ public void Can_map_value_types_constants_with_instance_methods()
                 c.CreateMap<GarageModel, Garage>()
                     .ReverseMap()
                         .ForMember(d => d.Color, opt => opt.MapFrom(s => s.Truck.Color));
+                c.CreateMap<TruckModel, Truck>()
+                    .ReverseMap();
             });
 
             config.AssertConfigurationIsValid();
@@ -45,6 +47,8 @@ public void Can_convert_return_type()
                 c.CreateMap<GarageModel, Garage>()
                     .ReverseMap()
                         .ForMember(d => d.Color, opt => opt.MapFrom(s => s.Truck.Color));
+                c.CreateMap<TruckModel, Truck>()
+                    .ReverseMap();
             });
 
             config.AssertConfigurationIsValid();

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

@@ -262,7 +262,6 @@ public void Map_expression_should_throws_exception_when_mapping_is_missed()
             {
                 cfg.AddExpressionMapping();
                 cfg.CreateMap<Car, CarModel>();
-                cfg.CreateMissingTypeMaps = false;
             });
 
             var customMapper = config.CreateMapper();
@@ -276,7 +275,7 @@ public void Map_expression_should_throws_exception_when_mapping_is_missed()
                     {
                         exception.InnerException.ShouldNotBeNull();
                         exception.InnerException.ShouldBeOfType<InvalidOperationException>();
-                        exception.InnerException.Message.ShouldContain("Mapper.CreateMap<CarModel, Car>", Case.Insensitive);
+                        exception.InnerException.Message.ShouldContain("CreateMap<CarModel, Car>", Case.Insensitive);
                     });
         }
 
@@ -700,7 +699,7 @@ private static void SetupAutoMapper()
             var config = new MapperConfiguration(cfg =>
             {
                 cfg.AddExpressionMapping();
-                cfg.AddProfiles(typeof(OrganizationProfile));
+                cfg.AddMaps(typeof(OrganizationProfile));
             });
 
             mapper = config.CreateMapper();
@@ -1198,7 +1197,7 @@ public OrganizationProfile()
                 .ReverseMap()
                 .ForMember(d => d.Count, opt => opt.MapFrom(s => s.Count));
 
-            CreateMissingTypeMaps = true;
+            CreateMap<Branch, BranchModel>();
         }
     }