Merge pull request #14309 from abpframework/auto-merge/rel-6-0/1400

Merge branch dev with rel-6.0

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs

@@ -25,6 +25,7 @@ public static class OpenIddictApplicationExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -86,6 +87,7 @@ public static class OpenIddictApplicationExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationExtensions.cs

@@ -19,6 +19,7 @@ public static class OpenIddictAuthorizationExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -68,6 +69,7 @@ public static class OpenIddictAuthorizationExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/OpenIddictScopeExtensions.cs

@@ -19,6 +19,7 @@ public static class OpenIddictScopeExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -69,6 +70,7 @@ public static class OpenIddictScopeExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenExtensions.cs

@@ -24,6 +24,7 @@ public static class OpenIddictTokenExtensions
 
         foreach (var extraProperty in model.ExtraProperties)
         {
+            entity.ExtraProperties.Remove(extraProperty.Key);
             entity.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }
 
@@ -81,6 +82,7 @@ public static class OpenIddictTokenExtensions
 
         foreach (var extraProperty in entity.ExtraProperties)
         {
+            model.ExtraProperties.Remove(extraProperty.Key);
             model.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
         }