Merge branch 'rel-6.0' into cmskit-global-resources-issue-13620

docs/en/CLI.md

@@ -124,7 +124,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
         * `--separate-auth-server`: The Identity Server project comes as a separate project and runs at a different endpoint. It separates the Identity Server from the API Host application. If not specified, you will have a single endpoint in the server side.
     * `--mobile` or `-m`: Specifies the mobile application framework. If not specified, no mobile application will be created. Available options:
       * `react-native`: React Native.
-      * `maui`: MAUI.
+      * `maui`: MAUI. This mobile option is only available for ABP Commercial.
     * `--database-provider` or `-d`: Specifies the database provider. Default provider is `ef`. Available providers:
         * `ef`: Entity Framework Core.
         * `mongodb`: MongoDB.
@@ -145,7 +145,8 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
         * `mongodb`: MongoDB.
     * `--theme`: Specifes the theme. Default theme is `leptonx-lite`. Available themes:
         * `leptonx-lite`: [LeptonX Lite Theme](/Themes/LeptonXLite/mvc.md).
-        * `basic`: [Basic Theme](/UI/AspNetCore/Basic-Theme.md).        
+        * `basic`: [Basic Theme](/UI/AspNetCore/Basic-Theme.md).    
+  * **`maui`**: .NET MAUI. A minimalist .NET MAUI application will be created if you specify this option.
 * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory.
 * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version.
 * `--preview`: Use latest preview version.
@@ -245,7 +246,7 @@ It can also create a new module for your solution and add it to your solution. S
 
 > A business module generally consists of several packages (because of layering, different database provider options or other reasons). Using `add-module` command dramatically simplifies adding a module to a solution. However, each module may require some additional configurations which is generally indicated in the documentation of the related module.
 
-Usage
+Usage:
 
 ````bash
 abp add-module <module-name> [options]
@@ -279,7 +280,7 @@ abp add-module ProductManagement --new --add-to-solution-file
 
 Lists names of open-source application modules.
 
-Usage
+Usage:
 
 ````bash
 abp list-modules [options]
@@ -295,11 +296,21 @@ abp list-modules
 
 * `--include-pro-modules`: Includes commercial (pro) modules in the output.
 
+### list-templates
+
+Lists all available templates to create a solution.
+
+Usage:
+
+```bash
+abp list-templates
+```
+
 ### get-source
 
 Downloads the source code of a module to your computer.
 
-Usage
+Usage:
 
 ````bash
 abp get-source <module-name> [options]

docs/en/Modules/OpenIddict.md

@@ -216,7 +216,7 @@ https://documentation.openiddict.com/guides/index.html#events-model
 
 ## Migrating Guide
 
-[Migrating from IdentityServer to OpenIddict Step by Step Guide ](Migration-Guides/OpenIddict-Step-by-Step.md)
+[Migrating from IdentityServer to OpenIddict Step by Step Guide ](../Migration-Guides/OpenIddict-Step-by-Step.md)
 
 ## Sponsor
 

docs/en/docs-nav.json

@@ -43,6 +43,10 @@
           "text": "WPF Application",
           "path": "Startup-Templates/WPF.md"
         },
+        {
+          "text": "MAUI",
+          "path": "Startup-Templates/MAUI.md"
+        },
         {
           "text": "Empty Web Project",
           "path": "Getting-Started-AspNetCore-Application.md"

docs/zh-Hans/CLI.md

@@ -123,6 +123,7 @@ abp new Acme.BookStore
   * `module`: [Module template](Startup-Templates/Module.md). 其他选项:
     * `--no-ui`: 不包含UI.仅创建服务模块(也称为微服务 - 没有UI).
   * **`console`**: [Console template](Startup-Templates/Console.md).
+  * **`maui`**: [Maui template](Startup-Templates/MAUI.md).
   * **`app-nolayers`**: 应用程序单层模板
   * `--ui` 或者 `-u`: 指定ui框架.默认`mvc`框架.其他选项:
     * `mvc`: ASP.NET Core MVC.

docs/zh-Hans/docs-nav.json

@@ -61,6 +61,10 @@
         {
           "text": "WPF",
           "path": "Startup-Templates/WPF.md"
+        },
+        {
+          "text": "MAUI",
+          "path": "Startup-Templates/MAUI.md"
         }
       ]
     },

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -123,7 +123,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
         sb.AppendLine("--tiered                                    (if supported by the template)");
         sb.AppendLine("--no-ui                                     (if supported by the template)");
         sb.AppendLine("--no-random-port                            (Use template's default ports)");
