Change override async to async override.

https://github.com/abpframework/abp/pull/5924

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);

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");

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";
 

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();
 

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
             }
         }
     }
-}
+}

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);
         }
     }
-}
+}

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;
         }
     }
-}
+}

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;
         }
     }
-}
+}

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);
 

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);
 

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 Microsoft.AspNetCore.Razor.TagHelpers;
-using System.Text;
+using System.Text;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
-{
+{
-    public class AbpModalTagHelperService : AbpTagHelperService<AbpModalTagHelper>
+    public class AbpModalTagHelperService : AbpTagHelperService<AbpModalTagHelper>
-    {
+    {
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
+        {
-            output.TagName = null;
+            output.TagName = null;
-
+
-            var childContent = await output.GetChildContentAsync();
+            var childContent = await output.GetChildContentAsync();
-
+
-            SetContent(context, output, childContent);
+            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()
+        protected virtual string GetModalClasses()
-        {
+        {
-            return "modal fade";
+            return "modal fade";
-        }
+        }
-
+
-        protected virtual string GetModalDialogClasses()
+        protected virtual string GetModalDialogClasses()
-        {
+        {
-            var classNames = new StringBuilder("modal-dialog");
+            var classNames = new StringBuilder("modal-dialog");
-
+
-            if (TagHelper.Centered ?? false)
+            if (TagHelper.Centered ?? false)
-            {
+            {
-                classNames.Append(" ");
+                classNames.Append(" ");
-                classNames.Append("modal-dialog-centered");
+                classNames.Append("modal-dialog-centered");
-            }
+            }
-
+
-            if (TagHelper.Size != AbpModalSize.Default)
+            if (TagHelper.Size != AbpModalSize.Default)
-            {
+            {
-                classNames.Append(" ");
+                classNames.Append(" ");
-                classNames.Append(TagHelper.Size.ToClassName());
+                classNames.Append(TagHelper.Size.ToClassName());
-            }
+            }
-
+
-            return classNames.ToString();
+            return classNames.ToString();
-        }
+        }
-
+
-        protected virtual string GetModalContentClasses()
+        protected virtual string GetModalContentClasses()
-        {
+        {
-            return "modal-content";
+            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");
             }
-        }
+        }
-    }
+    }
-}
+}

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, 
+            IHtmlGenerator generator,
-            HtmlEncoder encoder, 
+            HtmlEncoder encoder,
-            IAbpTagHelperLocalizer tagHelperLocalizer, 
+            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
             }
         }
     }
-}
+}

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))
             {

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();
 

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();
 

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)

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,

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

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, 
+            IAbpMethodInvocation invocation,
-            out AuditLogInfo auditLog, 
+            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
             );
 

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)

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();

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;
         }

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;
         }
     }
-}
+}

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;
 

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);

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);
     }
-}
+}

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);
     }
-}
+}

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);

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;
         }
     }
-}
+}

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);
 

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);
 

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;

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);
         }
     }
-}
+}

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);
         }
     }
-}
+}

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())
             {

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)

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
             {

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);

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);
         }

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>();
 

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());
         }
     }
-}
+}

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;
         }
     }
-}
+}

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))
             {

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());
         }
     }
-}
+}

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)
             {

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())
             {

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)

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)

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());
         }
     }
-}
+}

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());
         }
     }
-}
+}

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))
             {

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();

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);
             }
-           
+
         }
     }
 

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);
         }
     }
-}
+}

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))
 		    {

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"));

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)
             {

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()
             {

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,

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,

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();

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)
             {

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;
         }
     }
-}
+}

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()))
             {

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)

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)

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))
             {