Update source to 1.2.0

Update source to 1.2.0

Author: zzzprojects

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit.cs

@@ -10,8 +10,8 @@
 #if EF5 || EF6
 using System.Data.Entity;
 
-#elif EF7
-using Microsoft.Data.Entity;
+#elif EFCORE
+using Microsoft.EntityFrameworkCore;
 
 #endif
 

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit/AuditEntityAdded.cs

@@ -11,8 +11,8 @@
 #elif EF6
 using System.Data.Entity.Core.Objects;
 
-#elif EF7
-using Microsoft.Data.Entity.ChangeTracking;
+#elif EFCORE
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 #endif
 
@@ -25,7 +25,7 @@ public partial class Audit
         /// <param name="objectStateEntry">The object state entry.</param>
 #if EF5 || EF6
         public static void AuditEntityAdded(Audit audit, ObjectStateEntry objectStateEntry)
-#elif EF7
+#elif EFCORE
         public static void AuditEntityAdded(Audit audit, EntityEntry objectStateEntry)
 #endif
         {
@@ -42,7 +42,7 @@ public static void AuditEntityAdded(Audit audit, EntityEntry objectStateEntry)
                 entry.DelayedKey = objectStateEntry;
             }
             AuditEntityAdded(entry, objectStateEntry.CurrentValues);
-#elif EF7
+#elif EFCORE
     // TODO: We must check if the key IsTemporary! We can maybe use flag...
     //if (!objectStateEntry.IsKeySet)
     //{
@@ -78,7 +78,7 @@ public static void AuditEntityAdded(AuditEntry auditEntry, DbUpdatableDataRecord
                 }
             }
         }
-#elif EF7
+#elif EFCORE
     /// <summary>Audit entity added.</summary>
     /// <param name="objectStateEntry">The object state entry.</param>
         public static void AuditEntityAdded(AuditEntry entry, EntityEntry objectStateEntry)

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit/AuditEntityDeleted.cs

@@ -12,8 +12,8 @@
 #elif EF6
 using System.Data.Entity.Core.Objects;
 
-#elif EF7
-using Microsoft.Data.Entity.ChangeTracking;
+#elif EFCORE
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 #endif
 
@@ -26,7 +26,7 @@ public partial class Audit
         /// <param name="objectStateEntry">The object state entry.</param>
 #if EF5 || EF6
         public static void AuditEntityDeleted(Audit audit, ObjectStateEntry objectStateEntry)
-#elif EF7
+#elif EFCORE
         public static void AuditEntityDeleted(Audit audit, EntityEntry objectStateEntry)
 #endif
         {
@@ -38,7 +38,7 @@ public static void AuditEntityDeleted(Audit audit, EntityEntry objectStateEntry)
 
 #if EF5 || EF6
             AuditEntityDeleted(entry, objectStateEntry.OriginalValues);
-#elif EF7
+#elif EFCORE
             AuditEntityDeleted(entry, objectStateEntry);
 #endif
             audit.Entries.Add(entry);
@@ -68,7 +68,7 @@ public static void AuditEntityDeleted(AuditEntry entry, DbDataRecord record, str
                 }
             }
         }
-#elif EF7
+#elif EFCORE
     /// <summary>Audit entity deleted.</summary>
     /// <param name="objectStateEntry">The object state entry.</param>
         public static void AuditEntityDeleted(AuditEntry entry, EntityEntry objectStateEntry)

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit/AuditEntityModified.cs

@@ -13,9 +13,9 @@
 #elif EF6
 using System.Data.Entity.Core.Objects;
 
-#elif EF7
-using Microsoft.Data.Entity;
-using Microsoft.Data.Entity.ChangeTracking;
+#elif EFCORE
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 #endif
 
@@ -28,7 +28,7 @@ public partial class Audit
         /// <param name="objectStateEntry">The object state entry.</param>
 #if EF5 || EF6
         public static void AuditEntityModified(Audit audit, ObjectStateEntry objectStateEntry, AuditEntryState state)
-#elif EF7
+#elif EFCORE
         public static void AuditEntityModified(Audit audit, EntityEntry objectStateEntry, AuditEntryState state)
 #endif
         {
@@ -39,7 +39,7 @@ public static void AuditEntityModified(Audit audit, EntityEntry objectStateEntry
 
 #if EF5 || EF6
             AuditEntityModified(audit, entry, objectStateEntry, objectStateEntry.OriginalValues, objectStateEntry.CurrentValues);
-#elif EF7
+#elif EFCORE
             AuditEntityModified(audit, entry, objectStateEntry);
 #endif
             audit.Entries.Add(entry);
@@ -79,7 +79,7 @@ public static void AuditEntityModified(Audit audit, AuditEntry entry, ObjectStat
                 }
             }
         }
-#elif EF7
+#elif EFCORE
     /// <summary>Audit entity modified.</summary>
     /// <param name="objectStateEntry">The object state entry.</param>
         public static void AuditEntityModified(Audit audit, AuditEntry entry, EntityEntry objectStateEntry)
