Merge branch 'dev' into maliming/DomainTenantResolveContributor

abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json

@@ -27,6 +27,8 @@
     "Blog": "博客",
     "Commercial": "商业版",
     "MyAccount": "我的账户",
+    "Permission:License": "许可",
+    "Permission:UserInfo": "用户信息",
     "SeeDocuments": "查看文档",
     "Samples": "示例"
   }

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json

@@ -28,8 +28,12 @@
     "MyOrganizations": "我的组织",
     "ApiKey": "API key",
     "UserNameNotFound": "没有用户名为{0}的用户",
-    "SuccessfullyAddedToNewsletter": "感谢你订阅我们的新闻通讯!",
+    "SuccessfullyAddedToNewsletter": "感谢你订阅我们的新闻简讯!",
     "MyProfile": "我的资料",
-    "EmailNotValid": "请输入有效的电子邮件地址"
+    "EmailNotValid": "请输入有效的电子邮件地址",
+    "JoinOurMarketingNewsletter": "加入我们的营销简讯",
+    "WouldLikeToReceiveMarketingMaterials": "我想收到市场营销资料,例如产品交易和特别优惠.",
+    "StartUsingYourLicenseNow": "立即开始使用你的许可证",
+    "WelcomePage": "欢迎页面"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/zh-Hans.json

@@ -35,7 +35,6 @@
     "EmailNotValid": "请输入有效的电子邮箱地址.",
     "FeatureRequest": "功能请求",
     "CreateArticleTitleInfo": "文章标题显示在文章列表中.",
-    "CreateArticleUrlInfo": "文章的原始GitHub/外部URL.",
     "CreateArticleSummaryInfo": "文章的简短摘要将显示在文章列表中.",
     "CreateArticleCoverInfo": "为了创建有效的文章,请添加封面图. 仅支持16:9的图片!",
     "ThisExtensionIsNotAllowed": "不允许此扩展名.",
@@ -84,6 +83,34 @@
     "Edit": "修改",
     "ProfileImageChange": "更改资料图片",
     "BlogItemErrorMessage": "无法从ABP获取最新的博客文章详细信息.",
-    "PlannedReleaseDate": "计划发布日期"
+    "PlannedReleaseDate": "计划发布日期",
+    "CommunityArticleRequestErrorMessage": "无法从Github获取最新的文章请求.",
+    "ArticleRequestFromGithubIssue": "现在没有任何文章请求.",
+    "LatestArticles": "最新的帖子",
+    "ArticleRequests": "文章请求",
+    "AllArticleRequests": "查看所有文章请求",
+    "SubscribeToTheNewsletter": "订阅简讯",
+    "NewsletterEmailDefinition": "获取有关ABP发生的信息,例如新版本,免费资源,文章等.",
+    "NoThanks": "不用了，谢谢",
+    "MaybeLater": "以后再说",
+    "JoinOurArticleNewsletter": "加入我们的文章简讯",
+    "Community": "社区",
+    "Marketing": "营销",
+    "CommunityPrivacyPolicyConfirmation": "我同意条款和条件以及<a href=\"https://commercial.abp.io/Privacy\">隐私政策</a>.",
+    "ArticleRequestMessageTitle": "<a href=\"https://github.com/abpframework/abp/issues/new\">在GitHub上创建一个Issue</a>,以请求你要在此网站上查看的文章/教程.",
+    "ArticleRequestMessageBody": "在这里,是社区请求的文章列表. 您要写一篇要求的文章吗? 请单击该请求并加入讨论.",
+    "Language": "语言",
+    "CreateArticleLanguageInfo": "本文所用的语言",
+    "VideoPost": "视频",
+    "Article": "文章",
+    "Read": "阅读",
+    "CreateGithubArticleUrlInfo": "文章的原始GitHub链接.",
+    "CreateVideoContentUrlInfo": "文章的原始Youtube链接.",
+    "CreateExternalArticleUrlInfo": "本文的原始外部网址",
+    "VideoContentForm": "视频内容来源",
+    "GithubPostForm": "Github文章来源",
+    "ExternalPostForm": "外部文章来源",
+    "PostSourceTypeChooses": "我们接受文章的三种来源类型;",
+    "Posts": "文章"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json

@@ -192,6 +192,7 @@
     "MultipleUIOptions": "多个UI选项",
     "MultipleDBOptions": "多个数据库提供程序",
     "MultipleUIOptionsExplanation": "核心框架设计为独立与UI,可以和任何类型的UI系统一起使用. 同时提供了多个开箱即用的预构建集成选项.",
-    "SelectLanguage": "選擇語言"
+    "MultipleDBOptionsExplanation": "该框架可以使用任何数据源,并且以下提供程序已得到正式开发和支持；",
+    "SelectLanguage": "选择语言"
   }
-}
+}

docs/en/Background-Workers.md

