diff --git a/docs/en/Application-Services.md b/docs/en/Application-Services.md
index f48ff9cb5b..7fe9825f2a 100644
--- a/docs/en/Application-Services.md
+++ b/docs/en/Application-Services.md
@@ -342,12 +342,12 @@ public class DistrictAppService
     {
     }
 
-    protected override async Task DeleteByIdAsync(DistrictKey id)
+    protected async override Task DeleteByIdAsync(DistrictKey id)
     {
         await Repository.DeleteAsync(d => d.CityId == id.CityId && d.Name == id.Name);
     }
 
-    protected override async Task<District> GetEntityByIdAsync(DistrictKey id)
+    protected async override Task<District> GetEntityByIdAsync(DistrictKey id)
     {
         return await AsyncQueryableExecuter.FirstOrDefaultAsync(
             Repository.Where(d => d.CityId == id.CityId && d.Name == id.Name)
@@ -400,7 +400,7 @@ public class MyPeopleAppService : CrudAppService<Person, PersonDto, Guid>
     {
     }
 
-    protected override async Task CheckDeletePolicyAsync()
+    protected async override Task CheckDeletePolicyAsync()
     {
         await AuthorizationService.CheckAsync("...");
     }
diff --git a/docs/en/Authorization.md b/docs/en/Authorization.md
index eef4237039..158466d153 100644
--- a/docs/en/Authorization.md
+++ b/docs/en/Authorization.md
@@ -234,7 +234,7 @@ context
 
 When you write this code inside your permission definition provider, it finds the "role deletion" permission of the [Identity Module](Modules/Identity.md) and disabled the permission, so no one can delete a role on the application.
 
-> Tip: It is better to check the value returned by the `GetPermissionOrNull` method since it may return null if the given permission was not defined. 
+> Tip: It is better to check the value returned by the `GetPermissionOrNull` method since it may return null if the given permission was not defined.
 
 ## IAuthorizationService
 
@@ -354,7 +354,7 @@ public class SystemAdminPermissionValueProvider : PermissionValueProvider
 
     public override string Name => "SystemAdmin";
 
-    public override async Task<PermissionGrantResult>
+    public async override Task<PermissionGrantResult>
            CheckAsync(PermissionValueCheckContext context)
     {
         if (context.Principal?.FindFirst("User_Type")?.Value == "SystemAdmin")
diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index c8a617efec..2e1b9d2a90 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -54,7 +54,7 @@ public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
         Timer.Period = 600000; //10 minutes
     }
 
-    protected override async Task DoWorkAsync(
+    protected async override Task DoWorkAsync(
         PeriodicBackgroundWorkerContext workerContext)
     {
         Logger.LogInformation("Starting: Setting status of inactive users...");
diff --git a/docs/en/Blog-Posts/2020-05-08 v2_7_Release/Post.md b/docs/en/Blog-Posts/2020-05-08 v2_7_Release/Post.md
index b6c1d3f952..c09b0eb75c 100644
--- a/docs/en/Blog-Posts/2020-05-08 v2_7_Release/Post.md	
+++ b/docs/en/Blog-Posts/2020-05-08 v2_7_Release/Post.md	
@@ -16,7 +16,7 @@ ABP.IO Platform is rapidly growing and we are getting more and more contribution
 
 ### Object Extending System
 
-In the last few releases, we've mostly focused on providing ways to extend existing modules when you use them as NuGet/NPM Packages. 
+In the last few releases, we've mostly focused on providing ways to extend existing modules when you use them as NuGet/NPM Packages.
 
 The Object Extending System allows module developers to create extensible modules and allows application developers to customize and extend a module easily.
 
@@ -43,7 +43,7 @@ ObjectExtensionManager.Instance
             options.Attributes.Add(new RequiredAttribute());
             options.Attributes.Add(
                 new StringLengthAttribute(32) {
-                    MinimumLength = 6 
+                    MinimumLength = 6
                 }
             );
         });
@@ -121,7 +121,7 @@ Just create a class derived from the `ExceptionSubscriber` class in your applica
 ````csharp
 public class MyExceptionSubscriber : ExceptionSubscriber
 {
-    public override async Task HandleAsync(ExceptionNotificationContext context)
+    public async override Task HandleAsync(ExceptionNotificationContext context)
     {
         //TODO...
     }
@@ -244,4 +244,4 @@ We ([Volosoft](https://volosoft.com/) - the core team behind the ABP.IO platform
 
 [ABP Framework](https://abp.io/) provides all the infrastructure and application independent framework features to make you more productive, focus on your own business code and implement software development best practices. It provides you a well defined and comfortable development experience without repeating yourself.
 
-[ABP Commercial](https://commercial.abp.io/) provides pre-built functionalities, themes and tooling to save your time if your requirements involve these functionalities in addition to the premium support for the framework and the pre-built modules.
\ No newline at end of file
+[ABP Commercial](https://commercial.abp.io/) provides pre-built functionalities, themes and tooling to save your time if your requirements involve these functionalities in addition to the premium support for the framework and the pre-built modules.
diff --git a/docs/en/Community-Articles/2020-04-19-Customize-the-SignIn-Manager/POST.md b/docs/en/Community-Articles/2020-04-19-Customize-the-SignIn-Manager/POST.md
index d46049526d..1342407880 100644
--- a/docs/en/Community-Articles/2020-04-19-Customize-the-SignIn-Manager/POST.md
+++ b/docs/en/Community-Articles/2020-04-19-Customize-the-SignIn-Manager/POST.md
@@ -1,6 +1,6 @@
 # How to Customize the SignIn Manager for ABP Applications
 
-After creating a new application using the [application startup template](https://docs.abp.io/en/abp/latest/Startup-Templates/Application), you may want extend or change the default behavior of the SignIn Manager for your authentication and registration flow needs. ABP [Account Module](https://docs.abp.io/en/abp/latest/Modules/Account) uses the [Identity Management Module](https://docs.abp.io/en/abp/latest/Modules/Identity) for SignIn Manager and the [Identity Management Module](https://docs.abp.io/en/abp/latest/Modules/Identity) uses default [Microsoft Identity SignIn Manager](https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs) ([see here](https://github.com/abpframework/abp/blob/be32a55449e270d2d456df3dabdc91f3ffdd4fa9/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs#L17)). 
+After creating a new application using the [application startup template](https://docs.abp.io/en/abp/latest/Startup-Templates/Application), you may want extend or change the default behavior of the SignIn Manager for your authentication and registration flow needs. ABP [Account Module](https://docs.abp.io/en/abp/latest/Modules/Account) uses the [Identity Management Module](https://docs.abp.io/en/abp/latest/Modules/Identity) for SignIn Manager and the [Identity Management Module](https://docs.abp.io/en/abp/latest/Modules/Identity) uses default [Microsoft Identity SignIn Manager](https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs) ([see here](https://github.com/abpframework/abp/blob/be32a55449e270d2d456df3dabdc91f3ffdd4fa9/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs#L17)).
 
 To write your Custom SignIn Manager, you need to extend [Microsoft Identity SignIn Manager](https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs) class and register it to the DI container.
 
@@ -27,7 +27,7 @@ public class CustomSignInManager : Microsoft.AspNetCore.Identity.SignInManager<V
 }
 ````
 
-> It is important to use **Volo.Abp.Identity.IdentityUser** type for SignInManager to inherit, not the AppUser of your application. 
+> It is important to use **Volo.Abp.Identity.IdentityUser** type for SignInManager to inherit, not the AppUser of your application.
 
 Afterwards you can override any of the SignIn Manager methods you need and add new methods and properties needed for your authentication or registration flow.
 
@@ -38,7 +38,7 @@ In this case we'll be overriding the `GetExternalLoginInfoAsync` method which is
 A good way to override a method is  copying its [source code](https://github.com/dotnet/aspnetcore/blob/c56aa320c32ee5429d60647782c91d53ac765865/src/Identity/Core/src/SignInManager.cs#L638-L674). In this case, we will be using a minorly modified version of the source code which explicitly shows the namespaces of the methods and properties to help better understanding of the concept.
 
 ````csharp
-public override async Task<Microsoft.AspNetCore.Identity.ExternalLoginInfo> GetExternalLoginInfoAsync(string expectedXsrf = null)
+public async override Task<Microsoft.AspNetCore.Identity.ExternalLoginInfo> GetExternalLoginInfoAsync(string expectedXsrf = null)
 {
     var auth = await Context.AuthenticateAsync(Microsoft.AspNetCore.Identity.IdentityConstants.ExternalScheme);
     var items = auth?.Properties?.Items;
@@ -93,4 +93,4 @@ PreConfigure<IdentityBuilder>(identityBuilder =>
 
 ## The Source Code
 
-You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization).
\ No newline at end of file
+You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization).
diff --git a/docs/en/Community-Articles/2020-08-07-Passwordless-Authentication/POST.md b/docs/en/Community-Articles/2020-08-07-Passwordless-Authentication/POST.md
index b31ea023f2..9489c004bd 100644
--- a/docs/en/Community-Articles/2020-08-07-Passwordless-Authentication/POST.md
+++ b/docs/en/Community-Articles/2020-08-07-Passwordless-Authentication/POST.md
@@ -33,7 +33,7 @@ namespace PasswordlessAuthentication.Web
         }
 
         //We need to override this method as well.
-        public override async Task<string> GetUserModifierAsync(string purpose, UserManager<TUser> manager, TUser user)
+        public async override Task<string> GetUserModifierAsync(string purpose, UserManager<TUser> manager, TUser user)
         {
             var userId = await manager.GetUserIdAsync(user);
 
@@ -105,7 +105,7 @@ namespace PasswordlessAuthentication.Web.Pages
             UserManager = userManager;
             _userRepository = userRepository;
         }
-        
+
         public ActionResult OnGet()
         {
             if (!CurrentUser.IsAuthenticated)
@@ -115,15 +115,15 @@ namespace PasswordlessAuthentication.Web.Pages
 
             return Page();
         }
-        
+
         //added for passwordless authentication
         public async Task<IActionResult> OnPostGeneratePasswordlessTokenAsync()
         {
             var adminUser = await _userRepository.FindByNormalizedUserNameAsync("admin");
-            
+
             var token = await UserManager.GenerateUserTokenAsync(adminUser, "PasswordlessLoginProvider",
                 "passwordless-auth");
-            
+
             PasswordlessLoginUrl = Url.Action("Login", "Passwordless",
                 new {token = token, userId = adminUser.Id.ToString()}, Request.Scheme);
 
@@ -238,7 +238,7 @@ namespace PasswordlessAuthentication.Web.Controllers
 
             return Redirect("/");
         }
-        
+
         private static IEnumerable<Claim> CreateClaims(IUser user, IEnumerable<string> roles)
         {
             var claims = new List<Claim>
@@ -272,4 +272,4 @@ That's all! We created a passwordless login with 7 steps.
 
 ## Source Code
 
-The completed sample is available on [GitHub repository](https://github.com/abpframework/abp-samples/tree/master/PasswordlessAuthentication).
\ No newline at end of file
+The completed sample is available on [GitHub repository](https://github.com/abpframework/abp-samples/tree/master/PasswordlessAuthentication).
diff --git a/docs/en/Customizing-Application-Modules-Overriding-Services.md b/docs/en/Customizing-Application-Modules-Overriding-Services.md
index b8706eea61..97df12a3a6 100644
--- a/docs/en/Customizing-Application-Modules-Overriding-Services.md
+++ b/docs/en/Customizing-Application-Modules-Overriding-Services.md
@@ -29,7 +29,7 @@ public class TestAppService : IIdentityUserAppService, ITransientDependency
 }
 ````
 
-The dependency injection system allows to register multiple services for the same interface. The last registered one is used when the interface is injected. It is a good practice to explicitly replace the service. 
+The dependency injection system allows to register multiple services for the same interface. The last registered one is used when the interface is injected. It is a good practice to explicitly replace the service.
 
 Example:
 
@@ -76,7 +76,7 @@ public class MyIdentityUserAppService : IdentityUserAppService
     {
     }
 
-    public override async Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
+    public async override Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
     {
         if (input.PhoneNumber.IsNullOrWhiteSpace())
         {
@@ -109,33 +109,33 @@ public class MyIdentityUserManager : IdentityUserManager
 {
         public MyIdentityUserManager(
             IdentityUserStore store,
-            IIdentityRoleRepository roleRepository, 
+            IIdentityRoleRepository roleRepository,
             IIdentityUserRepository userRepository,
-            IOptions<IdentityOptions> optionsAccessor, 
+            IOptions<IdentityOptions> optionsAccessor,
             IPasswordHasher<IdentityUser> passwordHasher,
-            IEnumerable<IUserValidator<IdentityUser>> userValidators, 
-            IEnumerable<IPasswordValidator<IdentityUser>> passwordValidators, 
+            IEnumerable<IUserValidator<IdentityUser>> userValidators,
+            IEnumerable<IPasswordValidator<IdentityUser>> passwordValidators,
             ILookupNormalizer keyNormalizer,
             IdentityErrorDescriber errors,
             IServiceProvider services,
-            ILogger<IdentityUserManager> logger, 
-            ICancellationTokenProvider cancellationTokenProvider) : 
+            ILogger<IdentityUserManager> logger,
+            ICancellationTokenProvider cancellationTokenProvider) :
             base(store,
                 roleRepository,
-                userRepository, 
-                optionsAccessor, 
-                passwordHasher, 
-                userValidators, 
+                userRepository,
+                optionsAccessor,
+                passwordHasher,
+                userValidators,
                 passwordValidators,
-                keyNormalizer, 
-                errors, 
-                services, 
-                logger, 
+                keyNormalizer,
+                errors,
+                services,
+                logger,
                 cancellationTokenProvider)
         {
         }
 
-    public override async Task<IdentityResult> CreateAsync(IdentityUser user)
+    public async override Task<IdentityResult> CreateAsync(IdentityUser user)
     {
         if (user.PhoneNumber.IsNullOrWhiteSpace())
         {
@@ -182,7 +182,7 @@ namespace MyProject.Controllers
 
         }
 
-        public override async Task SendPasswordResetCodeAsync(
+        public async override Task SendPasswordResetCodeAsync(
             SendPasswordResetCodeDto input)
         {
             Logger.LogInformation("Your custom logic...");
@@ -214,7 +214,7 @@ Assuming that you've already added a `SocialSecurityNumber` as described in the
 You can use the [object extension system](Object-Extensions.md) to add the property to the `IdentityUserDto`. Write this code inside the `YourProjectNameDtoExtensions` class comes with the application startup template:
 
 ````csharp
-ObjectExtensionManager.Instance                    
+ObjectExtensionManager.Instance
     .AddOrUpdateProperty<IdentityUserDto, string>(
         "SocialSecurityNumber"
     );
@@ -286,8 +286,8 @@ ObjectExtensionManager.Instance
     .AddOrUpdateProperty<string>(
         new[]
         {
-            typeof(IdentityUserDto), 
-            typeof(IdentityUserCreateDto), 
+            typeof(IdentityUserDto),
+            typeof(IdentityUserCreateDto),
             typeof(IdentityUserUpdateDto)
         },
         "SocialSecurityNumber"
diff --git a/docs/en/Domain-Driven-Design.md b/docs/en/Domain-Driven-Design.md
index ce33295492..bbf22eab13 100644
--- a/docs/en/Domain-Driven-Design.md
+++ b/docs/en/Domain-Driven-Design.md
@@ -19,8 +19,12 @@ ABP follows DDD principles and patterns to achieve a layered application model w
 - **Domain Layer**: Includes business objects and the core (domain) business rules. This is the heart of the application.
 - **Infrastructure Layer**: Provides generic technical capabilities that support higher layers mostly using 3rd-party libraries.
 
+DDD mostly interest in the **Domain** and the **Application** layers, rather than the Infrastructure and the Presentation layers.
+
 ## Contents
 
+See the following documents to learn what ABP Framework provides to you to implement DDD in your project.
+
 * **Domain Layer**
   * [Entities & Aggregate Roots](Entities.md)
   * Value Objects
@@ -30,4 +34,4 @@ ABP follows DDD principles and patterns to achieve a layered application model w
 * **Application Layer**
   * [Application Services](Application-Services.md)
   * [Data Transfer Objects (DTOs)](Data-Transfer-Objects.md)
-  * Unit of Work
\ No newline at end of file
+  * [Unit of Work](Unit-Of-Work.md)
\ No newline at end of file
diff --git a/docs/en/Entity-Framework-Core.md b/docs/en/Entity-Framework-Core.md
index 98163e7c28..5d41d571b7 100644
--- a/docs/en/Entity-Framework-Core.md
+++ b/docs/en/Entity-Framework-Core.md
@@ -92,7 +92,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         b.ToTable("Books");
 
         //Configure the base properties
-        b.ConfigureByConvention(); 
+        b.ConfigureByConvention();
 
         //Configure other properties (if you are using the fluent API)
         b.Property(x => x.Name).IsRequired().HasMaxLength(128);
@@ -113,7 +113,7 @@ If you have multiple databases in your application, you can configure the connec
 [ConnectionStringName("MySecondConnString")]
 public class MyDbContext : AbpDbContext<MyDbContext>
 {
-    
+
 }
 ```
 
@@ -254,7 +254,7 @@ If you want to replace default repository implementation with your custom reposi
 context.Services.AddAbpDbContext<BookStoreDbContext>(options =>
 {
     options.AddDefaultRepositories();
-    
+
     //Replaces IRepository<Book, Guid>
     options.AddRepository<Book, BookRepository>();
 });
@@ -263,7 +263,7 @@ context.Services.AddAbpDbContext<BookStoreDbContext>(options =>
 This is especially important when you want to **override a base repository method** to customize it. For instance, you may want to override `DeleteAsync` method to delete a specific entity in a more efficient way:
 
 ````csharp
-public override async Task DeleteAsync(
+public async override Task DeleteAsync(
     Guid id,
     bool autoSave = false,
     CancellationToken cancellationToken = default)
@@ -365,7 +365,7 @@ public class MyRepositoryBase<TEntity>
     : EfCoreRepository<BookStoreDbContext, TEntity>
       where TEntity : class, IEntity
 {
-    public MyRepositoryBase(IDbContextProvider<BookStoreDbContext> dbContextProvider) 
+    public MyRepositoryBase(IDbContextProvider<BookStoreDbContext> dbContextProvider)
         : base(dbContextProvider)
     {
     }
@@ -395,7 +395,7 @@ context.Services.AddAbpDbContext<BookStoreDbContext>(options =>
         typeof(MyRepositoryBase<,>),
         typeof(MyRepositoryBase<>)
     );
-    
+
     //...
 });
 ```
@@ -448,4 +448,4 @@ In this example, `OtherDbContext` implements `IBookStoreDbContext`. This feature
 
 ## See Also
 
-* [Entities](Entities.md)
\ No newline at end of file
+* [Entities](Entities.md)
diff --git a/docs/en/Exception-Handling.md b/docs/en/Exception-Handling.md
index 59a2c6bd0e..04cc6fc695 100644
--- a/docs/en/Exception-Handling.md
+++ b/docs/en/Exception-Handling.md
@@ -85,7 +85,7 @@ Error **details** in an optional field of the JSON error message. Thrown `Except
 
 ### Logging
 
-Caught exceptions are automatically logged. 
+Caught exceptions are automatically logged.
 
 #### Log Level
 
@@ -300,7 +300,7 @@ In this case, create a class derived from the `ExceptionSubscriber` class in you
 ````csharp
 public class MyExceptionSubscriber : ExceptionSubscriber
 {
-    public override async Task HandleAsync(ExceptionNotificationContext context)
+    public async override Task HandleAsync(ExceptionNotificationContext context)
     {
         //TODO...
     }
diff --git a/docs/en/MongoDB.md b/docs/en/MongoDB.md
index 475eb94f1b..98769c13b8 100644
--- a/docs/en/MongoDB.md
+++ b/docs/en/MongoDB.md
@@ -40,7 +40,7 @@ public class MyDbContext : AbpMongoDbContext
     protected override void CreateModel(IMongoModelBuilder modelBuilder)
     {
         base.CreateModel(modelBuilder);
-        
+
         //Customize the configuration for your collections.
     }
 }
@@ -62,7 +62,7 @@ So, most of times you don't need to explicitly configure registration for your e
 protected override void CreateModel(IMongoModelBuilder modelBuilder)
 {
     base.CreateModel(modelBuilder);
-    
+
     modelBuilder.Entity<Question>(b =>
     {
         b.CollectionName = "MyQuestions"; //Sets the collection name
@@ -88,7 +88,7 @@ If you have multiple databases in your application, you can configure the connec
 [ConnectionStringName("MySecondConnString")]
 public class MyDbContext : AbpMongoDbContext
 {
-    
+
 }
 ````
 
@@ -202,7 +202,7 @@ You generally want to derive from the `IRepository` to inherit standard reposito
 Example implementation of the `IBookRepository` interface:
 
 ```csharp
-public class BookRepository : 
+public class BookRepository :
     MongoDbRepository<BookStoreMongoDbContext, Book, Guid>,
     IBookRepository
 {
@@ -242,9 +242,9 @@ context.Services.AddMongoDbContext<BookStoreMongoDbContext>(options =>
 This is especially important when you want to **override a base repository method** to customize it. For instance, you may want to override `DeleteAsync` method to delete an entity in a more efficient way:
 
 ```csharp
-public override async Task DeleteAsync(
-    Guid id, 
-    bool autoSave = false, 
+public async override Task DeleteAsync(
+    Guid id,
+    bool autoSave = false,
     CancellationToken cancellationToken = default)
 {
     //TODO: Custom implementation of the delete method
@@ -381,4 +381,4 @@ context.Services.AddMongoDbContext<OtherMongoDbContext>(options =>
 });
 ```
 
-In this example, `OtherMongoDbContext` implements `IBookStoreMongoDbContext`. This feature allows you to have multiple MongoDbContext (one per module) on development, but single MongoDbContext (implements all interfaces of all MongoDbContexts) on runtime.
\ No newline at end of file
+In this example, `OtherMongoDbContext` implements `IBookStoreMongoDbContext`. This feature allows you to have multiple MongoDbContext (one per module) on development, but single MongoDbContext (implements all interfaces of all MongoDbContexts) on runtime.
diff --git a/docs/en/Tutorials/Part-10.md b/docs/en/Tutorials/Part-10.md
index 53f19d93dd..e161a267cc 100644
--- a/docs/en/Tutorials/Part-10.md
+++ b/docs/en/Tutorials/Part-10.md
@@ -10,7 +10,7 @@
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
 
-* **{{DB_Value}}** as the ORM provider. 
+* **{{DB_Value}}** as the ORM provider.
 * **{{UI_Value}}** as the UI Framework.
 
 This tutorial is organized as the following parts;
@@ -78,7 +78,7 @@ builder.Entity<Book>(b =>
     b.ToTable(BookStoreConsts.DbTablePrefix + "Books", BookStoreConsts.DbSchema);
     b.ConfigureByConvention(); //auto configure for the base class props
     b.Property(x => x.Name).IsRequired().HasMaxLength(128);
-    
+
     // ADD THE MAPPING FOR THE RELATION
     b.HasOne<Author>().WithMany().HasForeignKey(x => x.AuthorId).IsRequired();
 });
@@ -362,7 +362,7 @@ namespace Acme.BookStore.Books
             DeletePolicyName = BookStorePermissions.Books.Create;
         }
 
-        public override async Task<BookDto> GetAsync(Guid id)
+        public async override Task<BookDto> GetAsync(Guid id)
         {
             await CheckGetPolicyAsync();
 
@@ -384,7 +384,7 @@ namespace Acme.BookStore.Books
             return bookDto;
         }
 
-        public override async Task<PagedResultDto<BookDto>>
+        public async override Task<PagedResultDto<BookDto>>
             GetListAsync(PagedAndSortedResultRequestDto input)
         {
             await CheckGetListPolicyAsync();
@@ -485,7 +485,7 @@ namespace Acme.BookStore.Books
             DeletePolicyName = BookStorePermissions.Books.Create;
         }
 
-        public override async Task<BookDto> GetAsync(Guid id)
+        public async override Task<BookDto> GetAsync(Guid id)
         {
             await CheckGetPolicyAsync();
 
@@ -498,7 +498,7 @@ namespace Acme.BookStore.Books
             return bookDto;
         }
 
-        public override async Task<PagedResultDto<BookDto>> 
+        public async override Task<PagedResultDto<BookDto>>
             GetListAsync(PagedAndSortedResultRequestDto input)
         {
             await CheckGetListPolicyAsync();
@@ -524,7 +524,7 @@ namespace Acme.BookStore.Books
             var authorDictionary = await GetAuthorDictionaryAsync(books);
 
             //Set AuthorName for the DTOs
-            bookDtos.ForEach(bookDto => bookDto.AuthorName = 
+            bookDtos.ForEach(bookDto => bookDto.AuthorName =
                              authorDictionary[bookDto.AuthorId].Name);
 
             //Get the total count with another query (required for the paging)
@@ -622,7 +622,7 @@ namespace Acme.BookStore.Books
             result.Items.ShouldContain(b => b.Name == "1984" &&
                                        b.AuthorName == "George Orwell");
         }
-        
+
         [Fact]
         public async Task Should_Create_A_Valid_Book()
         {
@@ -645,7 +645,7 @@ namespace Acme.BookStore.Books
             result.Id.ShouldNotBe(Guid.Empty);
             result.Name.ShouldBe("New test book 42");
         }
-        
+
         [Fact]
         public async Task Should_Not_Create_A_Book_Without_Name()
         {
@@ -1100,15 +1100,15 @@ The final `@code` block should be the following:
     //ADDED A NEW FIELD
     IReadOnlyList<AuthorLookupDto> authorList = Array.Empty<AuthorLookupDto>();
 
-    protected override async Task OnInitializedAsync()
+    protected async override Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
 
-        canCreateBook = await 
+        canCreateBook = await
             AuthorizationService.IsGrantedAsync(BookStorePermissions.Books.Create);
-        canEditBook = await 
+        canEditBook = await
             AuthorizationService.IsGrantedAsync(BookStorePermissions.Books.Edit);
-        canDeleteBook = await 
+        canDeleteBook = await
             AuthorizationService.IsGrantedAsync(BookStorePermissions.Books.Delete);
 
         //GET AUTHORS
@@ -1164,4 +1164,4 @@ Add the following `Field` definition into the `ModalBody` of the *Edit* modal, a
 
 That's all. We are reusing the `authorList` defined for the *Create* modal.
 
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/docs/en/Tutorials/Part-5.md b/docs/en/Tutorials/Part-5.md
index a293ec586e..f07356e892 100644
--- a/docs/en/Tutorials/Part-5.md
+++ b/docs/en/Tutorials/Part-5.md
@@ -487,7 +487,7 @@ Add the following code block to the end of the `Books.razor` file:
     bool canEditBook;
     bool canDeleteBook;
 
-    protected override async Task OnInitializedAsync()
+    protected async override Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
 
diff --git a/docs/en/Tutorials/Part-9.md b/docs/en/Tutorials/Part-9.md
index 374efff2b4..fce94633d2 100644
--- a/docs/en/Tutorials/Part-9.md
+++ b/docs/en/Tutorials/Part-9.md
@@ -1038,7 +1038,7 @@ namespace Acme.BookStore.Blazor.Pages
             EditingAuthor = new UpdateAuthorDto();
         }
 
-        protected override async Task OnInitializedAsync()
+        protected async override Task OnInitializedAsync()
         {
             await SetPermissionsAsync();
             await GetAuthorsAsync();
diff --git a/docs/en/UI/Angular/Component-Replacement.md b/docs/en/UI/Angular/Component-Replacement.md
index 577129e139..cf0041ab72 100644
--- a/docs/en/UI/Angular/Component-Replacement.md
+++ b/docs/en/UI/Angular/Component-Replacement.md
@@ -45,7 +45,7 @@ Run the following command to generate a layout in `angular` folder:
 yarn ng generate component my-application-layout
 ```
 
-Add the following code in your layout template (`my-layout.component.html`) where you want the page to be loaded.
+Add the following code in your layout template (`my-application-layout.component.html`) where you want the page to be loaded.
 
 ```html
 <router-outlet></router-outlet>
diff --git a/docs/en/UI/AspNetCore/Customization-User-Interface.md b/docs/en/UI/AspNetCore/Customization-User-Interface.md
index ccb832ccc7..bc8e15e8bb 100644
--- a/docs/en/UI/AspNetCore/Customization-User-Interface.md
+++ b/docs/en/UI/AspNetCore/Customization-User-Interface.md
@@ -28,15 +28,15 @@ namespace Acme.BookStore.Web.Pages.Identity.Users
     public class MyEditModalModel : EditModalModel
     {
         public MyEditModalModel(
-            IIdentityUserAppService identityUserAppService, 
+            IIdentityUserAppService identityUserAppService,
             IIdentityRoleAppService identityRoleAppService
             ) : base(
-                identityUserAppService, 
+                identityUserAppService,
                 identityRoleAppService)
         {
         }
 
-        public override async Task<IActionResult> OnPostAsync()
+        public async override Task<IActionResult> OnPostAsync()
         {
             //TODO: Additional logic
             await base.OnPostAsync();
@@ -84,10 +84,10 @@ Create a page model class deriving from the ` LoginModel ` (defined in the ` Vol
 public class MyLoginModel : LoginModel
 {
     public MyLoginModel(
-        IAuthenticationSchemeProvider schemeProvider, 
+        IAuthenticationSchemeProvider schemeProvider,
         IOptions<AbpAccountOptions> accountOptions
         ) : base(
-        schemeProvider, 
+        schemeProvider,
         accountOptions)
     {
 
@@ -437,7 +437,7 @@ See the layouts section below to learn more about the layout system.
 
 Layout system allows themes to define standard, named layouts and allows any page to select a proper layout for its purpose. There are three pre-defined layouts:
 
-* "**Application**": The main (and the default) layout for an application. It typically contains header, menu (sidebar), footer, toolbar... etc. 
+* "**Application**": The main (and the default) layout for an application. It typically contains header, menu (sidebar), footer, toolbar... etc.
 * "**Account**": This layout is used by login, register and other similar pages. It is used for the pages under the `/Pages/Account` folder by default.
 * "**Empty**": Empty and minimal layout.
 
diff --git a/docs/zh-Hans/Application-Services.md b/docs/zh-Hans/Application-Services.md
index 6bb18daa37..e68217a94d 100644
--- a/docs/zh-Hans/Application-Services.md
+++ b/docs/zh-Hans/Application-Services.md
@@ -353,12 +353,12 @@ public class DistrictAppService
     {
     }
 
-    protected override async Task DeleteByIdAsync(DistrictKey id)
+    protected async override Task DeleteByIdAsync(DistrictKey id)
     {
         await Repository.DeleteAsync(d => d.CityId == id.CityId && d.Name == id.Name);
     }
 
-    protected override async Task<District> GetEntityByIdAsync(DistrictKey id)
+    protected async override Task<District> GetEntityByIdAsync(DistrictKey id)
     {
         return await AsyncQueryableExecuter.FirstOrDefaultAsync(
             Repository.Where(d => d.CityId == id.CityId && d.Name == id.Name)
diff --git a/docs/zh-Hans/Authorization.md b/docs/zh-Hans/Authorization.md
index 96caae1404..db0dfdb654 100644
--- a/docs/zh-Hans/Authorization.md
+++ b/docs/zh-Hans/Authorization.md
@@ -343,7 +343,7 @@ public class SystemAdminPermissionValueProvider : PermissionValueProvider
 
     public override string Name => "SystemAdmin";
 
-    public override async Task<PermissionGrantResult>
+    public async override Task<PermissionGrantResult>
            CheckAsync(PermissionValueCheckContext context)
     {
         if (context.Principal?.FindFirst("User_Type")?.Value == "SystemAdmin")
diff --git a/docs/zh-Hans/Background-Workers.md b/docs/zh-Hans/Background-Workers.md
index 1daedde384..26bafed2da 100644
--- a/docs/zh-Hans/Background-Workers.md
+++ b/docs/zh-Hans/Background-Workers.md
@@ -54,7 +54,7 @@ public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
         Timer.Period = 600000; //10 minutes
     }
 
-    protected override async Task DoWorkAsync(
+    protected async override Task DoWorkAsync(
         PeriodicBackgroundWorkerContext workerContext)
     {
         Logger.LogInformation("Starting: Setting status of inactive users...");
diff --git a/docs/zh-Hans/Blog-Posts/2020-05-08 v2_7_Release/Post.md b/docs/zh-Hans/Blog-Posts/2020-05-08 v2_7_Release/Post.md
index 0f97391eb8..bc448179cc 100644
--- a/docs/zh-Hans/Blog-Posts/2020-05-08 v2_7_Release/Post.md	
+++ b/docs/zh-Hans/Blog-Posts/2020-05-08 v2_7_Release/Post.md	
@@ -121,7 +121,7 @@ ABP框架的[异常处理系统](https://docs.abp.io/en/abp/latest/Exception-Han
 ````csharp
 public class MyExceptionSubscriber : ExceptionSubscriber
 {
-    public override async Task HandleAsync(ExceptionNotificationContext context)
+    public async override Task HandleAsync(ExceptionNotificationContext context)
     {
         //TODO...
     }
diff --git a/docs/zh-Hans/Customizing-Application-Modules-Overriding-Services.md b/docs/zh-Hans/Customizing-Application-Modules-Overriding-Services.md
index 21245cec16..2e950d4355 100644
--- a/docs/zh-Hans/Customizing-Application-Modules-Overriding-Services.md
+++ b/docs/zh-Hans/Customizing-Application-Modules-Overriding-Services.md
@@ -76,7 +76,7 @@ public class MyIdentityUserAppService : IdentityUserAppService
     {
     }
 
-    public override async Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
+    public async override Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
     {
         if (input.PhoneNumber.IsNullOrWhiteSpace())
         {
@@ -109,33 +109,33 @@ public class MyIdentityUserManager : IdentityUserManager
 {
     public MyIdentityUserManager(
         IdentityUserStore store,
-        IIdentityRoleRepository roleRepository, 
+        IIdentityRoleRepository roleRepository,
         IIdentityUserRepository userRepository,
-        IOptions<IdentityOptions> optionsAccessor, 
+        IOptions<IdentityOptions> optionsAccessor,
         IPasswordHasher<IdentityUser> passwordHasher,
-        IEnumerable<IUserValidator<IdentityUser>> userValidators, 
-        IEnumerable<IPasswordValidator<IdentityUser>> passwordValidators, 
+        IEnumerable<IUserValidator<IdentityUser>> userValidators,
+        IEnumerable<IPasswordValidator<IdentityUser>> passwordValidators,
         ILookupNormalizer keyNormalizer,
         IdentityErrorDescriber errors,
         IServiceProvider services,
-        ILogger<IdentityUserManager> logger, 
-        ICancellationTokenProvider cancellationTokenProvider) : 
+        ILogger<IdentityUserManager> logger,
+        ICancellationTokenProvider cancellationTokenProvider) :
         base(store,
             roleRepository,
-            userRepository, 
-            optionsAccessor, 
-            passwordHasher, 
-            userValidators, 
+            userRepository,
+            optionsAccessor,
+            passwordHasher,
+            userValidators,
             passwordValidators,
-            keyNormalizer, 
-            errors, 
-            services, 
-            logger, 
+            keyNormalizer,
+            errors,
+            services,
+            logger,
             cancellationTokenProvider)
     {
     }
 
-    public override async Task<IdentityResult> CreateAsync(IdentityUser user)
+    public async override Task<IdentityResult> CreateAsync(IdentityUser user)
     {
         if (user.PhoneNumber.IsNullOrWhiteSpace())
         {
@@ -251,8 +251,8 @@ ObjectExtensionManager.Instance
     .AddOrUpdateProperty<string>(
         new[]
         {
-            typeof(IdentityUserDto), 
-            typeof(IdentityUserCreateDto), 
+            typeof(IdentityUserDto),
+            typeof(IdentityUserCreateDto),
             typeof(IdentityUserUpdateDto)
         },
         "SocialSecurityNumber"
diff --git a/docs/zh-Hans/Entity-Framework-Core.md b/docs/zh-Hans/Entity-Framework-Core.md
index 211ec4d65f..b5252b86c0 100644
--- a/docs/zh-Hans/Entity-Framework-Core.md
+++ b/docs/zh-Hans/Entity-Framework-Core.md
@@ -263,7 +263,7 @@ context.Services.AddAbpDbContext<BookStoreDbContext>(options =>
 在你想要覆盖默认仓储方法对其自定义时,这一点非常需要. 例如你可能希望自定义`DeleteAsync`方法覆盖默认实现
 
 ````csharp
-public override async Task DeleteAsync(
+public async override Task DeleteAsync(
     Guid id,
     bool autoSave = false,
     CancellationToken cancellationToken = default)
@@ -365,7 +365,7 @@ public class MyRepositoryBase<TEntity>
     : EfCoreRepository<BookStoreDbContext, TEntity>
       where TEntity : class, IEntity
 {
-    public MyRepositoryBase(IDbContextProvider<BookStoreDbContext> dbContextProvider) 
+    public MyRepositoryBase(IDbContextProvider<BookStoreDbContext> dbContextProvider)
         : base(dbContextProvider)
     {
     }
@@ -447,4 +447,4 @@ context.Services.AddAbpDbContext<OtherDbContext>(options =>
 
 ## 另请参阅
 
-* [实体](Entities.md)
\ No newline at end of file
+* [实体](Entities.md)
diff --git a/docs/zh-Hans/How-To/Customize-SignIn-Manager.md b/docs/zh-Hans/How-To/Customize-SignIn-Manager.md
index 73cbcd2ce7..eea0364e6e 100644
--- a/docs/zh-Hans/How-To/Customize-SignIn-Manager.md
+++ b/docs/zh-Hans/How-To/Customize-SignIn-Manager.md
@@ -38,7 +38,7 @@ public class CustomSignInManager : Microsoft.AspNetCore.Identity.SignInManager<V
 一个好的开始是从复制[源码](https://github.com/dotnet/aspnetcore/blob/c56aa320c32ee5429d60647782c91d53ac765865/src/Identity/Core/src/SignInManager.cs#L638-L674)而不是从零开始. 在这个用例中我们对源码进行较少的修改,为了帮助理解概念它显式显示了方法和属性的命名空间.
 
 ````csharp
-public override async Task<Microsoft.AspNetCore.Identity.ExternalLoginInfo> GetExternalLoginInfoAsync(string expectedXsrf = null)
+public async override Task<Microsoft.AspNetCore.Identity.ExternalLoginInfo> GetExternalLoginInfoAsync(string expectedXsrf = null)
 {
     var auth = await Context.AuthenticateAsync(Microsoft.AspNetCore.Identity.IdentityConstants.ExternalScheme);
     var items = auth?.Properties?.Items;
diff --git a/docs/zh-Hans/MongoDB.md b/docs/zh-Hans/MongoDB.md
index c90b9b5740..2ceeb1e00c 100644
--- a/docs/zh-Hans/MongoDB.md
+++ b/docs/zh-Hans/MongoDB.md
@@ -160,7 +160,7 @@ public interface IBookRepository : IRepository<Book, Guid>
 实现`IBookRepository`接口的例子:
 
 ```csharp
-public class BookRepository : 
+public class BookRepository :
     MongoDbRepository<BookStoreMongoDbContext, Book, Guid>,
     IBookRepository
 {
@@ -200,9 +200,9 @@ context.Services.AddMongoDbContext<BookStoreMongoDbContext>(options =>
 当你想**重写基础仓储方法**时,这一点尤为重要.例如,你想要重写`DeleteAsync`方法,以便更有效的删除实体:
 
 ```csharp
-public override async Task DeleteAsync(
-    Guid id, 
-    bool autoSave = false, 
+public async override Task DeleteAsync(
+    Guid id,
+    bool autoSave = false,
     CancellationToken cancellationToken = default)
 {
     //TODO: 自定义实现删除方法
@@ -338,4 +338,4 @@ context.Services.AddMongoDbContext<OtherMongoDbContext>(options =>
 });
 ```
 
-这个例子中,`OtherMongoDbContext`实现了`IBookStoreMongoDbContext`.这个特性允许你在发开的时候使用多个MongoDbContext(每个模块一个),但是运行的时候只能使有一个MongoDbContext(实现所有MongoDbContexts的所有接口)
\ No newline at end of file
+这个例子中,`OtherMongoDbContext`实现了`IBookStoreMongoDbContext`.这个特性允许你在发开的时候使用多个MongoDbContext(每个模块一个),但是运行的时候只能使有一个MongoDbContext(实现所有MongoDbContexts的所有接口)
diff --git a/docs/zh-Hans/UI/Angular/Component-Replacement.md b/docs/zh-Hans/UI/Angular/Component-Replacement.md
index 221ac6775a..2c37a5a2e7 100644
--- a/docs/zh-Hans/UI/Angular/Component-Replacement.md
+++ b/docs/zh-Hans/UI/Angular/Component-Replacement.md
@@ -49,7 +49,7 @@ export class AppComponent {
 yarn ng generate component my-application-layout
 ```
 
-在你的布局模板(`my-layout.component.html`)中添加以下代码:
+在你的布局模板(`my-application-layout.component.html`)中添加以下代码:
 
 ```html
 <router-outlet></router-outlet>
@@ -543,4 +543,4 @@ export class AppComponent implements OnInit {
 
 ## 下一步是什么?
 
-- [自定义设置页面](./Custom-Setting-Page.md)
\ No newline at end of file
+- [自定义设置页面](./Custom-Setting-Page.md)
diff --git a/docs/zh-Hans/UI/AspNetCore/Customization-User-Interface.md b/docs/zh-Hans/UI/AspNetCore/Customization-User-Interface.md
index c94c29d27f..44eb9b6e26 100644
--- a/docs/zh-Hans/UI/AspNetCore/Customization-User-Interface.md
+++ b/docs/zh-Hans/UI/AspNetCore/Customization-User-Interface.md
@@ -36,7 +36,7 @@ namespace Acme.BookStore.Web.Pages.Identity.Users
         {
         }
 
-        public override async Task<IActionResult> OnPostAsync()
+        public async override Task<IActionResult> OnPostAsync()
         {
             //TODO: Additional logic
             await base.OnPostAsync();
@@ -83,10 +83,10 @@ namespace Acme.BookStore.Web.Pages.Identity.Users
 public class MyLoginModel : LoginModel
 {
     public MyLoginModel(
-        IAuthenticationSchemeProvider schemeProvider, 
+        IAuthenticationSchemeProvider schemeProvider,
         IOptions<AbpAccountOptions> accountOptions
         ) : base(
-        schemeProvider, 
+        schemeProvider,
         accountOptions)
     {
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
index 8c7b348f7d..2f31e57cf7 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
@@ -21,7 +21,7 @@
     private IReadOnlyList<LanguageInfo> _otherLanguages;
     private LanguageInfo _currentLanguage;
 
-    protected override async Task OnInitializedAsync()
+    protected async override Task OnInitializedAsync()
     {
         var selectedLanguageName = await JsRuntime.InvokeAsync<string>(
             "localStorage.getItem",
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
index 17718dbcfb..a16ae0c597 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
@@ -26,7 +26,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
         protected string ServerUrl { get; set; }
         protected string ServerAccountUrl { get; set; }
 
-        protected override async Task OnInitializedAsync()
+        protected async override Task OnInitializedAsync()
         {
             Menu = await MenuManager.GetAsync(StandardMenus.User);
             
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor.cs
index 6fddf263b3..33044282f9 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
 
         private List<RenderFragment> ToolbarItemRenders { get; set; } = new List<RenderFragment>();
 
-        protected override async Task OnInitializedAsync()
+        protected async override Task OnInitializedAsync()
         {
             var toolbar = await ToolbarManager.GetAsync(StandardToolbars.Main);
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
index f769f512a5..4cba01bea2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             ConfigurationClient = configurationClient;
         }
 
-        public override async Task<string> GetOrNullAsync(string name)
+        public async override Task<string> GetOrNullAsync(string name)
         {
             var configuration = await ConfigurationClient.GetAsync();
             return configuration.Features.Values.GetOrDefault(name);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbTagHelperService.cs
index 4b433ac495..e1b4469f8c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbTagHelperService.cs
@@ -8,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Breadcrumb
 {
     public class AbpBreadcrumbTagHelperService : AbpTagHelperService<AbpBreadcrumbTagHelper>
     {
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = "nav";
             output.Attributes.Add("aria-label", "breadcrumb");
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselTagHelperService.cs
index c3672db7f5..e4a277ba66 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselTagHelperService.cs
@@ -19,7 +19,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Carousel
             L = localizer;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = "div";
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
index 6e532cb71d..0cd400d43c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
 {
     public class AbpAccordionItemTagHelperService : AbpTagHelperService<AbpAccordionItemTagHelper>
     {
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             SetRandomIdIfNotProvided();
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionTagHelperService.cs
index c7f93e87cc..7651309e1a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionTagHelperService.cs
@@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
             HtmlGenerator = htmlGenerator;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             SetRandomIdIfNotProvided();
 
@@ -25,7 +25,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
             output.TagMode = TagMode.StartTagAndEndTag;
             output.Attributes.AddClass("accordion");
             output.Attributes.Add("id",TagHelper.Id);
-            
+
             var items = InitilizeFormGroupContentsContext(context, output);
 
             await output.GetChildContentAsync();
@@ -62,4 +62,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpCollapseBodyTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpCollapseBodyTagHelperService.cs
index 10e49b92a7..198c5b91e6 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpCollapseBodyTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpCollapseBodyTagHelperService.cs
@@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
 {
     public class AbpCollapseBodyTagHelperService : AbpTagHelperService<AbpCollapseBodyTagHelper>
     {
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = "div";
             output.Attributes.AddClass("collapse");
@@ -27,4 +27,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
             output.Content.SetHtmlContent(innerContent);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
index 673204b302..52ea6ace85 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
@@ -24,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
             _serviceProvider = serviceProvider;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var content = await output.GetChildContentAsync();
 
@@ -60,7 +60,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
         protected virtual async Task<string> GetMainButtonAsync(TagHelperContext context, TagHelperOutput output, TagHelperContent content)
         {
             var abpButtonTagHelper = _serviceProvider.GetRequiredService<AbpButtonTagHelper>();
-            
+
             abpButtonTagHelper.Icon = TagHelper.Icon;
             abpButtonTagHelper.Text = TagHelper.Text;
             abpButtonTagHelper.IconType = TagHelper.IconType;
@@ -121,7 +121,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
                 {"aria-haspopup", "true"},
                 {"aria-expanded", "false"},
             };
-            
+
             attributes.AddClass("dropdown-toggle");
             attributes.AddClass("dropdown-toggle-split");
 
@@ -142,4 +142,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
             return buttonTag;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
index 4504906566..cd8c7e6f22 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
@@ -31,7 +31,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             _serviceProvider = serviceProvider;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var list = InitilizeFormGroupContentsContext(context, output);
 
@@ -144,7 +144,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 }
             }
         }
-        
+
         protected virtual void RemoveFormGroupItemsNotInModel(TagHelperContext context, TagHelperOutput output, List<FormGroupItem> items)
         {
             var models = GetModels(context, output);
@@ -303,4 +303,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             return explorer.GetAttribute<AbpRadioButton>() != null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
index ff5b085df5..adb50d7382 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
@@ -26,7 +26,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             _tagHelperLocalizer = tagHelperLocalizer;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var (innerHtml, isCheckBox) = await GetFormInputGroupAsHtmlAsync(context, output);
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
index 017d58dc17..a33b48d11b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
@@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             _stringLocalizerFactory = stringLocalizerFactory;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var innerHtml = await GetFormInputGroupAsHtmlAsync(context, output);
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
index 78d664b562..9086d8def4 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
@@ -1,22 +1,22 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Text;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using System.Text;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
-{
-    public class AbpModalTagHelperService : AbpTagHelperService<AbpModalTagHelper>
-    {
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            output.TagName = null;
-
-            var childContent = await output.GetChildContentAsync();
-
-            SetContent(context, output, childContent);
-        }
-
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+{
+    public class AbpModalTagHelperService : AbpTagHelperService<AbpModalTagHelper>
+    {
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            output.TagName = null;
+
+            var childContent = await output.GetChildContentAsync();
+
+            SetContent(context, output, childContent);
+        }
+
         protected virtual void SetContent(TagHelperContext context, TagHelperOutput output, TagHelperContent childContent)
         {
             var modalContent = GetModalContentElement(context, output, childContent);
@@ -24,16 +24,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             var modal = GetModal(context, output, modalDialog);
 
             output.Content.SetHtmlContent(modal);
-        } 
-
+        }
+
         protected virtual TagBuilder GetModalContentElement(TagHelperContext context, TagHelperOutput output, TagHelperContent childContent)
         {
             var element = new TagBuilder("div");
             element.AddCssClass(GetModalContentClasses());
             element.InnerHtml.SetHtmlContent(childContent);
             return element;
-        }
-
+        }
+
         protected virtual TagBuilder GetModalDialogElement(TagHelperContext context, TagHelperOutput output, IHtmlContent innerHtml)
         {
             var element = new TagBuilder("div");
@@ -41,8 +41,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             element.Attributes.Add("role", "document");
             element.InnerHtml.SetHtmlContent(innerHtml);
             return element;
-        }
-
+        }
+
         protected virtual TagBuilder GetModal(TagHelperContext context, TagHelperOutput output, IHtmlContent innerHtml)
         {
             var element = new TagBuilder("div");
@@ -61,37 +61,37 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             element.InnerHtml.SetHtmlContent(innerHtml);
 
             return element;
-        }
-
-        protected virtual string GetModalClasses()
-        {
-            return "modal fade";
-        }
-
-        protected virtual string GetModalDialogClasses()
-        {
-            var classNames = new StringBuilder("modal-dialog");
-
-            if (TagHelper.Centered ?? false)
-            {
-                classNames.Append(" ");
-                classNames.Append("modal-dialog-centered");
-            }
-
-            if (TagHelper.Size != AbpModalSize.Default)
-            {
-                classNames.Append(" ");
-                classNames.Append(TagHelper.Size.ToClassName());
-            }
-
-            return classNames.ToString();
-        }
-
-        protected virtual string GetModalContentClasses()
-        {
-            return "modal-content";
-        }
-
+        }
+
+        protected virtual string GetModalClasses()
+        {
+            return "modal fade";
+        }
+
+        protected virtual string GetModalDialogClasses()
+        {
+            var classNames = new StringBuilder("modal-dialog");
+
+            if (TagHelper.Centered ?? false)
+            {
+                classNames.Append(" ");
+                classNames.Append("modal-dialog-centered");
+            }
+
+            if (TagHelper.Size != AbpModalSize.Default)
+            {
+                classNames.Append(" ");
+                classNames.Append(TagHelper.Size.ToClassName());
+            }
+
+            return classNames.ToString();
+        }
+
+        protected virtual string GetModalContentClasses()
+        {
+            return "modal-content";
+        }
+
         protected virtual string GetDataAttributes()
         {
             if (TagHelper.Static == true)
@@ -107,6 +107,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             {
                 builder.Attributes.Add("data-backdrop", "static");
             }
-        }
-    }
-}
\ No newline at end of file
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
index 71f3bfe247..148f196aad 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
@@ -21,9 +21,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
         private readonly IStringLocalizerFactory _stringLocalizerFactory;
 
         public AbpPaginationTagHelperService(
-            IHtmlGenerator generator, 
-            HtmlEncoder encoder, 
-            IAbpTagHelperLocalizer tagHelperLocalizer, 
+            IHtmlGenerator generator,
+            HtmlEncoder encoder,
+            IAbpTagHelperLocalizer tagHelperLocalizer,
             IStringLocalizerFactory stringLocalizerFactory)
         {
             _generator = generator;
@@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
             _stringLocalizerFactory = stringLocalizerFactory;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             if (TagHelper.Model.ShownItemsCount <= 0)
             {
@@ -199,4 +199,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
index 8746e4a48b..cdaf55d87c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
 {
     public class AbpTabDropdownTagHelperService : AbpTagHelperService<AbpTabDropdownTagHelper>
     {
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             if (string.IsNullOrWhiteSpace(TagHelper.Name))
             {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
index 9080e49d83..c4d4b654a9 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
 {
     public class AbpTabTagHelperService : AbpTagHelperService<AbpTabTagHelper>
     {
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             SetPlaceholderForNameIfNotProvided();
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabsTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabsTagHelperService.cs
index 92e50990a4..8046af8ccd 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabsTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabsTagHelperService.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
             HtmlGenerator = htmlGenerator;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             SetRandomNameIfNotProvided();
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs
index eca80c5fcf..0ffb5b9049 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             ResourceService = resourceService;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var tagHelperItems = context.Items.GetOrDefault(AbpTagHelperConsts.ContextBundleItemListKey) as List<BundleTagHelperItem>;
             if (tagHelperItems != null)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs
index f0c76d5cc4..9158f33b90 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             ResourceService = resourceService;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             await ResourceService.ProcessAsync(
                 TagHelper.ViewContext,
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs
index 6efbb793e7..9e4e77a6dd 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs
@@ -38,7 +38,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             );
         }
 
-        protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
+        protected async override Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
         {
             return await BundleManager.GetScriptBundleFilesAsync(bundleName);
         }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs
index 8612e4f8b4..a9d9b54fca 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs
@@ -38,7 +38,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             );
         }
 
-        protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
+        protected async override Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
         {
             return await BundleManager.GetStyleBundleFilesAsync(bundleName);
         }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
index 27fc4c4d13..9a16b4b43a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
@@ -21,14 +21,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
         private readonly IGuidGenerator _guidGenerator;
 
         public AbpComponentDemoSectionTagHelper(
-            IVirtualFileProvider virtualFileProvider, 
+            IVirtualFileProvider virtualFileProvider,
             IGuidGenerator guidGenerator)
         {
             _virtualFileProvider = virtualFileProvider;
             _guidGenerator = guidGenerator;
         }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = null;
 
@@ -40,7 +40,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             var codeBlockTabId = _guidGenerator.Create();
             var tagHelperCodeBlockId = _guidGenerator.Create();
             var bootstrapCodeBlockId = _guidGenerator.Create();
-            
+
             output.PreContent.AppendHtml("<div class=\"card\">");
             output.PreContent.AppendHtml("<div class=\"card-header\">");
             output.PreContent.AppendHtml("<div class=\"row\">");
@@ -58,14 +58,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             output.PreContent.AppendHtml("<div class=\"card-body\">");
             output.PreContent.AppendHtml($"<div class=\"tab-content\" id=\"nav-preview-tabContent-{previewId}\">");
             output.PreContent.AppendHtml($"<div class=\"tab-pane fade show active\" id=\"nav-preview-{previewId}\" role=\"tabpanel\" aria-labelledby=\"nav-preview-tab-{previewId}\">");
-            
+
             /* component rendering here */
 
             output.PostContent.AppendHtml("</div>"); // tab-pane
             output.PostContent.AppendHtml($"<div class=\"tab-pane fade\" id=\"nav-code-{codeBlockId}\" role=\"tabpanel\" aria-labelledby=\"nav-code-tab-{codeBlockId}\">");
-            
+
             /* CodeBlock tabs */
-            
+
             output.PostContent.AppendHtml($"<ul class=\"nav nav-tabs\" id=\"code-block-tab-{codeBlockTabId}\" role=\"tablist\">");
             output.PostContent.AppendHtml("<li class=\"nav-item\">");
             output.PostContent.AppendHtml($"<a class=\"nav-link active\" id=\"tag-helper-tab-{tagHelperCodeBlockId}\" data-toggle=\"pill\" href=\"#tag-helper-{tagHelperCodeBlockId}\" role=\"tab\" aria-controls=\"tag-helper-{tagHelperCodeBlockId}\" aria-selected=\"true\">Abp Tag Helper</a>");
@@ -75,7 +75,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             output.PostContent.AppendHtml("</li>");
             output.PostContent.AppendHtml("</ul>");
             output.PostContent.AppendHtml($"<div class=\"tab-content\" id=\"code-block-tabContent-{codeBlockTabId}\">");
-            
+
             output.PostContent.AppendHtml($"<div class=\"tab-pane fade show active\" id=\"tag-helper-{tagHelperCodeBlockId}\" role=\"tabpanel\" aria-labelledby=\"tag-helper-tab-{tagHelperCodeBlockId}\">");
             output.PostContent.AppendHtml("<pre class=\"p-4\">");
             output.PostContent.AppendHtml("<code class=\"language-html\">");
@@ -83,7 +83,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             output.PostContent.AppendHtml("</code>");
             output.PostContent.AppendHtml("</pre>");
             output.PostContent.AppendHtml("</div>");
-            
+
             output.PostContent.AppendHtml($"<div class=\"tab-pane fade\" id=\"bootstrap-{bootstrapCodeBlockId}\" role=\"tabpanel\" aria-labelledby=\"bootstrap-tab-{bootstrapCodeBlockId}\">");
             output.PostContent.AppendHtml("<pre class=\"p-4\">");
             output.PostContent.AppendHtml("<code class=\"language-html\">");
@@ -91,7 +91,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             output.PostContent.AppendHtml("</code>");
             output.PostContent.AppendHtml("</pre>");
             output.PostContent.AppendHtml("</div>");
-            
+
             output.PostContent.AppendHtml("</div>"); // tab-content
             output.PostContent.AppendHtml("</div>"); // tab-pane
             output.PostContent.AppendHtml("</div>"); // tab-content
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/SecurityLog/AspNetCoreSecurityLogManager.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/SecurityLog/AspNetCoreSecurityLogManager.cs
index f0fc0aa347..b518c5abbb 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/SecurityLog/AspNetCoreSecurityLogManager.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/SecurityLog/AspNetCoreSecurityLogManager.cs
@@ -48,7 +48,7 @@ namespace Volo.Abp.AspNetCore.SecurityLog
             WebClientInfoProvider = webClientInfoProvider;
         }
 
-        protected override async Task<SecurityLogInfo> CreateAsync()
+        protected async override Task<SecurityLogInfo> CreateAsync()
         {
             var securityLogInfo = await base.CreateAsync();
 
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs
index 5a401a218e..0eef78ed6a 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs
+++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingInterceptor.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.Auditing
             _auditingManager = auditingManager;
         }
 
-        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+        public async override Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             if (!ShouldIntercept(invocation, out var auditLog, out var auditLogAction))
             {
@@ -46,8 +46,8 @@ namespace Volo.Abp.Auditing
         }
 
         protected virtual bool ShouldIntercept(
-            IAbpMethodInvocation invocation, 
-            out AuditLogInfo auditLog, 
+            IAbpMethodInvocation invocation,
+            out AuditLogInfo auditLog,
             out AuditLogActionInfo auditLogAction)
         {
             auditLog = null;
@@ -73,7 +73,7 @@ namespace Volo.Abp.Auditing
             auditLogAction = _auditingHelper.CreateAuditLogAction(
                 auditLog,
                 invocation.TargetObject.GetType(),
-                invocation.Method, 
+                invocation.Method,
                 invocation.Arguments
             );
 
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationPolicyProvider.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationPolicyProvider.cs
index f636877fc1..f889251c69 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationPolicyProvider.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationPolicyProvider.cs
@@ -23,7 +23,7 @@ namespace Volo.Abp.Authorization
             _options = options.Value;
         }
 
-        public override async Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
+        public async override Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
         {
             var policy = await base.GetPolicyAsync(policyName);
             if (policy != null)
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AuthorizationInterceptor.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AuthorizationInterceptor.cs
index 44466884dd..82f4adeabe 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AuthorizationInterceptor.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AuthorizationInterceptor.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Authorization
             _methodInvocationAuthorizationService = methodInvocationAuthorizationService;
         }
 
-        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+        public async override Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             await AuthorizeAsync(invocation);
             await invocation.ProceedAsync();
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/PermissionRequirementHandler.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/PermissionRequirementHandler.cs
index d4ec7c1d3c..b0446f5602 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/PermissionRequirementHandler.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/PermissionRequirementHandler.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Authorization
             _permissionChecker = permissionChecker;
         }
 
-        protected override async Task HandleRequirementAsync(
+        protected async override Task HandleRequirementAsync(
             AuthorizationHandlerContext context,
             PermissionRequirement requirement)
         {
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/ClientPermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/ClientPermissionValueProvider.cs
index 38c29b1ddf..c1d9b3a6dc 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/ClientPermissionValueProvider.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/ClientPermissionValueProvider.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.Authorization.Permissions
 
         }
 
-        public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
+        public async override Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
         {
             var clientId = context.Principal?.FindFirst(AbpClaimTypes.ClientId)?.Value;
 
@@ -24,7 +24,7 @@ namespace Volo.Abp.Authorization.Permissions
                 return PermissionGrantResult.Undefined;
             }
 
-            return await PermissionStore.IsGrantedAsync(context.Permission.Name, Name, clientId) 
+            return await PermissionStore.IsGrantedAsync(context.Permission.Name, Name, clientId)
                 ? PermissionGrantResult.Granted
                 : PermissionGrantResult.Undefined;
         }
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/RolePermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/RolePermissionValueProvider.cs
index b98867a78e..a458cd8fdb 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/RolePermissionValueProvider.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/RolePermissionValueProvider.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.Authorization.Permissions
 
         }
 
-        public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
+        public async override Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
         {
             var roles = context.Principal?.FindAll(AbpClaimTypes.Role).Select(c => c.Value).ToArray();
 
@@ -36,4 +36,4 @@ namespace Volo.Abp.Authorization.Permissions
             return PermissionGrantResult.Undefined;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs
index c7f327c40c..204b928e61 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.Authorization.Permissions
 
         }
 
-        public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
+        public async override Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
         {
             var userId = context.Principal?.FindFirst(AbpClaimTypes.UserId)?.Value;
 
diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs
index fdf0b8c90d..62e79010cc 100644
--- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs
@@ -30,7 +30,7 @@ namespace Volo.Abp.BackgroundJobs
             Timer.Period = WorkerOptions.JobPollPeriod;
         }
 
-        protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
+        protected async override Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
         {
             var store = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobStore>();
 
diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs
index 96cf3988bd..e6a65a2865 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs
@@ -57,7 +57,7 @@ namespace Volo.Abp.BackgroundWorkers.Quartz
                 .Build();
         }
 
-        public override async Task Execute(IJobExecutionContext context)
+        public async override Task Execute(IJobExecutionContext context)
         {
             var worker = (IBackgroundWorker) ServiceProvider.GetService(typeof(TWorker));
             var workerContext = new PeriodicBackgroundWorkerContext(ServiceProvider);
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs
index cb2f6dbfae..ed48ba69ee 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs
@@ -22,13 +22,13 @@ namespace Volo.Abp.BackgroundWorkers
             Timer.Elapsed += Timer_Elapsed;
         }
 
-        public override async Task StartAsync(CancellationToken cancellationToken = default)
+        public async override Task StartAsync(CancellationToken cancellationToken = default)
         {
             await base.StartAsync(cancellationToken);
             Timer.Start(cancellationToken);
         }
 
-        public override async Task StopAsync(CancellationToken cancellationToken = default)
+        public async override Task StopAsync(CancellationToken cancellationToken = default)
         {
             Timer.Stop(cancellationToken);
             await base.StopAsync(cancellationToken);
@@ -59,4 +59,4 @@ namespace Volo.Abp.BackgroundWorkers
 
         protected abstract Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext);
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
index c63adaf798..e29dbfec6e 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
@@ -9,7 +9,7 @@ using Volo.Abp.Threading;
 namespace Volo.Abp.BackgroundWorkers
 {
     /// <summary>
-    /// Extends <see cref="BackgroundWorkerBase"/> to add a periodic running Timer. 
+    /// Extends <see cref="BackgroundWorkerBase"/> to add a periodic running Timer.
     /// </summary>
     public abstract class PeriodicBackgroundWorkerBase : BackgroundWorkerBase
     {
@@ -25,13 +25,13 @@ namespace Volo.Abp.BackgroundWorkers
             Timer.Elapsed += Timer_Elapsed;
         }
 
-        public override async Task StartAsync(CancellationToken cancellationToken = default)
+        public async override Task StartAsync(CancellationToken cancellationToken = default)
         {
             await base.StartAsync(cancellationToken);
             Timer.Start(cancellationToken);
         }
 
-        public override async Task StopAsync(CancellationToken cancellationToken = default)
+        public async override Task StopAsync(CancellationToken cancellationToken = default)
         {
             Timer.Stop(cancellationToken);
             await base.StopAsync(cancellationToken);
@@ -62,4 +62,4 @@ namespace Volo.Abp.BackgroundWorkers
         /// </summary>
         protected abstract void DoWork(PeriodicBackgroundWorkerContext workerContext);
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
index 2b7e8421b8..d1ef8b6d93 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
@@ -205,7 +205,7 @@ namespace Volo.Abp.BlazoriseUI
             EditingEntity = new TUpdateViewModel();
         }
 
-        protected override async Task OnInitializedAsync()
+        protected async override Task OnInitializedAsync()
         {
             await SetBreadcrumbItemsAsync();
             await SetPermissionsAsync();
diff --git a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs
index 237465ef91..aa0fecaf09 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs
@@ -73,7 +73,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             return Task.FromResult(BlobExistsAsync(ossClient, containerName, blobName));
         }
 
-        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var containerName = GetContainerName(args);
             var blobName = AliyunBlobNameCalculator.Calculate(args);
diff --git a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProvider.cs
index 6acb91aea9..191f9a0ac7 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProvider.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.BlobStoring.Aws
             AmazonS3ClientFactory = amazonS3ClientFactory;
         }
 
-        public override async Task SaveAsync(BlobProviderSaveArgs args)
+        public async override Task SaveAsync(BlobProviderSaveArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var configuration = args.Configuration.GetAwsConfiguration();
@@ -48,7 +48,7 @@ namespace Volo.Abp.BlobStoring.Aws
             }
         }
 
-        public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        public async override Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var containerName = GetContainerName(args);
@@ -70,7 +70,7 @@ namespace Volo.Abp.BlobStoring.Aws
             }
         }
 
-        public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        public async override Task<bool> ExistsAsync(BlobProviderExistsArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var containerName = GetContainerName(args);
@@ -81,7 +81,7 @@ namespace Volo.Abp.BlobStoring.Aws
             }
         }
 
-        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var containerName = GetContainerName(args);
@@ -155,4 +155,4 @@ namespace Volo.Abp.BlobStoring.Aws
                 : configuration.ContainerName;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs
index 1afc3b6a53..3a9a062e76 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.Azure
             AzureBlobNameCalculator = azureBlobNameCalculator;
         }
 
-        public override async Task SaveAsync(BlobProviderSaveArgs args)
+        public async override Task SaveAsync(BlobProviderSaveArgs args)
         {
             var blobName = AzureBlobNameCalculator.Calculate(args);
             var configuration = args.Configuration.GetAzureConfiguration();
@@ -33,7 +33,7 @@ namespace Volo.Abp.BlobStoring.Azure
             await GetBlobClient(args, blobName).UploadAsync(args.BlobStream, true);
         }
 
-        public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        public async override Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
         {
             var blobName = AzureBlobNameCalculator.Calculate(args);
 
@@ -45,14 +45,14 @@ namespace Volo.Abp.BlobStoring.Azure
             return false;
         }
 
-        public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        public async override Task<bool> ExistsAsync(BlobProviderExistsArgs args)
         {
             var blobName = AzureBlobNameCalculator.Calculate(args);
 
             return await BlobExistsAsync(args, blobName);
         }
 
-        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var blobName = AzureBlobNameCalculator.Calculate(args);
 
diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobProvider.cs
index cbfe4bcaf7..3a512a0ba3 100644
--- a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobProvider.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.BlobStoring.FileSystem
             FilePathCalculator = filePathCalculator;
         }
 
-        public override async Task SaveAsync(BlobProviderSaveArgs args)
+        public async override Task SaveAsync(BlobProviderSaveArgs args)
         {
             var filePath = FilePathCalculator.Calculate(args);
 
@@ -59,7 +59,7 @@ namespace Volo.Abp.BlobStoring.FileSystem
             return ExistsAsync(filePath);
         }
 
-        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var filePath = FilePathCalculator.Calculate(args);
 
diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs
index 1a3f14e97b..fca23324dc 100644
--- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.BlobStoring.Minio
             MinioBlobNameCalculator = minioBlobNameCalculator;
         }
 
-        public override async Task SaveAsync(BlobProviderSaveArgs args)
+        public async override Task SaveAsync(BlobProviderSaveArgs args)
         {
             var blobName = MinioBlobNameCalculator.Calculate(args);
             var configuration = args.Configuration.GetMinioConfiguration();
@@ -36,7 +36,7 @@ namespace Volo.Abp.BlobStoring.Minio
             await client.PutObjectAsync(containerName, blobName, args.BlobStream, args.BlobStream.Length);
         }
 
-        public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        public async override Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
         {
             var blobName = MinioBlobNameCalculator.Calculate(args);
             var client = GetMinioClient(args);
@@ -51,7 +51,7 @@ namespace Volo.Abp.BlobStoring.Minio
             return false;
         }
 
-        public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        public async override Task<bool> ExistsAsync(BlobProviderExistsArgs args)
         {
             var blobName = MinioBlobNameCalculator.Calculate(args);
             var client = GetMinioClient(args);
@@ -60,7 +60,7 @@ namespace Volo.Abp.BlobStoring.Minio
             return await BlobExistsAsync(client, containerName, blobName);
         }
 
-        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var blobName = MinioBlobNameCalculator.Calculate(args);
             var client = GetMinioClient(args);
@@ -69,10 +69,10 @@ namespace Volo.Abp.BlobStoring.Minio
             if (!await BlobExistsAsync(client, containerName, blobName))
             {
                 return null;
-            }      
-               
+            }
+
             var memoryStream = new MemoryStream();
-            await client.GetObjectAsync(containerName, blobName,  (stream) => 
+            await client.GetObjectAsync(containerName, blobName,  (stream) =>
             {
                     if (stream != null)
                     {
@@ -118,13 +118,13 @@ namespace Volo.Abp.BlobStoring.Minio
                     await client.StatObjectAsync(containerName, blobName);
                 }
                 catch (Exception e)
-                {                   
+                {
                     if (e is ObjectNotFoundException)
                     {
                         return false;
-                    }                
-                    
-                    throw;                    
+                    }
+
+                    throw;
                 }
 
                 return true;
diff --git a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapter.cs b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapter.cs
index 89f3713521..7a99859d3a 100644
--- a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapter.cs
+++ b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapter.cs
@@ -18,9 +18,9 @@ namespace Volo.Abp.Castle.DynamicProxy
             Proceed = proceed;
         }
 
-        public override async Task ProceedAsync()
+        public async override Task ProceedAsync()
         {
             await Proceed(Invocation, ProceedInfo);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs
index bf91102337..a0babad231 100644
--- a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs
+++ b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs
@@ -19,9 +19,9 @@ namespace Volo.Abp.Castle.DynamicProxy
             Proceed = proceed;
         }
 
-        public override async Task ProceedAsync()
+        public async override Task ProceedAsync()
         {
             ReturnValue = await Proceed(Invocation, ProceedInfo);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAsyncAbpInterceptorAdapter.cs b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAsyncAbpInterceptorAdapter.cs
index 8a0c4fdd45..6d08e8f6a6 100644
--- a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAsyncAbpInterceptorAdapter.cs
+++ b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAsyncAbpInterceptorAdapter.cs
@@ -15,14 +15,14 @@ namespace Volo.Abp.Castle.DynamicProxy
             _abpInterceptor = abpInterceptor;
         }
 
-        protected override async Task InterceptAsync(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task> proceed)
+        protected async override Task InterceptAsync(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task> proceed)
         {
             await _abpInterceptor.InterceptAsync(
                 new CastleAbpMethodInvocationAdapter(invocation, proceedInfo, proceed)
             );
         }
 
-        protected override async Task<TResult> InterceptAsync<TResult>(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task<TResult>> proceed)
+        protected async override Task<TResult> InterceptAsync<TResult>(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task<TResult>> proceed)
         {
             var adapter = new CastleAbpMethodInvocationAdapterWithReturnValue<TResult>(invocation, proceedInfo, proceed);
 
diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs
index fffde41ba7..111359d7f3 100644
--- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs
@@ -80,12 +80,12 @@ namespace Volo.Abp.Application.Services
             Repository = repository;
         }
 
-        protected override async Task DeleteByIdAsync(TKey id)
+        protected async override Task DeleteByIdAsync(TKey id)
         {
             await Repository.DeleteAsync(id);
         }
 
-        protected override async Task<TEntity> GetEntityByIdAsync(TKey id)
+        protected async override Task<TEntity> GetEntityByIdAsync(TKey id)
         {
             return await Repository.GetAsync(id);
         }
diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ReadOnlyAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ReadOnlyAppService.cs
index d99928126c..c585b2ac38 100644
--- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ReadOnlyAppService.cs
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ReadOnlyAppService.cs
@@ -46,7 +46,7 @@ namespace Volo.Abp.Application.Services
             Repository = repository;
         }
 
-        protected override async Task<TEntity> GetEntityByIdAsync(TKey id)
+        protected async override Task<TEntity> GetEntityByIdAsync(TKey id)
         {
             return await Repository.GetAsync(id);
         }
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJob.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJob.cs
index a81bfb8c7f..5c704f74f0 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJob.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJob.cs
@@ -14,7 +14,7 @@ namespace Volo.Abp.Emailing
             EmailSender = emailSender;
         }
 
-        public override async Task ExecuteAsync(BackgroundEmailSendingJobArgs args)
+        public async override Task ExecuteAsync(BackgroundEmailSendingJobArgs args)
         {
             if (args.From.IsNullOrWhiteSpace())
             {
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs
index b278d70d16..b0c572f0e4 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs
@@ -69,7 +69,7 @@ namespace Volo.Abp.Emailing
             );
         }
 
-        public async Task QueueAsync(string from, string to, string subject, string body, bool isBodyHtml = true)
+        public virtual async Task QueueAsync(string from, string to, string subject, string body, bool isBodyHtml = true)
         {
             if (!BackgroundJobManager.IsAvailable())
             {
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSender.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSender.cs
index 24ca7d6a34..710febff9d 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSender.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSender.cs
@@ -67,7 +67,7 @@ namespace Volo.Abp.Emailing.Smtp
             }
         }
 
-        protected override async Task SendEmailAsync(MailMessage mail)
+        protected async override Task SendEmailAsync(MailMessage mail)
         {
             using (var smtpClient = await BuildClientAsync())
             {
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
index 4f2ce6b434..d75133cb07 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
@@ -45,7 +45,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
             );
         }
 
-        public override async Task<TEntity> InsertAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
+        public async override Task<TEntity> InsertAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             CheckAndSetId(entity);
 
@@ -59,7 +59,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
             return savedEntity;
         }
 
-        public override async Task<TEntity> UpdateAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
+        public async override Task<TEntity> UpdateAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             DbContext.Attach(entity);
 
@@ -73,7 +73,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
             return updatedEntity;
         }
 
-        public override async Task DeleteAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
+        public async override Task DeleteAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             DbSet.Remove(entity);
 
@@ -83,19 +83,19 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
             }
         }
 
-        public override async Task<List<TEntity>> GetListAsync(bool includeDetails = false, CancellationToken cancellationToken = default)
+        public async override Task<List<TEntity>> GetListAsync(bool includeDetails = false, CancellationToken cancellationToken = default)
         {
             return includeDetails
                 ? await WithDetails().ToListAsync(GetCancellationToken(cancellationToken))
                 : await DbSet.ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public override async Task<long> GetCountAsync(CancellationToken cancellationToken = default)
+        public async override Task<long> GetCountAsync(CancellationToken cancellationToken = default)
         {
             return await DbSet.LongCountAsync(GetCancellationToken(cancellationToken));
         }
 
-        public override async Task<List<TEntity>> GetPagedListAsync(
+        public async override Task<List<TEntity>> GetPagedListAsync(
             int skipCount,
             int maxResultCount,
             string sorting,
@@ -115,7 +115,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
             return DbSet.AsQueryable();
         }
 
-        public override async Task<TEntity> FindAsync(
+        public async override Task<TEntity> FindAsync(
             Expression<Func<TEntity, bool>> predicate,
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
@@ -129,7 +129,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
                     .SingleOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
-        public override async Task DeleteAsync(Expression<Func<TEntity, bool>> predicate, bool autoSave = false, CancellationToken cancellationToken = default)
+        public async override Task DeleteAsync(Expression<Func<TEntity, bool>> predicate, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             var entities = await GetQueryable()
                 .Where(predicate)
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 9a61e7f8e3..a17aab8621 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -148,7 +148,7 @@ namespace Volo.Abp.EntityFrameworkCore
             }
         }
 
-        public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = default)
+        public async override Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = default)
         {
             try
             {
diff --git a/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs
index fd6d773952..363744c1d4 100644
--- a/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs
+++ b/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs
@@ -146,7 +146,7 @@ namespace Volo.Abp.EventBus.Kafka
             GetOrCreateHandlerFactories(eventType).Locking(factories => factories.Clear());
         }
 
-        public override async Task PublishAsync(Type eventType, object eventData)
+        public async override Task PublishAsync(Type eventType, object eventData)
         {
             var eventName = EventNameAttribute.GetNameOrDefault(eventType);
             var body = Serializer.Serialize(eventData);
diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs
index ce3549646e..44d229ee94 100644
--- a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs
+++ b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs
@@ -124,7 +124,7 @@ namespace Volo.Abp.EventBus.Rebus
             return Subscribe(typeof(TEvent), handler);
         }
 
-        public override async Task PublishAsync(Type eventType, object eventData)
+        public async override Task PublishAsync(Type eventType, object eventData)
         {
             await AbpRebusEventBusOptions.Publish(Rebus, eventType, eventData);
         }
diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs
index 8c7bef6f2d..828bd4f5c7 100644
--- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs
+++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs
@@ -117,7 +117,7 @@ namespace Volo.Abp.EventBus.Local
             GetOrCreateHandlerFactories(eventType).Locking(factories => factories.Clear());
         }
 
-        public override async Task PublishAsync(Type eventType, object eventData)
+        public async override Task PublishAsync(Type eventType, object eventData)
         {
             var exceptions = new List<Exception>();
 
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs
index 49ea1b3f4c..3bb039f7b2 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.Features
             PrincipalAccessor = principalAccessor;
         }
 
-        public override async Task<string> GetOrNullAsync(FeatureDefinition feature)
+        public async override Task<string> GetOrNullAsync(FeatureDefinition feature)
         {
             var editionId = PrincipalAccessor.Principal?.FindEditionId();
             if (editionId == null)
@@ -29,4 +29,4 @@ namespace Volo.Abp.Features
             return await FeatureStore.GetOrNullAsync(feature.Name, Name, editionId.Value.ToString());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs
index 0c653c3448..b52ffe355e 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs
@@ -34,8 +34,8 @@ namespace Volo.Abp.Features
                 true
             );
         }
-        
-        public override async Task<string> GetOrNullAsync(string name)
+
+        public async override Task<string> GetOrNullAsync(string name)
         {
             var featureDefinition = FeatureDefinitionManager.Get(name);
             var providers = Enumerable
@@ -65,4 +65,4 @@ namespace Volo.Abp.Features
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureInterceptor.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureInterceptor.cs
index 9986af6275..7b84593378 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureInterceptor.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureInterceptor.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.Features
             _methodInvocationFeatureCheckerService = methodInvocationFeatureCheckerService;
         }
 
-        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+        public async override Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             if (AbpCrossCuttingConcerns.IsApplied(invocation.TargetObject, AbpCrossCuttingConcerns.FeatureChecking))
             {
diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs
index 5ae4b5f876..6e4dc669fa 100644
--- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs
+++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs
@@ -10,16 +10,16 @@ namespace Volo.Abp.Features
         public override string Name => ProviderName;
 
         protected ICurrentTenant CurrentTenant { get; }
-        
+
         public TenantFeatureValueProvider(IFeatureStore featureStore, ICurrentTenant currentTenant)
             : base(featureStore)
         {
             CurrentTenant = currentTenant;
         }
 
-        public override async Task<string> GetOrNullAsync(FeatureDefinition feature)
+        public async override Task<string> GetOrNullAsync(FeatureDefinition feature)
         {
             return await FeatureStore.GetOrNullAsync(feature.Name, Name, CurrentTenant.Id?.ToString());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextIdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextIdentityModelRemoteServiceHttpClientAuthenticator.cs
index a829a630d6..f3001eb443 100644
--- a/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextIdentityModelRemoteServiceHttpClientAuthenticator.cs
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextIdentityModelRemoteServiceHttpClientAuthenticator.cs
@@ -19,7 +19,7 @@ namespace Volo.Abp.Http.Client.IdentityModel.Web
         {
         }
 
-        public override async Task Authenticate(RemoteServiceHttpClientAuthenticateContext context)
+        public async override Task Authenticate(RemoteServiceHttpClientAuthenticateContext context)
         {
             if (context.RemoteService.GetUseCurrentAccessToken() != false)
             {
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
index 321d538044..81c1d02d9b 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -75,7 +75,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             Logger = NullLogger<DynamicHttpProxyInterceptor<TService>>.Instance;
         }
 
-        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+        public async override Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             if (invocation.Method.ReturnType.GenericTypeArguments.IsNullOrEmpty())
             {
diff --git a/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs b/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs
index 0fb93e8f40..d089f7b684 100644
--- a/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs
+++ b/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs
@@ -28,7 +28,7 @@ namespace Volo.Abp.MailKit
             SmtpConfiguration = smtpConfiguration;
         }
 
-        protected override async Task SendEmailAsync(MailMessage mail)
+        protected async override Task SendEmailAsync(MailMessage mail)
         {
             using (var client = await BuildClientAsync())
             {
diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
index fdf66b08a6..bb77149a29 100644
--- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
+++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
@@ -170,7 +170,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
             return Task.FromResult(GetQueryable().Where(predicate).SingleOrDefault());
         }
 
-        public override async Task DeleteAsync(
+        public async override Task DeleteAsync(
             Expression<Func<TEntity, bool>> predicate,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
@@ -182,7 +182,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
             }
         }
 
-        public override async Task<TEntity> InsertAsync(
+        public async override Task<TEntity> InsertAsync(
             TEntity entity,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
@@ -194,7 +194,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
             return entity;
         }
 
-        public override async Task<TEntity> UpdateAsync(
+        public async override Task<TEntity> UpdateAsync(
             TEntity entity,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
@@ -218,7 +218,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
             return entity;
         }
 
-        public override async Task DeleteAsync(
+        public async override Task DeleteAsync(
             TEntity entity,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
index 02dd0e5de7..6af98da56b 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
@@ -55,7 +55,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             GuidGenerator = SimpleGuidGenerator.Instance;
         }
 
-        public override async Task<TEntity> InsertAsync(
+        public async override Task<TEntity> InsertAsync(
             TEntity entity,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
@@ -81,7 +81,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             return entity;
         }
 
-        public override async Task<TEntity> UpdateAsync(
+        public async override Task<TEntity> UpdateAsync(
             TEntity entity,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
@@ -131,7 +131,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             return entity;
         }
 
-        public override async Task DeleteAsync(
+        public async override Task DeleteAsync(
             TEntity entity,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
@@ -194,17 +194,17 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             }
         }
 
-        public override async Task<List<TEntity>> GetListAsync(bool includeDetails = false, CancellationToken cancellationToken = default)
+        public async override Task<List<TEntity>> GetListAsync(bool includeDetails = false, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable().ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public override async Task<long> GetCountAsync(CancellationToken cancellationToken = default)
+        public async override Task<long> GetCountAsync(CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable().LongCountAsync(GetCancellationToken(cancellationToken));
         }
 
-        public override async Task<List<TEntity>> GetPagedListAsync(
+        public async override Task<List<TEntity>> GetPagedListAsync(
             int skipCount,
             int maxResultCount,
             string sorting,
@@ -218,7 +218,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public override async Task DeleteAsync(
+        public async override Task DeleteAsync(
             Expression<Func<TEntity, bool>> predicate,
             bool autoSave = false,
             CancellationToken cancellationToken = default)
@@ -238,7 +238,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             return GetMongoQueryable();
         }
 
-        public override async Task<TEntity> FindAsync(
+        public async override Task<TEntity> FindAsync(
             Expression<Func<TEntity, bool>> predicate,
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/TenantSettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/TenantSettingValueProvider.cs
index eab23b7258..4fa876ae80 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/TenantSettingValueProvider.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/TenantSettingValueProvider.cs
@@ -10,16 +10,16 @@ namespace Volo.Abp.Settings
         public override string Name => ProviderName;
 
         protected ICurrentTenant CurrentTenant { get; }
-        
+
         public TenantSettingValueProvider(ISettingStore settingStore, ICurrentTenant currentTenant)
             : base(settingStore)
         {
             CurrentTenant = currentTenant;
         }
 
-        public override async Task<string> GetOrNullAsync(SettingDefinition setting)
+        public async override Task<string> GetOrNullAsync(SettingDefinition setting)
         {
             return await SettingStore.GetOrNullAsync(setting.Name, Name, CurrentTenant.Id?.ToString());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/UserSettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/UserSettingValueProvider.cs
index 01125f3201..0781b10433 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/UserSettingValueProvider.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/UserSettingValueProvider.cs
@@ -17,7 +17,7 @@ namespace Volo.Abp.Settings
             CurrentUser = currentUser;
         }
 
-        public override async Task<string> GetOrNullAsync(SettingDefinition setting)
+        public async override Task<string> GetOrNullAsync(SettingDefinition setting)
         {
             if (CurrentUser.Id == null)
             {
@@ -27,4 +27,4 @@ namespace Volo.Abp.Settings
             return await SettingStore.GetOrNullAsync(setting.Name, Name, CurrentUser.Id.ToString());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
index 81bd132a5e..f5afcea494 100644
--- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
+++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.Uow
             _defaultOptions = options.Value;
         }
 
-        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+        public async override Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             if (!UnitOfWorkHelper.IsUnitOfWorkMethod(invocation.Method, out var unitOfWorkAttribute))
             {
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptor.cs b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptor.cs
index b4ce642471..d0d9e7594d 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptor.cs
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptor.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Validation
             _methodInvocationValidator = methodInvocationValidator;
         }
 
-        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+        public async override Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             Validate(invocation);
             await invocation.ProceedAsync();
diff --git a/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo/Abp/BlobStoring/Minio/AbpBlobStoringMinioTestModule.cs b/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo/Abp/BlobStoring/Minio/AbpBlobStoringMinioTestModule.cs
index 71d780e880..a448c2160e 100644
--- a/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo/Abp/BlobStoring/Minio/AbpBlobStoringMinioTestModule.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo/Abp/BlobStoring/Minio/AbpBlobStoringMinioTestModule.cs
@@ -60,7 +60,7 @@ namespace Volo.Abp.BlobStoring.Minio
             });
         }
 
-        public override async void OnApplicationShutdown(ApplicationShutdownContext context)
+        public async override void OnApplicationShutdown(ApplicationShutdownContext context)
         {
             var minioClient = new MinioClient(_endPoint, _accessKey, _secretKey);
             if (await minioClient.BucketExistsAsync(_randomContainerName))
@@ -74,7 +74,7 @@ namespace Volo.Abp.BlobStoring.Minio
 
                 await minioClient.RemoveBucketAsync(_randomContainerName);
             }
-           
+
         }
     }
 
diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs
index ac5f6beb16..7f38276df2 100644
--- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs
+++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs
@@ -5,7 +5,7 @@ namespace Volo.Abp.DynamicProxy
 {
     public class SimpleAsyncInterceptor : AbpInterceptor
     {
-        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+        public async override Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             await Task.Delay(5);
 			(invocation.TargetObject as ICanLogOnObject)?.Logs?.Add($"{GetType().Name}_InterceptAsync_BeforeInvocation");
@@ -14,4 +14,4 @@ namespace Volo.Abp.DynamicProxy
             await Task.Delay(5);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs
index 15bcf4631b..ebbf890b14 100644
--- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs
+++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs
@@ -12,8 +12,8 @@ namespace Volo.Abp.DynamicProxy
 	    {
 		    _cache = new ConcurrentDictionary<MethodInfo, object>();
 	    }
-		
-	    public override async Task InterceptAsync(IAbpMethodInvocation invocation)
+
+	    public async override Task InterceptAsync(IAbpMethodInvocation invocation)
 	    {
 		    if (_cache.ContainsKey(invocation.Method))
 		    {
diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Basic_Tests.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Basic_Tests.cs
index 09b1551e3d..f998da8528 100644
--- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Basic_Tests.cs
+++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Basic_Tests.cs
@@ -51,7 +51,7 @@ namespace Volo.Abp.MongoDB.Repositories
         }
 
         [Fact]
-        public override async Task InsertAsync()
+        public async override Task InsertAsync()
         {
             var person = new Person(Guid.NewGuid(), "New Person", 35);
             person.Phones.Add(new Phone(person.Id, "1234567890"));
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/DistrictAppService.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/DistrictAppService.cs
index f7e7fde5e2..772db07e72 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/DistrictAppService.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/DistrictAppService.cs
@@ -15,12 +15,12 @@ namespace Volo.Abp.TestApp.Application
         {
         }
 
-        protected override async Task DeleteByIdAsync(DistrictKey id)
+        protected async override Task DeleteByIdAsync(DistrictKey id)
         {
             await Repository.DeleteAsync(d => d.CityId == id.CityId && d.Name == id.Name);
         }
 
-        protected override async Task<District> GetEntityByIdAsync(DistrictKey id)
+        protected async override Task<District> GetEntityByIdAsync(DistrictKey id)
         {
             return await AsyncExecuter.FirstOrDefaultAsync(
                 Repository.Where(d => d.CityId == id.CityId && d.Name == id.Name)
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs
index 7dfee0da53..4be9f9fbe7 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs
+++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs
@@ -28,7 +28,7 @@ namespace Volo.Abp.Account.Blazor.Pages.Account
 
         protected PersonalInfoModel PersonalInfoModel;
         
-        protected override async Task OnInitializedAsync()
+        protected async override Task OnInitializedAsync()
         {
             await GetUserInformations();
         }
diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
index df6eb0e1ae..e52f6731dc 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
@@ -43,7 +43,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             IdentityServerEvents = identityServerEvents;
         }
 
-        public override async Task<IActionResult> OnGetAsync()
+        public async override Task<IActionResult> OnGetAsync()
         {
             LoginInput = new LoginInputModel();
 
@@ -98,7 +98,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return Page();
         }
 
-        public override async Task<IActionResult> OnPostAsync(string action)
+        public async override Task<IActionResult> OnPostAsync(string action)
         {
             if (action == "Cancel")
             {
@@ -173,7 +173,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return RedirectSafely(ReturnUrl, ReturnUrlHash);
         }
 
-        public override async Task<IActionResult> OnPostExternalLogin(string provider)
+        public async override Task<IActionResult> OnPostExternalLogin(string provider)
         {
             if (AccountOptions.WindowsAuthenticationSchemeName == provider)
             {
diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLogoutModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLogoutModel.cs
index bec2ede369..26ee0d4c34 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLogoutModel.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLogoutModel.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             Interaction = interaction;
         }
 
-        public override async Task<IActionResult> OnGetAsync()
+        public async override Task<IActionResult> OnGetAsync()
         {
             await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
             {
diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobProvider.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobProvider.cs
index 7fec4592c6..6d9b3dfc5b 100644
--- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobProvider.cs
+++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobProvider.cs
@@ -26,7 +26,7 @@ namespace Volo.Abp.BlobStoring.Database
             CurrentTenant = currentTenant;
         }
 
-        public override async Task SaveAsync(BlobProviderSaveArgs args)
+        public async override Task SaveAsync(BlobProviderSaveArgs args)
         {
             var container = await GetOrCreateContainerAsync(args.ContainerName, args.CancellationToken);
 
@@ -57,7 +57,7 @@ namespace Volo.Abp.BlobStoring.Database
             }
         }
 
-        public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        public async override Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
         {
             var container = await DatabaseBlobContainerRepository.FindAsync(
                 args.ContainerName,
@@ -77,7 +77,7 @@ namespace Volo.Abp.BlobStoring.Database
             );
         }
 
-        public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        public async override Task<bool> ExistsAsync(BlobProviderExistsArgs args)
         {
             var container = await DatabaseBlobContainerRepository.FindAsync(
                 args.ContainerName,
@@ -96,7 +96,7 @@ namespace Volo.Abp.BlobStoring.Database
             );
         }
 
-        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var container = await DatabaseBlobContainerRepository.FindAsync(
                 args.ContainerName,
diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAuthorizationHandler.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAuthorizationHandler.cs
index bd6dcdf8c5..9771d136b3 100644
--- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAuthorizationHandler.cs
+++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAuthorizationHandler.cs
@@ -15,7 +15,7 @@ namespace Volo.Blogging.Comments
             _permissionChecker = permissionChecker;
         }
 
-        protected override async Task HandleRequirementAsync(
+        protected async override Task HandleRequirementAsync(
             AuthorizationHandlerContext context,
             OperationAuthorizationRequirement requirement,
             Comment resource)
diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs
index 9d2d0e9e9f..7c6033f4b2 100644
--- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs
+++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAuthorizationHandler.cs
@@ -15,7 +15,7 @@ namespace Volo.Blogging.Posts
             _permissionChecker = permissionChecker;
         }
 
-        protected override async Task HandleRequirementAsync(
+        protected async override Task HandleRequirementAsync(
             AuthorizationHandlerContext context,
             OperationAuthorizationRequirement requirement,
             Post resource)
diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
index 8e4b435b48..8de9014cbe 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
@@ -33,7 +33,7 @@ namespace Volo.Abp.Identity.AspNetCore
             AbpOptions = options.Value;
         }
 
-        public override async Task<SignInResult> PasswordSignInAsync(
+        public async override Task<SignInResult> PasswordSignInAsync(
             string userName,
             string password,
             bool isPersistent,
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
index 303c511b80..ad93eace86 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -41,7 +41,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             ManagePermissionsPolicyName = IdentityPermissions.Users.ManagePermissions;
         }
 
-        protected override async Task OnInitializedAsync()
+        protected async override Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
 
@@ -69,7 +69,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             return base.OnCreatingEntityAsync();
         }
 
-        protected override async Task OnOpeningEditModalAsync(Guid id)
+        protected async override Task OpenEditModalAsync(Guid id)
         {
             EditModalSelectedTab = DefaultSelectedTab;
 
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs
index 11abe2bdf3..9831b03d5d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs
@@ -24,7 +24,7 @@ namespace Volo.Abp.Identity
         }
 
         [UnitOfWork]
-        public override async Task<ClaimsPrincipal> CreateAsync(IdentityUser user)
+        public async override Task<ClaimsPrincipal> CreateAsync(IdentityUser user)
         {
             var principal = await base.CreateAsync(user);
             var identity = principal.Identities.First();
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
index 40c249e5c4..7522b96159 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
@@ -50,7 +50,7 @@ namespace Volo.Abp.Identity
             return role;
         }
 
-        public override async Task<IdentityResult> SetRoleNameAsync(IdentityRole role, string name)
+        public async override Task<IdentityResult> SetRoleNameAsync(IdentityRole role, string name)
         {
             if (role.IsStatic && role.Name != name)
             {
@@ -60,7 +60,7 @@ namespace Volo.Abp.Identity
             return await base.SetRoleNameAsync(role, name);
         }
 
-        public override async Task<IdentityResult> DeleteAsync(IdentityRole role)
+        public async override Task<IdentityResult> DeleteAsync(IdentityRole role)
         {
             if (role.IsStatic)
             {
diff --git a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs
index 74aa138b5e..53ebe46fb2 100644
--- a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs
+++ b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.PermissionManagement.Identity
         public RolePermissionManagementProvider(
             IPermissionGrantRepository permissionGrantRepository,
             IGuidGenerator guidGenerator,
-            ICurrentTenant currentTenant, 
+            ICurrentTenant currentTenant,
             IUserRoleFinder userRoleFinder)
             : base(
                 permissionGrantRepository,
@@ -26,7 +26,7 @@ namespace Volo.Abp.PermissionManagement.Identity
             UserRoleFinder = userRoleFinder;
         }
 
-        public override async Task<PermissionValueProviderGrantInfo> CheckAsync(string name, string providerName, string providerKey)
+        public async override Task<PermissionValueProviderGrantInfo> CheckAsync(string name, string providerName, string providerKey)
         {
             if (providerName == Name)
             {
@@ -54,4 +54,4 @@ namespace Volo.Abp.PermissionManagement.Identity
             return PermissionValueProviderGrantInfo.NonGranted;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs
index 224abc6c10..3eb14131f1 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs
@@ -24,7 +24,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         }
 
         [UnitOfWork]
-        public override async Task GetProfileDataAsync(ProfileDataRequestContext context)
+        public async override Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             using (CurrentTenant.Change(context.Subject.FindTenantId()))
             {
@@ -33,7 +33,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         }
 
         [UnitOfWork]
-        public override async Task IsActiveAsync(IsActiveContext context)
+        public async override Task IsActiveAsync(IsActiveContext context)
         {
             using (CurrentTenant.Change(context.Subject.FindTenantId()))
             {
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Tokens/TokenCleanupBackgroundWorker.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Tokens/TokenCleanupBackgroundWorker.cs
index e910a3b30f..a7ad09d191 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Tokens/TokenCleanupBackgroundWorker.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Tokens/TokenCleanupBackgroundWorker.cs
@@ -22,7 +22,7 @@ namespace Volo.Abp.IdentityServer.Tokens
             timer.Period = Options.CleanupPeriod;
         }
 
-        protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
+        protected async override Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
         {
             await workerContext
                 .ServiceProvider
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs
index 17e84876af..bdfe2bbb81 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs
@@ -72,7 +72,7 @@ namespace Volo.Abp.IdentityServer.ApiResources
             return await DbSet.AnyAsync(ar => ar.Id != expectedId && ar.Name == name, GetCancellationToken(cancellationToken));
         }
 
-        public override async Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = default)
+        public async override Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             var resourceClaims = DbContext.Set<ApiResourceClaim>().Where(sc => sc.ApiResourceId == id);
             foreach (var scopeClaim in resourceClaims)
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiScopes/ApiScopeRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiScopes/ApiScopeRepository.cs
index 88772bfab7..8e5d2bd09c 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiScopes/ApiScopeRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiScopes/ApiScopeRepository.cs
@@ -50,7 +50,7 @@ namespace Volo.Abp.IdentityServer.ApiScopes
             return await DbSet.AnyAsync(x => x.Id != expectedId && x.Name == name, GetCancellationToken(cancellationToken));
         }
 
-        public override async Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = new CancellationToken())
+        public async override Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = new CancellationToken())
         {
             var scopeClaims = DbContext.Set<ApiScopeClaim>().Where(sc => sc.ApiScopeId == id);
             foreach (var claim in scopeClaims)
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs
index b1ff2770bb..671d98d822 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs
@@ -54,7 +54,7 @@ namespace Volo.Abp.IdentityServer.Clients
             return await DbSet.AnyAsync(c => c.Id != expectedId && c.ClientId == clientId, cancellationToken: cancellationToken);
         }
 
-        public override async Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = default)
+        public async override Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             foreach (var clientGrantType in DbContext.Set<ClientGrantType>().Where(x => x.ClientId == id))
             {
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs
index 3c4775fd02..749e1449a5 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs
@@ -29,7 +29,7 @@ namespace Volo.Abp.SettingManagement.Blazor.Pages.SettingManagement
         protected string SelectedGroup;
         protected List<BreadcrumbItem> BreadcrumbItems = new List<BreadcrumbItem>();
 
-        protected override async Task OnInitializedAsync()
+        protected async override Task OnInitializedAsync()
         {
             SettingComponentCreationContext = new SettingComponentCreationContext(ServiceProvider);
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index 9106c32c78..b9272ce77f 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -7,7 +7,7 @@ using Volo.Abp.FeatureManagement.Blazor.Components;
 
 namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 {
-    public abstract class TenantManagementBase
+    public abstract class TenantManagementBase 
         : AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
     {
         protected const string FeatureProviderName = "T";
@@ -35,8 +35,8 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 
             TenantInfo = new TenantInfoModel();
         }
-
-        protected override async Task SetPermissionsAsync()
+        
+        protected async override Task SetPermissionsAsync()
         {
             await base.SetPermissionsAsync();
 
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Pages/Index.razor b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Pages/Index.razor
index 66c4949ac9..1140cddeff 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Pages/Index.razor
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Pages/Index.razor
@@ -49,7 +49,7 @@
 {
     private IEnumerable<Claim> _claims;
 
-    protected override async Task OnInitializedAsync()
+    protected async override Task OnInitializedAsync()
     {
         var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
         if (authState.User.Identity.IsAuthenticated)
diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs b/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs
index b76f8832e4..6ab1bd8c86 100644
--- a/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs
+++ b/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs
@@ -34,7 +34,7 @@ namespace MyCompanyName.MyProjectName
             _application = _host.Services.GetService<IAbpApplicationWithExternalServiceProvider>();
         }
 
-        protected override async void OnStartup(StartupEventArgs e)
+        protected async override void OnStartup(StartupEventArgs e)
         {
             Log.Logger = new LoggerConfiguration()
 #if DEBUG
@@ -66,7 +66,7 @@ namespace MyCompanyName.MyProjectName
             }
         }
 
-        protected override async void OnExit(ExitEventArgs e)
+        protected async override void OnExit(ExitEventArgs e)
         {
             _application.Shutdown();
             await _host.StopAsync();