-        sb.AppendLine("--separate-identity-server                  (if supported by the template)");
+        sb.AppendLine("--separate-auth-server                      (if supported by the template)");
         sb.AppendLine("--local-framework-ref --abp-path <your-local-abp-repo-path>  (keeps local references to projects instead of replacing with NuGet package references)");
         sb.AppendLine("");
         sb.AppendLine("Examples:");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs

@@ -14,6 +14,8 @@ public class TemplateCodeDeleteStep : ProjectBuildPipelineStep
                 file.Name.EndsWith(".json") ||
                 file.Name.EndsWith(".gitignore") ||
                 file.Name.EndsWith(".yml") ||
+                file.Name.EndsWith(".yaml") ||
+                file.Name.EndsWith(".md") ||
                 file.Name.EndsWith(".ps1") ||
                 file.Name.EndsWith(".html") || 
                 file.Name.EndsWith(".ts") ||

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs

@@ -130,6 +130,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
                 steps.Add(new RemoveFolderStep("/apps/blazor"));
                 steps.Add(new RemoveProjectFromTyeStep("blazor"));
                 steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
+                
+                context.Symbols.Add("ui:angular");
                 break;
 
             case UiFramework.Blazor:
@@ -147,7 +149,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
                     null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server"));
                 steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
-
+                
+                context.Symbols.Add("ui:blazor");
                 break;
 
             case UiFramework.BlazorServer:
@@ -169,7 +172,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
                 steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.Server",
                     "MyCompanyName.MyProjectName.Blazor"));
                 steps.Add(new RenameProjectInTyeStep("blazor-server", "blazor"));
-
+                
+                context.Symbols.Add("ui:blazor-server");
                 break;
 
             case UiFramework.Mvc:
@@ -186,6 +190,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
                 steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
 
                 steps.Add(new RemoveFolderStep("/apps/angular"));
+                
+                context.Symbols.Add("ui:mvc");
                 break;
         }
 

framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AbpLazyServiceProvider.cs

@@ -1,19 +1,13 @@
 using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Volo.Abp.DependencyInjection;
 
-public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDependency
+[ExposeServices(typeof(IAbpLazyServiceProvider))]
+public class AbpLazyServiceProvider : CachedServiceProviderBase, IAbpLazyServiceProvider, ITransientDependency
 {
-    protected IDictionary<Type, object> CachedServices { get; set; }
-
-    protected IServiceProvider ServiceProvider { get; set; }
-
     public AbpLazyServiceProvider(IServiceProvider serviceProvider)
+        : base(serviceProvider)
     {
-        ServiceProvider = serviceProvider;
-        CachedServices = new Dictionary<Type, object>();
     }
 
     public virtual T LazyGetRequiredService<T>()
@@ -23,7 +17,7 @@ public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDepende
 
     public virtual object LazyGetRequiredService(Type serviceType)
     {
-        return CachedServices.GetOrAdd(serviceType, () => ServiceProvider.GetRequiredService(serviceType));
+        return GetService(serviceType);
     }
 
     public virtual T LazyGetService<T>()
@@ -33,7 +27,7 @@ public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDepende
 
     public virtual object LazyGetService(Type serviceType)
     {
-        return CachedServices.GetOrAdd(serviceType, () => ServiceProvider.GetService(serviceType));
+        return GetService(serviceType);
     }
 
     public virtual T LazyGetService<T>(T defaultValue)
@@ -53,6 +47,9 @@ public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDepende
 
     public virtual object LazyGetService(Type serviceType, Func<IServiceProvider, object> factory)
     {
-        return CachedServices.GetOrAdd(serviceType, () => factory(ServiceProvider));
+        return CachedServices.GetOrAdd(
+            serviceType,
+            _ => new Lazy<object>(() => factory(ServiceProvider))
+        ).Value;
     }
 }

framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/CachedServiceProviderBase.cs

@@ -5,21 +5,21 @@ namespace Volo.Abp.DependencyInjection;
 
 public abstract class CachedServiceProviderBase
 {
-    private readonly IServiceProvider _serviceProvider;
-    private readonly ConcurrentDictionary<Type, Lazy<object>> _cachedServices;
+    protected IServiceProvider ServiceProvider { get; }
+    protected ConcurrentDictionary<Type, Lazy<object>> CachedServices { get; }
 
     protected CachedServiceProviderBase(IServiceProvider serviceProvider)
     {
-        _serviceProvider = serviceProvider;
-        _cachedServices = new ConcurrentDictionary<Type, Lazy<object>>();
-        _cachedServices.TryAdd(typeof(IServiceProvider), new Lazy<object>(() => _serviceProvider));
+        ServiceProvider = serviceProvider;
+        CachedServices = new ConcurrentDictionary<Type, Lazy<object>>();
+        CachedServices.TryAdd(typeof(IServiceProvider), new Lazy<object>(() => ServiceProvider));
     }
 
     public virtual object GetService(Type serviceType)
     {
-        return _cachedServices.GetOrAdd(
+        return CachedServices.GetOrAdd(
             serviceType,
-            _ => new Lazy<object>(() => _serviceProvider.GetService(serviceType))
+            _ => new Lazy<object>(() => ServiceProvider.GetService(serviceType))
         ).Value;
     }
-}
+}

framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs

@@ -0,0 +1,50 @@
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Volo.Abp.Testing.Utils;
+using Xunit;
+
+namespace Volo.Abp.DependencyInjection;
+
+public class AbpLazyServiceProvider_Tests
+{
+    [Fact]
+    public void LazyServiceProvider_Should_Cache_Services()
+    {
+        using (var application = AbpApplicationFactory.Create<TestModule>())
+        {
+            application.Initialize();
+
+            var lazyServiceProvider = application.ServiceProvider.GetRequiredService<IAbpLazyServiceProvider>();
+
+            var transientTestService1 = lazyServiceProvider.LazyGetRequiredService<TransientTestService>();
+            var transientTestService2 = lazyServiceProvider.LazyGetRequiredService<TransientTestService>();
+            transientTestService1.ShouldBeSameAs(transientTestService2);
+
+            var testCounter = application.ServiceProvider.GetRequiredService<ITestCounter>();
+            testCounter.GetValue(nameof(TransientTestService)).ShouldBe(1);
+        }
+    }
+
+    [DependsOn(typeof(AbpTestBaseModule))]
+    private class TestModule : AbpModule
+    {
+        public TestModule()
+        {
+            SkipAutoServiceRegistration = true;
+        }
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddType<TransientTestService>();
+        }
+    }
+
+    private class TransientTestService : ITransientDependency
+    {
+        public TransientTestService(ITestCounter counter)
+        {
+            counter.Increment(nameof(TransientTestService));
+        }
+    }
+}

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs

@@ -1,6 +1,7 @@
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Validation;
 using Volo.Abp.Validation.Localization;
 using Volo.Abp.VirtualFileSystem;
@@ -25,5 +26,10 @@ public class AbpTenantManagementDomainSharedModule : AbpModule
                     typeof(AbpValidationResource)
                 ).AddVirtualJson("/Volo/Abp/TenantManagement/Localization/Resources");
         });
+
+        Configure<AbpExceptionLocalizationOptions>(options =>
+        {
+            options.MapCodeNamespace("Volo.Abp.TenantManagement", typeof(AbpTenantManagementResource));
+        });
     }
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json