@@ -45,7 +45,7 @@ Assume that we want to make a user passive, if the user has not logged in to the
 public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
 {
     public PassiveUserCheckerWorker(
-            AbpTimer timer,
+            AbpAsyncTimer timer,
             IServiceScopeFactory serviceScopeFactory
         ) : base(
             timer, 

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor

@@ -21,7 +21,7 @@
     private IReadOnlyList<LanguageInfo> _otherLanguages;
     private LanguageInfo _currentLanguage;
 
-    protected async override Task OnInitializedAsync()
+    protected override async Task OnInitializedAsync()
     {
         var selectedLanguageName = await JsRuntime.InvokeAsync<string>(
             "localStorage.getItem",

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

@@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
 
         protected ApplicationMenu Menu { get; set; }
 
-        protected async override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
             Menu = await MenuManager.GetAsync(StandardMenus.User);
 

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs

@@ -11,7 +11,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
 
         protected ApplicationMenu Menu { get; set; }
 
-        protected async override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
             Menu = await MenuManager.GetAsync(StandardMenus.Main);
         }

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 async override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
             var toolbar = await ToolbarManager.GetAsync(StandardToolbars.Main);
 

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/FormTenantResolveContributor.cs

@@ -11,7 +11,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
         public override string Name => ContributorName;
 
-        protected async override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
+        protected override async Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
         {
             if (!httpContext.Request.HasFormContentType)
             {

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs

@@ -10,7 +10,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     public abstract class HttpTenantResolveContributorBase : TenantResolveContributorBase
     {
-        public async override Task ResolveAsync(ITenantResolveContext context)
+        public override async Task ResolveAsync(ITenantResolveContext context)
         {
             var httpContext = context.GetHttpContext();
             if (httpContext == null)

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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             SetRandomIdIfNotProvided();
 

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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = "div";
             output.Attributes.AddClass("collapse");

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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var content = await output.GetChildContentAsync();
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs

@@ -36,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             _localizer = localizer;
         }
 
-        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var list = InitilizeFormGroupContentsContext(context, output);
 

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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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

@@ -36,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             _stringLocalizerFactory = stringLocalizerFactory;
         }
 
-        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             var innerHtml = await GetFormInputGroupAsHtmlAsync(context, output);
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs

@@ -8,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
 {
     public class AbpModalTagHelperService : AbpTagHelperService<AbpModalTagHelper>
     {
-        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = null;
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs

@@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
             _stringLocalizerFactory = stringLocalizerFactory;
         }
 
-        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             if (TagHelper.Model.ShownItemsCount <= 0)
             {

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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async 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 async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             await ResourceService.ProcessAsync(
                 TagHelper.ViewContext,

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 async override Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
+        protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
         {
             return await BundleManager.GetScriptBundleFilesAsync(bundleName);
         }

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 async override Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
+        protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
         {
             return await BundleManager.GetStyleBundleFilesAsync(bundleName);
         }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs

@@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
             _guidGenerator = guidGenerator;
         }
 
-        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = null;
 

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Content/RemoteStreamContentOutputFormatter.cs

@@ -18,7 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Content
             return typeof(IRemoteStreamContent).IsAssignableFrom(type);
         }
 
-        public async override Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
         {
             var remoteStream = (IRemoteStreamContent)context.Object;
             using (var stream = remoteStream.GetStream())

framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/SecurityLog/AspNetCoreSecurityLogManager.cs

@@ -48,7 +48,7 @@ namespace Volo.Abp.AspNetCore.SecurityLog
             WebClientInfoProvider = webClientInfoProvider;
         }
 
-        protected async override Task<SecurityLogInfo> CreateAsync()
+        protected override async Task<SecurityLogInfo> CreateAsync()
         {
             var securityLogInfo = await base.CreateAsync();
 

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationPolicyProvider.cs

@@ -23,7 +23,7 @@ namespace Volo.Abp.Authorization
             _options = options.Value;
         }
 
-        public async override Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
+        public override async Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
         {
             var policy = await base.GetPolicyAsync(policyName);
             if (policy != null)

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/PermissionRequirementHandler.cs

@@ -13,7 +13,7 @@ namespace Volo.Abp.Authorization
             _permissionChecker = permissionChecker;
         }
 
-        protected async override Task HandleRequirementAsync(
+        protected override async Task HandleRequirementAsync(
             AuthorizationHandlerContext context,
             PermissionRequirement requirement)
         {

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/ClientPermissionValueProvider.cs

@@ -19,7 +19,7 @@ namespace Volo.Abp.Authorization.Permissions
             CurrentTenant = currentTenant;
         }
 
-        public async override Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
+        public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
         {
             var clientId = context.Principal?.FindFirst(AbpClaimTypes.ClientId)?.Value;
 
@@ -36,7 +36,7 @@ namespace Volo.Abp.Authorization.Permissions
             }
         }
 
-        public async override Task<MultiplePermissionGrantResult> CheckAsync(PermissionValuesCheckContext context)
+        public override async Task<MultiplePermissionGrantResult> CheckAsync(PermissionValuesCheckContext context)
         {
             var permissionNames = context.Permissions.Select(x => x.Name).ToArray();
 

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/RolePermissionValueProvider.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.Authorization.Permissions
 
         }
 
-        public async override Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
+        public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
         {
             var roles = context.Principal?.FindAll(AbpClaimTypes.Role).Select(c => c.Value).ToArray();
 
@@ -37,7 +37,7 @@ namespace Volo.Abp.Authorization.Permissions
             return PermissionGrantResult.Undefined;
         }
 
-        public async override Task<MultiplePermissionGrantResult> CheckAsync(PermissionValuesCheckContext context)
+        public override async Task<MultiplePermissionGrantResult> CheckAsync(PermissionValuesCheckContext context)
         {
             var permissionNames = context.Permissions.Select(x => x.Name).ToList();
             var result = new MultiplePermissionGrantResult(permissionNames.ToArray());

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/UserPermissionValueProvider.cs

@@ -16,7 +16,7 @@ namespace Volo.Abp.Authorization.Permissions
 
         }
 
-        public async override Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
+        public override async Task<PermissionGrantResult> CheckAsync(PermissionValueCheckContext context)
         {
             var userId = context.Principal?.FindFirst(AbpClaimTypes.UserId)?.Value;
 
@@ -30,7 +30,7 @@ namespace Volo.Abp.Authorization.Permissions
                 : PermissionGrantResult.Undefined;
         }
 
-        public async override Task<MultiplePermissionGrantResult> CheckAsync(PermissionValuesCheckContext context)
+        public override async Task<MultiplePermissionGrantResult> CheckAsync(PermissionValuesCheckContext context)
         {
             var permissionNames = context.Permissions.Select(x => x.Name).ToArray();
 

framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs

@@ -30,7 +30,7 @@ namespace Volo.Abp.BackgroundJobs
             Timer.Period = WorkerOptions.JobPollPeriod;
         }
 
-        protected async override Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
+        protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
         {
             var store = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobStore>();
 

framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AsyncPeriodicBackgroundWorkerBase.cs

@@ -22,13 +22,13 @@ namespace Volo.Abp.BackgroundWorkers
             Timer.Elapsed = Timer_Elapsed;
         }
 
-        public async override Task StartAsync(CancellationToken cancellationToken = default)
+        public override async Task StartAsync(CancellationToken cancellationToken = default)
         {
             await base.StartAsync(cancellationToken);
             Timer.Start(cancellationToken);
         }
 
-        public async override Task StopAsync(CancellationToken cancellationToken = default)
+        public override async Task StopAsync(CancellationToken cancellationToken = default)
         {
             Timer.Stop(cancellationToken);
             await base.StopAsync(cancellationToken);

framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs

@@ -25,13 +25,13 @@ namespace Volo.Abp.BackgroundWorkers
             Timer.Elapsed += Timer_Elapsed;
         }
 
-        public async override Task StartAsync(CancellationToken cancellationToken = default)
+        public override async Task StartAsync(CancellationToken cancellationToken = default)
         {
             await base.StartAsync(cancellationToken);
             Timer.Start(cancellationToken);
         }
 
-        public async override Task StopAsync(CancellationToken cancellationToken = default)
+        public override async Task StopAsync(CancellationToken cancellationToken = default)
         {
             Timer.Stop(cancellationToken);
             await base.StopAsync(cancellationToken);

framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs

@@ -41,7 +41,7 @@ namespace Volo.Abp.BlazoriseUI.Components
         [Inject]
         protected IUiMessageService UiMessageService { get; set; }
 
-        protected async override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
             await SetDefaultValuesAsync();

framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs

@@ -73,7 +73,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             return Task.FromResult(BlobExists(ossClient, containerName, blobName));
         }
 
-        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public override async 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 async override Task SaveAsync(BlobProviderSaveArgs args)
+        public override async Task SaveAsync(BlobProviderSaveArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var configuration = args.Configuration.GetAwsConfiguration();
@@ -48,7 +48,7 @@ namespace Volo.Abp.BlobStoring.Aws
             }
         }
 
-        public async override Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var containerName = GetContainerName(args);
@@ -70,7 +70,7 @@ namespace Volo.Abp.BlobStoring.Aws
             }
         }
 
-        public async override Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var containerName = GetContainerName(args);
@@ -81,7 +81,7 @@ namespace Volo.Abp.BlobStoring.Aws
             }
         }
 
-        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var blobName = AwsBlobNameCalculator.Calculate(args);
             var containerName = GetContainerName(args);

framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs

@@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.Azure
             AzureBlobNameCalculator = azureBlobNameCalculator;
         }
 
