Dynamic Setting Store implementation.

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs

@@ -289,7 +289,7 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp
             Values = new Dictionary<string, string>()
         };
 
-        var settingDefinitions = _settingDefinitionManager.GetAll().Where(x => x.IsVisibleToClients);
+        var settingDefinitions = (await _settingDefinitionManager.GetAllAsync()).Where(x => x.IsVisibleToClients);
 
         var settingValues = await _settingProvider.GetAllAsync(settingDefinitions.Select(x => x.Name).ToArray());
 

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingOptions.cs

@@ -1,4 +1,5 @@
-using Volo.Abp.Collections;
+using System.Collections.Generic;
+using Volo.Abp.Collections;
 
 namespace Volo.Abp.Settings;
 
@@ -8,9 +9,12 @@ public class AbpSettingOptions
 
     public ITypeList<ISettingValueProvider> ValueProviders { get; }
 
+    public HashSet<string> DeletedSettings { get; }
+
     public AbpSettingOptions()
     {
         DefinitionProviders = new TypeList<ISettingDefinitionProvider>();
         ValueProviders = new TypeList<ISettingValueProvider>();
+        DeletedSettings = new HashSet<string>();
     }
 }

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/IDynamicSettingDefinitionStore.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Settings;
+
+public interface IDynamicSettingDefinitionStore
+{
+    Task<SettingDefinition> GetAsync([NotNull] string name);
+
+    Task<IReadOnlyList<SettingDefinition>> GetAllAsync();
+
+    Task<SettingDefinition> GetOrNullAsync([NotNull] string name);
+}

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingDefinitionManager.cs

@@ -1,14 +1,17 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 
 namespace Volo.Abp.Settings;
 
 public interface ISettingDefinitionManager
 {
-    [NotNull]
+    [ItemNotNull]
-    SettingDefinition Get([NotNull] string name);
+    Task<SettingDefinition> GetAsync([NotNull] string name);
 
-    IReadOnlyList<SettingDefinition> GetAll();
+    [ItemNotNull]
+    Task<IReadOnlyList<SettingDefinition>> GetAllAsync();
 
-    SettingDefinition GetOrNull(string name);
+    [ItemCanBeNull]
+    Task<SettingDefinition> GetOrNullAsync([NotNull] string name);
 }

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/IStaticSettingDefinitionStore.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Settings;
+
+public interface IStaticSettingDefinitionStore
+{
+    Task<SettingDefinition> GetAsync([NotNull] string name);
+
+    Task<IReadOnlyList<SettingDefinition>> GetAllAsync();
+
+    Task<SettingDefinition> GetOrNullAsync([NotNull] string name);
+}

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/NullDynamicSettingDefinitionStore.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Settings;
+
+public class NullDynamicSettingDefinitionStore : IDynamicSettingDefinitionStore, ISingletonDependency
+{
+    private readonly static Task<SettingDefinition> CachedSettingResult = Task.FromResult((SettingDefinition)null);
+
+    private readonly static Task<IReadOnlyList<SettingDefinition>> CachedSettingsResult = Task.FromResult((IReadOnlyList<SettingDefinition>)Array.Empty<SettingDefinition>().ToImmutableList());
+
+    public Task<SettingDefinition> GetAsync(string name)
+    {
+        return CachedSettingResult;
+    }
+
+    public Task<IReadOnlyList<SettingDefinition>> GetAllAsync()
+    {
+        return CachedSettingsResult;
+    }
+
+    public Task<SettingDefinition> GetOrNullAsync(string name)
+    {
+        return CachedSettingResult;
+    }
+}

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs

@@ -1,72 +1,50 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
+using System.Threading.Tasks;
-using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Settings;
 
 public class SettingDefinitionManager : ISettingDefinitionManager, ISingletonDependency
 {
-    protected Lazy<IDictionary<string, SettingDefinition>> SettingDefinitions { get; }
+    protected readonly IStaticSettingDefinitionStore StaticStore;
+    protected readonly IDynamicSettingDefinitionStore DynamicStore;
 
-    protected AbpSettingOptions Options { get; }
+    public SettingDefinitionManager(IStaticSettingDefinitionStore staticStore, IDynamicSettingDefinitionStore dynamicStore)
-
-    protected IServiceProvider ServiceProvider { get; }
-
-    public SettingDefinitionManager(
-        IOptions<AbpSettingOptions> options,
-        IServiceProvider serviceProvider)
     {
-        ServiceProvider = serviceProvider;
+        StaticStore = staticStore;
-        Options = options.Value;
+        DynamicStore = dynamicStore;
-
-        SettingDefinitions = new Lazy<IDictionary<string, SettingDefinition>>(CreateSettingDefinitions, true);
     }
 
-    public virtual SettingDefinition Get(string name)
+    public virtual async Task<SettingDefinition> GetAsync(string name)
     {
-        Check.NotNull(name, nameof(name));
+        var permission = await GetOrNullAsync(name);
-
+        if (permission == null)
-        var setting = GetOrNull(name);
-
-        if (setting == null)
         {
-            throw new AbpException("Undefined setting: " + name);
+            throw new AbpException("Undefined Template: " + name);
         }
 
-        return setting;
+        return permission;
     }
 
-    public virtual IReadOnlyList<SettingDefinition> GetAll()
+    public virtual async Task<SettingDefinition> GetOrNullAsync(string name)
     {
-        return SettingDefinitions.Value.Values.ToImmutableList();
+        Check.NotNull(name, nameof(name));
-    }
 
-    public virtual SettingDefinition GetOrNull(string name)
+        return await StaticStore.GetOrNullAsync(name) ?? await DynamicStore.GetOrNullAsync(name);
-    {
-        return SettingDefinitions.Value.GetOrDefault(name);
     }
 
-    protected virtual IDictionary<string, SettingDefinition> CreateSettingDefinitions()
+    public virtual async Task<IReadOnlyList<SettingDefinition>> GetAllAsync()
     {
-        var settings = new Dictionary<string, SettingDefinition>();
+        var staticTemplates = await StaticStore.GetAllAsync();
+        var staticTemplateNames = staticTemplates
+            .Select(p => p.Name)
+            .ToImmutableHashSet();
 
-        using (var scope = ServiceProvider.CreateScope())
+        var dynamicTemplates = await DynamicStore.GetAllAsync();
-        {
-            var providers = Options
-                .DefinitionProviders
-                .Select(p => scope.ServiceProvider.GetRequiredService(p) as ISettingDefinitionProvider)
-                .ToList();
-
-            foreach (var provider in providers)
-            {
-                provider.Define(new SettingDefinitionContext(settings));
-            }
-        }
 
-        return settings;
+        /* We prefer static Templates over dynamics */
+        return staticTemplates.Concat(dynamicTemplates.Where(d => !staticTemplateNames.Contains(d.Name))).ToImmutableList();
     }
 }

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs

