Add ApplyObjectExtensionMappings method

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

@@ -78,10 +78,15 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
         {
             if (b.Metadata.ClrType.IsAssignableTo<IHasExtraProperties>())
             {
-                ObjectExtensionManager.Instance.ConfigureEfCoreEntity(b);
+                ObjectExtensionManager.Instance.ConfigureEfCoreEntityProperties(b);
             }
         }
 
+        public static void ApplyObjectExtensionMappings(this EntityTypeBuilder b)
+        {
+            ObjectExtensionManager.Instance.ConfigureEfCoreEntity(b);
+        }
+
         public static void ConfigureSoftDelete<T>(this EntityTypeBuilder<T> b)
             where T : class, ISoftDelete
         {

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs

@@ -150,7 +150,7 @@ namespace Volo.Abp.ObjectExtending
             );
         }
 
-        public static void ConfigureEfCoreEntity(
+        public static void ConfigureEfCoreEntityProperties(
             [NotNull] this ObjectExtensionManager objectExtensionManager,
             [NotNull] EntityTypeBuilder typeBuilder)
         {
@@ -163,13 +163,6 @@ namespace Volo.Abp.ObjectExtending
                 return;
             }
 
-            var efCoreEntityMappings = objectExtension.GetEfCoreEntityMappings();
-
-            foreach (var efCoreEntityMapping in efCoreEntityMappings)
-            {
-                efCoreEntityMapping.EntityTypeBuildAction?.Invoke(typeBuilder);
-            }
-
             foreach (var property in objectExtension.GetProperties())
             {
                 var efCoreMapping = property.GetEfCoreMappingOrNull();
@@ -193,6 +186,27 @@ namespace Volo.Abp.ObjectExtending
             }
         }
 
+        public static void ConfigureEfCoreEntity(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] EntityTypeBuilder typeBuilder)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+            Check.NotNull(typeBuilder, nameof(typeBuilder));
+
+            var objectExtension = objectExtensionManager.GetOrNull(typeBuilder.Metadata.ClrType);
+            if (objectExtension == null)
+            {
+                return;
+            }
+
+            var efCoreEntityMappings = objectExtension.GetEfCoreEntityMappings();
+
+            foreach (var efCoreEntityMapping in efCoreEntityMappings)
+            {
+                efCoreEntityMapping.EntityTypeBuildAction?.Invoke(typeBuilder);
+            }
+        }
+
         public static void ConfigureEfCoreDbContext<TDbContext>(
             [NotNull] this ObjectExtensionManager objectExtensionManager,
             [NotNull] ModelBuilder modelBuilder)

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs

@@ -42,6 +42,8 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
             modelBuilder.Entity<Phone>(b =>
             {
                 b.HasKey(p => new {p.PersonId, p.Number});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             modelBuilder
@@ -49,6 +51,8 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
                 {
                     p.HasNoKey();
                     p.ToView("View_PersonView");
+
+                    p.ApplyObjectExtensionMappings();
                 });
 
             modelBuilder.Entity<City>(b =>
@@ -58,6 +62,8 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
                     d.WithOwner().HasForeignKey(x => x.CityId);
                     d.HasKey(x => new {x.CityId, x.Name});
                 });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             modelBuilder.TryConfigureObjectExtensions<TestAppDbContext>();

modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingDbContextModelBuilderExtensions.cs

