From 287a9696449ebcb70874e7e7db99b8b6547915d1 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 13 Apr 2021 14:36:26 +0300 Subject: [PATCH 1/2] Cli add-module: Use MVC package for blazor-server application when module doesn't have a blazor package resolves https://github.com/abpframework/abp/issues/8573 --- .../Cli/ProjectModification/ProjectFinder.cs | 6 +++++ .../SolutionModuleAdder.cs | 25 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs index 7cc0423892..57adc5dd9b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs @@ -94,6 +94,12 @@ namespace Volo.Abp.Cli.ProjectModification projects.Add(project); } + project = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); + if (project != null && BlazorProjectTypeChecker.IsBlazorServerProject(project)) + { + projects.Add(project); + } + return projects.ToArray(); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 4e66954dcc..3b5e695203 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/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)) From a36fe74269866cc6f94cddda37fdccb402b44839 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Wed, 14 Apr 2021 03:20:34 +0300 Subject: [PATCH 2/2] refactor BlazorProjectTypeChecker #8573 --- .../Cli/ProjectModification/ProjectFinder.cs | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs index 57adc5dd9b..6c41fa3330 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs +++ b/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; } @@ -95,7 +101,9 @@ namespace Volo.Abp.Cli.ProjectModification } project = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); - if (project != null && BlazorProjectTypeChecker.IsBlazorServerProject(project)) + if (project != null && + File.Exists(project) && + BlazorProjectTypeChecker.IsBlazorServerProject(project)) { projects.Add(project); } @@ -126,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]; } @@ -171,4 +179,4 @@ namespace Volo.Abp.Cli.ProjectModification return projectFolders.ToArray(); } } -} +} \ No newline at end of file