From 24ed94a32808588d8a208941bd19916bdf5130a0 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 9 Jan 2020 15:44:42 +0800
Subject: [PATCH] Make AbpDictionaryValueComparer support generics to resolve
 migration errors.

---
 .../Modeling/AbpEntityTypeBuilderExtensions.cs            | 2 +-
 .../ValueComparers/AbpDictionaryValueComparer.cs          | 2 +-
 .../IdentityServerDbContextModelCreatingExtensions.cs     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
index dceaeaf74f..6db09d4d17 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
@@ -59,7 +59,7 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
                 b.Property<Dictionary<string, object>>(nameof(IHasExtraProperties.ExtraProperties))
                     .HasColumnName(nameof(IHasExtraProperties.ExtraProperties))
                     .HasConversion(new AbpJsonValueConverter<Dictionary<string, object>>())
-                    .Metadata.SetValueComparer(new AbpDictionaryValueComparer());
+                    .Metadata.SetValueComparer(new AbpDictionaryValueComparer<string, object>());
             }
         }
 
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/AbpDictionaryValueComparer.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/AbpDictionaryValueComparer.cs
index 4efd8bfa63..c6959b0801 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/AbpDictionaryValueComparer.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/AbpDictionaryValueComparer.cs
@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace Volo.Abp.EntityFrameworkCore.ValueComparers
 {
-    public class AbpDictionaryValueComparer : ValueComparer<Dictionary<string, object>>
+    public class AbpDictionaryValueComparer<TKey, TValue> : ValueComparer<Dictionary<TKey, TValue>>
     {
         public AbpDictionaryValueComparer()
             : base(
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
index 8776d6ed83..9f65e4e419 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
@@ -204,8 +204,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 identityResource.Property(x => x.DisplayName).HasMaxLength(IdentityResourceConsts.DisplayNameMaxLength);
                 identityResource.Property(x => x.Description).HasMaxLength(IdentityResourceConsts.DescriptionMaxLength);
                 identityResource.Property(x => x.Properties)
-                    .HasConversion(new AbpJsonValueConverter<Dictionary<string, object>>())
-                    .Metadata.SetValueComparer(new AbpDictionaryValueComparer());
+                    .HasConversion(new AbpJsonValueConverter<Dictionary<string, string>>())
+                    .Metadata.SetValueComparer(new AbpDictionaryValueComparer<string, string>());
 
                 identityResource.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.IdentityResourceId).IsRequired();
             });
@@ -229,8 +229,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 apiResource.Property(x => x.DisplayName).HasMaxLength(ApiResourceConsts.DisplayNameMaxLength);
                 apiResource.Property(x => x.Description).HasMaxLength(ApiResourceConsts.DescriptionMaxLength);
                 apiResource.Property(x => x.Properties)
-                    .HasConversion(new AbpJsonValueConverter<Dictionary<string, object>>())
-                    .Metadata.SetValueComparer(new AbpDictionaryValueComparer());
+                    .HasConversion(new AbpJsonValueConverter<Dictionary<string, string>>())
+                    .Metadata.SetValueComparer(new AbpDictionaryValueComparer<string, string>());
 
                 apiResource.HasMany(x => x.Secrets).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();
                 apiResource.HasMany(x => x.Scopes).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();