Merge branch 'dev' into IsChangeTrackingEnabled

Directory.Build.props

@@ -2,10 +2,10 @@
   <PropertyGroup>
     
     <!-- All Microsoft AspNetCore packages -->
-    <MicrosoftAspNetCorePackageVersion>7.0.0</MicrosoftAspNetCorePackageVersion>
+    <MicrosoftAspNetCorePackageVersion>7.0.10</MicrosoftAspNetCorePackageVersion>
     
     <!-- All Microsoft EntityFrameworkCore packages -->
-    <MicrosoftEntityFrameworkCorePackageVersion>7.0.1</MicrosoftEntityFrameworkCorePackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>7.0.10</MicrosoftEntityFrameworkCorePackageVersion>
     
     <!-- All Microsoft packages -->
     <MicrosoftPackageVersion>7.0.0</MicrosoftPackageVersion>

docs/en/Modules/Cms-Kit/Index.md

@@ -33,7 +33,7 @@ All features are individually usable. If you disable a feature, it completely di
 [ABP CLI](../../CLI.md) allows installing a module to a solution using the `add-module` command. You can install the CMS Kit module in a command-line terminal with the following command:
 
 ```bash
-abp add-module Volo.CmsKit
+abp add-module Volo.CmsKit --skip-db-migrations
 ```
 
 > By default, Cms-Kit is disabled by `GlobalFeature`. Because of that the initial migration will be empty. So you can skip the migration by adding `--skip-db-migrations` to command when installing if you are using Entity Framework Core. After enabling Cms-Kit global feture, please add new migration.

framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj

