Merge branch 'dev' into auto-merge/rel-6-0/1209

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@@ -397,6 +397,8 @@
     "BookDiscountDeletionConfirmationMessage": "Are you sure you want to delete this book discount?",
     "CustomPaymentFlexSwitchDescription": "With license",
     "AllowFeatureUpgradeOnLicenseExpire": "Allow feature upgrade on license expire",
-    "Deleted{0}": "[Deleted {0}]"
+    "Deleted{0}": "[Deleted {0}]",
+    "Tags": "Tags",
+    "SetTagsInfo": "Tags should be comma-separated. Eg: CSharp, Entity Framework"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json

@@ -164,6 +164,13 @@
     "Books": "Books",
     "ABPDiscordServer": "ABP Discord Server",
     "ABPCommunityTalks": "ABP Community Talks",
-    "ABPCommunityPosts": "ABP Community Posts"
+    "ABPCommunityPosts": "ABP Community Posts",
+    "BuyAndGetMonths": "BUY 12 MONTHS, <span class=\"text-info\">GET 14 MONTHS!</span>",
+    "GetYourDeal": "Get Your Deal",
+    "BuyOrRenewLicense": "Buy or Renew License Now and Get 2 Extra Months!",
+    "BuyOrRenewLicenseToGetExtra2Months": "Buy or Renew License Now and Get 2 Extra Months! HURRY UP! ⏰ Last Day: {0}",
+    "HurryUp": "HURRY UP!",
+    "LastDay": "Last Day: {0}",
+    "BuyNewLicenseBetweenDatesToGetBenefit": "Buy a new license between {0} and {1} to get benefit for extra 2 months!"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json

@@ -161,6 +161,13 @@
     "Error_Page_500_Title": "好像出了什么问题！",
     "Error_Page_500_Description_1": "我们会自动跟踪这些错误，但如果问题仍然存在，请随时 <br /> 联系我们。 与此同时，尝试刷新。",
     "Error_Page_500_Description_2": "通过 <a href=\"mailto:info@abp.io\" target=\"_blank\">info@abp.io</a> 与我们联系。",
-    "Books": "书籍"
+    "Books": "书籍",
+    "BuyAndGetMonths": "购买 12 个月，<span class=\"text-info\">获得 14 个月!</span>",
+    "GetYourDeal": "得到你的交易",
+    "BuyOrRenewLicense": "立即购买或续订许可证并额外获得 2 个月！",
+    "BuyOrRenewLicenseToGetExtra2Months": "立即购买或续订 ABP 商业许可证（适用于所有版本）并额外获得 2 个月！",
+    "HurryUp": "赶快下单!",
+    "LastDay": "活动截止日期: {0}",
+    "BuyNewLicenseBetweenDatesToGetBenefit": "在 {0} 和 {1} 之间购买一个新的许可证以获得额外 2 个月的收益！"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json

@@ -184,6 +184,7 @@
     "Post_Index_Page_MetaDescription": "ABP Community's purpose is to create a contribution environment for developers who use the ABP framework.",
     "Layout_Title": "{0} | ABP Community",
     "Layout_MetaDescription": "ABP Community is an environment where people can share posts about ABP framework and follows the projects.",
-    "Index_Page_CommunityIntroduction": "This is a hub for ABP Framework, .NET and software development. You can read the articles, watch the video tutorials, get informed about ABP’s development progress and ABP-related events, help other developers and share your expertise with the ABP community."
+    "Index_Page_CommunityIntroduction": "This is a hub for ABP Framework, .NET and software development. You can read the articles, watch the video tutorials, get informed about ABP’s development progress and ABP-related events, help other developers and share your expertise with the ABP community.",
+    "TagsInArticle": "Tags in article"
   }
 }

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>6.0.0-rc.1</Version>
+    <Version>7.0.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>

docs/en/Background-Jobs-RabbitMq.md

@@ -126,25 +126,31 @@ By default, all the job types use the `Default` RabbitMQ connection.
 Configure<AbpRabbitMqBackgroundJobOptions>(options =>
 {
     options.DefaultQueueNamePrefix = "my_app_jobs.";
+    options.DefaultDelayedQueueNamePrefix = "my_app_jobs.delayed"
+    options.PrefetchCount = 1;
     options.JobQueues[typeof(EmailSendingArgs)] =
         new JobQueueConfiguration(
             typeof(EmailSendingArgs),
             queueName: "my_app_jobs.emails",
-            connectionName: "SecondConnection"
+            connectionName: "SecondConnection",
+            delayedQueueName:"my_app_jobs.emails.delayed"
         );
 });
 ````
 
-* This example sets the default queue name prefix to `my_app_jobs.`. If different applications use the same RabbitMQ server, it would be important to use different prefixes for each application to not consume jobs of each other.
+* This example sets the default queue name prefix to `my_app_jobs.` and default delayed queue name prefix to `my_app_jobs.delayed`. If different applications use the same RabbitMQ server, it would be important to use different prefixes for each application to not consume jobs of each other.
+* Sets `PrefetchCount` for all queues.
 * Also specifies a different connection string for the `EmailSendingArgs`.
 
 `JobQueueConfiguration` class has some additional options in its constructor;
 
 * `queueName`: The queue name that is used for this job. The prefix is not added, so you need to specify the full name of the queue.
