Update to AM 9.0.0

Author: Tasteful

src/AutoMapper.Collection.EntityFramework/Extensions.cs

@@ -9,16 +9,18 @@ namespace AutoMapper.EntityFramework
     public static class Extensions
     {
         /// <summary>
+        /// Obsolete: Use Persist(IMapper) instead.
         /// Create a Persistence object for the <see cref="T:System.Data.Entity.DbSet`1"/> to have data persisted or removed from
         /// Uses static API's Mapper for finding TypeMap between classes
         /// </summary>
         /// <typeparam name="TSource">Source table type to be updated</typeparam>
         /// <param name="source">DbSet to be updated</param>
         /// <returns>Persistence object to Update or Remove data</returns>
+        [Obsolete("Use Persist(IMapper) instead.", true)]
         public static IPersistence Persist<TSource>(this DbSet<TSource> source)
             where TSource : class
         {
-            return new Persistence<TSource>(source, Mapper.Instance);
+            throw new NotSupportedException();
         }
 
         /// <summary>

src/AutoMapper.Collection.EntityFramework/Persistence.cs

@@ -14,7 +14,7 @@ public class Persistence<TTo> : IPersistence
         public Persistence(DbSet<TTo> sourceSet, IMapper mapper)
         {
             _sourceSet = sourceSet;
-            _mapper = mapper;
+            _mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
         }
 
         public void InsertOrUpdate<TFrom>(TFrom from)
@@ -25,10 +25,7 @@ public void InsertOrUpdate<TFrom>(TFrom from)
 
         public void InsertOrUpdate(Type type, object from)
         {
-            var equivExpr = _mapper == null
-                ? Mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) as Expression<Func<TTo, bool>>
-                : _mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) as Expression<Func<TTo, bool>>;
-            if (equivExpr == null)
+            if (!(_mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) is Expression<Func<TTo, bool>> equivExpr))
                 return;
 
             var to = _sourceSet.FirstOrDefault(equivExpr);
@@ -38,18 +35,13 @@ public void InsertOrUpdate(Type type, object from)
                 to = _sourceSet.Create<TTo>();
                 _sourceSet.Add(to);
             }
-            if (_mapper == null)
-                Mapper.Map(from, to);
-            else
-                _mapper.Map(from,to);
+            _mapper.Map(from, to);
         }
 
         public void Remove<TFrom>(TFrom from)
             where TFrom : class
         {
-            var equivExpr = _mapper == null
-                ? Mapper.Map<TFrom, Expression<Func<TTo, bool>>>(from)
-                : _mapper.Map<TFrom, Expression<Func<TTo, bool>>>(from);
+            var equivExpr = _mapper.Map<TFrom, Expression<Func<TTo, bool>>>(from);
             if (equivExpr == null)
                 return;
             var to = _sourceSet.FirstOrDefault(equivExpr);

src/AutoMapper.Collection.LinqToSQL/Persistence.cs

@@ -13,7 +13,7 @@ public class Persistence<TTo> : IPersistence
 
         public Persistence(Table<TTo> sourceSet, IMapper mapper)
         {
-            _mapper = mapper;
+            _mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
             _sourceSet = sourceSet;
         }
 
@@ -25,10 +25,7 @@ public void InsertOrUpdate<TFrom>(TFrom from)
 
         public void InsertOrUpdate(Type type, object from)
         {
-            var equivExpr = _mapper == null
-                ? Mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) as Expression<Func<TTo, bool>>
-                : _mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) as Expression<Func<TTo, bool>>;
-            if (equivExpr == null)
+            if (!(_mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) is Expression<Func<TTo, bool>> equivExpr))
                 return;
 
             var to = _sourceSet.FirstOrDefault(equivExpr);
@@ -38,18 +35,13 @@ public void InsertOrUpdate(Type type, object from)
                 to = Activator.CreateInstance<TTo>();
                 _sourceSet.InsertOnSubmit(to);
             }
-            if (_mapper == null)
-                Mapper.Map(from, to);
-            else
-                _mapper.Map(from, to);
+            _mapper.Map(from, to);
         }
 
         public void Remove<TFrom>(TFrom from)
             where TFrom : class
         {
-            var equivExpr = _mapper == null
-                ? Mapper.Map<TFrom, Expression<Func<TTo, bool>>>(from)
-                : _mapper.Map<TFrom, Expression<Func<TTo, bool>>>(from);
+            var equivExpr = _mapper.Map<TFrom, Expression<Func<TTo, bool>>>(from);
             if (equivExpr == null)
                 return;
             var to = _sourceSet.FirstOrDefault(equivExpr);

src/AutoMapper.Collection.LinqToSQL/PersistenceExtensions.cs

@@ -9,16 +9,18 @@ namespace AutoMapper.Collection.LinqToSQL
     public static class PersistenceExtensions
     {
         /// <summary>
+        /// Obsolete: Use Persist(IMapper) instead.
         /// Create a Persistence object for the <see cref="T:System.Data.Entity.DbSet`1"/> to have data persisted or removed from
         /// Uses static API's Mapper for finding TypeMap between classes
         /// </summary>
         /// <typeparam name="TSource">Source table type to be updated</typeparam>
         /// <param name="source">Table to be updated</param>
         /// <returns>Persistence object to Update or Remove data</returns>
+        [Obsolete("Use Persist(IMapper) instead.", true)]
         public static IPersistence Persist<TSource>(this Table<TSource> source)
             where TSource : class
         {
-            return new Persistence<TSource>(source, Mapper.Instance);
+            throw new NotSupportedException();
         }
 
         /// <summary>

src/AutoMapper.Collection/AutoMapper.Collection.csproj

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