Merge pull request #8597 from abpframework/issue/8573

Cli add-module: Use MVC package for blazor-server application when module doesn't have a blazor package

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

@@ -51,10 +51,16 @@ namespace Volo.Abp.Cli.ProjectModification
                     return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
                 case NuGetPackageTarget.BlazorWebAssembly:
                     var BlazorWebAssemblyTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
-                    return BlazorWebAssemblyTargetProject != null && !BlazorProjectTypeChecker.IsBlazorServerProject(BlazorWebAssemblyTargetProject) ? BlazorWebAssemblyTargetProject : null;
+                    return BlazorWebAssemblyTargetProject != null &&
+                           !BlazorProjectTypeChecker.IsBlazorServerProject(BlazorWebAssemblyTargetProject)
+                        ? BlazorWebAssemblyTargetProject
+                        : null;
                 case NuGetPackageTarget.BlazorServer:
                     var BlazorServerTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
-                    return BlazorServerTargetProject != null && BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject) ? BlazorServerTargetProject : null;
+                    return BlazorServerTargetProject != null &&
+                           BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject)
+                        ? BlazorServerTargetProject
+                        : null;
                 default:
                     return null;
             }
@@ -94,6 +100,14 @@ namespace Volo.Abp.Cli.ProjectModification
                 projects.Add(project);
             }
 
+            project = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
+            if (project != null &&
+                File.Exists(project) &&
+                BlazorProjectTypeChecker.IsBlazorServerProject(project))
+            {
+                projects.Add(project);
+            }
+
             return projects.ToArray();
         }
 
@@ -120,8 +134,8 @@ namespace Volo.Abp.Cli.ProjectModification
             for (var i = 0; i < assemblyNames.Length; i++)
             {
                 var assemblyName = assemblyNames[i];
-                if(assemblyName.EndsWith(postfix, StringComparison.OrdinalIgnoreCase) &&
-                   (excludePostfix == null || !assemblyName.EndsWith(excludePostfix)))
+                if (assemblyName.EndsWith(postfix, StringComparison.OrdinalIgnoreCase) &&
+                    (excludePostfix == null || !assemblyName.EndsWith(excludePostfix)))
                 {
                     return projectFiles[i];
                 }
@@ -165,4 +179,4 @@ namespace Volo.Abp.Cli.ProjectModification
             return projectFolders.ToArray();
         }
     }
-}
+}

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

@@ -189,6 +189,7 @@ namespace Volo.Abp.Cli.ProjectModification
             var moduleDirectory = Path.Combine(solutionDirectory, "modules", module.Name);
             var moduleSolutionFile = Directory.GetFiles(moduleDirectory, "*.sln", SearchOption.TopDirectoryOnly).First();
             var isProjectTiered = await IsProjectTiered(projectFiles);
+            var webPackagesWillBeAddedToBlazorServerProject = false;
 
             var blazorProject = projectFiles.FirstOrDefault(p => p.EndsWith(".Blazor.csproj"));
             if (blazorProject == null)
@@ -205,6 +206,8 @@ namespace Volo.Abp.Cli.ProjectModification
                 if (isBlazorServer)
                 {
                     await RemoveProjectByTarget(module, moduleSolutionFile, NuGetPackageTarget.BlazorWebAssembly, isProjectTiered);
+
+                    webPackagesWillBeAddedToBlazorServerProject = module.NugetPackages.All(np=> np.Target != NuGetPackageTarget.BlazorServer && np.TieredTarget != NuGetPackageTarget.BlazorServer);
                 }
                 else
                 {
@@ -212,7 +215,7 @@ namespace Volo.Abp.Cli.ProjectModification
                 }
             }
 
-            if (!projectFiles.Any(p => p.EndsWith(".Web.csproj")))
+            if (!projectFiles.Any(p => p.EndsWith(".Web.csproj")) && !webPackagesWillBeAddedToBlazorServerProject)
             {
                 await RemoveProjectByTarget(module, moduleSolutionFile, NuGetPackageTarget.Web, isProjectTiered);
             }
@@ -459,6 +462,8 @@ namespace Volo.Abp.Cli.ProjectModification
         private async Task AddNugetAndNpmReferences(ModuleWithMastersInfo module, string[] projectFiles,
             bool useDotnetCliToInstall)
         {
+            var webPackagesWillBeAddedToBlazorServerProject = SouldWebPackagesBeAddedToBlazorServerProject(module, projectFiles);
+
             foreach (var nugetPackage in module.NugetPackages)
             {
                 var nugetTarget =
@@ -466,6 +471,11 @@ namespace Volo.Abp.Cli.ProjectModification
                         ? nugetPackage.TieredTarget
                         : nugetPackage.Target;
 
+                if (webPackagesWillBeAddedToBlazorServerProject && nugetTarget == NuGetPackageTarget.Web)
+                {
+                    nugetTarget = NuGetPackageTarget.BlazorServer;
+                }
+
                 var targetProjectFile = ProjectFinder.FindNuGetTargetProjectFile(projectFiles, nugetTarget);
                 if (targetProjectFile == null)
                 {
@@ -501,6 +511,19 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
+        private static bool SouldWebPackagesBeAddedToBlazorServerProject(ModuleWithMastersInfo module, string[] projectFiles)
+        {
+            var blazorProject = projectFiles.FirstOrDefault(p => p.EndsWith(".Blazor.csproj"));
+
+            if (blazorProject == null)
+            {
+                return false;
+            }
+
+            var isBlazorServerProject = BlazorProjectTypeChecker.IsBlazorServerProject(blazorProject);
+            return isBlazorServerProject && module.NugetPackages.All(np => np.Target != NuGetPackageTarget.BlazorServer && np.TieredTarget != NuGetPackageTarget.BlazorServer);
+        }
+
         protected void ModifyDbContext(string[] projectFiles, ModuleInfo module, bool skipDbMigrations = false)
         {
             if (string.IsNullOrWhiteSpace(module.EfCoreConfigureMethodName))