@@ -16,10 +16,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise" Version="1.2.3" />
-        <PackageReference Include="Blazorise.DataGrid" Version="1.2.3" />
-        <PackageReference Include="Blazorise.Snackbar" Version="1.2.3" />
-        <PackageReference Include="Blazorise.Components" Version="1.2.3" />
+        <PackageReference Include="Blazorise" Version="1.3.1" />
+        <PackageReference Include="Blazorise.DataGrid" Version="1.3.1" />
+        <PackageReference Include="Blazorise.Snackbar" Version="1.3.1" />
+        <PackageReference Include="Blazorise.Components" Version="1.3.1" />
     </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -187,7 +187,9 @@ public abstract class AppTemplateBase : TemplateInfo
         }
         else
         {
-            if (context.BuildArgs.ExtraProperties.ContainsKey(NewCommand.Options.Tiered.Long) || context.BuildArgs.ExtraProperties.ContainsKey("separate-identity-server"))
+            if (context.BuildArgs.ExtraProperties.ContainsKey(NewCommand.Options.Tiered.Long) ||
+                context.BuildArgs.ExtraProperties.ContainsKey("separate-identity-server") ||
+                context.BuildArgs.ExtraProperties.ContainsKey("separate-auth-server"))
             {
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Public"));
             }

framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
   </ItemGroup>
 

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs

@@ -127,6 +127,11 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
     {
         CheckChangeTracking();
         var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         var dbContext = await GetDbContextAsync();
         cancellationToken = GetCancellationToken(cancellationToken);
 
@@ -173,14 +178,21 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
     public async override Task UpdateManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
+        var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         CheckChangeTracking();
+
         cancellationToken = GetCancellationToken(cancellationToken);
 
         if (BulkOperationProvider != null)
         {
             await BulkOperationProvider.UpdateManyAsync<TDbContext, TEntity>(
                 this,
-                entities,
+                entityArray,
                 autoSave,
                 GetCancellationToken(cancellationToken)
                 );
@@ -190,7 +202,7 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
         var dbContext = await GetDbContextAsync();
 
-        dbContext.Set<TEntity>().UpdateRange(entities);
+        dbContext.Set<TEntity>().UpdateRange(entityArray);
 
         if (autoSave)
         {
@@ -213,14 +225,21 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
     public async override Task DeleteManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
+        var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         CheckChangeTracking();
+
         cancellationToken = GetCancellationToken(cancellationToken);
 
         if (BulkOperationProvider != null)
         {
             await BulkOperationProvider.DeleteManyAsync<TDbContext, TEntity>(
                 this,
-                entities,
+                entityArray,
                 autoSave,
                 cancellationToken
             );
@@ -230,7 +249,7 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
         var dbContext = await GetDbContextAsync();
 
-        dbContext.RemoveRange(entities);
+        dbContext.RemoveRange(entityArray.Select(x => x));
 
         if (autoSave)
         {

framework/src/Volo.Abp.Json.SystemTextJson/Volo.Abp.Json.SystemTextJson.csproj

@@ -20,7 +20,7 @@
         <ProjectReference Include="..\Volo.Abp.Json.Abstractions\Volo.Abp.Json.Abstractions.csproj" />
         <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
         <ProjectReference Include="..\Volo.Abp.Data\Volo.Abp.Data.csproj" />
-        <PackageReference Include="System.Text.Json" Version="$(MicrosoftAspNetCorePackageVersion)" />
+        <PackageReference Include="System.Text.Json" Version="$(MicrosoftPackageVersion)" />
     </ItemGroup>
 
 </Project>

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

@@ -138,9 +138,13 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
 
     public async override Task InsertManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
-        cancellationToken = GetCancellationToken(cancellationToken);
-
         var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
+        cancellationToken = GetCancellationToken(cancellationToken);
 
         foreach (var entity in entityArray)
         {
@@ -228,6 +232,10 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
     public async override Task UpdateManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
         var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
 
         foreach (var entity in entityArray)
         {
@@ -358,12 +366,18 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
        bool autoSave = false,
        CancellationToken cancellationToken = default)
     {
+        var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         cancellationToken = GetCancellationToken(cancellationToken);
 
         var softDeletedEntities = new Dictionary<TEntity, string>();
         var hardDeletedEntities = new List<TEntity>();
 
-        foreach (var entity in entities)
+        foreach (var entity in entityArray)
         {
             if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity))
             {
@@ -383,7 +397,7 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
 
         if (BulkOperationProvider != null)
         {
-            await BulkOperationProvider.DeleteManyAsync(this, entities, dbContext.SessionHandle, autoSave, cancellationToken);
+            await BulkOperationProvider.DeleteManyAsync(this, entityArray, dbContext.SessionHandle, autoSave, cancellationToken);
             return;
         }
 

framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleDocumentFilter.cs

@@ -13,7 +13,7 @@ public class AbpSwashbuckleDocumentFilter : IDocumentFilter
     protected virtual string[] ActionUrlPrefixes { get; set; } = new[] { "Volo." };
 
     protected virtual string RegexConstraintPattern => @":regex\(([^()]*)\)";
-
+    
     public virtual void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
     {
         var actionUrls = context.ApiDescriptions
@@ -28,29 +28,8 @@ public class AbpSwashbuckleDocumentFilter : IDocumentFilter
         swaggerDoc
             .Paths
             .RemoveAll(path => !actionUrls.Contains(path.Key));
-
-        var actionSchemas = new HashSet<string>();
-        actionSchemas.UnionWith(swaggerDoc.Paths.Select(path => new { path = path.Value, schemas = swaggerDoc.Components.Schemas }).SelectMany(x => GetSchemaIdList(x.path, x.schemas)));
-
-        swaggerDoc.Components.Schemas.RemoveAll(schema => !actionSchemas.Contains(schema.Key));
     }
 
-    protected virtual HashSet<string> GetSchemaIdList(OpenApiPathItem pathItem, IDictionary<string, OpenApiSchema> schemas)
-    {
-        var selectedSchemas = new HashSet<OpenApiSchema>();
-        var schemaIds = new HashSet<string>();
-
-        selectedSchemas.UnionWith(pathItem.Parameters.Select(parameter => parameter.Schema));
-        selectedSchemas.UnionWith(pathItem.Parameters.SelectMany(parameter => parameter.Content.Select(x => x.Value.Schema)));
-        selectedSchemas.UnionWith(pathItem.Operations.Values.SelectMany(c => c.Responses.SelectMany(x => x.Value.Content.Values.Select(x => x.Schema))));
-        selectedSchemas.UnionWith(pathItem.Operations.Values.SelectMany(c => c.Parameters.Select(x => x.Schema)));
-
-        foreach (var schema in selectedSchemas)
-        {
-            schemaIds.UnionWith(MakeListSchemaId(schema, schemas));
-        }
-        return schemaIds;
-    }
     protected virtual string? RemoveRouteParameterConstraints(ActionDescriptor actionDescriptor)
     {
         var route = actionDescriptor.AttributeRouteInfo?.Template?.EnsureStartsWith('/').Replace("?", "");
@@ -70,34 +49,10 @@ public class AbpSwashbuckleDocumentFilter : IDocumentFilter
             {
                 break;
             }
-
-            route = route.Remove(startIndex, endIndex - startIndex);
+            
+            route = route.Remove(startIndex, (endIndex - startIndex));
         }
 
         return route;
     }
-
-    private HashSet<string> MakeListSchemaId(OpenApiSchema schema, IDictionary<string, OpenApiSchema> contextSchemas)
-    {
-        var schemasId = new HashSet<string>();
-        if (schema != null)
-        {
-            if (schema.Reference != null)
-            {
-                schemasId.Add(schema.Reference.Id);
-                foreach (var sc in contextSchemas.Where(x => x.Key == schema.Reference.Id).Select(x => x.Value))
-                {
-                    foreach (var property in sc.Properties.Values)
-                    {
-                        schemasId.UnionWith(MakeListSchemaId(property, contextSchemas));
-                    }
-                }
-            }
-            if (schema.Items != null)
-            {
-                schemasId.UnionWith(MakeListSchemaId(schema.Items, contextSchemas));
-            }
-        }
-        return schemasId;
-    }
-}
+}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlob.cs

@@ -17,6 +17,10 @@ public class DatabaseBlob : AggregateRoot<Guid>, IMultiTenant
     [DisableAuditing]
     public virtual byte[] Content { get; protected set; }
 
+    protected DatabaseBlob()
+    {
+    }
+
     public DatabaseBlob(Guid id, Guid containerId, [NotNull] string name, [NotNull] byte[] content, Guid? tenantId = null)
         : base(id)
     {

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobContainer.cs

@@ -11,6 +11,10 @@ public class DatabaseBlobContainer : AggregateRoot<Guid>, IMultiTenant
 
     public virtual string Name { get; protected set; }
 
+    protected DatabaseBlobContainer()
+    {
+    }
+
     public DatabaseBlobContainer(Guid id, [NotNull] string name, Guid? tenantId = null)
         : base(id)
     {

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs

@@ -16,6 +16,10 @@ public class Blog : FullAuditedAggregateRoot<Guid>, IMultiTenant
 
     public virtual Guid? TenantId { get; protected set; }
 
+    protected Blog()
+    {
+    }
+
     protected internal Blog(
         Guid id,
         [NotNull] string name,

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogFeature.cs

@@ -13,6 +13,10 @@ public class BlogFeature : FullAuditedAggregateRoot<Guid>
 
     public bool IsEnabled { get; protected internal set; }
 
+    protected BlogFeature()
+    {
+    }
+
     public BlogFeature(Guid blogId, [NotNull] string featureName, bool isEnabled = true)
     {
         BlogId = blogId;

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuItem.cs

@@ -41,6 +41,10 @@ public class MenuItem : AuditedAggregateRoot<Guid>, IMultiTenant
 
     public Guid? TenantId { get; protected set; }
 
+    protected MenuItem()
+    {
+    }
+
     public MenuItem(Guid id,
                     [NotNull] string displayName,
                     [NotNull] string url,

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs

@@ -173,7 +173,10 @@ public class IdentityUserAppService : IdentityAppServiceBase, IIdentityUserAppSe
             (await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
         }
 
-        (await UserManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
+        if (user.Id != CurrentUser.Id)
+        {
+            (await UserManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
+        }
 
         user.Name = input.Name;
         user.Surname = input.Surname;

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -129,9 +129,12 @@
                                     <Field>
                                         <Check TValue="bool" @bind-Checked="@NewEntity.IsActive">@L["DisplayName:IsActive"]</Check>
                                     </Field>
-                                    <Field>
-                                        <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
-                                    </Field>
+                                    @if (!IsEditCurrentUser)
+                                    {
+                                        <Field>
+                                            <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                                        </Field>
+                                    }
                                     <ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" ModalType="ExtensionPropertyModalType.CreateModal" />
                                 </TabPanel>
                                 <TabPanel Name="Roles">

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@@ -41,6 +41,7 @@ public partial class UserManagement
 
     private List<TableColumn> UserManagementTableColumns => TableColumns.Get<UserManagement>();
     private TextRole _passwordTextRole = TextRole.Password;
+    public bool IsEditCurrentUser { get; set; }
 
     public UserManagement()
     {
@@ -119,7 +120,7 @@ public partial class UserManagement
         try
         {
             EditModalSelectedTab = DefaultSelectedTab;
-
+            IsEditCurrentUser = entity.Id == CurrentUser.Id;
             var userRoleNames = (await AppService.GetRolesAsync(entity.Id)).Items.Select(r => r.Name).ToList();
 
             EditUserRoles = Roles.Select(x => new AssignedRoleViewModel

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml

@@ -39,8 +39,10 @@
                         <abp-input asp-for="UserInfo.Email" />
                         <abp-input asp-for="UserInfo.PhoneNumber" />
                         <abp-input asp-for="UserInfo.IsActive" />
-                        <abp-input asp-for="UserInfo.LockoutEnabled" />
-
+                        @if (!Model.IsEditCurrentUser)
+                        {
+                            <abp-input asp-for="UserInfo.LockoutEnabled" />
+                        }
                         @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.UserInfoViewModel>())
                         {
                             if (!propertyInfo.Name.EndsWith("_Text"))

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

@@ -24,6 +24,8 @@ public class EditModalModel : IdentityPageModel
 
     protected IIdentityUserAppService IdentityUserAppService { get; }
 
+    public bool IsEditCurrentUser { get; set; }
+
     public EditModalModel(IIdentityUserAppService identityUserAppService)
     {
         IdentityUserAppService = identityUserAppService;
@@ -32,10 +34,9 @@ public class EditModalModel : IdentityPageModel
     public virtual async Task<IActionResult> OnGetAsync(Guid id)
     {
         var user = await IdentityUserAppService.GetAsync(id);
-        
         UserInfo = ObjectMapper.Map<IdentityUserDto, UserInfoViewModel>(user);
-
         Roles = ObjectMapper.Map<IReadOnlyList<IdentityRoleDto>, AssignedRoleViewModel[]>((await IdentityUserAppService.GetAssignableRolesAsync()).Items);
+        IsEditCurrentUser = CurrentUser.Id == id;
 
         var userRoleNames = (await IdentityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Name).ToList();
         foreach (var role in Roles)

npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts

@@ -1,19 +1,22 @@
-import { LocalizationParam, SubscriptionService } from '@abp/ng.core';
 import {
-  AfterViewInit,
   ApplicationRef,
   Component,
+  Injector,
+  inject,
+  OnInit,
   ComponentFactoryResolver,
   ElementRef,
   EmbeddedViewRef,
-  Injector,
-  OnDestroy,
-  OnInit,
   Type,
   ViewChild,
+  AfterViewInit,
+  OnDestroy,
 } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
 import { fromEvent, Subject } from 'rxjs';
 import { debounceTime, filter } from 'rxjs/operators';
+import { LocalizationParam, SubscriptionService } from '@abp/ng.core';
+import { ErrorScreenErrorCodes } from '../../models';
 
 @Component({
   selector: 'abp-http-error-wrapper',
@@ -21,14 +24,17 @@ import { debounceTime, filter } from 'rxjs/operators';
   styleUrls: ['http-error-wrapper.component.scss'],
   providers: [SubscriptionService],
 })
-export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnInit {
+export class HttpErrorWrapperComponent implements OnInit, AfterViewInit, OnDestroy {
+  protected readonly document = inject(DOCUMENT);
+  protected readonly window = this.document.defaultView;
+
   appRef!: ApplicationRef;
 
   cfRes!: ComponentFactoryResolver;
 
   injector!: Injector;
 
-  status = 0;
+  status: ErrorScreenErrorCodes = 0;
 
   title: LocalizationParam = 'Oops!';
 
@@ -53,12 +59,12 @@ export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnIn
 
   constructor(private subscription: SubscriptionService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.backgroundColor =
-      window.getComputedStyle(document.body)?.getPropertyValue('background-color') || '#fff';
+      this.window.getComputedStyle(this.document.body)?.getPropertyValue('background-color') || '#fff';
   }
 
-  ngAfterViewInit() {
+  ngAfterViewInit(): void {
     if (this.customComponent) {
       const customComponentRef = this.cfRes
         .resolveComponentFactory(this.customComponent)
@@ -74,18 +80,18 @@ export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnIn
       customComponentRef.changeDetectorRef.detectChanges();
     }
 
-    const keyup$ = fromEvent<KeyboardEvent>(document, 'keyup').pipe(
+    const keyup$ = fromEvent<KeyboardEvent>(this.document, 'keyup').pipe(
       debounceTime(150),
       filter((key: KeyboardEvent) => key && key.key === 'Escape'),
     );
     this.subscription.addOne(keyup$, () => this.destroy());
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     this.destroy();
   }
 
-  destroy() {
+  destroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
   }

npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

@@ -1,25 +1,29 @@
-import { HttpErrorReporterService } from '@abp/ng.core';
-import { HttpErrorResponse } from '@angular/common/http';
 import { inject, Injectable, Injector } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
 import { Observable, of, throwError } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
+
+import { HttpErrorReporterService } from '@abp/ng.core';
+
 import { CustomHttpErrorHandlerService } from '../models/common';
 import { Confirmation } from '../models/confirmation';
-import { ConfirmationService } from '../services/confirmation.service';
+
 import { CUSTOM_ERROR_HANDLERS, HTTP_ERROR_HANDLER } from '../tokens/http-error.token';
+import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';
 import { DEFAULT_ERROR_LOCALIZATIONS, DEFAULT_ERROR_MESSAGES } from '../constants/default-errors';
+
+import { ConfirmationService } from '../services/confirmation.service';
 import { RouterErrorHandlerService } from '../services/router-error-handler.service';
-import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';
 
 @Injectable({ providedIn: 'root' })
 export class ErrorHandler {
-  private httpErrorReporter = inject(HttpErrorReporterService);
-  private confirmationService = inject(ConfirmationService);
-  private routerErrorHandlerService = inject(RouterErrorHandlerService);
-  protected httpErrorConfig = inject(HTTP_ERROR_CONFIG);
-  private customErrorHandlers = inject(CUSTOM_ERROR_HANDLERS);
-  private defaultHttpErrorHandler = (_, err: HttpErrorResponse) => throwError(() => err);
-  private httpErrorHandler =
+  protected readonly httpErrorReporter = inject(HttpErrorReporterService);
+  protected readonly confirmationService = inject(ConfirmationService);
+  protected readonly routerErrorHandlerService = inject(RouterErrorHandlerService);
+  protected readonly httpErrorConfig = inject(HTTP_ERROR_CONFIG);
+  protected readonly customErrorHandlers = inject(CUSTOM_ERROR_HANDLERS);
+  protected readonly defaultHttpErrorHandler = (_, err: HttpErrorResponse) => throwError(() => err);
+  protected readonly httpErrorHandler =
     inject(HTTP_ERROR_HANDLER, { optional: true }) || this.defaultHttpErrorHandler;
 
   constructor(protected injector: Injector) {
@@ -34,17 +38,14 @@ export class ErrorHandler {
   protected listenToRestError() {
     this.httpErrorReporter.reporter$
       .pipe(filter(this.filterRestErrors), switchMap(this.executeErrorHandler))
-      .subscribe(err => {
-        this.handleError(err);
-      });
+      .subscribe(err => this.handleError(err));
   }
 
-  private executeErrorHandler = (error: HttpErrorResponse) => {
+  protected executeErrorHandler = (error: HttpErrorResponse) => {
     const errHandler = this.httpErrorHandler(this.injector, error);
     const isObservable = errHandler instanceof Observable;
-    const response = isObservable ? errHandler : of(null);
 
-    return response.pipe(
+    return (isObservable ? errHandler : of(null)).pipe(
       catchError(err => {
         this.handleError(err);
         return of(null);
@@ -59,16 +60,18 @@ export class ErrorHandler {
     return (b.priority || 0) - (a.priority || 0);
   }
 
-  private handleError(err: unknown) {
+  protected handleError(err: unknown) {
     if (this.customErrorHandlers && this.customErrorHandlers.length) {
       const canHandleService = this.customErrorHandlers
         .sort(this.sortHttpErrorHandlers)
         .find(service => service.canHandle(err));
+
       if (canHandleService) {
         canHandleService.execute();
         return;
       }
     }
+
     this.showError().subscribe();
   }
 
@@ -90,10 +93,10 @@ export class ErrorHandler {
   protected filterRestErrors = ({ status }: HttpErrorResponse): boolean => {
     if (typeof status !== 'number') return false;
 
-    if (!this.httpErrorConfig.skipHandledErrorCodes) {
+    if (!this.httpErrorConfig || !this.httpErrorConfig.skipHandledErrorCodes) {
       return true;
     }
 
-    return this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === status) < 0;
+    return this.httpErrorConfig.skipHandledErrorCodes?.findIndex(code => code === status) < 0;
   };
 }

npm/ng-packs/packages/theme-shared/src/lib/models/common.ts

@@ -1,5 +1,5 @@
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injector, Type } from '@angular/core';
+import { Type } from '@angular/core';
 import { Validation } from '@ngx-validate/core';
 import { Observable } from 'rxjs';
 import { ConfirmationIcons } from '../tokens/confirmation-icons.token';
@@ -10,7 +10,7 @@ export interface RootParams {
   confirmationIcons?: Partial<ConfirmationIcons>;
 }
 
-export type ErrorScreenErrorCodes = 401 | 403 | 404 | 500;
+export type ErrorScreenErrorCodes = 0 | 401 | 403 | 404 | 500;
 
 export interface HttpErrorConfig {
   skipHandledErrorCodes?: ErrorScreenErrorCodes[] | number[];
@@ -26,5 +26,5 @@ export type LocaleDirection = 'ltr' | 'rtl';
 export interface CustomHttpErrorHandlerService {
   readonly priority: number;
   canHandle(error: unknown): boolean;
-  execute();
+  execute(): void;
 }

npm/ng-packs/packages/theme-shared/src/lib/services/create-error-component.service.ts

@@ -8,8 +8,9 @@ import {
   Injector,
   RendererFactory2,
 } from '@angular/core';
-import { Subject } from 'rxjs';
+import { DOCUMENT } from '@angular/common';
 import { ResolveEnd } from '@angular/router';
+import { Subject } from 'rxjs';
 import { filter } from 'rxjs/operators';
 import { RouterEvents } from '@abp/ng.core';
 import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token';
@@ -18,31 +19,20 @@ import { ErrorScreenErrorCodes } from '../models/common';
 
 @Injectable({ providedIn: 'root' })
 export class CreateErrorComponentService {
-  protected rendererFactory = inject(RendererFactory2);
-  protected cfRes = inject(ComponentFactoryResolver);
-  private routerEvents = inject(RouterEvents);
-  private injector = inject(Injector);
-  private httpErrorConfig = inject(HTTP_ERROR_CONFIG);
+  protected readonly document = inject(DOCUMENT);
+  protected readonly rendererFactory = inject(RendererFactory2);
+  protected readonly cfRes = inject(ComponentFactoryResolver);
+  protected readonly routerEvents = inject(RouterEvents);
+  protected readonly injector = inject(Injector);
+  protected readonly httpErrorConfig = inject(HTTP_ERROR_CONFIG);
 
   componentRef: ComponentRef<HttpErrorWrapperComponent> | null = null;
 
-  private getErrorHostElement() {
-    return document.body;
-  }
-
-  public canCreateCustomError(status: ErrorScreenErrorCodes) {
-    return !!(
-      this.httpErrorConfig?.errorScreen?.component &&
-      this.httpErrorConfig?.errorScreen?.forWhichErrors &&
-      this.httpErrorConfig?.errorScreen?.forWhichErrors.indexOf(status) > -1
-    );
-  }
-
   constructor() {
     this.listenToRouterDataResolved();
   }
 
-  protected listenToRouterDataResolved() {
+  protected listenToRouterDataResolved(): void {
     this.routerEvents
       .getEvents(ResolveEnd)
       .pipe(filter(() => !!this.componentRef))
@@ -52,11 +42,25 @@ export class CreateErrorComponentService {
       });
   }
 
-  private isCloseIconHidden() {
-    return !!this.httpErrorConfig.errorScreen?.hideCloseIcon;
+  protected getErrorHostElement(): HTMLElement {
+    return this.document.body;
+  }
+
+  protected isCloseIconHidden(): boolean {
+    return !!this.httpErrorConfig?.errorScreen?.hideCloseIcon;
+  }
+
+  canCreateCustomError(status: ErrorScreenErrorCodes) {
+    const { component, forWhichErrors } = this.httpErrorConfig?.errorScreen || {};
+
+    if (!component || !forWhichErrors) {
+      return false;
+    }
+
+    return forWhichErrors.indexOf(status) > -1;
   }
 
-  execute(instance: Partial<HttpErrorWrapperComponent>) {
+  execute(instance: Partial<HttpErrorWrapperComponent>): void {
     const renderer = this.rendererFactory.createRenderer(null, null);
     const hostElement = this.getErrorHostElement();
     const host = renderer.selectRootElement(hostElement, true);

npm/ng-packs/packages/theme-shared/src/lib/services/router-error-handler.service.ts

@@ -1,42 +1,43 @@
 import { inject, Injectable } from '@angular/core';
+import { NavigationError } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { RouterEvents } from '@abp/ng.core';
-import { NavigationError } from '@angular/router';
 import { HTTP_ERROR_CONFIG } from '../tokens/';
 import { CreateErrorComponentService } from '../services';
 import { DEFAULT_ERROR_LOCALIZATIONS, DEFAULT_ERROR_MESSAGES } from '../constants/default-errors';
+import { ErrorScreenErrorCodes } from '../models';
 
 @Injectable({ providedIn: 'root' })
 export class RouterErrorHandlerService {
-  private readonly routerEvents = inject(RouterEvents);
-  private httpErrorConfig = inject(HTTP_ERROR_CONFIG);
-  private createErrorComponentService = inject(CreateErrorComponentService);
-
-  listen() {
-    this.routerEvents
-      .getNavigationEvents('Error')
-      .pipe(filter(this.filterRouteErrors))
-      .subscribe(() => this.show404Page());
-  }
+  protected readonly routerEvents = inject(RouterEvents);
+  protected readonly httpErrorConfig = inject(HTTP_ERROR_CONFIG);
+  protected readonly createErrorComponentService = inject(CreateErrorComponentService);
 
   protected filterRouteErrors = (navigationError: NavigationError): boolean => {
-    if (!this.httpErrorConfig.skipHandledErrorCodes) {
+    if (!this.httpErrorConfig?.skipHandledErrorCodes) {
       return true;
     }
-    
+
     return (
       navigationError.error?.message?.indexOf('Cannot match') > -1 &&
       this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === 404) < 0
     );
   };
 
+  listen() {
+    this.routerEvents
+      .getNavigationEvents('Error')
+      .pipe(filter(this.filterRouteErrors))
+      .subscribe(() => this.show404Page());
+  }
+
   show404Page() {
     const instance = {
       title: {
         key: DEFAULT_ERROR_LOCALIZATIONS.defaultError404.title,
         defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.title,
       },
-      status: 404,
+      status: <ErrorScreenErrorCodes>404,
     };
 
     this.createErrorComponentService.execute(instance);

npm/ng-packs/packages/theme-shared/src/lib/services/status-code-error-handler.service.ts

@@ -12,19 +12,57 @@ import { CreateErrorComponentService } from './create-error-component.service';
 
 @Injectable({ providedIn: 'root' })
 export class StatusCodeErrorHandlerService implements CustomHttpErrorHandlerService {
-  private readonly confirmationService = inject(ConfirmationService);
-  private readonly createErrorComponentService = inject(CreateErrorComponentService);
-  private readonly authService = inject(AuthService);
+  protected readonly confirmationService = inject(ConfirmationService);
+  protected readonly createErrorComponentService = inject(CreateErrorComponentService);
+  protected readonly authService = inject(AuthService);
+
+  protected readonly handledStatusCodes = [401, 403, 404, 500] as const;
+  protected status: typeof this.handledStatusCodes[number];
+
   readonly priority = CUSTOM_HTTP_ERROR_HANDLER_PRIORITY.normal;
-  private status: typeof this.handledStatusCodes[number];
-  private readonly handledStatusCodes = [401, 403, 404, 500] as const;
+
+  protected navigateToLogin(): void {
+    this.authService.navigateToLogin();
+  }
+
+  protected showConfirmation(
+    message: LocalizationParam,
+    title: LocalizationParam,
+  ): Observable<Confirmation.Status> {
+    return this.confirmationService.error(message, title, {
+      hideCancelBtn: true,
+      yesText: 'AbpAccount::Close',
+    });
+  }
+
+  protected showPage(): void {
+    const key = `defaultError${this.status}`;
+    const shouldRemoveDetail = [401, 404].indexOf(this.status) > -1;
+    const instance = {
+      title: {
+        key: DEFAULT_ERROR_LOCALIZATIONS[key]?.title,
+        defaultValue: DEFAULT_ERROR_MESSAGES[key]?.title,
+      },
+      details: {
+        key: DEFAULT_ERROR_LOCALIZATIONS[key]?.details,
+        defaultValue: DEFAULT_ERROR_MESSAGES[key]?.details,
+      },
+      status: this.status,
+    };
+
+    if (shouldRemoveDetail) {
+      delete instance.details;
+    }
+
+    this.createErrorComponentService.execute(instance);
+  }
 
   canHandle({ status }): boolean {
-    this.status = status;
+    this.status = status || 0;
     return this.handledStatusCodes.indexOf(status) > -1;
   }
 
-  execute() {
+  execute(): void {
     const key = `defaultError${this.status}`;
     const title = {
       key: DEFAULT_ERROR_LOCALIZATIONS[key]?.title,
@@ -36,6 +74,7 @@ export class StatusCodeErrorHandlerService implements CustomHttpErrorHandlerServ
     };
 
     const canCreateCustomError = this.createErrorComponentService.canCreateCustomError(this.status);
+
     switch (this.status) {
       case 401:
       case 404:
@@ -56,39 +95,4 @@ export class StatusCodeErrorHandlerService implements CustomHttpErrorHandlerServ
         break;
     }
   }
-
-  private navigateToLogin() {
-    this.authService.navigateToLogin();
-  }
-
-  protected showConfirmation(
-    message: LocalizationParam,
-    title: LocalizationParam,
-  ): Observable<Confirmation.Status> {
-    return this.confirmationService.error(message, title, {
-      hideCancelBtn: true,
-      yesText: 'AbpAccount::Close',
-    });
-  }
-
-  protected showPage() {
-    const key = `defaultError${this.status}`;
-
-    const instance = {
-      title: {
-        key: DEFAULT_ERROR_LOCALIZATIONS[key]?.title,
-        defaultValue: DEFAULT_ERROR_MESSAGES[key]?.title,
-      },
-      details: {
-        key: DEFAULT_ERROR_LOCALIZATIONS[key]?.details,
-        defaultValue: DEFAULT_ERROR_MESSAGES[key]?.details,
-      },
-      status: this.status,
-    };
-    const shouldRemoveDetail = [401, 404].indexOf(this.status) > -1;
-    if (shouldRemoveDetail) {
-      delete instance.details;
-    }
-    this.createErrorComponentService.execute(instance);
-  }
 }

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
@@ -82,7 +82,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
@@ -83,7 +83,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj

@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=638118923149875950" rel="stylesheet"/>
+    <link href="global.css?_v=638289244950963716" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@@ -29,7 +29,7 @@
 </div>
 
 <!--ABP:Scripts-->
-    <script src="global.js?_v=638118923150952740"></script>
+    <script src="global.js?_v=638289244953139634"></script>
     <!--/ABP:Scripts-->
 </body>
 </html>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>
@@ -78,7 +78,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>
@@ -79,11 +79,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
     </PackageReference>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj

@@ -29,7 +29,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj

@@ -74,7 +74,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj

@@ -75,7 +75,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj

@@ -77,7 +77,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj

@@ -78,7 +78,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj

@@ -34,7 +34,7 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
   </ItemGroup>
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj

@@ -14,11 +14,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
   </ItemGroup>
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj

@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=638210550967168851" rel="stylesheet"/>
+    <link href="global.css?_v=638289244910528761" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@@ -29,7 +29,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=638210550970188800"></script>
+    <script src="global.js?_v=638289244912430522"></script>
     <!--/ABP:Scripts-->
 
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
 </Project>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj

@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj

@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
   </ItemGroup>
 
 </Project>

templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj

@@ -35,7 +35,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-	    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+	    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly"  Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=638210551285656747" rel="stylesheet"/>
+    <link href="global.css?_v=638289244983804402" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
 </head>
@@ -22,7 +22,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=638210551286504891"></script>
+    <script src="global.js?_v=638289244984662394"></script>
     <!--/ABP:Scripts-->
 </body>
 </html>

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

@@ -13,8 +13,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.3" />
-        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.3" />
+        <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
+        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
         <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1" />

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

@@ -14,8 +14,8 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="IdentityModel" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />

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

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>

templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
     <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore.Sqlite\Volo.Abp.EntityFrameworkCore.Sqlite.csproj" />