Set value comparer for ExtraProperties and Properties dictionary.

Resolve #2459

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.IO.Compression;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -390,7 +391,11 @@ namespace Volo.Abp.EntityFrameworkCore
                         d => JsonConvert.SerializeObject(d, Formatting.None),
                         s => JsonConvert.DeserializeObject<Dictionary<string, object>>(s)
                     )
-                    .HasColumnName(nameof(IHasExtraProperties.ExtraProperties));
+                    .HasColumnName(nameof(IHasExtraProperties.ExtraProperties))
+                    .Metadata.SetValueComparer(new ValueComparer<Dictionary<string, object>>(
+                        (d1, d2) => d1.SequenceEqual(d2),
+                        d => d.Aggregate(0, (k, v) => HashCode.Combine(k, v.GetHashCode())),
+                        d => d.ToDictionary(k => k.Key, v => v.Value)));
             });
         }
 

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Newtonsoft.Json;
 using Volo.Abp.Auditing;
@@ -61,7 +63,11 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
                         d => JsonConvert.SerializeObject(d, Formatting.None),
                         s => JsonConvert.DeserializeObject<Dictionary<string, object>>(s)
                     )
-                    .HasColumnName(nameof(IHasExtraProperties.ExtraProperties));
+                    .HasColumnName(nameof(IHasExtraProperties.ExtraProperties))
+                    .Metadata.SetValueComparer(new ValueComparer<Dictionary<string, object>>(
+                        (d1, d2) => d1.SequenceEqual(d2),
+                        d => d.Aggregate(0, (k, v) => HashCode.Combine(k, v.GetHashCode())),
+                        d => d.ToDictionary(k => k.Key, v => v.Value)));
             }
         }
 

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.IO.Compression;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Newtonsoft.Json;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
@@ -205,7 +208,10 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                     .HasConversion(
                         d => JsonConvert.SerializeObject(d, Formatting.None),
                         s => JsonConvert.DeserializeObject<Dictionary<string, string>>(s)
-                    );
+                    ).Metadata.SetValueComparer(new ValueComparer<Dictionary<string, string>>(
+                        (d1, d2) => d1.SequenceEqual(d2),
+                        d => d.Aggregate(0, (k, v) => HashCode.Combine(k, v.GetHashCode())),
+                        d => d.ToDictionary(k => k.Key, v => v.Value)));
 
                 identityResource.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.IdentityResourceId).IsRequired();
             });
@@ -232,7 +238,10 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                     .HasConversion(
                         d => JsonConvert.SerializeObject(d, Formatting.None),
                         s => JsonConvert.DeserializeObject<Dictionary<string, string>>(s)
-                    );
+                    ).Metadata.SetValueComparer(new ValueComparer<Dictionary<string, string>>(
+                        (d1, d2) => d1.SequenceEqual(d2),
+                        d => d.Aggregate(0, (k, v) => HashCode.Combine(k, v.GetHashCode())),
+                        d => d.ToDictionary(k => k.Key, v => v.Value)));
 
                 apiResource.HasMany(x => x.Secrets).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();
                 apiResource.HasMany(x => x.Scopes).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();