@@ -53,6 +53,8 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
 
                 b.HasIndex(x => new { x.TenantId, x.ExecutionTime });
                 b.HasIndex(x => new { x.TenantId, x.UserId, x.ExecutionTime });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<AuditLogAction>(b =>
@@ -70,6 +72,8 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
 
                 b.HasIndex(x => new { x.AuditLogId });
                 b.HasIndex(x => new { x.TenantId, x.ServiceName, x.MethodName, x.ExecutionTime });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<EntityChange>(b =>
@@ -89,6 +93,8 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
 
                 b.HasIndex(x => new { x.AuditLogId });
                 b.HasIndex(x => new { x.TenantId, x.EntityTypeFullName, x.EntityId });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<EntityPropertyChange>(b =>
@@ -103,6 +109,8 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
                 b.Property(x => x.OriginalValue).HasMaxLength(EntityPropertyChangeConsts.MaxOriginalValueLength).HasColumnName(nameof(EntityPropertyChange.OriginalValue));
 
                 b.HasIndex(x => new { x.EntityChangeId });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<AbpAuditLoggingDbContext>();

modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs

@@ -39,6 +39,8 @@ namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore
                 b.Property(x => x.Priority).HasDefaultValue(BackgroundJobPriority.Normal);
 
                 b.HasIndex(x => new { x.IsAbandoned, x.NextTryTime });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<BackgroundJobsDbContext>();

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContextModelCreatingExtensions.cs

@@ -30,6 +30,8 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
                 b.HasMany<DatabaseBlob>().WithOne().HasForeignKey(p => p.ContainerId);
 
                 b.HasIndex(x => new {x.TenantId, x.Name});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<DatabaseBlob>(b =>
@@ -45,6 +47,8 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
                 b.HasOne<DatabaseBlobContainer>().WithMany().HasForeignKey(p => p.ContainerId);
 
                 b.HasIndex(x => new {x.TenantId, x.ContainerId, x.Name});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<BlobStoringDbContext>();

modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs

@@ -38,6 +38,8 @@ namespace Volo.Blogging.EntityFrameworkCore
 
                 b.ConfigureByConvention();
                 b.ConfigureAbpUser();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<Blog>(b =>
@@ -49,6 +51,8 @@ namespace Volo.Blogging.EntityFrameworkCore
                 b.Property(x => x.Name).IsRequired().HasMaxLength(BlogConsts.MaxNameLength).HasColumnName(nameof(Blog.Name));
                 b.Property(x => x.ShortName).IsRequired().HasMaxLength(BlogConsts.MaxShortNameLength).HasColumnName(nameof(Blog.ShortName));
                 b.Property(x => x.Description).IsRequired(false).HasMaxLength(BlogConsts.MaxDescriptionLength).HasColumnName(nameof(Blog.Description));
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<Post>(b =>
@@ -67,6 +71,8 @@ namespace Volo.Blogging.EntityFrameworkCore
                 b.HasMany(p => p.Tags).WithOne().HasForeignKey(qt => qt.PostId);
 
                 b.HasOne<Blog>().WithMany().IsRequired().HasForeignKey(p => p.BlogId);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<Comment>(b =>
@@ -81,6 +87,8 @@ namespace Volo.Blogging.EntityFrameworkCore
 
                 b.HasOne<Comment>().WithMany().HasForeignKey(p => p.RepliedCommentId);
                 b.HasOne<Post>().WithMany().IsRequired().HasForeignKey(p => p.PostId);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<Tag>(b =>
@@ -94,6 +102,8 @@ namespace Volo.Blogging.EntityFrameworkCore
                 b.Property(x => x.UsageCount).HasColumnName(nameof(Tag.UsageCount));
 
                 b.HasMany<PostTag>().WithOne().HasForeignKey(qt => qt.TagId);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<PostTag>(b =>
@@ -106,6 +116,8 @@ namespace Volo.Blogging.EntityFrameworkCore
                 b.Property(x => x.TagId).HasColumnName(nameof(PostTag.TagId));
 
                 b.HasKey(x => new { x.PostId, x.TagId });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<BloggingDbContext>();

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs

@@ -42,6 +42,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
 
                     b.HasIndex(x => new { x.TenantId, x.UserName });
                     b.HasIndex(x => new { x.TenantId, x.Email });
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
             else
@@ -63,6 +65,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
 
                     b.HasIndex(x => new { x.TenantId, x.EntityType, x.EntityId, x.ReactionName });
                     b.HasIndex(x => new { x.TenantId, x.CreatorId, x.EntityType, x.EntityId, x.ReactionName });
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
             else
@@ -85,6 +89,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
 
                     b.HasIndex(x => new { x.TenantId, x.EntityType, x.EntityId });
                     b.HasIndex(x => new { x.TenantId, x.RepliedCommentId });
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
             else
@@ -105,6 +111,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     r.Property(x => x.EntityId).IsRequired().HasMaxLength(RatingConsts.MaxEntityIdLength);
 
                     r.HasIndex(x => new { x.TenantId, x.EntityType, x.EntityId, x.CreatorId });
+
+                    r.ApplyObjectExtensionMappings();
                 });
             }
             else
@@ -128,6 +136,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                         x.TenantId,
                         x.Name
                     });
+
+                    b.ApplyObjectExtensionMappings();
                 });
 
                 builder.Entity<EntityTag>(b =>
@@ -142,6 +152,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     b.Property(x => x.TagId).IsRequired();
 
                     b.HasIndex(x => new { x.TenantId, x.EntityId, x.TagId });
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
             else
@@ -163,6 +175,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     b.Property(x => x.Content).HasMaxLength(PageConsts.MaxContentLength);
 
                     b.HasIndex(x => new { x.TenantId, Url = x.Slug });
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
             else
@@ -181,6 +195,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     b.Property(p => p.Name).IsRequired().HasMaxLength(BlogConsts.MaxNameLength);
 
                     b.Property(p => p.Slug).IsRequired().HasMaxLength(BlogConsts.MaxSlugLength);
+
+                    b.ApplyObjectExtensionMappings();
                 });
 
                 builder.Entity<BlogPost>(b =>
@@ -196,6 +212,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     b.Property(p => p.Content).HasMaxLength(BlogPostConsts.MaxContentLength);
 
                     b.HasIndex(x => new { x.Slug, x.BlogId });
+
+                    b.ApplyObjectExtensionMappings();
                 });
 
                 builder.Entity<BlogFeature>(b =>
@@ -205,6 +223,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     b.ConfigureByConvention();
 
                     b.Property(p => p.FeatureName).IsRequired().HasMaxLength(BlogFeatureConsts.MaxFeatureNameLenth);
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
             else
@@ -226,6 +246,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     b.Property(x => x.Name).IsRequired().HasMaxLength(MediaDescriptorConsts.MaxNameLength);
                     b.Property(x => x.MimeType).IsRequired().HasMaxLength(MediaDescriptorConsts.MaxMimeTypeLength);
                     b.Property(x => x.Size).HasMaxLength(MediaDescriptorConsts.MaxSizeLength);
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
             else

modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs

@@ -40,6 +40,8 @@ namespace Volo.Docs.EntityFrameworkCore
                 b.Property(x => x.NavigationDocumentName).IsRequired().HasMaxLength(ProjectConsts.MaxNavigationDocumentNameLength);
                 b.Property(x => x.ParametersDocumentName).IsRequired().HasMaxLength(ProjectConsts.MaxParametersDocumentNameLength);
                 b.Property(x => x.LatestVersionBranchName).HasMaxLength(ProjectConsts.MaxLatestVersionBranchNameLength);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<Document>(b =>
@@ -62,6 +64,8 @@ namespace Volo.Docs.EntityFrameworkCore
                 b.HasMany(x => x.Contributors).WithOne()
                     .HasForeignKey(x => new { x.DocumentId })
                     .IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<DocumentContributor>(b =>
@@ -71,6 +75,8 @@ namespace Volo.Docs.EntityFrameworkCore
                 b.ConfigureByConvention();
 
                 b.HasKey(x => new { x.DocumentId, x.Username });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<DocsDbContext>();

modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContextModelCreatingExtensions.cs

@@ -36,6 +36,8 @@ namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
                 b.Property(x => x.ProviderKey).HasMaxLength(FeatureValueConsts.MaxProviderKeyLength);
 
                 b.HasIndex(x => new { x.Name, x.ProviderName, x.ProviderKey });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<FeatureManagementDbContext>();

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs

@@ -60,6 +60,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.HasIndex(u => u.NormalizedEmail);
                 b.HasIndex(u => u.UserName);
                 b.HasIndex(u => u.Email);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityUserClaim>(b =>
@@ -74,6 +76,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.Property(uc => uc.ClaimValue).HasMaxLength(IdentityUserClaimConsts.MaxClaimValueLength);
 
                 b.HasIndex(uc => uc.UserId);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityUserRole>(b =>
@@ -88,6 +92,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.HasOne<IdentityUser>().WithMany(u => u.Roles).HasForeignKey(ur => ur.UserId).IsRequired();
 
                 b.HasIndex(ur => new {ur.RoleId, ur.UserId});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityUserLogin>(b =>
@@ -106,6 +112,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                     .HasMaxLength(IdentityUserLoginConsts.MaxProviderDisplayNameLength);
 
                 b.HasIndex(l => new {l.LoginProvider, l.ProviderKey});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityUserToken>(b =>
@@ -119,6 +127,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.Property(ul => ul.LoginProvider).HasMaxLength(IdentityUserTokenConsts.MaxLoginProviderLength)
                     .IsRequired();
                 b.Property(ul => ul.Name).HasMaxLength(IdentityUserTokenConsts.MaxNameLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityRole>(b =>
@@ -136,6 +146,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.HasMany(r => r.Claims).WithOne().HasForeignKey(rc => rc.RoleId).IsRequired();
 
                 b.HasIndex(r => r.NormalizedName);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityRoleClaim>(b =>
@@ -150,6 +162,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.Property(uc => uc.ClaimValue).HasMaxLength(IdentityRoleClaimConsts.MaxClaimValueLength);
 
                 b.HasIndex(uc => uc.RoleId);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             if (builder.IsHostDatabase())
@@ -165,6 +179,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                     b.Property(uc => uc.Regex).HasMaxLength(IdentityClaimTypeConsts.MaxRegexLength);
                     b.Property(uc => uc.RegexDescription).HasMaxLength(IdentityClaimTypeConsts.MaxRegexDescriptionLength);
                     b.Property(uc => uc.Description).HasMaxLength(IdentityClaimTypeConsts.MaxDescriptionLength);
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
 
@@ -183,6 +199,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.HasMany(ou => ou.Roles).WithOne().HasForeignKey(our => our.OrganizationUnitId).IsRequired();
 
                 b.HasIndex(ou => ou.Code);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<OrganizationUnitRole>(b =>
@@ -196,6 +214,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.HasOne<IdentityRole>().WithMany().HasForeignKey(ou => ou.RoleId).IsRequired();
 
                 b.HasIndex(ou => new {ou.RoleId, ou.OrganizationUnitId});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityUserOrganizationUnit>(b =>
@@ -209,6 +229,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.HasOne<OrganizationUnit>().WithMany().HasForeignKey(ou => ou.OrganizationUnitId).IsRequired();
 
                 b.HasIndex(ou => new {ou.UserId, ou.OrganizationUnitId});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentitySecurityLog>(b =>
@@ -234,6 +256,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 b.HasIndex(x => new { x.TenantId, x.Identity });
                 b.HasIndex(x => new { x.TenantId, x.Action });
                 b.HasIndex(x => new { x.TenantId, x.UserId });
+
+                b.ApplyObjectExtensionMappings();
             });
 
             if (builder.IsHostDatabase())
@@ -251,6 +275,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                         LinkedUserId = x.TargetUserId,
                         LinkedTenantId = x.TargetTenantId
                     }).IsUnique();
+
+                    b.ApplyObjectExtensionMappings();
                 });
             }
 

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

@@ -63,6 +63,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasMany(x => x.Properties).WithOne().HasForeignKey(x => x.ClientId).IsRequired();
 
                 b.HasIndex(x => x.ClientId);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientGrantType>(b =>
@@ -74,6 +76,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ClientId, x.GrantType});
 
                 b.Property(x => x.GrantType).HasMaxLength(ClientGrantTypeConsts.GrantTypeMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientRedirectUri>(b =>
@@ -90,6 +94,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 }
 
                 b.Property(x => x.RedirectUri).HasMaxLength(ClientRedirectUriConsts.RedirectUriMaxLengthValue).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientPostLogoutRedirectUri>(b =>
@@ -108,6 +114,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.Property(x => x.PostLogoutRedirectUri)
                     .HasMaxLength(ClientPostLogoutRedirectUriConsts.PostLogoutRedirectUriMaxLengthValue)
                     .IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientScope>(b =>
@@ -119,6 +127,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ClientId, x.Scope});
 
                 b.Property(x => x.Scope).HasMaxLength(ClientScopeConsts.ScopeMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientSecret>(b =>
@@ -136,6 +146,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 }
                 b.Property(x => x.Value).HasMaxLength(ClientSecretConsts.ValueMaxLength).IsRequired();
                 b.Property(x => x.Description).HasMaxLength(ClientSecretConsts.DescriptionMaxLength);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientClaim>(b =>
@@ -148,6 +160,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 
                 b.Property(x => x.Type).HasMaxLength(ClientClaimConsts.TypeMaxLength).IsRequired();
                 b.Property(x => x.Value).HasMaxLength(ClientClaimConsts.ValueMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientIdPRestriction>(b =>
@@ -159,6 +173,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ClientId, x.Provider});
 
                 b.Property(x => x.Provider).HasMaxLength(ClientIdPRestrictionConsts.ProviderMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientCorsOrigin>(b =>
@@ -170,6 +186,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ClientId, x.Origin});
 
                 b.Property(x => x.Origin).HasMaxLength(ClientCorsOriginConsts.OriginMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ClientProperty>(b =>
@@ -186,6 +204,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                     ClientPropertyConsts.ValueMaxLength = 300;
                 }
                 b.Property(x => x.Value).HasMaxLength(ClientPropertyConsts.ValueMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             #endregion
@@ -204,6 +224,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 
                 b.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.IdentityResourceId).IsRequired();
                 b.HasMany(x => x.Properties).WithOne().HasForeignKey(x => x.IdentityResourceId).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityResourceClaim>(b =>
@@ -215,6 +237,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.IdentityResourceId, x.Type});
 
                 b.Property(x => x.Type).HasMaxLength(UserClaimConsts.TypeMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<IdentityResourceProperty>(b =>
@@ -231,6 +255,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                     IdentityResourcePropertyConsts.ValueMaxLength = 300;
                 }
                 b.Property(x => x.Value).HasMaxLength(IdentityResourcePropertyConsts.ValueMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             #endregion
@@ -252,6 +278,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasMany(x => x.Scopes).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();
                 b.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();
                 b.HasMany(x => x.Properties).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ApiResourceSecret>(b =>
@@ -271,6 +299,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.Property(x => x.Value).HasMaxLength(ApiResourceSecretConsts.ValueMaxLength).IsRequired();
 
                 b.Property(x => x.Description).HasMaxLength(ApiResourceSecretConsts.DescriptionMaxLength);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ApiResourceClaim>(b =>
@@ -282,6 +312,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ApiResourceId, x.Type});
 
                 b.Property(x => x.Type).HasMaxLength(UserClaimConsts.TypeMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ApiResourceScope>(b =>
@@ -293,6 +325,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ApiResourceId, x.Scope});
 
                 b.Property(x => x.Scope).HasMaxLength(ApiResourceScopeConsts.ScopeMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ApiResourceProperty>(b =>
@@ -309,6 +343,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                     ApiResourcePropertyConsts.ValueMaxLength = 300;
                 }
                 b.Property(x => x.Value).HasMaxLength(ApiResourcePropertyConsts.ValueMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             #endregion
@@ -327,6 +363,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 
                 b.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.ApiScopeId).IsRequired();
                 b.HasMany(x => x.Properties).WithOne().HasForeignKey(x => x.ApiScopeId).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ApiScopeClaim>(b =>
@@ -338,6 +376,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ApiScopeId, x.Type});
 
                 b.Property(x => x.Type).HasMaxLength(UserClaimConsts.TypeMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<ApiScopeProperty>(b =>
@@ -354,6 +394,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                     ApiScopePropertyConsts.ValueMaxLength = 300;
                 }
                 b.Property(x => x.Value).HasMaxLength(ApiScopePropertyConsts.ValueMaxLength).IsRequired();
+
+                b.ApplyObjectExtensionMappings();
             });
 
             #endregion
@@ -386,6 +428,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasIndex(x => new {x.SubjectId, x.ClientId, x.Type});
                 b.HasIndex(x => new {x.SubjectId, x.SessionId, x.Type});
                 b.HasIndex(x => x.Expiration);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             #endregion
@@ -416,6 +460,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasIndex(x => new {x.UserCode});
                 b.HasIndex(x => x.DeviceCode).IsUnique();
                 b.HasIndex(x => x.Expiration);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             #endregion

modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementDbContextModelBuilderExtensions.cs

@@ -31,6 +31,8 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
                 b.Property(x => x.ProviderKey).HasMaxLength(PermissionGrantConsts.MaxProviderKeyLength).IsRequired();
 
                 b.HasIndex(x => new {x.Name, x.ProviderName, x.ProviderKey});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<PermissionManagementDbContext>();

modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/SettingManagementDbContextModelBuilderExtensions.cs

@@ -54,6 +54,8 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore
                 b.Property(x => x.ProviderKey).HasMaxLength(SettingConsts.MaxProviderKeyLength);
 
                 b.HasIndex(x => new {x.Name, x.ProviderName, x.ProviderKey});
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<SettingManagementDbContext>();

modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementDbContextModelCreatingExtensions.cs

@@ -36,6 +36,8 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore
                 b.HasMany(u => u.ConnectionStrings).WithOne().HasForeignKey(uc => uc.TenantId).IsRequired();
 
                 b.HasIndex(u => u.Name);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.Entity<TenantConnectionString>(b =>
@@ -48,6 +50,8 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore
 
                 b.Property(cs => cs.Name).IsRequired().HasMaxLength(TenantConnectionStringConsts.MaxNameLength);
                 b.Property(cs => cs.Value).IsRequired().HasMaxLength(TenantConnectionStringConsts.MaxValueLength);
+
+                b.ApplyObjectExtensionMappings();
             });
 
             builder.TryConfigureObjectExtensions<TenantManagementDbContext>();