Merge pull request #17141 from abpframework/auto-merge/rel-7-3/2073

Merge branch dev with rel-7.3

modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/AbpBloggingDbProperties.cs

@@ -1,4 +1,6 @@
-namespace Volo.Blogging
+using Volo.Abp.Data;
+
+namespace Volo.Blogging
 {
     public static class AbpBloggingDbProperties
     {
@@ -10,7 +12,7 @@
         /// <summary>
         /// Default value: "null".
         /// </summary>
-        public static string DbSchema { get; set; } = null;
+        public static string DbSchema { get; set; } = AbpCommonDbProperties.DbSchema;
 
         /// <summary>
         /// "Blogging".

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/AbpCmsKitDbProperties.cs

@@ -1,10 +1,12 @@
-namespace Volo.CmsKit;
+using Volo.Abp.Data;
+
+namespace Volo.CmsKit;
 
 public static class AbpCmsKitDbProperties
 {
     public static string DbTablePrefix { get; set; } = "Cms";
 
-    public static string DbSchema { get; set; } = null;
+    public static string DbSchema { get; set; } = AbpCommonDbProperties.DbSchema;
 
     public const string ConnectionStringName = "CmsKit";
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/AbpDocsDbProperties.cs

@@ -1,10 +1,12 @@
-namespace Volo.Docs
+using Volo.Abp.Data;
+
+namespace Volo.Docs
 {
     public static class AbpDocsDbProperties
     {
         public static string DbTablePrefix { get; set; } = "Docs";
 
-        public static string DbSchema { get; set; } = null;
+        public static string DbSchema { get; set; } = AbpCommonDbProperties.DbSchema;
 
         public const string ConnectionStringName = "Docs";
     }

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDbProperties.cs

@@ -1,10 +1,12 @@
-namespace Volo.Abp.IdentityServer;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.IdentityServer;
 
 public static class AbpIdentityServerDbProperties
 {
     public static string DbTablePrefix { get; set; } = "IdentityServer";
 
-    public static string DbSchema { get; set; } = null;
+    public static string DbSchema { get; set; } = AbpCommonDbProperties.DbSchema;
 
     public const string ConnectionStringName = "AbpIdentityServer";
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDbProperties.cs

@@ -1,10 +1,12 @@
-namespace Volo.Abp.OpenIddict;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.OpenIddict;
 
 public static class AbpOpenIddictDbProperties
 {
     public static string DbTablePrefix { get; set; } = "OpenIddict";
 
-    public static string DbSchema { get; set; } = null;
+    public static string DbSchema { get; set; } = AbpCommonDbProperties.DbSchema;
 
     public const string ConnectionStringName = "AbpOpenIddict";
 }