Merge pull request #124 from Tasteful/feature_AM810

Update to AM 8.1.0

Author: TylerCarlson1

README.md

@@ -1,74 +1,88 @@
 <img src="https://s3.amazonaws.com/automapper/logo.png" alt="AutoMapper"> 
 
-AutoMapper.Collection
-================================
+# AutoMapper.Collection
 Adds ability to map collections to existing collections without re-creating the collection object.
 
 Will Add/Update/Delete items from a preexisting collection object based on user defined equivalency between the collection's generic item type from the source collection and the destination collection.
 
-How to add to AutoMapper?
---------------------------------
+## How to add to AutoMapper?
 Call AddCollectionMappers when configuring
-
-	Mapper.Initialize(cfg =>
-            {
-                cfg.AddCollectionMappers();
-				// Configuration code
-            });
+```
+Mapper.Initialize(cfg =>
+{
+    cfg.AddCollectionMappers();
+    // Configuration code
+});
+```
 Will add new IObjectMapper objects into the master mapping list.
 
-Adding equivalency between two classes
---------------------------------
+## Adding equivalency between two classes
 Adding equivalence to objects is done with EqualityComparison extended from the IMappingExpression class.
-
-	cfg.CreateMap<OrderItemDTO, OrderItem>().EqualityComparison((odto, o) => odto.ID == o.ID);
+```
+cfg.CreateMap<OrderItemDTO, OrderItem>().EqualityComparison((odto, o) => odto.ID == o.ID);
+```
 Mapping OrderDTO back to Order will compare Order items list based on if their ID's match
-
-	Mapper.Map<List<OrderDTO>,List<Order>>(orderDtos, orders);
+```
+Mapper.Map<List<OrderDTO>,List<Order>>(orderDtos, orders);
+```
 If ID's match will map OrderDTO to Order
 
 If OrderDTO exists and Order doesn't add to collection
 
 If Order exists and OrderDTO doesn't remove from collection
 
-Why update collection?  Just recreate it 
--------------------------------
+## Why update collection? Just recreate it 
 ORMs don't like setting the collection, so you need to add and remove from preexisting one.
 
 This automates the process by just specifying what is equal to each other.
 
-Can it just figure out the ID equivalency for me in EF?
--------------------------------
-Automapper.Collection.EntityFramework can do that for you.
-	
-	Mapper.Initialize(cfg =>
-            {
-                cfg.AddCollectionMappers();
-                cfg.SetGeneratePropertyMaps<GenerateEntityFrameworkPrimaryKeyPropertyMaps<DB>>();
-				// Configuration code
-            });
+## Can it just figure out the ID equivalency for me in Entity Framework?
+`Automapper.Collection.EntityFramework` or `Automapper.Collection.EntityFrameworkCore` can do that for you.
+
+```
+Mapper.Initialize(cfg =>
+{
+    cfg.AddCollectionMappers();
+    cfg.SetGeneratePropertyMaps<GenerateEntityFrameworkPrimaryKeyPropertyMaps<DB>>();
+    // Configuration code
+});
+```
 User defined equality expressions will overwrite primary key expressions.
 
-What about comparing to a single existing Entity for updating?
---------------------------------
+## What about comparing to a single existing Entity for updating?
 Automapper.Collection.EntityFramework does that as well through extension method from of DbSet<TEntity>.
 
 Translate equality between dto and EF object to an expression of just the EF using the dto's values as constants.
-
-	dbContext.Orders.Persist().InsertOrUpdate<OrderDTO>(newOrderDto);
-	dbContext.Orders.Persist().InsertOrUpdate<OrderDTO>(existingOrderDto);
-	dbContext.Orders.Persist().Remove<OrderDTO>(deletedOrderDto);
-	dbContext.SubmitChanges();
+```
+dbContext.Orders.Persist().InsertOrUpdate<OrderDTO>(newOrderDto);
+dbContext.Orders.Persist().InsertOrUpdate<OrderDTO>(existingOrderDto);
+dbContext.Orders.Persist().Remove<OrderDTO>(deletedOrderDto);
+dbContext.SubmitChanges();
+```
 **Note:** This is done by converting the OrderDTO to Expression<Func<Order,bool>> and using that to find matching type in the database.  You can also map objects to expressions as well.
 
 Persist doesn't call submit changes automatically
 