@@ -90,7 +90,7 @@ public static void AuditEntityModified(Audit audit, AuditEntry entry, EntityEntr
 
                 if (entry.Parent.CurrentOrDefaultConfiguration.IsAuditedProperty(entry.Entry, propertyEntry.Name))
                 {
-                    if (audit.Configuration.IgnorePropertyUnchanged || property.Metadata.IsKey() || property.IsModified)
+                    if (!audit.Configuration.IgnorePropertyUnchanged || property.Metadata.IsKey() || property.IsModified)
                     {
                         entry.Properties.Add(new AuditEntryProperty(entry, propertyEntry.Name, property.OriginalValue, property.CurrentValue));
                     }

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit/AuditRelationshipAdded.cs

@@ -15,7 +15,7 @@
 using System.Data.Entity.Core;
 using System.Data.Entity.Core.Objects;
 
-#elif EF7
+#elif EFCORE
 using Microsoft.Data.Entity.ChangeTracking;
 
 #endif
@@ -29,7 +29,7 @@ public partial class Audit
         /// <param name="objectStateEntry">The object state entry.</param>
 #if EF5 || EF6
         public static void AuditRelationAdded(Audit audit, ObjectStateEntry objectStateEntry)
-#elif EF7
+#elif EFCORE
         public static void AuditRelationAdded(Audit audit, EntityEntry objectStateEntry)
 #endif
         {

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit/AuditRelationshipDeleted.cs

@@ -14,7 +14,7 @@
 using System.Data.Entity.Core;
 using System.Data.Entity.Core.Objects;
 
-#elif EF7
+#elif EFCORE
 using Microsoft.Data.Entity.ChangeTracking;
 
 #endif
@@ -28,7 +28,7 @@ public partial class Audit
         /// <param name="objectStateEntry">The object state entry.</param>
 #if EF5 || EF6
         public static void AuditRelationDeleted(Audit audit, ObjectStateEntry objectStateEntry)
-#elif EF7
+#elif EFCORE
         public static void AuditRelationDeleted(Audit audit, EntityEntry objectStateEntry)
 #endif
         {

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit/PostSaveChanges.cs

@@ -14,8 +14,8 @@
 using System.Data.Entity.Core;
 using System.Data.Entity.Core.Objects;
 
-#elif EF7
-using Microsoft.Data.Entity.ChangeTracking;
+#elif EFCORE
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 #endif
 
@@ -33,7 +33,7 @@ public static void PostSaveChanges(Audit audit)
                 {
 #if EF5 || EF6
                     var objectStateEntry = entry.DelayedKey as ObjectStateEntry;
-#elif EF7
+#elif EFCORE
                     var objectStateEntry = entry.DelayedKey as EntityEntry;
 #endif
                     if (objectStateEntry != null)
@@ -71,7 +71,7 @@ public static void PostSaveChanges(Audit audit)
                             }
                         }
                     }
-#elif EF7
+#elif EFCORE
                         foreach (var keyValue in objectStateEntry.Metadata.GetKeys())
                         {
                             var key = objectStateEntry.Property(keyValue.Properties[0].Name);

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Audit/PreSaveChanges.cs

@@ -14,9 +14,9 @@
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
 
-#elif EF7
+#elif EFCORE
 using System.Linq;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 
 #endif
 
@@ -33,7 +33,7 @@ public static void PreSaveChanges(Audit audit, DbContext context)
             var objectContext = ((IObjectContextAdapter) context).ObjectContext;
             objectContext.DetectChanges();
             var changes = objectContext.ObjectStateManager.GetObjectStateEntries(EntityState.Added | EntityState.Modified | EntityState.Deleted);
-#elif EF7
+#elif EFCORE
             context.ChangeTracker.DetectChanges();
             var changes = context.ChangeTracker.Entries().Where(x => x.State == EntityState.Added ||
                                                                      x.State == EntityState.Modified ||

src/Z.EntityFramework.Plus.EF5.NET40/Audit/AuditConfiguration.cs

@@ -11,9 +11,9 @@
 #if EF5 || EF6
 using System.Data.Entity;
 
-#elif EF7
-using Microsoft.Data.Entity;
-using Microsoft.Data.Entity.ChangeTracking;
+#elif EFCORE
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 #endif
 

src/Z.EntityFramework.Plus.EF5.NET40/Audit/AuditConfiguration/FormatValue.cs

@@ -6,17 +6,19 @@
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
 using System;
+
 #if EF5
 using System.Data;
+using System.Data.Entity;
 using System.Data.Objects;
 
 #elif EF6
 using System.Data.Entity;
 using System.Data.Entity.Core.Objects;
 
-#elif EF7
-using Microsoft.Data.Entity;
-using Microsoft.Data.Entity.ChangeTracking;
+#elif EFCORE
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 #endif
 
@@ -30,7 +32,7 @@ public partial class AuditConfiguration
         /// <returns>The formatted value.</returns>
 #if EF5 || EF6
         public string FormatValue(ObjectStateEntry entry, string propertyName, object currentValue)
-#elif EF7
+#elif EFCORE
         public string FormatValue(EntityEntry entry, string propertyName, object currentValue)
 #endif
         {