Merge pull request #22868 from abpframework/auto-merge/rel-9-1/3722

Merge branch rel-9.2 with rel-9.1

framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

@@ -552,6 +552,11 @@ public abstract class AbpCrudPageBase<
 
     protected virtual async Task OnDeletedEntityAsync()
     {
+        if (Entities.Count == 1 && CurrentPage > 1)
+        {
+            CurrentPage -= 1;
+        }
+
         await GetEntitiesAsync();
         await InvokeAsync(StateHasChanged);
         await Notify.Success(GetDeleteMessage());

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUrls.cs

@@ -5,9 +5,24 @@ namespace Volo.Abp.Cli;
 
 public static class CliUrls
 {
-    public static string WwwAbpIo = WwwAbpIoProduction;
-    public static string AccountAbpIo = AccountAbpIoProduction;
-    public static string NuGetRootPath = NuGetRootPathProduction;
+    public static string WwwAbpIo
+    {
+        get => WwwAbpIoProduction;
+        set => WwwAbpIoProduction = value;
+    }
+
+    public static string AccountAbpIo
+    {
+        get => AccountAbpIoProduction;
+        set => AccountAbpIoProduction = value;
+    }
+
+    public static string NuGetRootPath
+    {
+        get => NuGetRootPathProduction;
+        set => NuGetRootPathProduction = value;
+    }
+
     public static string LatestVersionCheckFullPath = "https://raw.githubusercontent.com/abpframework/abp/dev/latest-versions.json";
 
     public static string WwwAbpIoProduction = "https://abp.io/";