-How to get it
---------------------------------
-On Nuget
+## Where can I get it?
+
+First, [install NuGet](http://docs.nuget.org/docs/start-here/installing-nuget). Then, install [AutoMapper.Collection](https://www.nuget.org/packages/AutoMapper.Collection/) from the package manager console:
+```
+PM> Install-Package AutoMapper.Collection
+```
+
+### Additional packages
+
+#### AutoMapper Collection for Entity Framework
+```
+PM> Install-Package AutoMapper.Collection.EntityFramework
+```
 
-	PM> Install-Package AutoMapper.Collection
-	PM> Install-Package AutoMapper.Collection.EntityFramework
-Also have AutoMapper.LinqToSQL
+#### AutoMapper Collection for Entity Framework Core
+```
+PM> Install-Package AutoMapper.Collection.EntityFrameworkCore
+```
 
-	PM> Install-Package AutoMapper.Collection.LinqToSQL
+#### AutoMapper Collection for LinqToSQL
+```
+PM> Install-Package AutoMapper.Collection.LinqToSQL
+```

src/AutoMapper.Collection.EntityFramework.Tests/AssemblyInfo.cs

@@ -10,22 +10,20 @@
 
 namespace AutoMapper.Collection.EntityFramework.Tests
 {
-    public class EntityFramworkTests
+    public class EntityFramworkTests : MappingTestBase
     {
-        public EntityFramworkTests()
+        private void ConfigureMapper(IMapperConfigurationExpression cfg)
         {
-            Mapper.Reset();
-            Mapper.Initialize(x =>
-            {
-                x.AddCollectionMappers();
-                x.CreateMap<ThingDto, Thing>().ReverseMap();
-                x.SetGeneratePropertyMaps<GenerateEntityFrameworkPrimaryKeyPropertyMaps<DB>>();
-            });
+            cfg.AddCollectionMappers();
+            cfg.CreateMap<ThingDto, Thing>().ReverseMap();
+            cfg.SetGeneratePropertyMaps<GenerateEntityFrameworkPrimaryKeyPropertyMaps<DB>>();
         }
 
         [Fact]
         public void Should_Persist_To_Update()
         {
+            var mapper = CreateMapper(ConfigureMapper);
+
             var db = new DB();
             db.Things.Add(new Thing { Title = "Test2" });
             db.Things.Add(new Thing { Title = "Test3" });
@@ -36,7 +34,7 @@ public void Should_Persist_To_Update()
 
             var item = db.Things.First();
 
-            db.Things.Persist().InsertOrUpdate(new ThingDto { ID = item.ID, Title = "Test" });
+            db.Things.Persist(mapper).InsertOrUpdate(new ThingDto { ID = item.ID, Title = "Test" });
             Assert.Equal(1, db.ChangeTracker.Entries<Thing>().Count(x => x.State == EntityState.Modified));
 
             Assert.Equal(3, db.Things.Count());
@@ -47,6 +45,8 @@ public void Should_Persist_To_Update()
         [Fact]
         public void Should_Persist_To_Insert()
         {
+            var mapper = CreateMapper(ConfigureMapper);
+
             var db = new DB();
             db.Things.Add(new Thing { Title = "Test2" });
             db.Things.Add(new Thing { Title = "Test3" });
@@ -55,7 +55,7 @@ public void Should_Persist_To_Insert()
 
             Assert.Equal(3, db.Things.Count());
 
-            db.Things.Persist().InsertOrUpdate(new ThingDto { Title = "Test" });
+            db.Things.Persist(mapper).InsertOrUpdate(new ThingDto { Title = "Test" });
             Assert.Equal(3, db.Things.Count());
             Assert.Equal(1, db.ChangeTracker.Entries<Thing>().Count(x => x.State == EntityState.Added));
 
@@ -69,7 +69,7 @@ public void Should_Persist_To_Insert()
         public class DB : DbContext
         {
             public DB()
-                : base(new SqlCeConnection("Data Source=MyDatabase.sdf;Persist Security Info=False;"), contextOwnsConnection: true)
+                : base(new SqlCeConnection($"Data Source={Guid.NewGuid()}.sdf;Persist Security Info=False;"), contextOwnsConnection: true)
             {
                 Things.RemoveRange(Things);
                 SaveChanges();

src/AutoMapper.Collection.EntityFramework.Tests/EntityFramworkTests.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace AutoMapper.Collection
+{
+    public abstract class MappingTestBase
+    {
+        protected IMapper CreateMapper(Action<IMapperConfigurationExpression> cfg)
+        {
+            var map = new MapperConfiguration(cfg);
+            map.CompileMappings();
+
+            var mapper = map.CreateMapper();
+            mapper.ConfigurationProvider.AssertConfigurationIsValid();
+            return mapper;
+        }
+    }
+}

src/AutoMapper.Collection.EntityFramework.Tests/MappingTestBase.cs

@@ -1,31 +1,19 @@
 using AutoMapper.EquivalencyExpression;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 
 namespace AutoMapper.Collection
 {
-    public abstract class InheritanceWithCollectionTests
+    public abstract class InheritanceWithCollectionTests : MappingTestBase
     {
-        protected abstract void Create(IMapperConfigurationExpression cfg);
-
-        private IMapper CreateMapper()
-        {
-            var map = new MapperConfiguration(Create);
-            map.AssertConfigurationIsValid();
-            map.CompileMappings();
-
-            return map.CreateMapper();
-        }
+        protected abstract void ConfigureMapper(IMapperConfigurationExpression cfg);
 
         [Fact]
         public void TypeMap_Should_include_base_types()
         {
-            var mapper = CreateMapper();
+            var mapper = CreateMapper(ConfigureMapper);
             var typeMap = mapper.ConfigurationProvider.ResolveTypeMap(typeof(MailOrderDomain), typeof(OrderEf));
 
             var typePairs = new[]{
@@ -37,7 +25,7 @@ public void TypeMap_Should_include_base_types()
         [Fact]
         public void TypeMap_Should_include_derivied_types()
         {
-            var mapper = CreateMapper();
+            var mapper = CreateMapper(ConfigureMapper);
             var typeMap = mapper.ConfigurationProvider.ResolveTypeMap(typeof(OrderDomain), typeof(OrderEf));
 
             var typePairs = new[]{
@@ -50,7 +38,7 @@ public void TypeMap_Should_include_derivied_types()
         [Fact]
         public void Map_Should_ReturnOnlineOrderEf_When_ListIsOfTypeOrderEf()
         {
-            var mapper = CreateMapper();
+            var mapper = CreateMapper(ConfigureMapper);
 
             //arrange
             var orderDomain = new OnlineOrderDomain { Id = "Id", Key = "Key" };
@@ -85,7 +73,7 @@ public void Map_Should_ReturnOnlineOrderEf_When_ListIsOfTypeOrderEf()
         [Fact]
         public void Map_FromEfToDomain_And_AddAnOnlineOrderInTheDomainObject_And_ThenMapBackToEf_Should_UseTheSameReferenceInTheEfCollection()
         {
-            var mapper = CreateMapper();
+            var mapper = CreateMapper(ConfigureMapper);
 
             //arrange
             var onlineOrderEf = new OnlineOrderEf { Id = "Id", Key = "Key" };
@@ -193,7 +181,7 @@ public List<OrderEf> Resolve(RootDomain source, RootEf destination, List<OrderEf
 
         public class Include : InheritanceWithCollectionTests
         {
-            protected override void Create(IMapperConfigurationExpression cfg)
+            protected override void ConfigureMapper(IMapperConfigurationExpression cfg)
             {
                 cfg.ShouldMapProperty = propertyInfo => propertyInfo.GetMethod.IsPublic || propertyInfo.GetMethod.IsAssembly || propertyInfo.GetMethod.IsFamily || propertyInfo.GetMethod.IsPrivate;
                 cfg.AddCollectionMappers();
@@ -238,7 +226,7 @@ protected override void Create(IMapperConfigurationExpression cfg)
 
         public class IncludeBase : InheritanceWithCollectionTests
         {
-            protected override void Create(IMapperConfigurationExpression cfg)
+            protected override void ConfigureMapper(IMapperConfigurationExpression cfg)
             {
                 cfg.ShouldMapProperty = propertyInfo => propertyInfo.GetMethod.IsPublic || propertyInfo.GetMethod.IsAssembly || propertyInfo.GetMethod.IsFamily || propertyInfo.GetMethod.IsPrivate;
                 cfg.AddCollectionMappers();