-        public async override Task SaveAsync(BlobProviderSaveArgs args)
+        public override async 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 async override Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
         {
             var blobName = AzureBlobNameCalculator.Calculate(args);
 
@@ -45,14 +45,14 @@ namespace Volo.Abp.BlobStoring.Azure
             return false;
         }
 
-        public async override Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
         {
             var blobName = AzureBlobNameCalculator.Calculate(args);
 
             return await BlobExistsAsync(args, blobName);
         }
 
-        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public override async 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 async override Task SaveAsync(BlobProviderSaveArgs args)
+        public override async Task SaveAsync(BlobProviderSaveArgs args)
         {
             var filePath = FilePathCalculator.Calculate(args);
 
@@ -59,7 +59,7 @@ namespace Volo.Abp.BlobStoring.FileSystem
             return ExistsAsync(filePath);
         }
 
-        public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public override async 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 async override Task SaveAsync(BlobProviderSaveArgs args)
+        public override async 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 async override Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        public override async 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 async override Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        public override async 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 async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
             var blobName = MinioBlobNameCalculator.Calculate(args);
             var client = GetMinioClient(args);

framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapter.cs

@@ -18,7 +18,7 @@ namespace Volo.Abp.Castle.DynamicProxy
             Proceed = proceed;
         }
 
-        public async override Task ProceedAsync()
+        public override async Task ProceedAsync()
         {
             await Proceed(Invocation, ProceedInfo);
         }

framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs

@@ -19,7 +19,7 @@ namespace Volo.Abp.Castle.DynamicProxy
             Proceed = proceed;
         }
 
-        public async override Task ProceedAsync()
+        public override async Task ProceedAsync()
         {
             ReturnValue = await Proceed(Invocation, ProceedInfo);
         }

framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAsyncAbpInterceptorAdapter.cs

@@ -15,14 +15,14 @@ namespace Volo.Abp.Castle.DynamicProxy
             _abpInterceptor = abpInterceptor;
         }
 
-        protected async override Task InterceptAsync(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task> proceed)
+        protected override async Task InterceptAsync(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task> proceed)
         {
             await _abpInterceptor.InterceptAsync(
                 new CastleAbpMethodInvocationAdapter(invocation, proceedInfo, proceed)
             );
         }
 
-        protected async override Task<TResult> InterceptAsync<TResult>(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task<TResult>> proceed)
+        protected override async Task<TResult> InterceptAsync<TResult>(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task<TResult>> proceed)
         {
             var adapter = new CastleAbpMethodInvocationAdapterWithReturnValue<TResult>(invocation, proceedInfo, proceed);
 

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJob.cs

@@ -14,7 +14,7 @@ namespace Volo.Abp.Emailing
             EmailSender = emailSender;
         }
 
-        public async override Task ExecuteAsync(BackgroundEmailSendingJobArgs args)
+        public override async Task ExecuteAsync(BackgroundEmailSendingJobArgs args)
         {
             if (args.From.IsNullOrWhiteSpace())
             {

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSender.cs

@@ -67,7 +67,7 @@ namespace Volo.Abp.Emailing.Smtp
             }
         }
 
-        protected async override Task SendEmailAsync(MailMessage mail)
+        protected override async Task SendEmailAsync(MailMessage mail)
         {
             using (var smtpClient = await BuildClientAsync())
             {

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs

@@ -146,7 +146,7 @@ namespace Volo.Abp.EntityFrameworkCore
             }
         }
 
-        public async override Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = default)
+        public override async 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 async override Task PublishAsync(Type eventType, object eventData)
+        public override async 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 async override Task PublishAsync(Type eventType, object eventData)
+        public override async 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 async override Task PublishAsync(Type eventType, object eventData)
+        public override async 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 async override Task<string> GetOrNullAsync(FeatureDefinition feature)
+        public override async Task<string> GetOrNullAsync(FeatureDefinition feature)
         {
             var editionId = PrincipalAccessor.Principal?.FindEditionId();
             if (editionId == null)

framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs

@@ -35,7 +35,7 @@ namespace Volo.Abp.Features
             );
         }
 
-        public async override Task<string> GetOrNullAsync(string name)
+        public override async Task<string> GetOrNullAsync(string name)
         {
             var featureDefinition = FeatureDefinitionManager.Get(name);
             var providers = Enumerable

framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.Features
             CurrentTenant = currentTenant;
         }
 