+* `DelayedQueueName`: The delayed queue name that is used for delayed execution of job. The prefix is not added, so you need to specify the full name of the queue.
 * `connectionName`: The RabbitMQ connection name (see the connection configuration above). This is optional and the default value is `Default`.
 * `durable` (optional, default: `true`).
 * `exclusive` (optional, default: `false`).
-* `autoDelete` (optional, default: `false`)
+* `autoDelete` (optional, default: `false`).
+* `PrefetchCount` (optional, default: null)
 
 See the RabbitMQ documentation if you want to understand the `durable`, `exclusive` and `autoDelete` options better, while most of the times the default configuration is what you want. 
 

docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md

@@ -141,13 +141,14 @@ Configure<AbpRabbitMqOptions>(options =>
 });
 ````
 
-**Example: Configure the client and exchange names**
+**Example: Configure the client, exchange names and prefetchCount**
 
 ````csharp
 Configure<AbpRabbitMqEventBusOptions>(options =>
 {
     options.ClientName = "TestApp1";
     options.ExchangeName = "TestMessages";
+    options.PrefetchCount = 1;
 });
 ````
 

docs/zh-Hans/Background-Jobs-RabbitMq.md

@@ -126,25 +126,31 @@ Configure<AbpRabbitMqOptions>(options =>
 Configure<AbpRabbitMqBackgroundJobOptions>(options =>
 {
     options.DefaultQueueNamePrefix = "my_app_jobs.";
+    options.DefaultDelayedQueueNamePrefix = "my_app_jobs.delayed"
+    options.PrefetchCount = 1;
     options.JobQueues[typeof(EmailSendingArgs)] =
         new JobQueueConfiguration(
             typeof(EmailSendingArgs),
             queueName: "my_app_jobs.emails",
-            connectionName: "SecondConnection"
+            connectionName: "SecondConnection",
+            delayedQueueName:"my_app_jobs.emails.delayed"
         );
 });
 ```
 
-- 这个示例将默认的队列名前缀设置为 `my_app_jobs.`,如果多个项目都使用的同一个 RabbitMQ 服务,设置不同的前缀可以避免执行其他项目的后台作业.
+- 这个示例将默认的队列名前缀设置为 `my_app_jobs.`并且设置默认的延迟队列名为 `my_app_jobs.delayed`,如果多个项目都使用的同一个 RabbitMQ 服务,设置不同的前缀可以避免执行其他项目的后台作业.
+- 设置了预取数量, 用于所有队列.
 - 这里还设置了 `EmailSendingArgs` 绑定的 RabbitMQ 连接.
 
 `JobQueueConfiguration` 类的构造函数中,还有一些其他的可选参数.
 
 - `queueName`: 指定后台作业对应的队列名称(全名).
+* `DelayedQueueName`: 指定后台延迟执行的作业对于的队列名称(全名).
 - `connectionName`: 后台作业对应的 RabbitMQ 连接名称,默认是 `Default`.
 - `durable`: 可选参数,默认为 `true`.
 - `exclusive`: 可选参数,默认为 `false`.
 - `autoDelete`: 可选参数,默认为 `false`.
+* `PrefetchCount` (可选参数, 默认为: null)
 
 如果你想要更多地了解 `durable`,`exclusive`,`autoDelete` 的用法,请阅读 RabbitMQ 提供的文档.
 

docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md

@@ -141,13 +141,14 @@ Configure<AbpRabbitMqOptions>(options =>
 });
 ````
 
-**示例: 配置客户端和交换机名称**
+**示例: 配置客户端,交换机名称和预取数量**
 
 ````csharp
 Configure<AbpRabbitMqEventBusOptions>(options =>
 {
     options.ClientName = "TestApp1";
     options.ExchangeName = "TestMessages";
+    options.PrefetchCount = 1;
 });
 ````
 

framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs

@@ -10,7 +10,7 @@ public interface IDeletionAuditedObject : IHasDeletionTime
     /// <summary>
     /// Id of the deleter user.
     /// </summary>
-    Guid? DeleterId { get; set; }
+    Guid? DeleterId { get; }
 }
 
 /// <summary>
@@ -22,5 +22,5 @@ public interface IDeletionAuditedObject<TUser> : IDeletionAuditedObject
     /// <summary>
     /// Reference to the deleter user.
     /// </summary>
-    TUser Deleter { get; set; }
+    TUser Deleter { get; }
 }

framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasDeletionTime.cs

@@ -11,5 +11,5 @@ public interface IHasDeletionTime : ISoftDelete
     /// <summary>
     /// Deletion time.
     /// </summary>
-    DateTime? DeletionTime { get; set; }
+    DateTime? DeletionTime { get; }
 }

framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasModificationTime.cs

@@ -10,5 +10,5 @@ public interface IHasModificationTime
     /// <summary>
     /// The last modified time for this entity.
     /// </summary>
-    DateTime? LastModificationTime { get; set; }
+    DateTime? LastModificationTime { get; }
 }

framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs

@@ -10,7 +10,7 @@ public interface IModificationAuditedObject : IHasModificationTime
     /// <summary>
     /// Last modifier user for this entity.
     /// </summary>
-    Guid? LastModifierId { get; set; }
+    Guid? LastModifierId { get; }
 }
 
 /// <summary>
@@ -22,5 +22,5 @@ public interface IModificationAuditedObject<TUser> : IModificationAuditedObject
     /// <summary>
     /// Reference to the last modifier user of this entity.
     /// </summary>
-    TUser LastModifier { get; set; }
+    TUser LastModifier { get; }
 }

framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditPropertySetter.cs

@@ -99,7 +99,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency
     {
         if (targetObject is IHasModificationTime objectWithModificationTime)
         {
-            objectWithModificationTime.LastModificationTime = Clock.Now;
+            ObjectHelper.TrySetProperty(objectWithModificationTime, x => x.LastModificationTime, () => Clock.Now);
         }
     }
 
@@ -112,7 +112,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency
 
         if (!CurrentUser.Id.HasValue)
         {
-            modificationAuditedObject.LastModifierId = null;
+            ObjectHelper.TrySetProperty(modificationAuditedObject, x => x.LastModifierId, () => null);
             return;
         }
 
@@ -120,7 +120,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency
         {
             if (multiTenantEntity.TenantId != CurrentUser.TenantId)
             {
-                modificationAuditedObject.LastModifierId = null;
+                ObjectHelper.TrySetProperty(modificationAuditedObject, x => x.LastModifierId, () => null);
                 return;
             }
         }
@@ -134,7 +134,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency
         }
          */
 
-        modificationAuditedObject.LastModifierId = CurrentUser.Id;
+        ObjectHelper.TrySetProperty(modificationAuditedObject, x => x.LastModifierId, () => CurrentUser.Id);
     }
 
     protected virtual void SetDeletionTime(object targetObject)
@@ -143,7 +143,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency
         {
             if (objectWithDeletionTime.DeletionTime == null)
             {
-                objectWithDeletionTime.DeletionTime = Clock.Now;
+                ObjectHelper.TrySetProperty(objectWithDeletionTime, x => x.DeletionTime, () => Clock.Now);
             }
         }
     }
@@ -162,7 +162,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency
 
         if (!CurrentUser.Id.HasValue)
         {
-            deletionAuditedObject.DeleterId = null;
+            ObjectHelper.TrySetProperty(deletionAuditedObject, x => x.DeleterId, () => null);
             return;
         }
 
@@ -170,11 +170,11 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency
         {
             if (multiTenantEntity.TenantId != CurrentUser.TenantId)
             {
-                deletionAuditedObject.DeleterId = null;
+                ObjectHelper.TrySetProperty(deletionAuditedObject, x => x.DeleterId, () => null);
                 return;
             }
         }
 
-        deletionAuditedObject.DeleterId = CurrentUser.Id;
+        ObjectHelper.TrySetProperty(deletionAuditedObject, x => x.DeleterId, () => CurrentUser.Id);
     }
 }

framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs

@@ -19,6 +19,8 @@ public class AbpRabbitMqBackgroundJobOptions
     /// Default value: "AbpBackgroundJobsDelayed."
     /// </summary>
     public string DefaultDelayedQueueNamePrefix { get; set; }
+    
+    public ushort? PrefetchCount { get; set; }
 
     public AbpRabbitMqBackgroundJobOptions()
     {

framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs

@@ -66,7 +66,8 @@ public class JobQueue<TArgs> : IJobQueue<TArgs>
                new JobQueueConfiguration(
                    typeof(TArgs),
                    AbpRabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName,
-                   AbpRabbitMqBackgroundJobOptions.DefaultDelayedQueueNamePrefix + JobConfiguration.JobName
+                   AbpRabbitMqBackgroundJobOptions.DefaultDelayedQueueNamePrefix + JobConfiguration.JobName,
+                   prefetchCount: AbpRabbitMqBackgroundJobOptions.PrefetchCount
                );
     }
 
@@ -140,9 +141,14 @@ public class JobQueue<TArgs> : IJobQueue<TArgs>
 
         if (AbpBackgroundJobOptions.IsJobExecutionEnabled)
         {
+            if (QueueConfiguration.PrefetchCount.HasValue)
+            {
+                ChannelAccessor.Channel.BasicQos(0, QueueConfiguration.PrefetchCount.Value, false);
+            }
+            
             Consumer = new AsyncEventingBasicConsumer(ChannelAccessor.Channel);
             Consumer.Received += MessageReceived;
-
+            
             //TODO: What BasicConsume returns?
             ChannelAccessor.Channel.BasicConsume(
                 queue: QueueConfiguration.QueueName,

framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs

@@ -20,12 +20,14 @@ public class JobQueueConfiguration : QueueDeclareConfiguration
         string connectionName = null,
         bool durable = true,
         bool exclusive = false,
-        bool autoDelete = false)
+        bool autoDelete = false,
+        ushort? prefetchCount = null)
         : base(
             queueName,
             durable,
             exclusive,
-            autoDelete)
+            autoDelete,
+            prefetchCount)
     {
         JobArgsType = jobArgsType;
         ConnectionName = connectionName;

framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs

@@ -9,7 +9,7 @@
 public interface ISoftDelete
 {
     /// <summary>
-    /// Used to mark an Entity as 'Deleted'. 
+    /// Used to mark an Entity as 'Deleted'.
     /// </summary>
-    bool IsDeleted { get; set; }
+    bool IsDeleted { get; }
 }

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

@@ -485,7 +485,7 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext,
         }
 
         entry.Reload();
-        entry.Entity.As<ISoftDelete>().IsDeleted = true;
+        ObjectHelper.TrySetProperty(entry.Entity.As<ISoftDelete>(), x => x.IsDeleted, () => true);
         SetDeletionAuditProperties(entry);
     }
 

framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs

@@ -13,6 +13,8 @@ public class AbpRabbitMqEventBusOptions
     public string ExchangeName { get; set; }
 
     public string ExchangeType { get; set; }
+    
+    public ushort? PrefetchCount { get; set; }
 
     public string GetExchangeTypeOrDefault()
     {

framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs

@@ -78,7 +78,8 @@ public class RabbitMqDistributedEventBus : DistributedEventBusBase, ISingletonDe
                 AbpRabbitMqEventBusOptions.ClientName,
                 durable: true,
                 exclusive: false,
-                autoDelete: false
+                autoDelete: false,
+                prefetchCount: AbpRabbitMqEventBusOptions.PrefetchCount
             ),
             AbpRabbitMqEventBusOptions.ConnectionName
         );

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs

@@ -253,7 +253,7 @@ public class MemoryDbRepository<TMemoryDbContext, TEntity> : RepositoryBase<TEnt
 
         if (entity is ISoftDelete softDeleteEntity && !IsHardDeleted(entity))
         {
-            softDeleteEntity.IsDeleted = true;
+            ObjectHelper.TrySetProperty(softDeleteEntity, x => x.IsDeleted, () => true);
             (await GetCollectionAsync()).Update(entity);
         }
         else

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs

@@ -294,7 +294,7 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
 
         if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity))
         {
-            ((ISoftDelete)entity).IsDeleted = true;
+            ObjectHelper.TrySetProperty(((ISoftDelete)entity), x => x.IsDeleted, () => true);
             ApplyAbpConceptsForDeletedEntity(entity);
 
             ReplaceOneResult result;
@@ -365,8 +365,7 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
         {
             if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity))
             {
-                ((ISoftDelete)entity).IsDeleted = true;
-
+                ObjectHelper.TrySetProperty(((ISoftDelete)entity), x => x.IsDeleted, () => true);
                 softDeletedEntities.Add(entity, SetNewConcurrencyStamp(entity));
             }
             else

framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs

@@ -13,6 +13,8 @@ public class QueueDeclareConfiguration
     public bool Exclusive { get; set; }
 
     public bool AutoDelete { get; set; }
+    
+    public ushort? PrefetchCount { get; set; } 
 
     public IDictionary<string, object> Arguments { get; }
 
@@ -20,13 +22,15 @@ public class QueueDeclareConfiguration
         [NotNull] string queueName,
         bool durable = true,
         bool exclusive = false,
-        bool autoDelete = false)
+        bool autoDelete = false,
+        ushort? prefetchCount = null)
     {
         QueueName = queueName;
         Durable = durable;
         Exclusive = exclusive;
         AutoDelete = autoDelete;
         Arguments = new Dictionary<string, object>();
+        PrefetchCount = prefetchCount;
     }
 
     public virtual QueueDeclareOk Declare(IModel channel)

framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs

@@ -165,9 +165,14 @@ public class RabbitMqMessageConsumer : IRabbitMqMessageConsumer, ITransientDepen
                 arguments: Queue.Arguments
             );
 
+            if (Queue.PrefetchCount.HasValue)
+            {
+                Channel.BasicQos(0, Queue.PrefetchCount.Value, false);
+            }
+            
             var consumer = new AsyncEventingBasicConsumer(Channel);
             consumer.Received += HandleIncomingMessageAsync;
-
+            
             Channel.BasicConsume(
                 queue: Queue.QueueName,
                 autoAck: false,

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json

@@ -31,14 +31,14 @@
     "PagerPrevious": "Anterior",
     "PagerFirst": "Primul",
     "PagerLast": "Ultimul",
-    "PagerInfo": "Afişate _START_ to _END_ of _TOTAL_ înregistrări",
-    "PagerInfo{0}{1}{2}": "Afişate {0} to {1} of {2} înregistrări",
-    "PagerInfoEmpty": "Afişate 0 to 0 of 0 înregistrări",
+    "PagerInfo": "Afişate de la _START_ la _END_ din _TOTAL_ înregistrări",
+    "PagerInfo{0}{1}{2}": "Afişate de la {0} la {1} din {2} înregistrări",
+    "PagerInfoEmpty": "Afişate 0 din 0 înregistrări",
     "PagerInfoFiltered": "(filtrate de la _MAX_ înregistrări totale)",
     "NoDataAvailableInDatatable": "Nicio informaţie disponibilă",
     "Total": "total",
     "Selected": "selectate",
-    "PagerShowMenuEntries": "Arată _MENU_ intrări",
+    "PagerShowMenuEntries": "Afişează _MENU_ intrări",
     "DatatableActionDropdownDefaultText": "Acţiuni",
     "ChangePassword": "Schimbă parola",
     "PersonalInfo": "Profilul meu",
@@ -50,4 +50,4 @@
     "ItemWillBeDeletedMessage": "Acest articol va fi şters!",
     "ManageYourAccount": "Administraţi-vă contul"
   }
-}
+}

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDbProperties.cs → modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDbProperties.cs

@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.BackgroundJobs;
 
-public static class BackgroundJobsDbProperties
+public static class AbpBackgroundJobsDbProperties
 {
     public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix;
 

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

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)]
 public class BackgroundJobsDbContext : AbpDbContext<BackgroundJobsDbContext>, IBackgroundJobsDbContext
 {
     public DbSet<BackgroundJobRecord> BackgroundJobs { get; set; }

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

@@ -18,7 +18,7 @@ public static class BackgroundJobsDbContextModelCreatingExtensions
 
         builder.Entity<BackgroundJobRecord>(b =>
         {
-            b.ToTable(BackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs", BackgroundJobsDbProperties.DbSchema);
+            b.ToTable(AbpBackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs", AbpBackgroundJobsDbProperties.DbSchema);
 
             b.ConfigureByConvention();
 

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

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)]
 public interface IBackgroundJobsDbContext : IEfCoreDbContext
 {
     DbSet<BackgroundJobRecord> BackgroundJobs { get; }

modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContext.cs

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.BackgroundJobs.MongoDB;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)]
 public class BackgroundJobsMongoDbContext : AbpMongoDbContext, IBackgroundJobsMongoDbContext
 {
     public IMongoCollection<BackgroundJobRecord> BackgroundJobs { get; set; }

modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs

@@ -11,7 +11,7 @@ public static class BackgroundJobsMongoDbContextExtensions
 
         builder.Entity<BackgroundJobRecord>(b =>
         {
-            b.CollectionName = BackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs";
+            b.CollectionName = AbpBackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs";
         });
     }
 }

modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/IBackgroundJobsMongoDbContext.cs

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.BackgroundJobs.MongoDB;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)]
 public interface IBackgroundJobsMongoDbContext : IAbpMongoDbContext
 {
     IMongoCollection<BackgroundJobRecord> BackgroundJobs { get; }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseDbProperties.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseDbProperties.cs

@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.BlobStoring.Database;
 
-public static class BlobStoringDatabaseDbProperties
+public static class AbpBlobStoringDatabaseDbProperties
 {
     public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix;
 

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

@@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 
-[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)]
 public class BlobStoringDbContext : AbpDbContext<BlobStoringDbContext>, IBlobStoringDbContext
 {
     public DbSet<DatabaseBlobContainer> BlobContainers { get; set; }

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

@@ -12,7 +12,7 @@ public static class BlobStoringDbContextModelCreatingExtensions
 
         builder.Entity<DatabaseBlobContainer>(b =>
         {
-            b.ToTable(BlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers", BlobStoringDatabaseDbProperties.DbSchema);
+            b.ToTable(AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers", AbpBlobStoringDatabaseDbProperties.DbSchema);
 
             b.ConfigureByConvention();
 
@@ -27,7 +27,7 @@ public static class BlobStoringDbContextModelCreatingExtensions
 
         builder.Entity<DatabaseBlob>(b =>
         {
-            b.ToTable(BlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs", BlobStoringDatabaseDbProperties.DbSchema);
+            b.ToTable(AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs", AbpBlobStoringDatabaseDbProperties.DbSchema);
 
             b.ConfigureByConvention();
 

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

@@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 
-[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)]
 public interface IBlobStoringDbContext : IEfCoreDbContext
 {
     DbSet<DatabaseBlobContainer> BlobContainers { get; }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContext.cs

@@ -4,7 +4,7 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB;
 
-[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)]
 public class BlobStoringMongoDbContext : AbpMongoDbContext, IBlobStoringMongoDbContext
 {
     public IMongoCollection<DatabaseBlobContainer> BlobContainers => Collection<DatabaseBlobContainer>();

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContextExtensions.cs

@@ -11,12 +11,12 @@ public static class BlobStoringMongoDbContextExtensions
 
         builder.Entity<DatabaseBlobContainer>(b =>
         {
-            b.CollectionName = BlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers";
+            b.CollectionName = AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers";
         });
 
         builder.Entity<DatabaseBlob>(b =>
         {
-            b.CollectionName = BlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs";
+            b.CollectionName = AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs";
         });
     }
 }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/IBlobStoringMongoDbContext.cs

@@ -4,7 +4,7 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB;
 
-[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)]
 public interface IBlobStoringMongoDbContext : IAbpMongoDbContext
 {
     IMongoCollection<DatabaseBlobContainer> BlobContainers { get; }

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

@@ -1,6 +1,6 @@
 namespace Volo.Blogging
 {
-    public static class BloggingDbProperties
+    public static class AbpBloggingDbProperties
     {
         /// <summary>
         /// Default value: "Blg".

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

@@ -11,7 +11,7 @@ using Volo.Blogging.Users;
 namespace Volo.Blogging.EntityFrameworkCore
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(BloggingDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)]
     public class BloggingDbContext : AbpDbContext<BloggingDbContext>, IBloggingDbContext
     {
         public DbSet<BlogUser> Users { get; set; }

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

@@ -25,7 +25,7 @@ namespace Volo.Blogging.EntityFrameworkCore
 
             builder.Entity<BlogUser>(b =>
             {
-                b.ToTable(BloggingDbProperties.DbTablePrefix + "Users", BloggingDbProperties.DbSchema);
+                b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Users", AbpBloggingDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
                 b.ConfigureAbpUser();
@@ -35,7 +35,7 @@ namespace Volo.Blogging.EntityFrameworkCore
 
             builder.Entity<Blog>(b =>
             {
-                b.ToTable(BloggingDbProperties.DbTablePrefix + "Blogs", BloggingDbProperties.DbSchema);
+                b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Blogs", AbpBloggingDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -48,7 +48,7 @@ namespace Volo.Blogging.EntityFrameworkCore
 
             builder.Entity<Post>(b =>
             {
-                b.ToTable(BloggingDbProperties.DbTablePrefix + "Posts", BloggingDbProperties.DbSchema);
+                b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Posts", AbpBloggingDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -68,7 +68,7 @@ namespace Volo.Blogging.EntityFrameworkCore
 
             builder.Entity<Comment>(b =>
             {
-                b.ToTable(BloggingDbProperties.DbTablePrefix + "Comments", BloggingDbProperties.DbSchema);
+                b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Comments", AbpBloggingDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -84,7 +84,7 @@ namespace Volo.Blogging.EntityFrameworkCore
 
             builder.Entity<Tag>(b =>
             {
-                b.ToTable(BloggingDbProperties.DbTablePrefix + "Tags", BloggingDbProperties.DbSchema);
+                b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Tags", AbpBloggingDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -99,7 +99,7 @@ namespace Volo.Blogging.EntityFrameworkCore
 
             builder.Entity<PostTag>(b =>
             {
-                b.ToTable(BloggingDbProperties.DbTablePrefix + "PostTags", BloggingDbProperties.DbSchema);
+                b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "PostTags", AbpBloggingDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 

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

@@ -11,7 +11,7 @@ using Volo.Blogging.Users;
 namespace Volo.Blogging.EntityFrameworkCore
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(BloggingDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)]
     public interface IBloggingDbContext : IEfCoreDbContext
     {
         DbSet<BlogUser> Users { get; }

modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs

@@ -10,7 +10,7 @@ using Volo.Blogging.Users;
 namespace Volo.Blogging.MongoDB
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(BloggingDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)]
     public class BloggingMongoDbContext : AbpMongoDbContext, IBloggingMongoDbContext
     {
         public IMongoCollection<BlogUser> Users => Collection<BlogUser>();

modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs

@@ -16,27 +16,27 @@ namespace Volo.Blogging.MongoDB
 
             builder.Entity<BlogUser>(b =>
             {
-                b.CollectionName = BloggingDbProperties.DbTablePrefix + "Users";
+                b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Users";
             });
 
             builder.Entity<Blog>(b =>
             {
-                b.CollectionName = BloggingDbProperties.DbTablePrefix + "Blogs";
+                b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Blogs";
             });
 
             builder.Entity<Post>(b =>
             {
-                b.CollectionName = BloggingDbProperties.DbTablePrefix + "Posts";
+                b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Posts";
             });
 
             builder.Entity<Tagging.Tag>(b =>
             {
-                b.CollectionName = BloggingDbProperties.DbTablePrefix + "Tags";
+                b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Tags";
             });
 
             builder.Entity<Comment>(b =>
             {
-                b.CollectionName = BloggingDbProperties.DbTablePrefix + "Comments";
+                b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Comments";
             });
         }
     }

modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs

@@ -10,7 +10,7 @@ using Volo.Blogging.Users;
 namespace Volo.Blogging.MongoDB
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(BloggingDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)]
     public interface IBloggingMongoDbContext : IAbpMongoDbContext
     {
         IMongoCollection<BlogUser> Users { get; }

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

@@ -1,6 +1,6 @@
 namespace Volo.CmsKit;
 
-public static class CmsKitDbProperties
+public static class AbpCmsKitDbProperties
 {
     public static string DbTablePrefix { get; set; } = "Cms";
 

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

@@ -14,7 +14,7 @@ using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.EntityFrameworkCore;
 
-[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)]
 public class CmsKitDbContext : AbpDbContext<CmsKitDbContext>, ICmsKitDbContext
 {
     public DbSet<Comment> Comments { get; set; }

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

@@ -28,7 +28,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<CmsUser>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "Users", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Users", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
                 b.ConfigureAbpUser();
@@ -48,7 +48,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<UserReaction>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "UserReactions", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "UserReactions", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -71,7 +71,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<Comment>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "Comments", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Comments", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -95,7 +95,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<Rating>(r =>
             {
-                r.ToTable(CmsKitDbProperties.DbTablePrefix + "Ratings", CmsKitDbProperties.DbSchema);
+                r.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Ratings", AbpCmsKitDbProperties.DbSchema);
 
                 r.ConfigureByConvention();
 
@@ -117,7 +117,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<Tag>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "Tags", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Tags", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -134,7 +134,7 @@ public static class CmsKitDbContextModelCreatingExtensions
 
             builder.Entity<EntityTag>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "EntityTags", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "EntityTags", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -158,7 +158,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<Page>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "Pages", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Pages", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -180,7 +180,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<Blog>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "Blogs", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Blogs", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -193,7 +193,7 @@ public static class CmsKitDbContextModelCreatingExtensions
 
             builder.Entity<BlogPost>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "BlogPosts", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "BlogPosts", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -210,7 +210,7 @@ public static class CmsKitDbContextModelCreatingExtensions
 
             builder.Entity<BlogFeature>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "BlogFeatures", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "BlogFeatures", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -230,7 +230,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<MediaDescriptor>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "MediaDescriptors", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "MediaDescriptors", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -251,7 +251,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<MenuItem>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "MenuItems", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "MenuItems", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -269,7 +269,7 @@ public static class CmsKitDbContextModelCreatingExtensions
         {
             builder.Entity<GlobalResource>(b =>
             {
-                b.ToTable(CmsKitDbProperties.DbTablePrefix + "GlobalResources", CmsKitDbProperties.DbSchema);
+                b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "GlobalResources", AbpCmsKitDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 

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

@@ -14,7 +14,7 @@ using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.EntityFrameworkCore;
 
-[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)]
 public interface ICmsKitDbContext : IEfCoreDbContext
 {
     DbSet<Comment> Comments { get; }

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs

@@ -15,7 +15,7 @@ using Tag = Volo.CmsKit.Tags.Tag;
 
 namespace Volo.CmsKit.MongoDB;
 
-[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)]
 public class CmsKitMongoDbContext : AbpMongoDbContext, ICmsKitMongoDbContext
 {
     public IMongoCollection<Comment> Comments => Collection<Comment>();

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs

@@ -22,67 +22,67 @@ public static class CmsKitMongoDbContextExtensions
 
         builder.Entity<CmsUser>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Users";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Users";
         });
 
         builder.Entity<UserReaction>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "UserReactions";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "UserReactions";
         });
 
         builder.Entity<Comment>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Comments";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Comments";
         });
 
         builder.Entity<Rating>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Ratings";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Ratings";
         });
 
         builder.Entity<Tag>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Tags";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Tags";
         });
 
         builder.Entity<EntityTag>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "EntityTags";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "EntityTags";
         });
 
         builder.Entity<Page>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Pages";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Pages";
         });
 
         builder.Entity<Blog>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Blogs";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Blogs";
         });
 
         builder.Entity<BlogPost>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "BlogPosts";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "BlogPosts";
         });
 
         builder.Entity<BlogFeature>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "BlogFeatures";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "BlogFeatures";
         });
 
         builder.Entity<MediaDescriptor>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "MediaDescriptors";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "MediaDescriptors";
         });
 
         builder.Entity<MenuItem>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "MenuItems";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "MenuItems";
         });
 
         builder.Entity<GlobalResource>(x =>
         {
-            x.CollectionName = CmsKitDbProperties.DbTablePrefix + "GlobalResources";
+            x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "GlobalResources";
         });
     }
 }

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs

@@ -15,7 +15,7 @@ using Tag = Volo.CmsKit.Tags.Tag;
 
 namespace Volo.CmsKit.MongoDB;
 
-[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)]
 public interface ICmsKitMongoDbContext : IAbpMongoDbContext
 {
     IMongoCollection<UserReaction> UserReactions { get; }

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

@@ -1,6 +1,6 @@
 namespace Volo.Docs
 {
-    public static class DocsDbProperties
+    public static class AbpDocsDbProperties
     {
         public static string DbTablePrefix { get; set; } = "Docs";
 

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

@@ -8,7 +8,7 @@ using Volo.Docs.Projects;
 namespace Volo.Docs.EntityFrameworkCore
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(DocsDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)]
     public class DocsDbContext: AbpDbContext<DocsDbContext>, IDocsDbContext
     {
         public DbSet<Project> Projects { get; set; }

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

@@ -21,7 +21,7 @@ namespace Volo.Docs.EntityFrameworkCore
 
             builder.Entity<Project>(b =>
             {
-                b.ToTable(DocsDbProperties.DbTablePrefix + "Projects", DocsDbProperties.DbSchema);
+                b.ToTable(AbpDocsDbProperties.DbTablePrefix + "Projects", AbpDocsDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -37,7 +37,7 @@ namespace Volo.Docs.EntityFrameworkCore
 
             builder.Entity<Document>(b =>
             {
-                b.ToTable(DocsDbProperties.DbTablePrefix + "Documents", DocsDbProperties.DbSchema);
+                b.ToTable(AbpDocsDbProperties.DbTablePrefix + "Documents", AbpDocsDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 
@@ -61,7 +61,7 @@ namespace Volo.Docs.EntityFrameworkCore
 
             builder.Entity<DocumentContributor>(b =>
             {
-                b.ToTable(DocsDbProperties.DbTablePrefix + "DocumentContributors", DocsDbProperties.DbSchema);
+                b.ToTable(AbpDocsDbProperties.DbTablePrefix + "DocumentContributors", AbpDocsDbProperties.DbSchema);
 
                 b.ConfigureByConvention();
 

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

@@ -8,7 +8,7 @@ using Volo.Docs.Projects;
 namespace Volo.Docs.EntityFrameworkCore
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(DocsDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)]
     public interface IDocsDbContext : IEfCoreDbContext
     {
         DbSet<Project> Projects { get; }

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs

@@ -8,7 +8,7 @@ using Volo.Docs.Documents;
 namespace Volo.Docs.MongoDB
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(DocsDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)]
     public class DocsMongoDbContext : AbpMongoDbContext, IDocsMongoDbContext
     {
         public IMongoCollection<Project> Projects => Collection<Project>();

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs

@@ -14,12 +14,12 @@ namespace Volo.Docs.MongoDB
 
             builder.Entity<Project>(b =>
             {
-                b.CollectionName = DocsDbProperties.DbTablePrefix + "Projects";
+                b.CollectionName = AbpDocsDbProperties.DbTablePrefix + "Projects";
             });
 
             builder.Entity<Document>(b =>
             {
-                b.CollectionName = DocsDbProperties.DbTablePrefix + "DocumentS";
+                b.CollectionName = AbpDocsDbProperties.DbTablePrefix + "DocumentS";
             });
         }
     }

modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs

@@ -8,7 +8,7 @@ using Volo.Docs.Projects;
 namespace Volo.Docs.MongoDB
 {
     [IgnoreMultiTenancy]
-    [ConnectionStringName(DocsDbProperties.ConnectionStringName)]
+    [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)]
     public interface IDocsMongoDbContext : IAbpMongoDbContext
     {
         IMongoCollection<Project> Projects { get; }

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementDbProperties.cs → modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDbProperties.cs

@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.FeatureManagement;
 
-public static class FeatureManagementDbProperties
+public static class AbpFeatureManagementDbProperties
 {
     public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix;
 

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

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.FeatureManagement.EntityFrameworkCore;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)]
 public class FeatureManagementDbContext : AbpDbContext<FeatureManagementDbContext>, IFeatureManagementDbContext
 {
     public DbSet<FeatureValue> FeatureValues { get; set; }

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

@@ -17,7 +17,7 @@ public static class FeatureManagementDbContextModelCreatingExtensions
 
         builder.Entity<FeatureValue>(b =>
         {
-            b.ToTable(FeatureManagementDbProperties.DbTablePrefix + "FeatureValues", FeatureManagementDbProperties.DbSchema);
+            b.ToTable(AbpFeatureManagementDbProperties.DbTablePrefix + "FeatureValues", AbpFeatureManagementDbProperties.DbSchema);
 
             b.ConfigureByConvention();
 

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

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.FeatureManagement.EntityFrameworkCore;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)]
 public interface IFeatureManagementDbContext : IEfCoreDbContext
 {
     DbSet<FeatureValue> FeatureValues { get; }

modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.FeatureManagement.MongoDB;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)]
 public class FeatureManagementMongoDbContext : AbpMongoDbContext, IFeatureManagementMongoDbContext
 {
     public IMongoCollection<FeatureValue> FeatureValues => Collection<FeatureValue>();

modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs

@@ -11,7 +11,7 @@ public static class FeatureManagementMongoDbContextExtensions
 
         builder.Entity<FeatureValue>(b =>
         {
-            b.CollectionName = FeatureManagementDbProperties.DbTablePrefix + "FeatureValues";
+            b.CollectionName = AbpFeatureManagementDbProperties.DbTablePrefix + "FeatureValues";
         });
     }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs

@@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.FeatureManagement.MongoDB;
 
 [IgnoreMultiTenancy]
-[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)]
+[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)]
 public interface IFeatureManagementMongoDbContext : IAbpMongoDbContext
 {
     IMongoCollection<FeatureValue> FeatureValues { get; }

npm/scripts/yarn.lock

@@ -1144,9 +1144,9 @@ locate-path@^6.0.0:
     p-locate "^5.0.0"
 
 lodash@^4.17.20:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"