Merge pull request #10398 from abpframework/liangshiwei/patch

Change virtual keyword order
abpframework · Oct 22, 2021 · dfe6517 · dfe6517
2 parents 8ba028d + 7533fda
commit dfe6517
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs b/...Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs
@@ -13,7 +13,7 @@ public AbpPageToolbarViewComponent(IPageToolbarManager toolbarManager)
             ToolbarManager = toolbarManager;
         }
 
-        public async Task<IViewComponentResult> InvokeAsync(string pageName)
+        public virtual async Task<IViewComponentResult> InvokeAsync(string pageName)
         {
             var items = await ToolbarManager.GetItemsAsync(pageName);
             return View("~/Pages/Shared/Components/AbpPageToolbar/Default.cshtml", items);

diff --git a/...AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs b/...AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs
@@ -13,7 +13,7 @@ public MainNavbarMenuViewComponent(IMenuManager menuManager)
             MenuManager = menuManager;
         }
 
-        public async virtual Task<IViewComponentResult> InvokeAsync()
+        public virtual async Task<IViewComponentResult> InvokeAsync()
         {
             var menu = await MenuManager.GetMainMenuAsync();
             return View("~/Themes/Basic/Components/Menu/Default.cshtml", menu);

diff --git a/...Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs b/...Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs
@@ -17,7 +17,7 @@ public LanguageSwitchViewComponent(ILanguageProvider languageProvider)
             LanguageProvider = languageProvider;
         }
 
-        public async virtual Task<IViewComponentResult> InvokeAsync()
+        public virtual async Task<IViewComponentResult> InvokeAsync()
         {
             var languages = await LanguageProvider.GetLanguagesAsync();
             var currentLanguage = languages.FindByCulture(

diff --git a/...Core.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs b/...Core.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs
@@ -13,7 +13,7 @@ public MainNavbarToolbarViewComponent(IToolbarManager toolbarManager)
             ToolbarManager = toolbarManager;
         }
 
-        public async virtual Task<IViewComponentResult> InvokeAsync()
+        public virtual async Task<IViewComponentResult> InvokeAsync()
         {
             var toolbar = await ToolbarManager.GetAsync(StandardToolbars.Main);
             return View("~/Themes/Basic/Components/Toolbar/Default.cshtml", toolbar);

diff --git a/...Core.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs b/...Core.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs
@@ -13,7 +13,7 @@ public UserMenuViewComponent(IMenuManager menuManager)
             MenuManager = menuManager;
         }
 
-        public async virtual Task<IViewComponentResult> InvokeAsync()
+        public virtual async Task<IViewComponentResult> InvokeAsync()
         {
             var menu = await MenuManager.GetAsync(StandardMenus.User);
             return View("~/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml", menu);

diff --git a/...rc/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Components/TagEditor/TagEditorViewComponent.cs b/...rc/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Components/TagEditor/TagEditorViewComponent.cs
@@ -22,7 +22,7 @@ public TagEditorViewComponent(ITagAppService tagAppService)
             TagAppService = tagAppService;
         }
 
-        public async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId, bool displaySubmitButton = true)
+        public virtual async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId, bool displaySubmitButton = true)
         {
             var tags =
                 entityId.IsNullOrWhiteSpace() ?

diff --git a/...eb/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs b/...eb/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs
@@ -14,7 +14,7 @@ public EmailSettingGroupViewComponent(IEmailSettingsAppService emailSettingsAppS
             EmailSettingsAppService = emailSettingsAppService;
         }
 
-        public async virtual Task<IViewComponentResult> InvokeAsync()
+        public virtual async Task<IViewComponentResult> InvokeAsync()
         {
             var model = await EmailSettingsAppService.GetAsync();