-        public async override Task<string> GetOrNullAsync(FeatureDefinition feature)
+        public override async 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 async override Task Authenticate(RemoteServiceHttpClientAuthenticateContext context)
+        public override async Task Authenticate(RemoteServiceHttpClientAuthenticateContext context)
         {
             if (context.RemoteService.GetUseCurrentAccessToken() != false)
             {

framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AccessTokenProviderIdentityModelRemoteServiceHttpClientAuthenticator.cs

@@ -20,7 +20,7 @@ namespace Volo.Abp.Http.Client.IdentityModel.WebAssembly
             AccessTokenProvider = accessTokenProvider;
         }
 
-        public async override Task Authenticate(RemoteServiceHttpClientAuthenticateContext context)
+        public override async 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 async override Task InterceptAsync(IAbpMethodInvocation invocation)
+        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             if (invocation.Method.ReturnType.GenericTypeArguments.IsNullOrEmpty())
             {

framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs

@@ -28,7 +28,7 @@ namespace Volo.Abp.MailKit
             SmtpConfiguration = smtpConfiguration;
         }
 
-        protected async override Task SendEmailAsync(MailMessage mail)
+        protected override async Task SendEmailAsync(MailMessage mail)
         {
             using (var client = await BuildClientAsync())
             {

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

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Entities;
-using Volo.Abp.Domain.Repositories.MongoDB;
 
-namespace Volo.Abp.MongoDB.Volo.Abp.Domain.Repositories.MongoDB
+namespace Volo.Abp.Domain.Repositories.MongoDB
 {
     public interface IMongoDbBulkOperationProvider
     {

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

@@ -16,7 +16,6 @@ using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Guids;
 using Volo.Abp.MongoDB;
-using Volo.Abp.MongoDB.Volo.Abp.Domain.Repositories.MongoDB;
 
 namespace Volo.Abp.Domain.Repositories.MongoDB
 {

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

@@ -22,7 +22,7 @@ namespace Volo.Abp.Domain.Repositories
             return repository.ToMongoDbRepository().GetDatabaseAsync();
         }
 
-        [Obsolete("Use GetCollection method.")]
+        [Obsolete("Use GetCollectionAsync method.")]
         public static IMongoCollection<TEntity> GetCollection<TEntity, TKey>(this IBasicRepository<TEntity, TKey> repository)
             where TEntity : class, IEntity<TKey>
         {

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

@@ -19,12 +19,12 @@ namespace Volo.Abp.Settings
             CurrentTenant = currentTenant;
         }
 
-        public async override Task<string> GetOrNullAsync(SettingDefinition setting)
+        public override async Task<string> GetOrNullAsync(SettingDefinition setting)
         {
             return await SettingStore.GetOrNullAsync(setting.Name, Name, CurrentTenant.Id?.ToString());
         }
 
-        public async override Task<List<SettingValue>> GetAllAsync(SettingDefinition[] settings)
+        public override async Task<List<SettingValue>> GetAllAsync(SettingDefinition[] settings)
         {
             return await SettingStore.GetAllAsync(settings.Select(x => x.Name).ToArray(), Name, CurrentTenant.Id?.ToString());
         }

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

@@ -19,7 +19,7 @@ namespace Volo.Abp.Settings
             CurrentUser = currentUser;
         }
 
-        public async override Task<string> GetOrNullAsync(SettingDefinition setting)
+        public override async Task<string> GetOrNullAsync(SettingDefinition setting)
         {
             if (CurrentUser.Id == null)
             {
@@ -29,7 +29,7 @@ namespace Volo.Abp.Settings
             return await SettingStore.GetOrNullAsync(setting.Name, Name, CurrentUser.Id.ToString());
         }
 
-        public async override Task<List<SettingValue>> GetAllAsync(SettingDefinition[] settings)
+        public override async Task<List<SettingValue>> GetAllAsync(SettingDefinition[] settings)
         {
             if (CurrentUser.Id == null)
             {

framework/src/Volo.Abp.Swashbuckle/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs

@@ -15,8 +15,8 @@ namespace Microsoft.AspNetCore.Builder
 
             return app.UseSwaggerUI(options =>
             {
-                options.InjectJavascript("/swagger/ui/abp.js");
+                options.InjectJavascript("ui/abp.js");
-                options.InjectJavascript("/swagger/ui/abp.swagger.js");
+                options.InjectJavascript("ui/abp.swagger.js");
                 options.IndexStream = () => resolver.Resolver();
 
                 setupAction?.Invoke(options);

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json

@@ -30,7 +30,7 @@
     "PagerPrevious": "Anterior",
     "PagerFirst": "Primero",
     "PagerLast": "Último",
-    "PagerInfo": "Mostrando de la _START a la _END_ de _TOTAL_ entradas",
+    "PagerInfo": "Mostrando de la _START_ a la _END_ de _TOTAL_ entradas",
     "PagerInfo{0}{1}{2}": "Mostrando de la {0} a la {1} de {2} entradas",
     "PagerInfoEmpty": "Mostrando de la 0 a la 0 de 0 entradas",
     "PagerInfoFiltered": "(filtrado desde _MAX_ entradas totales)",

framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo/Abp/BlobStoring/Minio/AbpBlobStoringMinioTestModule.cs

@@ -60,7 +60,7 @@ namespace Volo.Abp.BlobStoring.Minio
             });
         }
 
-        public async override void OnApplicationShutdown(ApplicationShutdownContext context)
+        public override async void OnApplicationShutdown(ApplicationShutdownContext context)
         {
             var minioClient = new MinioClient(_endPoint, _accessKey, _secretKey);
             if (await minioClient.BucketExistsAsync(_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 async override Task InterceptAsync(IAbpMethodInvocation invocation)
+        public override async Task InterceptAsync(IAbpMethodInvocation invocation)
         {
             await Task.Delay(5);
 			(invocation.TargetObject as ICanLogOnObject)?.Logs?.Add($"{GetType().Name}_InterceptAsync_BeforeInvocation");

framework/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs

@@ -13,7 +13,7 @@ namespace Volo.Abp.DynamicProxy
 		    _cache = new ConcurrentDictionary<MethodInfo, object>();
 	    }
 
-	    public async override Task InterceptAsync(IAbpMethodInvocation invocation)
+	    public override async 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 async override Task InsertAsync()
+        public override async Task InsertAsync()
         {
             var person = new Person(Guid.NewGuid(), "New Person", 35);
             person.Phones.Add(new Phone(person.Id, "1234567890"));

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/DistrictAppService.cs

@@ -15,12 +15,12 @@ namespace Volo.Abp.TestApp.Application
         {
         }
 
-        protected async override Task DeleteByIdAsync(DistrictKey id)
+        protected override async Task DeleteByIdAsync(DistrictKey id)
         {
             await Repository.DeleteAsync(d => d.CityId == id.CityId && d.Name == id.Name);
         }
 
-        protected async override Task<District> GetEntityByIdAsync(DistrictKey id)
+        protected override async Task<District> GetEntityByIdAsync(DistrictKey id)
         {
             return await AsyncExecuter.FirstOrDefaultAsync(
                 Repository.Where(d => d.CityId == id.CityId && d.Name == id.Name)

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

@@ -40,7 +40,7 @@ namespace Volo.Abp.Identity
         public virtual async Task<PagedResultDto<IdentityRoleDto>> GetListAsync(GetIdentityRolesInput input)
         {
             var list = await RoleRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
-            var totalCount = await RoleRepository.GetCountAsync();
+            var totalCount = await RoleRepository.GetCountAsync(input.Filter);
 
             return new PagedResultDto<IdentityRoleDto>(
                 totalCount,

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs

@@ -18,7 +18,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
 
         }
 
-        public async Task<List<IdentitySecurityLog>> GetListAsync(
+        public virtual async Task<List<IdentitySecurityLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,
@@ -54,7 +54,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(cancellationToken);
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string applicationName = null,
@@ -84,7 +84,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             return await query.LongCountAsync(cancellationToken);
         }
 
-        public async Task<IdentitySecurityLog> GetByUserIdAsync(Guid id, Guid userId, bool includeDetails = false, CancellationToken cancellationToken = default)
+        public virtual async Task<IdentitySecurityLog> GetByUserIdAsync(Guid id, Guid userId, bool includeDetails = false, CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync())
                 .OrderBy(x => x.Id)

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityClaimTypeRepository.cs

@@ -47,7 +47,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             return identityClaimTypes;
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             string filter = null,
             CancellationToken cancellationToken = default)
         {

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityLinkUserRepository.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
 
         }
 
-        public async Task<IdentityLinkUser> FindAsync(IdentityLinkUserInfo sourceLinkUserInfo, IdentityLinkUserInfo targetLinkUserInfo, CancellationToken cancellationToken = default)
+        public virtual async Task<IdentityLinkUser> FindAsync(IdentityLinkUserInfo sourceLinkUserInfo, IdentityLinkUserInfo targetLinkUserInfo, CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync())
                 .OrderBy(x => x.Id).FirstOrDefaultAsync(x =>
@@ -28,7 +28,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 , cancellationToken: GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityLinkUser>> GetListAsync(IdentityLinkUserInfo linkUserInfo, CancellationToken cancellationToken = default)
+        public virtual async Task<List<IdentityLinkUser>> GetListAsync(IdentityLinkUserInfo linkUserInfo, CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync())
                 .Where(x =>

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs

@@ -64,7 +64,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             string filter = null,
             CancellationToken cancellationToken = default)
         {

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs

@@ -231,7 +231,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             return await query.ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityUser>> GetUsersInOrganizationsListAsync(
+        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationsListAsync(
             List<Guid> organizationUnitIds,
             CancellationToken cancellationToken = default
             )

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityClaimTypeRepository.cs

@@ -55,7 +55,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             string filter = null,
             CancellationToken cancellationToken = default)
         {

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityLinkUserRepository.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.Identity.MongoDB
         {
         }
 
-        public async Task<IdentityLinkUser> FindAsync(IdentityLinkUserInfo sourceLinkUserInfo, IdentityLinkUserInfo targetLinkUserInfo, CancellationToken cancellationToken = default)
+        public virtual async Task<IdentityLinkUser> FindAsync(IdentityLinkUserInfo sourceLinkUserInfo, IdentityLinkUserInfo targetLinkUserInfo, CancellationToken cancellationToken = default)
         {
             return await (await GetMongoQueryableAsync(cancellationToken))
                 .OrderBy(x => x.Id).FirstOrDefaultAsync(x =>
@@ -28,7 +28,7 @@ namespace Volo.Abp.Identity.MongoDB
                 , cancellationToken: GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityLinkUser>> GetListAsync(IdentityLinkUserInfo linkUserInfo, CancellationToken cancellationToken = default)
+        public virtual async Task<List<IdentityLinkUser>> GetListAsync(IdentityLinkUserInfo linkUserInfo, CancellationToken cancellationToken = default)
         {
             return await (await GetMongoQueryableAsync(cancellationToken)).Where(x =>
                     x.SourceUserId == linkUserInfo.UserId && x.SourceTenantId == linkUserInfo.TenantId ||

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs

@@ -18,7 +18,7 @@ namespace Volo.Abp.Identity.MongoDB
         {
         }
 
-        public async Task<IdentityRole> FindByNormalizedNameAsync(
+        public virtual async Task<IdentityRole> FindByNormalizedNameAsync(
             string normalizedRoleName,
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
@@ -28,7 +28,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .FirstOrDefaultAsync(r => r.NormalizedName == normalizedRoleName, GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityRole>> GetListAsync(
+        public virtual async Task<List<IdentityRole>> GetListAsync(
             string sorting = null,
             int maxResultCount = int.MaxValue,
             int skipCount = 0,
@@ -64,7 +64,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             string filter = null,
             CancellationToken cancellationToken = default)
         {

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs

@@ -19,7 +19,7 @@ namespace Volo.Abp.Identity.MongoDB
         {
         }
 
-        public async Task<List<IdentitySecurityLog>> GetListAsync(
+        public virtual async Task<List<IdentitySecurityLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,
@@ -53,7 +53,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string applicationName = null,
@@ -82,7 +82,7 @@ namespace Volo.Abp.Identity.MongoDB
         }
 
 
-        public async Task<IdentitySecurityLog> GetByUserIdAsync(Guid id, Guid userId, bool includeDetails = false,
+        public virtual async Task<IdentitySecurityLog> GetByUserIdAsync(Guid id, Guid userId, bool includeDetails = false,
             CancellationToken cancellationToken = default)
         {
             return await (await GetMongoQueryableAsync(cancellationToken)).OrderBy(x => x.Id).FirstOrDefaultAsync(x => x.Id == id && x.UserId == userId,

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs

@@ -53,7 +53,7 @@ namespace Volo.Abp.Identity.MongoDB
             return await dbContext.Roles.AsQueryable().Where(r => allRoleIds.Contains(r.Id)).Select(r => r.Name).ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<string>> GetRoleNamesInOrganizationUnitAsync(
+        public virtual async Task<List<string>> GetRoleNamesInOrganizationUnitAsync(
             Guid id,
             CancellationToken cancellationToken = default)
         {
@@ -178,7 +178,7 @@ namespace Volo.Abp.Identity.MongoDB
             return await dbContext.Roles.AsQueryable().Where(r => allRoleIds.Contains(r.Id)).ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
+        public virtual async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
             Guid id,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -210,7 +210,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .LongCountAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityUser>> GetUsersInOrganizationUnitAsync(
+        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationUnitAsync(
             Guid organizationUnitId,
             CancellationToken cancellationToken = default)
         {
@@ -221,7 +221,7 @@ namespace Volo.Abp.Identity.MongoDB
             return result;
         }
 
-        public async Task<List<IdentityUser>> GetUsersInOrganizationsListAsync(
+        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationsListAsync(
             List<Guid> organizationUnitIds,
             CancellationToken cancellationToken = default)
         {
@@ -232,7 +232,7 @@ namespace Volo.Abp.Identity.MongoDB
             return result;
         }
 
-        public async Task<List<IdentityUser>> GetUsersInOrganizationUnitWithChildrenAsync(
+        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationUnitWithChildrenAsync(
             string code,
             CancellationToken cancellationToken = default)
         {

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs

@@ -112,7 +112,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .CountAsync(cancellationToken);
         }
 
-        public async Task<List<IdentityRole>> GetUnaddedRolesAsync(
+        public virtual async Task<List<IdentityRole>> GetUnaddedRolesAsync(
             OrganizationUnit organizationUnit,
             string sorting = null,
             int maxResultCount = int.MaxValue,
@@ -132,7 +132,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(cancellationToken);
         }
 
-        public async Task<int> GetUnaddedRolesCountAsync(
+        public virtual async Task<int> GetUnaddedRolesCountAsync(
             OrganizationUnit organizationUnit,
             string filter = null,
             CancellationToken cancellationToken = default)
@@ -174,7 +174,7 @@ namespace Volo.Abp.Identity.MongoDB
             return await query.CountAsync(cancellationToken);
         }
 
-        public async Task<List<IdentityUser>> GetUnaddedUsersAsync(
+        public virtual async Task<List<IdentityUser>> GetUnaddedUsersAsync(
             OrganizationUnit organizationUnit,
             string sorting = null,
             int maxResultCount = int.MaxValue,
@@ -199,7 +199,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<int> GetUnaddedUsersCountAsync(OrganizationUnit organizationUnit, string filter = null,
+        public virtual async Task<int> GetUnaddedUsersCountAsync(OrganizationUnit organizationUnit, string filter = null,
             CancellationToken cancellationToken = default)
         {
             var dbContext = await GetDbContextAsync(cancellationToken);

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/IApiResourceRepository.cs

@@ -35,6 +35,11 @@ namespace Volo.Abp.IdentityServer.ApiResources
             CancellationToken cancellationToken = default
         );
 
+        Task<long> GetCountAsync(
+            string filter = null,
+            CancellationToken cancellationToken = default
+        );
+
         Task<bool> CheckNameExistAsync(
             string name,
             Guid? expectedId = null,

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiScopes/IApiScopeRepository.cs

@@ -29,6 +29,11 @@ namespace Volo.Abp.IdentityServer.ApiScopes
             CancellationToken cancellationToken = default
         );
 
+        Task<long> GetCountAsync(
+            string filter = null,
+            CancellationToken cancellationToken = default
+        );
+
         Task<bool> CheckNameExistAsync(
             string name,
             Guid? expectedId = null,

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/IClientRepository.cs

@@ -24,6 +24,11 @@ namespace Volo.Abp.IdentityServer.Clients
             CancellationToken cancellationToken = default
         );
 
+        Task<long> GetCountAsync(
+            string filter = null,
+            CancellationToken cancellationToken = default
+        );
+
         Task<List<string>> GetAllDistinctAllowedCorsOriginsAsync(CancellationToken cancellationToken = default);
 
         Task<bool> CheckClientIdExistAsync(

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs

@@ -23,6 +23,11 @@ namespace Volo.Abp.IdentityServer.IdentityResources
             CancellationToken cancellationToken = default
         );
 
+        Task<long> GetCountAsync(
+            string filter = null,
+            CancellationToken cancellationToken = default
+        );
+
         Task<IdentityResource> FindByNameAsync(
             string name,
             bool includeDetails = true,

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs

@@ -68,6 +68,16 @@ namespace Volo.Abp.IdentityServer.ApiResources
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .WhereIf(!filter.IsNullOrWhiteSpace(),
+                    x => x.Name.Contains(filter) ||
+                            x.Description.Contains(filter) ||
+                            x.DisplayName.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public virtual async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync()).AnyAsync(ar => ar.Id != expectedId && ar.Name == name, GetCancellationToken(cancellationToken));

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiScopes/ApiScopeRepository.cs

@@ -48,6 +48,16 @@ namespace Volo.Abp.IdentityServer.ApiScopes
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .WhereIf(!filter.IsNullOrWhiteSpace(),
+                    x => x.Name.Contains(filter) ||
+                         x.Description.Contains(filter) ||
+                         x.DisplayName.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync()).AnyAsync(x => x.Id != expectedId && x.Name == name, GetCancellationToken(cancellationToken));

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs

@@ -41,6 +41,13 @@ namespace Volo.Abp.IdentityServer.Clients
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .WhereIf(!filter.IsNullOrWhiteSpace(), x => x.ClientId.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public virtual async Task<List<string>> GetAllDistinctAllowedCorsOriginsAsync(CancellationToken cancellationToken = default)
         {
             return await (await GetDbContextAsync()).ClientCorsOrigins

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceRepository.cs

@@ -55,6 +55,16 @@ namespace Volo.Abp.IdentityServer.IdentityResources
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .WhereIf(!filter.IsNullOrWhiteSpace(),
+                    x => x.Name.Contains(filter) ||
+                         x.Description.Contains(filter) ||
+                         x.DisplayName.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public virtual async Task<IdentityResource> FindByNameAsync(
             string name,
             bool includeDetails = true,

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiResourceRepository.cs

@@ -56,6 +56,16 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .WhereIf<ApiResource, IMongoQueryable<ApiResource>>(!filter.IsNullOrWhiteSpace(),
+                x => x.Name.Contains(filter) ||
+                     x.Description.Contains(filter) ||
+                     x.DisplayName.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public virtual async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await (await GetMongoQueryableAsync(cancellationToken))

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiScopeRepository.cs

@@ -53,6 +53,16 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .WhereIf<ApiScope, IMongoQueryable<ApiScope>>(!filter.IsNullOrWhiteSpace(),
+                    x => x.Name.Contains(filter) ||
+                         x.Description.Contains(filter) ||
+                         x.DisplayName.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await (await GetMongoQueryableAsync(cancellationToken))

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoClientRepository.cs

@@ -48,6 +48,14 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .WhereIf<Client, IMongoQueryable<Client>>(!filter.IsNullOrWhiteSpace(),
+                    x => x.ClientId.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public virtual async Task<List<string>> GetAllDistinctAllowedCorsOriginsAsync(
             CancellationToken cancellationToken = default)
         {

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoIdentityResourceRepository.cs

@@ -30,6 +30,16 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .WhereIf<IdentityResource, IMongoQueryable<IdentityResource>>(!filter.IsNullOrWhiteSpace(),
+                    x => x.Name.Contains(filter) ||
+                         x.Description.Contains(filter) ||
+                         x.DisplayName.Contains(filter))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
         public virtual async Task<IdentityResource> FindByNameAsync(
             string name,
             bool includeDetails = true,

npm/ng-packs/package.json

@@ -80,7 +80,7 @@
     "just-compare": "^1.3.0",
     "lerna": "^3.19.0",
     "ng-packagr": "^11.0.1",
-    "ng-zorro-antd": "^10.1.1",
+    "ng-zorro-antd": "^11.0.1",
     "ngxs-schematic": "^1.1.9",
     "prettier": "^2.2.0",
     "protractor": "~7.0.0",

npm/ng-packs/packages/components/package.json

@@ -11,7 +11,7 @@
     "@ng-bootstrap/ng-bootstrap": ">=6.0.0"
   },
   "dependencies": {
-    "ng-zorro-antd": "^9.3.0",
+    "ng-zorro-antd": "^11.0.0",
     "tslib": "^2.0.0"
   },
   "publishConfig": {