Merge pull request #15020 from abpframework/auto-merge/rel-7-0/1559

Merge branch dev with rel-7.0

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageTarget.cs

@@ -16,5 +16,6 @@ public enum NuGetPackageTarget : byte
     Blazor = 11,
     IdentityServer = 12, //todo: Rename to AuthServer
     BlazorServer = 13,
-    BlazorWebAssembly = 14
+    BlazorWebAssembly = 14,
+    MauiBlazor = 15
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs

@@ -49,7 +49,8 @@ public static class ProjectFinder
                        FindProjectEndsWith(projectFiles, assemblyNames, ".Web") ??
                        FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi.Host");
             case NuGetPackageTarget.Blazor:
-                return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
+                return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor")
+                    ?? FindProjectEndsWith(projectFiles, assemblyNames, ".MauiBlazor");;
             case NuGetPackageTarget.BlazorWebAssembly:
                 var BlazorWebAssemblyTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
                 return BlazorWebAssemblyTargetProject != null &&
@@ -62,6 +63,8 @@ public static class ProjectFinder
                        BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject)
                     ? BlazorServerTargetProject
                     : null;
+            case NuGetPackageTarget.MauiBlazor:
+                return FindProjectEndsWith(projectFiles, assemblyNames, ".MauiBlazor");
             default:
                 return null;
         }