@@ -23,7 +23,7 @@ public class SettingProvider : ISettingProvider, ITransientDependency
 
     public virtual async Task<string> GetOrNullAsync(string name)
     {
-        var setting = SettingDefinitionManager.Get(name);
+        var setting = await SettingDefinitionManager.GetAsync(name);
         var providers = Enumerable
             .Reverse(SettingValueProviderManager.Providers);
 
@@ -46,7 +46,7 @@ public class SettingProvider : ISettingProvider, ITransientDependency
     public virtual async Task<List<SettingValue>> GetAllAsync(string[] names)
     {
         var result = new Dictionary<string, SettingValue>();
-        var settingDefinitions = SettingDefinitionManager.GetAll().Where(x => names.Contains(x.Name)).ToList();
+        var settingDefinitions = (await SettingDefinitionManager.GetAllAsync()).Where(x => names.Contains(x.Name)).ToList();
 
         foreach (var definition in settingDefinitions)
         {
@@ -85,7 +85,7 @@ public class SettingProvider : ISettingProvider, ITransientDependency
     public virtual async Task<List<SettingValue>> GetAllAsync()
     {
         var settingValues = new List<SettingValue>();
-        var settingDefinitions = SettingDefinitionManager.GetAll();
+        var settingDefinitions = await SettingDefinitionManager.GetAllAsync();
 
         foreach (var setting in settingDefinitions)
         {
@@ -110,4 +110,4 @@ public class SettingProvider : ISettingProvider, ITransientDependency
 
         return null;
     }
-}
+}

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/StaticSettingDefinitionStore.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Settings;
+
+public class StaticSettingDefinitionStore : IStaticSettingDefinitionStore, ISingletonDependency
+{
+    protected Lazy<IDictionary<string, SettingDefinition>> SettingDefinitions { get; }
+
+    protected AbpSettingOptions Options { get; }
+
+    protected IServiceProvider ServiceProvider { get; }
+
+    public StaticSettingDefinitionStore(IOptions<AbpSettingOptions> options, IServiceProvider serviceProvider)
+    {
+        ServiceProvider = serviceProvider;
+        Options = options.Value;
+
+        SettingDefinitions = new Lazy<IDictionary<string, SettingDefinition>>(CreateSettingDefinitions, true);
+    }
+
+    public virtual async Task<SettingDefinition> GetAsync(string name)
+    {
+        Check.NotNull(name, nameof(name));
+
+        var setting = await GetOrNullAsync(name);
+
+        if (setting == null)
+        {
+            throw new AbpException("Undefined setting: " + name);
+        }
+
+        return setting;
+    }
+
+    public virtual Task<IReadOnlyList<SettingDefinition>> GetAllAsync()
+    {
+        return Task.FromResult<IReadOnlyList<SettingDefinition>>(SettingDefinitions.Value.Values.ToImmutableList());
+    }
+
+    public virtual Task<SettingDefinition> GetOrNullAsync(string name)
+    {
+        return Task.FromResult(SettingDefinitions.Value.GetOrDefault(name));
+    }
+
+    protected virtual IDictionary<string, SettingDefinition> CreateSettingDefinitions()
+    {
+        var settings = new Dictionary<string, SettingDefinition>();
+
+        using (var scope = ServiceProvider.CreateScope())
+        {
+            var providers = Options
+                .DefinitionProviders
+                .Select(p => scope.ServiceProvider.GetRequiredService(p) as ISettingDefinitionProvider)
+                .ToList();
+
+            foreach (var provider in providers)
+            {
+                provider.Define(new SettingDefinitionContext(settings));
+            }
+        }
+
+        return settings;
+    }
+}

framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/NullIDynamicTemplateDefinitionStore.cs

@@ -10,7 +10,7 @@ public class NullIDynamicTemplateDefinitionStore : IDynamicTemplateDefinitionSto
 {
     private readonly static Task<TemplateDefinition> CachedTemplateResult = Task.FromResult((TemplateDefinition)null);
 
-    private readonly static Task<IReadOnlyList<TemplateDefinition>> CachedFeaturesResult = Task.FromResult((IReadOnlyList<TemplateDefinition>)Array.Empty<TemplateDefinition>().ToImmutableList());
+    private readonly static Task<IReadOnlyList<TemplateDefinition>> CachedTemplatesResult = Task.FromResult((IReadOnlyList<TemplateDefinition>)Array.Empty<TemplateDefinition>().ToImmutableList());
 
     public Task<TemplateDefinition> GetAsync(string name)
     {
@@ -19,7 +19,7 @@ public class NullIDynamicTemplateDefinitionStore : IDynamicTemplateDefinitionSto
 
     public Task<IReadOnlyList<TemplateDefinition>> GetAllAsync()
     {
-        return CachedFeaturesResult;
+        return CachedTemplatesResult;
     }
 
     public Task<TemplateDefinition> GetOrNullAsync(string name)

modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Migrations/20210209024820_init.cs

@@ -1,484 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Volo.Abp.SettingManagement.DemoApp.Migrations;
-
-public partial class init : Migration
-{
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-        migrationBuilder.CreateTable(
-            name: "AbpClaimTypes",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                Required = table.Column<bool>(type: "bit", nullable: false),
-                IsStatic = table.Column<bool>(type: "bit", nullable: false),
-                Regex = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                RegexDescription = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
-                Description = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
-                ValueType = table.Column<int>(type: "int", nullable: false),
-                ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpClaimTypes", x => x.Id);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpLinkUsers",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                SourceUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                SourceTenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                TargetUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TargetTenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpLinkUsers", x => x.Id);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpOrganizationUnits",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                Code = table.Column<string>(type: "nvarchar(95)", maxLength: 95, nullable: false),
-                DisplayName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpOrganizationUnits", x => x.Id);
-                table.ForeignKey(
-                    name: "FK_AbpOrganizationUnits_AbpOrganizationUnits_ParentId",
-                    column: x => x.ParentId,
-                    principalTable: "AbpOrganizationUnits",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Restrict);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpPermissionGrants",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpRoles",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                NormalizedName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                IsDefault = table.Column<bool>(type: "bit", nullable: false),
-                IsStatic = table.Column<bool>(type: "bit", nullable: false),
-                IsPublic = table.Column<bool>(type: "bit", nullable: false),
-                ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpRoles", x => x.Id);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpSecurityLogs",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                ApplicationName = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
-                Identity = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
-                Action = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
-                UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
-                TenantName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                ClientId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                CorrelationId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                ClientIpAddress = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                BrowserInfo = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpSecurityLogs", x => x.Id);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpSettings",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                Value = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: false),
-                ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpSettings", x => x.Id);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpUsers",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                NormalizedUserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                Surname = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                Email = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                NormalizedEmail = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                EmailConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                PasswordHash = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
-                SecurityStamp = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                IsExternal = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                PhoneNumber = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
-                PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                TwoFactorEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
-                LockoutEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                AccessFailedCount = table.Column<int>(type: "int", nullable: false, defaultValue: 0),
-                ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpUsers", x => x.Id);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpOrganizationUnitRoles",
-            columns: table => new {
-                RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                OrganizationUnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpOrganizationUnitRoles", x => new { x.OrganizationUnitId, x.RoleId });
-                table.ForeignKey(
-                    name: "FK_AbpOrganizationUnitRoles_AbpOrganizationUnits_OrganizationUnitId",
-                    column: x => x.OrganizationUnitId,
-                    principalTable: "AbpOrganizationUnits",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-                table.ForeignKey(
-                    name: "FK_AbpOrganizationUnitRoles_AbpRoles_RoleId",
-                    column: x => x.RoleId,
-                    principalTable: "AbpRoles",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpRoleClaims",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                ClaimType = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                ClaimValue = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpRoleClaims", x => x.Id);
-                table.ForeignKey(
-                    name: "FK_AbpRoleClaims_AbpRoles_RoleId",
-                    column: x => x.RoleId,
-                    principalTable: "AbpRoles",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpUserClaims",
-            columns: table => new {
-                Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                ClaimType = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                ClaimValue = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpUserClaims", x => x.Id);
-                table.ForeignKey(
-                    name: "FK_AbpUserClaims_AbpUsers_UserId",
-                    column: x => x.UserId,
-                    principalTable: "AbpUsers",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpUserLogins",
-            columns: table => new {
-                UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                LoginProvider = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                ProviderKey = table.Column<string>(type: "nvarchar(196)", maxLength: 196, nullable: false),
-                ProviderDisplayName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpUserLogins", x => new { x.UserId, x.LoginProvider });
-                table.ForeignKey(
-                    name: "FK_AbpUserLogins_AbpUsers_UserId",
-                    column: x => x.UserId,
-                    principalTable: "AbpUsers",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpUserOrganizationUnits",
-            columns: table => new {
-                UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                OrganizationUnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpUserOrganizationUnits", x => new { x.OrganizationUnitId, x.UserId });
-                table.ForeignKey(
-                    name: "FK_AbpUserOrganizationUnits_AbpOrganizationUnits_OrganizationUnitId",
-                    column: x => x.OrganizationUnitId,
-                    principalTable: "AbpOrganizationUnits",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-                table.ForeignKey(
-                    name: "FK_AbpUserOrganizationUnits_AbpUsers_UserId",
-                    column: x => x.UserId,
-                    principalTable: "AbpUsers",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpUserRoles",
-            columns: table => new {
-                UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpUserRoles", x => new { x.UserId, x.RoleId });
-                table.ForeignKey(
-                    name: "FK_AbpUserRoles_AbpRoles_RoleId",
-                    column: x => x.RoleId,
-                    principalTable: "AbpRoles",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-                table.ForeignKey(
-                    name: "FK_AbpUserRoles_AbpUsers_UserId",
-                    column: x => x.UserId,
-                    principalTable: "AbpUsers",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            });
-
-        migrationBuilder.CreateTable(
-            name: "AbpUserTokens",
-            columns: table => new {
-                UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                LoginProvider = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                Value = table.Column<string>(type: "nvarchar(max)", nullable: true)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_AbpUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
-                table.ForeignKey(
-                    name: "FK_AbpUserTokens_AbpUsers_UserId",
-                    column: x => x.UserId,
-                    principalTable: "AbpUsers",
-                    principalColumn: "Id",
-                    onDelete: ReferentialAction.Cascade);
-            });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpLinkUsers_SourceUserId_SourceTenantId_TargetUserId_TargetTenantId",
-            table: "AbpLinkUsers",
-            columns: new[] { "SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId" },
-            unique: true,
-            filter: "[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpOrganizationUnitRoles_RoleId_OrganizationUnitId",
-            table: "AbpOrganizationUnitRoles",
-            columns: new[] { "RoleId", "OrganizationUnitId" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpOrganizationUnits_Code",
-            table: "AbpOrganizationUnits",
-            column: "Code");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpOrganizationUnits_ParentId",
-            table: "AbpOrganizationUnits",
-            column: "ParentId");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey",
-            table: "AbpPermissionGrants",
-            columns: new[] { "Name", "ProviderName", "ProviderKey" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpRoleClaims_RoleId",
-            table: "AbpRoleClaims",
-            column: "RoleId");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpRoles_NormalizedName",
-            table: "AbpRoles",
-            column: "NormalizedName");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpSecurityLogs_TenantId_Action",
-            table: "AbpSecurityLogs",
-            columns: new[] { "TenantId", "Action" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpSecurityLogs_TenantId_ApplicationName",
-            table: "AbpSecurityLogs",
-            columns: new[] { "TenantId", "ApplicationName" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpSecurityLogs_TenantId_Identity",
-            table: "AbpSecurityLogs",
-            columns: new[] { "TenantId", "Identity" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpSecurityLogs_TenantId_UserId",
-            table: "AbpSecurityLogs",
-            columns: new[] { "TenantId", "UserId" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpSettings_Name_ProviderName_ProviderKey",
-            table: "AbpSettings",
-            columns: new[] { "Name", "ProviderName", "ProviderKey" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUserClaims_UserId",
-            table: "AbpUserClaims",
-            column: "UserId");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUserLogins_LoginProvider_ProviderKey",
-            table: "AbpUserLogins",
-            columns: new[] { "LoginProvider", "ProviderKey" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUserOrganizationUnits_UserId_OrganizationUnitId",
-            table: "AbpUserOrganizationUnits",
-            columns: new[] { "UserId", "OrganizationUnitId" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUserRoles_RoleId_UserId",
-            table: "AbpUserRoles",
-            columns: new[] { "RoleId", "UserId" });
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUsers_Email",
-            table: "AbpUsers",
-            column: "Email");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUsers_NormalizedEmail",
-            table: "AbpUsers",
-            column: "NormalizedEmail");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUsers_NormalizedUserName",
-            table: "AbpUsers",
-            column: "NormalizedUserName");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_AbpUsers_UserName",
-            table: "AbpUsers",
-            column: "UserName");
-    }
-
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-        migrationBuilder.DropTable(
-            name: "AbpClaimTypes");
-
-        migrationBuilder.DropTable(
-            name: "AbpLinkUsers");
-
-        migrationBuilder.DropTable(
-            name: "AbpOrganizationUnitRoles");
-
-        migrationBuilder.DropTable(
-            name: "AbpPermissionGrants");
-
-        migrationBuilder.DropTable(
-            name: "AbpRoleClaims");
-
-        migrationBuilder.DropTable(
-            name: "AbpSecurityLogs");
-
-        migrationBuilder.DropTable(
-            name: "AbpSettings");
-
-        migrationBuilder.DropTable(
-            name: "AbpUserClaims");
-
-        migrationBuilder.DropTable(
-            name: "AbpUserLogins");
-
-        migrationBuilder.DropTable(
-            name: "AbpUserOrganizationUnits");
-
-        migrationBuilder.DropTable(
-            name: "AbpUserRoles");
-
-        migrationBuilder.DropTable(
-            name: "AbpUserTokens");
-
-        migrationBuilder.DropTable(
-            name: "AbpOrganizationUnits");
-
-        migrationBuilder.DropTable(
-            name: "AbpRoles");
-
-        migrationBuilder.DropTable(
-            name: "AbpUsers");
-    }
-}

modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Migrations/20210209024820_init.Designer.cs → modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Migrations/20230626120017_Initial.Designer.cs

@@ -8,20 +8,24 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.SettingManagement.DemoApp;
 
+#nullable disable
+
 namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 {
     [DbContext(typeof(DemoAppDbContext))]
-    [Migration("20210209024820_init")]
+    [Migration("20230626120017_Initial")]
-    partial class init
+    partial class Initial
     {
+        /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .UseIdentityColumns()
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("ProductVersion", "7.0.1")
-                .HasAnnotation("ProductVersion", "5.0.2");
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
@@ -67,7 +71,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("AbpClaimTypes");
+                    b.ToTable("AbpClaimTypes", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
@@ -94,7 +98,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .IsUnique()
                         .HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL");
 
-                    b.ToTable("AbpLinkUsers");
+                    b.ToTable("AbpLinkUsers", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
@@ -109,6 +113,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("nvarchar(40)")
                         .HasColumnName("ConcurrencyStamp");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -143,7 +150,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("NormalizedName");
 
-                    b.ToTable("AbpRoles");
+                    b.ToTable("AbpRoles", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
@@ -171,7 +178,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("RoleId");
 
-                    b.ToTable("AbpRoleClaims");
+                    b.ToTable("AbpRoleClaims", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
@@ -246,7 +253,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("TenantId", "UserId");
 
-                    b.ToTable("AbpSecurityLogs");
+                    b.ToTable("AbpSecurityLogs", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
@@ -295,10 +302,17 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasDefaultValue(false)
                         .HasColumnName("EmailConfirmed");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("IsActive");
+
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bit")
@@ -319,6 +333,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<DateTimeOffset?>("LastPasswordChangeTime")
+                        .HasColumnType("datetimeoffset");
+
                     b.Property<bool>("LockoutEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bit")
@@ -367,6 +384,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("nvarchar(256)")
                         .HasColumnName("SecurityStamp");
 
+                    b.Property<bool>("ShouldChangePasswordOnNextLogin")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Surname")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)")
@@ -398,7 +418,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("UserName");
 
-                    b.ToTable("AbpUsers");
+                    b.ToTable("AbpUsers", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
@@ -426,7 +446,34 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AbpUserClaims");
+                    b.ToTable("AbpUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserDelegation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpUserDelegations", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
@@ -455,7 +502,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("LoginProvider", "ProviderKey");
 
-                    b.ToTable("AbpUserLogins");
+                    b.ToTable("AbpUserLogins", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
@@ -482,7 +529,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("UserId", "OrganizationUnitId");
 
-                    b.ToTable("AbpUserOrganizationUnits");
+                    b.ToTable("AbpUserOrganizationUnits", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
@@ -501,7 +548,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("RoleId", "UserId");
 
-                    b.ToTable("AbpUserRoles");
+                    b.ToTable("AbpUserRoles", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
@@ -526,7 +573,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
-                    b.ToTable("AbpUserTokens");
+                    b.ToTable("AbpUserTokens", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
@@ -569,6 +616,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("nvarchar(128)")
                         .HasColumnName("DisplayName");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -600,7 +650,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("ParentId");
 
-                    b.ToTable("AbpOrganizationUnits");
+                    b.ToTable("AbpOrganizationUnits", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
@@ -627,7 +677,60 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("RoleId", "OrganizationUnitId");
 
-                    b.ToTable("AbpOrganizationUnitRoles");
+                    b.ToTable("AbpOrganizationUnitRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<byte>("MultiTenancySide")
+                        .HasColumnType("tinyint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AbpPermissions", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
@@ -657,9 +760,39 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+                    b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
+                        .IsUnique()
+                        .HasFilter("[TenantId] IS NOT NULL");
+
+                    b.ToTable("AbpPermissionGrants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
 
-                    b.ToTable("AbpPermissionGrants");
+                    b.ToTable("AbpPermissionGroups", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
@@ -688,9 +821,58 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique()
+                        .HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
+
+                    b.ToTable("AbpSettings", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("DefaultValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEncrypted")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsInherited")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
 
-                    b.ToTable("AbpSettings");
+                    b.ToTable("AbpSettingDefinitionRecords", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>

modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Migrations/20230626120017_Initial.cs

@@ -0,0 +1,619 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Volo.Abp.SettingManagement.DemoApp.Migrations
+{
+    /// <inheritdoc />
+    public partial class Initial : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AbpClaimTypes",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Required = table.Column<bool>(type: "bit", nullable: false),
+                    IsStatic = table.Column<bool>(type: "bit", nullable: false),
+                    Regex = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    RegexDescription = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    Description = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
+                    ValueType = table.Column<int>(type: "int", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpClaimTypes", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpLinkUsers",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    SourceUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    SourceTenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    TargetUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TargetTenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpLinkUsers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpOrganizationUnits",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Code = table.Column<string>(type: "nvarchar(95)", maxLength: 95, nullable: false),
+                    DisplayName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    EntityVersion = table.Column<int>(type: "int", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpOrganizationUnits", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AbpOrganizationUnits_AbpOrganizationUnits_ParentId",
+                        column: x => x.ParentId,
+                        principalTable: "AbpOrganizationUnits",
+                        principalColumn: "Id");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpPermissionGrants",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpPermissionGroups",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    DisplayName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpPermissionGroups", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpPermissions",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    GroupName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    ParentName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    DisplayName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    IsEnabled = table.Column<bool>(type: "bit", nullable: false),
+                    MultiTenancySide = table.Column<byte>(type: "tinyint", nullable: false),
+                    Providers = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    StateCheckers = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpPermissions", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpRoles",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    NormalizedName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    IsDefault = table.Column<bool>(type: "bit", nullable: false),
+                    IsStatic = table.Column<bool>(type: "bit", nullable: false),
+                    IsPublic = table.Column<bool>(type: "bit", nullable: false),
+                    EntityVersion = table.Column<int>(type: "int", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpRoles", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpSecurityLogs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    ApplicationName = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
+                    Identity = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
+                    Action = table.Column<string>(type: "nvarchar(96)", maxLength: 96, nullable: true),
+                    UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
+                    TenantName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ClientId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    CorrelationId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ClientIpAddress = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    BrowserInfo = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpSecurityLogs", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpSettingDefinitionRecords",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    DisplayName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Description = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    DefaultValue = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    IsVisibleToClients = table.Column<bool>(type: "bit", nullable: false),
+                    Providers = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    IsInherited = table.Column<bool>(type: "bit", nullable: false),
+                    IsEncrypted = table.Column<bool>(type: "bit", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpSettingDefinitionRecords", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpSettings",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    Value = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: false),
+                    ProviderName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ProviderKey = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpSettings", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpUserDelegations",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    SourceUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TargetUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    StartTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    EndTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpUserDelegations", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpUsers",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    NormalizedUserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Surname = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Email = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    NormalizedEmail = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    EmailConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    PasswordHash = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
+                    SecurityStamp = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    IsExternal = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    PhoneNumber = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
+                    PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    IsActive = table.Column<bool>(type: "bit", nullable: false),
+                    TwoFactorEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
+                    LockoutEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    AccessFailedCount = table.Column<int>(type: "int", nullable: false, defaultValue: 0),
+                    ShouldChangePasswordOnNextLogin = table.Column<bool>(type: "bit", nullable: false),
+                    EntityVersion = table.Column<int>(type: "int", nullable: false),
+                    LastPasswordChangeTime = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpUsers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpOrganizationUnitRoles",
+                columns: table => new
+                {
+                    RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    OrganizationUnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpOrganizationUnitRoles", x => new { x.OrganizationUnitId, x.RoleId });
+                    table.ForeignKey(
+                        name: "FK_AbpOrganizationUnitRoles_AbpOrganizationUnits_OrganizationUnitId",
+                        column: x => x.OrganizationUnitId,
+                        principalTable: "AbpOrganizationUnits",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AbpOrganizationUnitRoles_AbpRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "AbpRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpRoleClaims",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    ClaimType = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    ClaimValue = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpRoleClaims", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AbpRoleClaims_AbpRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "AbpRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpUserClaims",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    ClaimType = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    ClaimValue = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpUserClaims", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AbpUserClaims_AbpUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AbpUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpUserLogins",
+                columns: table => new
+                {
+                    UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    LoginProvider = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    ProviderKey = table.Column<string>(type: "nvarchar(196)", maxLength: 196, nullable: false),
+                    ProviderDisplayName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpUserLogins", x => new { x.UserId, x.LoginProvider });
+                    table.ForeignKey(
+                        name: "FK_AbpUserLogins_AbpUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AbpUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpUserOrganizationUnits",
+                columns: table => new
+                {
+                    UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    OrganizationUnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpUserOrganizationUnits", x => new { x.OrganizationUnitId, x.UserId });
+                    table.ForeignKey(
+                        name: "FK_AbpUserOrganizationUnits_AbpOrganizationUnits_OrganizationUnitId",
+                        column: x => x.OrganizationUnitId,
+                        principalTable: "AbpOrganizationUnits",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AbpUserOrganizationUnits_AbpUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AbpUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpUserRoles",
+                columns: table => new
+                {
+                    UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    RoleId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpUserRoles", x => new { x.UserId, x.RoleId });
+                    table.ForeignKey(
+                        name: "FK_AbpUserRoles_AbpRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "AbpRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AbpUserRoles_AbpUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AbpUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AbpUserTokens",
+                columns: table => new
+                {
+                    UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    LoginProvider = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Value = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
+                    table.ForeignKey(
+                        name: "FK_AbpUserTokens_AbpUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AbpUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpLinkUsers_SourceUserId_SourceTenantId_TargetUserId_TargetTenantId",
+                table: "AbpLinkUsers",
+                columns: new[] { "SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId" },
+                unique: true,
+                filter: "[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpOrganizationUnitRoles_RoleId_OrganizationUnitId",
+                table: "AbpOrganizationUnitRoles",
+                columns: new[] { "RoleId", "OrganizationUnitId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpOrganizationUnits_Code",
+                table: "AbpOrganizationUnits",
+                column: "Code");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpOrganizationUnits_ParentId",
+                table: "AbpOrganizationUnits",
+                column: "ParentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpPermissionGrants_TenantId_Name_ProviderName_ProviderKey",
+                table: "AbpPermissionGrants",
+                columns: new[] { "TenantId", "Name", "ProviderName", "ProviderKey" },
+                unique: true,
+                filter: "[TenantId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpPermissionGroups_Name",
+                table: "AbpPermissionGroups",
+                column: "Name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpPermissions_GroupName",
+                table: "AbpPermissions",
+                column: "GroupName");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpPermissions_Name",
+                table: "AbpPermissions",
+                column: "Name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpRoleClaims_RoleId",
+                table: "AbpRoleClaims",
+                column: "RoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpRoles_NormalizedName",
+                table: "AbpRoles",
+                column: "NormalizedName");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSecurityLogs_TenantId_Action",
+                table: "AbpSecurityLogs",
+                columns: new[] { "TenantId", "Action" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSecurityLogs_TenantId_ApplicationName",
+                table: "AbpSecurityLogs",
+                columns: new[] { "TenantId", "ApplicationName" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSecurityLogs_TenantId_Identity",
+                table: "AbpSecurityLogs",
+                columns: new[] { "TenantId", "Identity" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSecurityLogs_TenantId_UserId",
+                table: "AbpSecurityLogs",
+                columns: new[] { "TenantId", "UserId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSettingDefinitionRecords_Name",
+                table: "AbpSettingDefinitionRecords",
+                column: "Name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSettings_Name_ProviderName_ProviderKey",
+                table: "AbpSettings",
+                columns: new[] { "Name", "ProviderName", "ProviderKey" },
+                unique: true,
+                filter: "[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUserClaims_UserId",
+                table: "AbpUserClaims",
+                column: "UserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUserLogins_LoginProvider_ProviderKey",
+                table: "AbpUserLogins",
+                columns: new[] { "LoginProvider", "ProviderKey" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUserOrganizationUnits_UserId_OrganizationUnitId",
+                table: "AbpUserOrganizationUnits",
+                columns: new[] { "UserId", "OrganizationUnitId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUserRoles_RoleId_UserId",
+                table: "AbpUserRoles",
+                columns: new[] { "RoleId", "UserId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUsers_Email",
+                table: "AbpUsers",
+                column: "Email");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUsers_NormalizedEmail",
+                table: "AbpUsers",
+                column: "NormalizedEmail");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUsers_NormalizedUserName",
+                table: "AbpUsers",
+                column: "NormalizedUserName");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpUsers_UserName",
+                table: "AbpUsers",
+                column: "UserName");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AbpClaimTypes");
+
+            migrationBuilder.DropTable(
+                name: "AbpLinkUsers");
+
+            migrationBuilder.DropTable(
+                name: "AbpOrganizationUnitRoles");
+
+            migrationBuilder.DropTable(
+                name: "AbpPermissionGrants");
+
+            migrationBuilder.DropTable(
+                name: "AbpPermissionGroups");
+
+            migrationBuilder.DropTable(
+                name: "AbpPermissions");
+
+            migrationBuilder.DropTable(
+                name: "AbpRoleClaims");
+
+            migrationBuilder.DropTable(
+                name: "AbpSecurityLogs");
+
+            migrationBuilder.DropTable(
+                name: "AbpSettingDefinitionRecords");
+
+            migrationBuilder.DropTable(
+                name: "AbpSettings");
+
+            migrationBuilder.DropTable(
+                name: "AbpUserClaims");
+
+            migrationBuilder.DropTable(
+                name: "AbpUserDelegations");
+
+            migrationBuilder.DropTable(
+                name: "AbpUserLogins");
+
+            migrationBuilder.DropTable(
+                name: "AbpUserOrganizationUnits");
+
+            migrationBuilder.DropTable(
+                name: "AbpUserRoles");
+
+            migrationBuilder.DropTable(
+                name: "AbpUserTokens");
+
+            migrationBuilder.DropTable(
+                name: "AbpOrganizationUnits");
+
+            migrationBuilder.DropTable(
+                name: "AbpRoles");
+
+            migrationBuilder.DropTable(
+                name: "AbpUsers");
+        }
+    }
+}

modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Migrations/DemoAppDbContextModelSnapshot.cs

@@ -7,6 +7,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.SettingManagement.DemoApp;
 
+#nullable disable
+
 namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 {
     [DbContext(typeof(DemoAppDbContext))]
@@ -16,10 +18,11 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .UseIdentityColumns()
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("ProductVersion", "7.0.1")
-                .HasAnnotation("ProductVersion", "5.0.2");
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
@@ -65,7 +68,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("AbpClaimTypes");
+                    b.ToTable("AbpClaimTypes", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
@@ -92,7 +95,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .IsUnique()
                         .HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL");
 
-                    b.ToTable("AbpLinkUsers");
+                    b.ToTable("AbpLinkUsers", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
@@ -107,6 +110,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("nvarchar(40)")
                         .HasColumnName("ConcurrencyStamp");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -141,7 +147,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("NormalizedName");
 
-                    b.ToTable("AbpRoles");
+                    b.ToTable("AbpRoles", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
@@ -169,7 +175,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("RoleId");
 
-                    b.ToTable("AbpRoleClaims");
+                    b.ToTable("AbpRoleClaims", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
@@ -244,7 +250,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("TenantId", "UserId");
 
-                    b.ToTable("AbpSecurityLogs");
+                    b.ToTable("AbpSecurityLogs", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
@@ -293,10 +299,17 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasDefaultValue(false)
                         .HasColumnName("EmailConfirmed");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit")
+                        .HasColumnName("IsActive");
+
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bit")
@@ -317,6 +330,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<DateTimeOffset?>("LastPasswordChangeTime")
+                        .HasColumnType("datetimeoffset");
+
                     b.Property<bool>("LockoutEnabled")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bit")
@@ -365,6 +381,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("nvarchar(256)")
                         .HasColumnName("SecurityStamp");
 
+                    b.Property<bool>("ShouldChangePasswordOnNextLogin")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Surname")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)")
@@ -396,7 +415,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("UserName");
 
-                    b.ToTable("AbpUsers");
+                    b.ToTable("AbpUsers", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
@@ -424,7 +443,34 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AbpUserClaims");
+                    b.ToTable("AbpUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserDelegation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpUserDelegations", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
@@ -453,7 +499,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("LoginProvider", "ProviderKey");
 
-                    b.ToTable("AbpUserLogins");
+                    b.ToTable("AbpUserLogins", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
@@ -480,7 +526,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("UserId", "OrganizationUnitId");
 
-                    b.ToTable("AbpUserOrganizationUnits");
+                    b.ToTable("AbpUserOrganizationUnits", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
@@ -499,7 +545,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("RoleId", "UserId");
 
-                    b.ToTable("AbpUserRoles");
+                    b.ToTable("AbpUserRoles", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
@@ -524,7 +570,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
-                    b.ToTable("AbpUserTokens");
+                    b.ToTable("AbpUserTokens", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
@@ -567,6 +613,9 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
                         .HasColumnType("nvarchar(128)")
                         .HasColumnName("DisplayName");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -598,7 +647,7 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("ParentId");
 
-                    b.ToTable("AbpOrganizationUnits");
+                    b.ToTable("AbpOrganizationUnits", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
@@ -625,7 +674,60 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasIndex("RoleId", "OrganizationUnitId");
 
-                    b.ToTable("AbpOrganizationUnitRoles");
+                    b.ToTable("AbpOrganizationUnitRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<byte>("MultiTenancySide")
+                        .HasColumnType("tinyint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AbpPermissions", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
@@ -655,9 +757,39 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+                    b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
+                        .IsUnique()
+                        .HasFilter("[TenantId] IS NOT NULL");
+
+                    b.ToTable("AbpPermissionGrants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
 
-                    b.ToTable("AbpPermissionGrants");
+                    b.ToTable("AbpPermissionGroups", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
@@ -686,9 +818,58 @@ namespace Volo.Abp.SettingManagement.DemoApp.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique()
+                        .HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
+
+                    b.ToTable("AbpSettings", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("DefaultValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEncrypted")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsInherited")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
 
-                    b.ToTable("AbpSettings");
+                    b.ToTable("AbpSettingDefinitionRecords", (string)null);
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingDefinitionRecordConsts.cs

@@ -0,0 +1,12 @@
+namespace Volo.Abp.SettingManagement;
+
+public class SettingDefinitionRecordConsts
+{
+    public static int MaxNameLength { get; set; } = 128;
+
+    public static int MaxDisplayNameLength { get; set; } = 256;
+
+    public static int MaxDescriptionLength { get; set; } = 512;
+
+    public static int MaxProvidersLength { get; set; } = 128;
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.csproj

@@ -22,4 +22,8 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Polly" Version="$(PollyPackageVersion)" />
+  </ItemGroup>
+
 </Project>

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs

@@ -1,7 +1,17 @@
-using Volo.Abp.Caching;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Polly;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain;
 using Volo.Abp.Modularity;
 using Volo.Abp.Settings;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.SettingManagement;
 
@@ -13,6 +23,8 @@ namespace Volo.Abp.SettingManagement;
     )]
 public class AbpSettingManagementDomainModule : AbpModule
 {
+    private readonly CancellationTokenSource _cancellationTokenSource = new();
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         Configure<SettingManagementOptions>(options =>
@@ -24,4 +36,128 @@ public class AbpSettingManagementDomainModule : AbpModule
             options.Providers.Add<UserSettingManagementProvider>();
         });
     }
+
+    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+    {
+        AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
+    }
+
+    public override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
+    {
+        InitializeDynamicSettings(context);
+        return Task.CompletedTask;
+    }
+
+    public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context)
+    {
+        _cancellationTokenSource.Cancel();
+        return Task.CompletedTask;
+    }
+
+    private void InitializeDynamicSettings(ApplicationInitializationContext context)
+    {
+        var options = context
+            .ServiceProvider
+            .GetRequiredService<IOptions<SettingManagementOptions>>()
+            .Value;
+
+        if (!options.SaveStaticSettingsToDatabase && !options.IsDynamicSettingStoreEnabled)
+        {
+            return;
+        }
+
+        var rootServiceProvider = context.ServiceProvider.GetRequiredService<IRootServiceProvider>();
+
+        Task.Run(async () =>
+        {
+            using var scope = rootServiceProvider.CreateScope();
+            var applicationLifetime = scope.ServiceProvider.GetService<IHostApplicationLifetime>();
+            var cancellationTokenProvider = scope.ServiceProvider.GetRequiredService<ICancellationTokenProvider>();
+            var cancellationToken = applicationLifetime?.ApplicationStopping ?? _cancellationTokenSource.Token;
+
+            try
+            {
+                using (cancellationTokenProvider.Use(cancellationToken))
+                {
+                    if (cancellationTokenProvider.Token.IsCancellationRequested)
+                    {
+                        return;
+                    }
+
+                    await SaveStaticSettingsToDatabaseAsync(options, scope, cancellationTokenProvider);
+
+                    if (cancellationTokenProvider.Token.IsCancellationRequested)
+                    {
+                        return;
+                    }
+
+                    await PreCacheDynamicSettingsAsync(options, scope);
+                }
+            }
+            // ReSharper disable once EmptyGeneralCatchClause (No need to log since it is logged above)
+            catch { }
+        });
+    }
+
+    private async static Task SaveStaticSettingsToDatabaseAsync(
+        SettingManagementOptions options,
+        IServiceScope scope,
+        ICancellationTokenProvider cancellationTokenProvider)
+    {
+        if (!options.SaveStaticSettingsToDatabase)
+        {
+            return;
+        }
+
+        await Policy
+            .Handle<Exception>()
+            .WaitAndRetryAsync(8, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt) * 10))
+            .ExecuteAsync(async _ =>
+            {
+                try
+                {
+                    // ReSharper disable once AccessToDisposedClosure
+                    await scope
+                        .ServiceProvider
+                        .GetRequiredService<IStaticSettingSaver>()
+                        .SaveAsync();
+                }
+                catch (Exception ex)
+                {
+                    // ReSharper disable once AccessToDisposedClosure
+                    scope.ServiceProvider
+                        .GetService<ILogger<AbpSettingManagementDomainModule>>()?
+                        .LogException(ex);
+
+                    throw; // Polly will catch it
+                }
+            }, cancellationTokenProvider.Token);
+    }
+
+    private async static Task PreCacheDynamicSettingsAsync(SettingManagementOptions options, IServiceScope scope)
+    {
+        if (!options.IsDynamicSettingStoreEnabled)
+        {
+            return;
+        }
+
+        try
+        {
+            // Pre-cache settings, so first request doesn't wait
+            await scope
+                .ServiceProvider
+                .GetRequiredService<IDynamicSettingDefinitionStore>()
+                .GetAllAsync();
+        }
+        catch (Exception ex)
+        {
+            // ReSharper disable once AccessToDisposedClosure
+            scope
+                .ServiceProvider
+                .GetService<ILogger<AbpSettingManagementDomainModule>>()?
+                .LogException(ex);
+
+            throw; // It will be cached in InitializeDynamicSettings
+        }
+    }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DynamicSettingDefinitionStore.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.DistributedLocking;
+using Volo.Abp.Settings;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.SettingManagement;
+
+[Dependency(ReplaceServices = true)]
+public class DynamicSettingDefinitionStore : IDynamicSettingDefinitionStore, ITransientDependency
+{
+    protected ISettingDefinitionRecordRepository SettingRepository { get; }
+    protected ISettingDefinitionSerializer SettingDefinitionSerializer { get; }
+    protected IDynamicSettingDefinitionStoreInMemoryCache StoreCache { get; }
+    protected IDistributedCache DistributedCache { get; }
+    protected IAbpDistributedLock DistributedLock { get; }
+    public SettingManagementOptions SettingManagementOptions { get; }
+    protected AbpDistributedCacheOptions CacheOptions { get; }
+
+    public DynamicSettingDefinitionStore(
+        ISettingDefinitionRecordRepository textSettingRepository,
+        ISettingDefinitionSerializer textSettingDefinitionSerializer,
+        IDynamicSettingDefinitionStoreInMemoryCache storeCache,
+        IDistributedCache distributedCache,
+        IOptions<AbpDistributedCacheOptions> cacheOptions,
+        IOptions<SettingManagementOptions> settingManagementOptions,
+        IAbpDistributedLock distributedLock)
+    {
+        SettingRepository = textSettingRepository;
+        SettingDefinitionSerializer = textSettingDefinitionSerializer;
+        StoreCache = storeCache;
+        DistributedCache = distributedCache;
+        DistributedLock = distributedLock;
+        SettingManagementOptions = settingManagementOptions.Value;
+        CacheOptions = cacheOptions.Value;
+    }
+
+    public virtual async Task<SettingDefinition> GetAsync(string name)
+    {
+        var setting = await GetOrNullAsync(name);
+        if (setting == null)
+        {
+            throw new AbpException("Undefined setting: " + name);
+        }
+
+        return setting;
+    }
+
+    public virtual async Task<SettingDefinition> GetOrNullAsync(string name)
+    {
+        if (!SettingManagementOptions.IsDynamicSettingStoreEnabled)
+        {
+            return null;
+        }
+
+        using (await StoreCache.SyncSemaphore.LockAsync())
+        {
+            await EnsureCacheIsUptoDateAsync();
+            return StoreCache.GetSettingOrNull(name);
+        }
+    }
+
+    public virtual async Task<IReadOnlyList<SettingDefinition>> GetAllAsync()
+    {
+        if (!SettingManagementOptions.IsDynamicSettingStoreEnabled)
+        {
+            return Array.Empty<SettingDefinition>();
+        }
+
+        using (await StoreCache.SyncSemaphore.LockAsync())
+        {
+            await EnsureCacheIsUptoDateAsync();
+            return StoreCache.GetSettings().ToImmutableList();
+        }
+    }
+
+    protected virtual async Task EnsureCacheIsUptoDateAsync()
+    {
+        if (StoreCache.LastCheckTime.HasValue &&
+            DateTime.Now.Subtract(StoreCache.LastCheckTime.Value).TotalSeconds < 30)
+        {
+            /* We get the latest setting with a small delay for optimization */
+            return;
+        }
+
+        var stampInDistributedCache = await GetOrSetStampInDistributedCache();
+
+        if (stampInDistributedCache == StoreCache.CacheStamp)
+        {
+            StoreCache.LastCheckTime = DateTime.Now;
+            return;
+        }
+
+        await UpdateInMemoryStoreCache();
+
+        StoreCache.CacheStamp = stampInDistributedCache;
+        StoreCache.LastCheckTime = DateTime.Now;
+    }
+
+    protected virtual async Task UpdateInMemoryStoreCache()
+    {
+        var settingRecords = await SettingRepository.GetListAsync();
+        await StoreCache.FillAsync(settingRecords);
+    }
+
+    protected virtual async Task<string> GetOrSetStampInDistributedCache()
+    {
+        var cacheKey = GetCommonStampCacheKey();
+
+        var stampInDistributedCache = await DistributedCache.GetStringAsync(cacheKey);
+        if (stampInDistributedCache != null)
+        {
+            return stampInDistributedCache;
+        }
+
+        await using (var commonLockHandle = await DistributedLock.TryAcquireAsync(GetCommonDistributedLockKey(), TimeSpan.FromMinutes(2)))
+        {
+            if (commonLockHandle == null)
+            {
+                /* This request will fail */
+                throw new AbpException(
+                    "Could not acquire distributed lock for setting definition common stamp check!"
+                );
+            }
+
+            stampInDistributedCache = await DistributedCache.GetStringAsync(cacheKey);
+            if (stampInDistributedCache != null)
+            {
+                return stampInDistributedCache;
+            }
+
+            stampInDistributedCache = Guid.NewGuid().ToString();
+
+            await DistributedCache.SetStringAsync(
+                cacheKey,
+                stampInDistributedCache,
+                new DistributedCacheEntryOptions
+                {
+                    SlidingExpiration = TimeSpan.FromDays(30) //TODO: Make it configurable?
+                }
+            );
+        }
+
+        return stampInDistributedCache;
+    }
+
+    protected virtual string GetCommonStampCacheKey()
+    {
+        return $"{CacheOptions.KeyPrefix}_AbpInMemorySettingCacheStamp";
+    }
+
+    protected virtual string GetCommonDistributedLockKey()
+    {
+        return $"{CacheOptions.KeyPrefix}_Common_AbpSettingUpdateLock";
+    }
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DynamicSettingDefinitionStoreInMemoryCache.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement;
+
+public class DynamicSettingDefinitionStoreInMemoryCache : IDynamicSettingDefinitionStoreInMemoryCache, ISingletonDependency
+{
+    public string CacheStamp { get; set; }
+
+    protected IDictionary<string, SettingDefinition> SettingDefinitions { get; }
+    protected ILocalizableStringSerializer LocalizableStringSerializer { get; }
+
+    public SemaphoreSlim SyncSemaphore { get; } = new(1, 1);
+
+    public DateTime? LastCheckTime { get; set; }
+
+    public DynamicSettingDefinitionStoreInMemoryCache(ILocalizableStringSerializer localizableStringSerializer)
+    {
+        LocalizableStringSerializer = localizableStringSerializer;
+        SettingDefinitions = new Dictionary<string, SettingDefinition>();
+    }
+
+    public Task FillAsync(List<SettingDefinitionRecord> settingRecords)
+    {
+        SettingDefinitions.Clear();
+
+        foreach (var record in settingRecords)
+        {
+            var settingDefinition = new SettingDefinition(
+                record.Name,
+                record.DefaultValue,
+                LocalizableStringSerializer.Deserialize(record.DisplayName),
+                record.Description != null ? LocalizableStringSerializer.Deserialize(record.Description) : null,
+                record.IsVisibleToClients,
+                record.IsInherited,
+                record.IsEncrypted);
+
+            foreach (var property in record.ExtraProperties)
+            {
+                settingDefinition.WithProperty(property.Key, property.Value);
+            }
+
+            SettingDefinitions[record.Name] = settingDefinition;
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public SettingDefinition GetSettingOrNull(string name)
+    {
+        return SettingDefinitions.GetOrDefault(name);
+    }
+
+    public IReadOnlyList<SettingDefinition> GetSettings()
+    {
+        return SettingDefinitions.Values.ToList();
+    }
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/IDynamicSettingDefinitionStoreInMemoryCache.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement;
+
+public interface IDynamicSettingDefinitionStoreInMemoryCache
+{
+    string CacheStamp { get; set; }
+
+    SemaphoreSlim SyncSemaphore { get; }
+
+    DateTime? LastCheckTime { get; set; }
+
+    Task FillAsync(List<SettingDefinitionRecord> settingRecords);
+
+    SettingDefinition GetSettingOrNull(string name);
+
+    IReadOnlyList<SettingDefinition> GetSettings();
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingDefinitionRecordRepository.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace Volo.Abp.SettingManagement;
+
+public interface ISettingDefinitionRecordRepository : IBasicRepository<SettingDefinitionRecord, Guid>
+{
+    Task<SettingDefinitionRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default);
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingDefinitionSerializer.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement;
+
+public interface ISettingDefinitionSerializer
+{
+    Task<SettingDefinitionRecord> SerializeAsync(SettingDefinition setting);
+
+    Task<List<SettingDefinitionRecord>> SerializeAsync(IEnumerable<SettingDefinition> settings);
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/IStaticSettingSaver.cs

@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.SettingManagement;
+
+public interface IStaticSettingSaver
+{
+    Task SaveAsync();
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingDefinitionRecord.cs

@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.SettingManagement;
+
+public class SettingDefinitionRecord : BasicAggregateRoot<Guid>, IHasExtraProperties
+{
+    /// <summary>
+    /// Unique name of the setting.
+    /// </summary>
+    [NotNull]
+    public string Name { get; set; }
+
+    [NotNull]
+    public string DisplayName { get; set; }
+
+    [CanBeNull]
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Default value of the setting.
+    /// </summary>
+    [CanBeNull]
+    public string DefaultValue { get; set; }
+
+    /// <summary>
+    /// Can clients see this setting and it's value.
+    /// It maybe dangerous for some settings to be visible to clients (such as an email server password).
+    /// Default: false.
+    /// </summary>
+    public bool IsVisibleToClients { get; set; }
+
+    /// <summary>
+    /// Comma separated list of provider names.
+    /// </summary>
+    public string Providers { get; set; }
+
+    /// <summary>
+    /// Is this setting inherited from parent scopes.
+    /// Default: True.
+    /// </summary>
+    public bool IsInherited { get; set; }
+
+    /// <summary>
+    /// Is this setting stored as encrypted in the data source.
+    /// Default: False.
+    /// </summary>
+    public bool IsEncrypted { get; set; }
+
+    public ExtraPropertyDictionary ExtraProperties { get; protected set; }
+
+    public SettingDefinitionRecord()
+    {
+        ExtraProperties = new ExtraPropertyDictionary();
+        this.SetDefaultsForExtraProperties();
+    }
+
+    public SettingDefinitionRecord(
+        Guid id,
+        string name,
+        string displayName,
+        string description,
+        string defaultValue,
+        bool isVisibleToClients,
+        string providers,
+        bool isInherited,
+        bool isEncrypted)
+        : base(id)
+    {
+        Name = Check.NotNullOrWhiteSpace(name, nameof(name), SettingDefinitionRecordConsts.MaxNameLength);
+        DisplayName =  Check.NotNullOrWhiteSpace(displayName, nameof(displayName), SettingDefinitionRecordConsts.MaxDisplayNameLength);
+        Description = Check.Length(description, nameof(description), SettingDefinitionRecordConsts.MaxDescriptionLength);
+        DefaultValue = defaultValue;
+        IsVisibleToClients = isVisibleToClients;
+        Providers = Check.Length(providers, nameof(providers), SettingDefinitionRecordConsts.MaxProvidersLength);
+        IsInherited = isInherited;
+        IsEncrypted = isEncrypted;
+        ExtraProperties = new ExtraPropertyDictionary();
+        this.SetDefaultsForExtraProperties();
+    }
+
+    public bool HasSameData(SettingDefinitionRecord otherRecord)
+    {
+        if (Name != otherRecord.Name)
+        {
+            return false;
+        }
+
+        if (DisplayName != otherRecord.DisplayName)
+        {
+            return false;
+        }
+
+        if (Description != otherRecord.Description)
+        {
+            return false;
+        }
+
+        if (DefaultValue != otherRecord.DefaultValue)
+        {
+            return false;
+        }
+
+        if (IsVisibleToClients != otherRecord.IsVisibleToClients)
+        {
+            return false;
+        }
+
+        if (Providers != otherRecord.Providers)
+        {
+            return false;
+        }
+
+        if (IsInherited != otherRecord.IsInherited)
+        {
+            return false;
+        }
+
+        if (IsEncrypted != otherRecord.IsEncrypted)
+        {
+            return false;
+        }
+
+        if (!this.HasSameExtraProperties(otherRecord))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public void Patch(SettingDefinitionRecord otherRecord)
+    {
+        if (Name != otherRecord.Name)
+        {
+            Name = otherRecord.Name;
+        }
+
+        if (DisplayName != otherRecord.DisplayName)
+        {
+            DisplayName = otherRecord.DisplayName;
+        }
+
+        if (Description != otherRecord.Description)
+        {
+            Description = otherRecord.Description;
+        }
+
+        if (DefaultValue != otherRecord.DefaultValue)
+        {
+            DefaultValue = otherRecord.DefaultValue;
+        }
+
+        if (IsVisibleToClients != otherRecord.IsVisibleToClients)
+        {
+            IsVisibleToClients = otherRecord.IsVisibleToClients;
+        }
+
+        if (Providers != otherRecord.Providers)
+        {
+            Providers = otherRecord.Providers;
+        }
+
+        if (IsInherited != otherRecord.IsInherited)
+        {
+            IsInherited = otherRecord.IsInherited;
+        }
+
+        if (IsEncrypted != otherRecord.IsEncrypted)
+        {
+            IsEncrypted = otherRecord.IsEncrypted;
+        }
+
+        if (!this.HasSameExtraProperties(otherRecord))
+        {
+            this.ExtraProperties.Clear();
+
+            foreach (var property in otherRecord.ExtraProperties)
+            {
+                this.ExtraProperties.Add(property.Key, property.Value);
+            }
+        }
+    }
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingDefinitionSerializer.cs

@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Guids;
+using Volo.Abp.Localization;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement;
+
+public class SettingDefinitionSerializer : ISettingDefinitionSerializer, ITransientDependency
+{
+    protected IGuidGenerator GuidGenerator { get; }
+    protected ILocalizableStringSerializer LocalizableStringSerializer { get; }
+
+    public SettingDefinitionSerializer(IGuidGenerator guidGenerator, ILocalizableStringSerializer localizableStringSerializer)
+    {
+        GuidGenerator = guidGenerator;
+        LocalizableStringSerializer = localizableStringSerializer;
+    }
+
+    public virtual Task<SettingDefinitionRecord> SerializeAsync(SettingDefinition setting)
+    {
+        using (CultureHelper.Use(CultureInfo.InvariantCulture))
+        {
+            var record = new SettingDefinitionRecord(
+                GuidGenerator.Create(),
+                setting.Name,
+                LocalizableStringSerializer.Serialize(setting.DisplayName),
+                LocalizableStringSerializer.Serialize(setting.Description),
+                setting.DefaultValue,
+                setting.IsVisibleToClients,
+                SerializeProviders(setting.Providers),
+                setting.IsInherited,
+                setting.IsEncrypted);
+
+            foreach (var property in setting.Properties)
+            {
+                record.SetProperty(property.Key, property.Value);
+            }
+
+            return Task.FromResult(record);
+        }
+    }
+
+    public virtual Task<List<SettingDefinitionRecord>> SerializeAsync(IEnumerable<SettingDefinition> settings)
+    {
+        return Task.FromResult(settings.Select(SerializeAsync).Select(t => t.Result).ToList());
+    }
+
+    protected virtual string SerializeProviders(ICollection<string> providers)
+    {
+        return providers.Any()
+            ? providers.JoinAsString(",")
+            : null;
+    }
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementOptions.cs

@@ -6,6 +6,16 @@ public class SettingManagementOptions
 {
     public ITypeList<ISettingManagementProvider> Providers { get; }
 
+    /// <summary>
+    /// Default: true.
+    /// </summary>
+    public bool SaveStaticSettingsToDatabase { get; set; } = true;
+
+    /// <summary>
+    /// Default: false.
+    /// </summary>
+    public bool IsDynamicSettingStoreEnabled { get; set; }
+
     public SettingManagementOptions()
     {
         Providers = new TypeList<ISettingManagementProvider>();

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs

@@ -92,7 +92,7 @@ public class SettingManagementStore : ISettingManagementStore, ITransientDepende
         string currentName,
         SettingCacheItem currentCacheItem)
     {
-        var settingDefinitions = SettingDefinitionManager.GetAll();
+        var settingDefinitions = await SettingDefinitionManager.GetAllAsync();
         var settingsDictionary = (await SettingRepository.GetListAsync(providerName, providerKey))
             .ToDictionary(s => s.Name, s => s.Value);
 
@@ -176,7 +176,7 @@ public class SettingManagementStore : ISettingManagementStore, ITransientDepende
         string providerKey,
         List<string> notCacheKeys)
     {
-        var settingDefinitions = SettingDefinitionManager.GetAll().Where(x => notCacheKeys.Any(k => GetSettingNameFormCacheKeyOrNull(k) == x.Name));
+        var settingDefinitions = (await SettingDefinitionManager.GetAllAsync()).Where(x => notCacheKeys.Any(k => GetSettingNameFormCacheKeyOrNull(k) == x.Name));
 
         var settingsDictionary = (await SettingRepository.GetListAsync(notCacheKeys.Select(GetSettingNameFormCacheKeyOrNull).ToArray(), providerName, providerKey))
             .ToDictionary(s => s.Name, s => s.Value);

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs

@@ -50,7 +50,7 @@ public class SettingManager : ISettingManager, ISingletonDependency
     {
         Check.NotNull(providerName, nameof(providerName));
 
-        var settingDefinitions = SettingDefinitionManager.GetAll();
+        var settingDefinitions = await SettingDefinitionManager.GetAllAsync();
         var providers = Enumerable.Reverse(Providers)
             .SkipWhile(c => c.Name != providerName);
 
@@ -113,7 +113,7 @@ public class SettingManager : ISettingManager, ISingletonDependency
         Check.NotNull(name, nameof(name));
         Check.NotNull(providerName, nameof(providerName));
 
-        var setting = SettingDefinitionManager.Get(name);
+        var setting = await SettingDefinitionManager.GetAsync(name);
 
         var providers = Enumerable
             .Reverse(Providers)
@@ -162,7 +162,7 @@ public class SettingManager : ISettingManager, ISingletonDependency
 
     protected virtual async Task<string> GetOrNullInternalAsync(string name, string providerName, string providerKey, bool fallback = true)
     {
-        var setting = SettingDefinitionManager.Get(name);
+        var setting = await SettingDefinitionManager.GetAsync(name);
         var providers = Enumerable
             .Reverse(Providers);
 

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/StaticSettingSaver.cs

@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.DistributedLocking;
+using Volo.Abp.Guids;
+using Volo.Abp.Json.SystemTextJson.Modifiers;
+using Volo.Abp.Settings;
+using Volo.Abp.Threading;
+using Volo.Abp.Uow;
+
+namespace Volo.Abp.SettingManagement;
+
+public class StaticSettingSaver : IStaticSettingSaver, ITransientDependency
+{
+    protected IStaticSettingDefinitionStore StaticStore { get; }
+    protected ISettingDefinitionRecordRepository SettingRepository { get; }
+    protected ISettingDefinitionSerializer SettingSerializer { get; }
+    protected IDistributedCache Cache { get; }
+    protected IApplicationInfoAccessor ApplicationInfoAccessor { get; }
+    protected IAbpDistributedLock DistributedLock { get; }
+    protected AbpSettingOptions SettingOptions { get; }
+    protected ICancellationTokenProvider CancellationTokenProvider { get; }
+    protected AbpDistributedCacheOptions CacheOptions { get; }
+    protected IUnitOfWorkManager UnitOfWorkManager { get; }
+    protected IGuidGenerator GuidGenerator { get; }
+
+    public StaticSettingSaver(
+        IStaticSettingDefinitionStore staticStore,
+        ISettingDefinitionRecordRepository settingRepository,
+        ISettingDefinitionSerializer settingSerializer,
+        IDistributedCache cache,
+        IOptions<AbpDistributedCacheOptions> cacheOptions,
+        IApplicationInfoAccessor applicationInfoAccessor,
+        IAbpDistributedLock distributedLock,
+        IOptions<AbpSettingOptions> settingOptions,
+        ICancellationTokenProvider cancellationTokenProvider,
+        IUnitOfWorkManager unitOfWorkManager,
+        IGuidGenerator guidGenerator)
+    {
+        StaticStore = staticStore;
+        SettingRepository = settingRepository;
+        SettingSerializer = settingSerializer;
+        Cache = cache;
+        ApplicationInfoAccessor = applicationInfoAccessor;
+        DistributedLock = distributedLock;
+        CancellationTokenProvider = cancellationTokenProvider;
+        SettingOptions = settingOptions.Value;
+        CacheOptions = cacheOptions.Value;
+        UnitOfWorkManager = unitOfWorkManager;
+        GuidGenerator = guidGenerator;
+    }
+
+    [UnitOfWork]
+    public async Task SaveAsync()
+    {
+        await using var applicationLockHandle = await DistributedLock.TryAcquireAsync(
+            GetApplicationDistributedLockKey()
+        );
+
+        if (applicationLockHandle == null)
+        {
+            /* Another application instance is already doing it */
+            return;
+        }
+
+        var cacheKey = GetApplicationHashCacheKey();
+        var cachedHash = await Cache.GetStringAsync(cacheKey, CancellationTokenProvider.Token);
+
+        var settingRecords = await SettingSerializer.SerializeAsync(await StaticStore.GetAllAsync());
+        var currentHash = CalculateHash(settingRecords, SettingOptions.DeletedSettings);
+
+        if (cachedHash == currentHash)
+        {
+            return;
+        }
+
+        await using (var commonLockHandle = await DistributedLock.TryAcquireAsync(
+                         GetCommonDistributedLockKey(),
+                         TimeSpan.FromMinutes(5)))
+        {
+            if (commonLockHandle == null)
+            {
+                /* It will re-try */
+                throw new AbpException("Could not acquire distributed lock for saving static Settings!");
+            }
+
+            using (var unitOfWork = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true))
+            {
+                try
+                {
+                    var hasChangesInSettings = await UpdateChangedSettingsAsync(settingRecords);
+
+                    if (hasChangesInSettings)
+                    {
+                        await Cache.SetStringAsync(
+                            GetCommonStampCacheKey(),
+                            Guid.NewGuid().ToString(),
+                            new DistributedCacheEntryOptions {
+                                SlidingExpiration = TimeSpan.FromDays(30) //TODO: Make it configurable?
+                            },
+                            CancellationTokenProvider.Token
+                        );
+                    }
+                }
+                catch
+                {
+                    try
+                    {
+                        await unitOfWork.RollbackAsync();
+                    }
+                    catch
+                    {
+                        /* ignored */
+                    }
+
+                    throw;
+                }
+
+                await unitOfWork.CompleteAsync();
+            }
+        }
+
+        await Cache.SetStringAsync(
+            cacheKey,
+            currentHash,
+            new DistributedCacheEntryOptions {
+                SlidingExpiration = TimeSpan.FromDays(30) //TODO: Make it configurable?
+            },
+            CancellationTokenProvider.Token
+        );
+    }
+
+    private async Task<bool> UpdateChangedSettingsAsync(List<SettingDefinitionRecord> SettingRecords)
+    {
+        var newRecords = new List<SettingDefinitionRecord>();
+        var changedRecords = new List<SettingDefinitionRecord>();
+
+        var settingRecordsInDatabase = (await SettingRepository.GetListAsync()).ToDictionary(x => x.Name);
+
+        foreach (var record in SettingRecords)
+        {
+            var settingRecordInDatabase = settingRecordsInDatabase.GetOrDefault(record.Name);
+            if (settingRecordInDatabase == null)
+            {
+                /* New group */
+                newRecords.Add(record);
+                continue;
+            }
+
+            if (record.HasSameData(settingRecordInDatabase))
+            {
+                /* Not changed */
+                continue;
+            }
+
+            /* Changed */
+            settingRecordInDatabase.Patch(record);
+            changedRecords.Add(settingRecordInDatabase);
+        }
+
+        /* Deleted */
+        var deletedRecords = new List<SettingDefinitionRecord>();
+
+        if (SettingOptions.DeletedSettings.Any())
+        {
+            deletedRecords.AddRange(settingRecordsInDatabase.Values.Where(x => SettingOptions.DeletedSettings.Contains(x.Name)));
+        }
+
+        if (newRecords.Any())
+        {
+            await SettingRepository.InsertManyAsync(newRecords);
+        }
+
+        if (changedRecords.Any())
+        {
+            await SettingRepository.UpdateManyAsync(changedRecords);
+        }
+
+        if (deletedRecords.Any())
+        {
+            await SettingRepository.DeleteManyAsync(deletedRecords);
+        }
+
+        return newRecords.Any() || changedRecords.Any() || deletedRecords.Any();
+    }
+
+    private string GetApplicationDistributedLockKey()
+    {
+        return $"{CacheOptions.KeyPrefix}_{ApplicationInfoAccessor.ApplicationName}_AbpSettingUpdateLock";
+    }
+
+    private string GetCommonDistributedLockKey()
+    {
+        return $"{CacheOptions.KeyPrefix}_Common_AbpSettingUpdateLock";
+    }
+
+    private string GetApplicationHashCacheKey()
+    {
+        return $"{CacheOptions.KeyPrefix}_{ApplicationInfoAccessor.ApplicationName}_AbpSettingsHash";
+    }
+
+    private string GetCommonStampCacheKey()
+    {
+        return $"{CacheOptions.KeyPrefix}_AbpInMemorySettingCacheStamp";
+    }
+
+    private string CalculateHash(List<SettingDefinitionRecord> settingRecords, IEnumerable<string> deletedSettings)
+    {
+        var jsonSerializerOptions = new JsonSerializerOptions
+        {
+            TypeInfoResolver = new DefaultJsonTypeInfoResolver
+            {
+                Modifiers =
+                {
+                    new AbpIgnorePropertiesModifiers<SettingDefinitionRecord, Guid>().CreateModifyAction(x => x.Id),
+                }
+            }
+        };
+
+        var stringBuilder = new StringBuilder();
+
+        stringBuilder.Append("SettingRecords:");
+        stringBuilder.AppendLine(JsonSerializer.Serialize(settingRecords, jsonSerializerOptions));
+
+        stringBuilder.Append("DeletedSetting:");
+        stringBuilder.Append(deletedSettings.JoinAsString(","));
+
+        return stringBuilder
+            .ToString()
+            .ToMd5();
+    }
+}

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

@@ -17,6 +17,7 @@ public class AbpSettingManagementEntityFrameworkCoreModule : AbpModule
             options.AddDefaultRepositories<ISettingManagementDbContext>();
 
             options.AddRepository<Setting, EfCoreSettingRepository>();
+            options.AddRepository<SettingDefinitionRecord, EfCoreSettingDefinitionRecordRepository>();
         });
     }
 }

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

@@ -0,0 +1,24 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Volo.Abp.SettingManagement.EntityFrameworkCore;
+
+public class EfCoreSettingDefinitionRecordRepository : EfCoreRepository<ISettingManagementDbContext, SettingDefinitionRecord, Guid>, ISettingDefinitionRecordRepository
+{
+    public EfCoreSettingDefinitionRecordRepository(IDbContextProvider<ISettingManagementDbContext> dbContextProvider)
+        : base(dbContextProvider)
+    {
+    }
+
+    public virtual async Task<SettingDefinitionRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default)
+    {
+        return await (await GetDbSetAsync())
+            .OrderBy(x => x.Id)
+            .FirstOrDefaultAsync(x => x.Name == name, cancellationToken);
+    }
+}

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

@@ -10,4 +10,6 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore;
 public interface ISettingManagementDbContext : IEfCoreDbContext
 {
     DbSet<Setting> Settings { get; }
+
+    DbSet<SettingDefinitionRecord> SettingDefinitionRecords { get; }
 }

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

@@ -10,6 +10,7 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore;
 public class SettingManagementDbContext : AbpDbContext<SettingManagementDbContext>, ISettingManagementDbContext
 {
     public DbSet<Setting> Settings { get; set; }
+    public DbSet<SettingDefinitionRecord> SettingDefinitionRecords { get; set; }
 
     public SettingManagementDbContext(DbContextOptions<SettingManagementDbContext> options)
         : base(options)

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

@@ -36,6 +36,21 @@ public static class SettingManagementDbContextModelBuilderExtensions
             b.ApplyObjectExtensionMappings();
         });
 
+        builder.Entity<SettingDefinitionRecord>(b =>
+        {
+            b.ToTable(AbpSettingManagementDbProperties.DbTablePrefix + "SettingDefinitionRecords", AbpSettingManagementDbProperties.DbSchema);
+
+            b.ConfigureByConvention();
+
+            b.Property(x => x.Name).HasMaxLength(SettingDefinitionRecordConsts.MaxNameLength).IsRequired();
+            b.Property(x => x.DisplayName).HasMaxLength(SettingDefinitionRecordConsts.MaxDisplayNameLength).IsRequired();
+            b.Property(x => x.Providers).HasMaxLength(SettingDefinitionRecordConsts.MaxProvidersLength);
+
+            b.HasIndex(x => new { x.Name }).IsUnique();
+
+            b.ApplyObjectExtensionMappings();
+        });
+
         builder.TryConfigureObjectExtensions<SettingManagementDbContext>();
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbModule.cs

@@ -17,6 +17,7 @@ public class AbpSettingManagementMongoDbModule : AbpModule
             options.AddDefaultRepositories<ISettingManagementMongoDbContext>();
 
             options.AddRepository<Setting, MongoSettingRepository>();
+            options.AddRepository<SettingDefinitionRecord, MongoSettingDefinitionRecordRepository>();
         });
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/ISettingManagementMongoDbContext.cs

@@ -10,4 +10,5 @@ namespace Volo.Abp.SettingManagement.MongoDB;
 public interface ISettingManagementMongoDbContext : IAbpMongoDbContext
 {
     IMongoCollection<Setting> Settings { get; }
+    IMongoCollection<SettingDefinitionRecord> SettingDefinitionRecords { get; }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/MongoSettingDefinitionRecordRepository.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using MongoDB.Driver.Linq;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+
+namespace Volo.Abp.SettingManagement.MongoDB;
+
+public class MongoSettingDefinitionRecordRepository : MongoDbRepository<ISettingManagementMongoDbContext, SettingDefinitionRecord, Guid>, ISettingDefinitionRecordRepository
+{
+    public MongoSettingDefinitionRecordRepository(IMongoDbContextProvider<ISettingManagementMongoDbContext> dbContextProvider)
+        : base(dbContextProvider)
+    {
+    }
+
+    public virtual async Task<SettingDefinitionRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default)
+    {
+        return await (await GetMongoQueryableAsync(cancellationToken))
+            .OrderBy(x => x.Id)
+            .FirstOrDefaultAsync(s => s.Name == name, GetCancellationToken(cancellationToken));
+    }
+}

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoDbContext.cs

@@ -10,6 +10,7 @@ namespace Volo.Abp.SettingManagement.MongoDB;
 public class SettingManagementMongoDbContext : AbpMongoDbContext, ISettingManagementMongoDbContext
 {
     public IMongoCollection<Setting> Settings => Collection<Setting>();
+    public IMongoCollection<SettingDefinitionRecord> SettingDefinitionRecords => Collection<SettingDefinitionRecord>();
 
     protected override void CreateModel(IMongoModelBuilder modelBuilder)
     {

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoDbContextExtensions.cs

@@ -13,5 +13,10 @@ public static class SettingManagementMongoDbContextExtensions
         {
             b.CollectionName = AbpSettingManagementDbProperties.DbTablePrefix + "Settings";
         });
+
+        builder.Entity<SettingDefinitionRecord>(b =>
+        {
+            b.CollectionName = AbpSettingManagementDbProperties.DbTablePrefix + "SettingDefinitionRecords";
+        });
     }
 }

modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider_Tests.cs

@@ -17,7 +17,7 @@ public class DefaultValueSettingManagementProvider_Tests : SettingsTestBase
     [Fact]
     public async Task GetOrNullAsync()
     {
-        var mySetting3 = _settingDefinitionManager.Get("MySetting3");
+        var mySetting3 = await _settingDefinitionManager.GetAsync("MySetting3");
 
         var defaultValueSettingManagementProvider = new DefaultValueSettingManagementProvider();
         (await defaultValueSettingManagementProvider
@@ -27,7 +27,7 @@ public class DefaultValueSettingManagementProvider_Tests : SettingsTestBase
     [Fact]
     public async Task SetAsync()
     {
-        var mySetting3 = _settingDefinitionManager.Get("MySetting3");
+        var mySetting3 = await _settingDefinitionManager.GetAsync("MySetting3");
 
         await Assert.ThrowsAsync<AbpException>(async () => await new DefaultValueSettingManagementProvider().SetAsync(mySetting3, "123",
             DefaultValueSettingValueProvider.ProviderName));
@@ -36,7 +36,7 @@ public class DefaultValueSettingManagementProvider_Tests : SettingsTestBase
     [Fact]
     public async Task ClearAsync()
     {
-        var mySetting3 = _settingDefinitionManager.Get("MySetting3");
+        var mySetting3 = await _settingDefinitionManager.GetAsync("MySetting3");
 
         await Assert.ThrowsAsync<AbpException>(async () =>
             await new DefaultValueSettingManagementProvider().ClearAsync(mySetting3,