@@ -1,6 +1,7 @@
 {
   "culture": "ar",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "اسم المستأجر موجود بالفعل: {Name}",
     "Menu:TenantManagement": "إدارة الجهات",
     "Tenants": "الجهات",
     "NewTenant": "جهة جديدة",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json

@@ -1,6 +1,7 @@
 {
   "culture": "de-DE",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Der Name des Mandanten ist bereits vorhanden: {Name}",
     "Menu:TenantManagement": "Mandantenverwaltung",
     "Tenants": "Mandanten",
     "NewTenant": "Neuer Mandant",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json

@@ -1,6 +1,7 @@
 {
   "culture": "en",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Tenant name already exist: {Name}",
     "Menu:TenantManagement": "Tenant management",
     "Tenants": "Tenants",
     "NewTenant": "New tenant",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json

@@ -1,6 +1,7 @@
 {
   "culture": "es",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "El nombre del inquilino ya existe: {Name}",
     "Menu:TenantManagement": "Gestión de tenants",
     "Tenants": "Inquilinos",
     "NewTenant": "Nuevo inquilino",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json

@@ -1,6 +1,7 @@
 {
   "culture": "fi",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Vuokralaisen nimi on jo olemassa: {Name}",
     "Menu:TenantManagement": "Vuokralaisten hallinta",
     "Tenants": "Vuokralaiset",
     "NewTenant": "Uusi vuokralainen",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json

@@ -1,6 +1,7 @@
 {
  "culture": "fr",
  "texts": {
+  "Volo.Abp.TenantManagement:DuplicateTenantName": "Le nom du locataire existe déjà: {Name}",
   "Menu:TenantManagement": "Gestion des locataires",
   "Tenants": "Locataires",
   "NewTenant": "Nouveau locataire",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json

@@ -1,6 +1,7 @@
 {
   "culture": "hi",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "किरायेदार नाम पहले से मौजूद है: {Name}",
     "Menu:TenantManagement": "किरायेदार प्रबंधन",
     "Tenants": "किरायेदारों",
     "NewTenant": "नया किरायेदार",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json

@@ -1,6 +1,7 @@
 {
   "culture": "it",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Il nome del tenant esiste già: {Name}",
     "Menu:TenantManagement": "Gestione tenants",
     "Tenants": "Tenants",
     "NewTenant": "Nuovo Tenant",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json

@@ -1,6 +1,7 @@
 {
   "culture": "pt-BR",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "O nome do ambiente já existe: {Name}",
     "Menu:TenantManagement": "Gerencimento de Inquilinos",
     "Tenants": "Inquilinos",
     "NewTenant": "Novo Inquilino",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json

@@ -1,6 +1,7 @@
 {
   "culture": "ru",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Имя арендатора уже существует: {Name}",
     "Menu:TenantManagement": "Управление арендаторами",
     "Tenants": "Арендаторы",
     "NewTenant": "Новый арендатор",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json

@@ -1,6 +1,7 @@
 {
   "culture": "sk",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Názov tenanta už existuje: {Name}",
     "Menu:TenantManagement": "Správa tenantov",
     "Tenants": "Tentanti",
     "NewTenant": "Nový tenant",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json

@@ -1,6 +1,7 @@
 {
   "culture": "sl",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Ime najemnika že obstaja: {Name}",
     "Menu:TenantManagement": "Upravljanje najemnikov",
     "Tenants": "Najemniki",
     "NewTenant": "Nov najemnik",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json

@@ -1,6 +1,7 @@
 {
   "culture": "tr",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Müşteri ismi zaten mevcut: {Name}",
     "Menu:TenantManagement": "Müşteri yönetimi",
     "Tenants": "Müşteriler",
     "NewTenant": "Yeni müşteri",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json

@@ -1,6 +1,7 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "租户名称已存在: {Name}",
     "Menu:TenantManagement": "租户管理",
     "Tenants": "租户",
     "NewTenant": "新租户",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json

@@ -1,6 +1,7 @@
 {
   "culture": "zh-Hant",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "租戶名稱已存在: {Name}",
     "Menu:TenantManagement": "租戶管理",
     "Tenants": "租戶",
     "NewTenant": "新租戶",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs

@@ -36,7 +36,7 @@ public class TenantManager : DomainService, ITenantManager
         var tenant = await TenantRepository.FindByNameAsync(name);
         if (tenant != null && tenant.Id != expectedId)
         {
-            throw new UserFriendlyException("Duplicate tenancy name: " + name); //TODO: A domain exception would be better..?
+            throw new BusinessException("Volo.Abp.TenantManagement:DuplicateTenantName").WithData("Name", name);
         }
     }
 }

modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests/Volo/Abp/TenantManagement/TenantAppService_Tests.cs

@@ -66,7 +66,7 @@ public class TenantAppService_Tests : AbpTenantManagementApplicationTestBase
     [Fact]
     public async Task CreateAsync_Should_Not_Allow_Duplicate_Names()
     {
-        await Assert.ThrowsAsync<UserFriendlyException>(async () =>
+        await Assert.ThrowsAsync<BusinessException>(async () =>
         {
             await _tenantAppService.CreateAsync(new TenantCreateDto { Name = "acme", AdminEmailAddress = "admin@admin.com", AdminPassword = "123456" });
         });
@@ -90,7 +90,7 @@ public class TenantAppService_Tests : AbpTenantManagementApplicationTestBase
     {
         var acme = UsingDbContext(dbContext => dbContext.Tenants.Single(t => t.Name == "acme"));
 
-        await Assert.ThrowsAsync<UserFriendlyException>(async () =>
+        await Assert.ThrowsAsync<BusinessException>(async () =>
         {
             await _tenantAppService.UpdateAsync(acme.Id, new TenantUpdateDto { Name = "volosoft" });
         });

modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo/Abp/TenantManagement/TenantManager_Tests.cs

@@ -26,7 +26,7 @@ public class TenantManager_Tests : AbpTenantManagementDomainTestBase
     [Fact]
     public async Task Create_Tenant_Name_Can_Not_Duplicate()
     {
-        await Assert.ThrowsAsync<UserFriendlyException>(async () => await _tenantManager.CreateAsync("volosoft"));
+        await Assert.ThrowsAsync<BusinessException>(async () => await _tenantManager.CreateAsync("volosoft"));
     }
 
     [Fact]
@@ -46,6 +46,6 @@ public class TenantManager_Tests : AbpTenantManagementDomainTestBase
         var tenant = await _tenantRepository.FindByNameAsync("acme");
         tenant.ShouldNotBeNull();
 
-        await Assert.ThrowsAsync<UserFriendlyException>(async () => await _tenantManager.ChangeNameAsync(tenant, "volosoft"));
+        await Assert.ThrowsAsync<BusinessException>(async () => await _tenantManager.ChangeNameAsync(tenant, "volosoft"));
     }
 }

npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@@ -39,7 +39,7 @@
       ><div class="text-center"><i class="fa fa-pulse fa-spinner"></i></div
     ></ng-template>
 
-    <form *ngIf="form; else loaderRef" [formGroup]="form" (ngSubmit)="save()">
+    <form *ngIf="form; else loaderRef" [blueprints]="blueprints" [formGroup]="form" (ngSubmit)="save()">
       <ul ngbNav #nav="ngbNav" class="nav-tabs">
         <li ngbNavItem>
           <a ngbNavLink>{{ 'AbpIdentity::UserInformations' | abpLocalization }}</a>

npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@@ -61,6 +61,9 @@ export class UsersComponent implements OnInit {
 
   entityDisplayName: string;
 
+  blueprints = { pattern: 'AbpIdentity::Volo.Abp.Identity:InvalidUserName[{{ actualValue }}]' };
+
+
   trackByFn: TrackByFunction<AbstractControl> = (index, item) => Object.keys(item)[0] || index;
 
   onVisiblePermissionChange = event => {

npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts

@@ -1,6 +1,7 @@
-import { IdentityUserDto } from '@abp/ng.identity/proxy';
+import {IdentityUserDto} from '@abp/ng.identity/proxy';
 import { EntityAction } from '@abp/ng.theme.shared/extensions';
 import { UsersComponent } from '../components/users/users.component';
+import {ConfigStateService, CurrentUserDto} from "@abp/ng.core";
 
 export const DEFAULT_USERS_ENTITY_ACTIONS = EntityAction.createMany<IdentityUserDto>([
   {
@@ -18,13 +19,18 @@ export const DEFAULT_USERS_ENTITY_ACTIONS = EntityAction.createMany<IdentityUser
       component.openPermissionsModal(data.record.id, data.record.userName);
     },
     permission: 'AbpIdentity.Users.ManagePermissions',
-  },
-  {
+  }, {
     text: 'AbpIdentity::Delete',
     action: data => {
       const component = data.getInjected(UsersComponent);
       component.delete(data.record.id, data.record.name || data.record.userName);
     },
+    visible: data  => {
+      const userName = data.record.userName;
+      const configStateService = data.getInjected(ConfigStateService)
+      const currentUser = configStateService.getOne("currentUser") as CurrentUserDto;
+      return  userName !== currentUser.userName;
+    },
     permission: 'AbpIdentity.Users.Delete',
   },
 ]);

npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts

@@ -3,13 +3,15 @@ import { getPasswordValidators } from '@abp/ng.theme.shared';
 import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions';
 import { Validators } from '@angular/forms';
 
+const onlyLetterAndNumberRegex = /^[a-zA-Z0-9]+$/;
+
 export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserDto>([
   {
     type: ePropType.String,
     name: 'userName',
     displayName: 'AbpIdentity::UserName',
     id: 'user-name',
-    validators: () => [Validators.required, Validators.maxLength(256)],
+    validators: () => [Validators.required, Validators.maxLength(256), Validators.pattern(onlyLetterAndNumberRegex)],
   },
   {
     type: ePropType.Password,

templates/console/src/MyCompanyName.MyProjectName/Program.cs

@@ -36,10 +36,9 @@ public class Program
                 services.AddApplicationAsync<MyProjectNameModule>(options =>
                 {
                     options.Services.ReplaceConfiguration(services.GetConfiguration());
-                    options.UseAutofac();
                     options.Services.AddLogging(loggingBuilder => loggingBuilder.AddSerilog());
                 });
-            }).UseConsoleLifetime();
+            }).UseAutofac().UseConsoleLifetime();
 
             var host = builder.Build();
             await host.Services.GetRequiredService<IAbpApplicationWithExternalServiceProvider>().InitializeAsync(host.Services);

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj

@@ -20,9 +20,8 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.Web\Volo.Abp.Http.Client.IdentityModel.Web.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.Web\Volo.Abp.Http.Client.Web.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.Web\Volo.Abp.Http.Client.Web.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Web\Volo.Abp.Identity.Web.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Web\Volo.Abp.FeatureManagement.Web.csproj" />