Merge pull request #25892 from abpframework/auto-merge/rel-10-6/4736

Merge branch dev with rel-10.6

framework/src/Volo.Abp.MudBlazorUI/Components/UiMessageAlert.razor.cs

@@ -88,13 +88,16 @@ public partial class UiMessageAlert : ComponentBase, IDisposable
 
     private async void OnMessageReceived(object? sender, UiMessageEventArgs e)
     {
-        MessageType = e.MessageType;
-        Message = e.Message;
-        Title = e.Title;
-        Options = e.Options;
-        Callback = e.Callback;
+        await InvokeAsync(async () =>
+        {
+            MessageType = e.MessageType;
+            Message = e.Message;
+            Title = e.Title;
+            Options = e.Options;
+            Callback = e.Callback;
 
-        await ShowMessageAlert();
+            await ShowMessageAlert();
+        });
     }
 
     protected virtual async Task ShowMessageAlert()

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor.cs

@@ -27,7 +27,7 @@ public partial class NavMenu : IDisposable
         _ = InvokeAsync(async () =>
         {
             Menu = await MenuManager.GetMainMenuAsync();
-            StateHasChanged();
+            await InvokeAsync(StateHasChanged);
         });
     }
 

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavToolbar.razor

@@ -49,7 +49,7 @@
         _ = InvokeAsync(async () =>
         {
             await GetToolbarItemRendersAsync();
-            StateHasChanged();
+            await InvokeAsync(StateHasChanged);
         });
     }