From 78c70353487e4b8374f1bd0acc310a8d5375ace8 Mon Sep 17 00:00:00 2001 From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com> Date: Tue, 19 Mar 2024 15:20:30 +0300 Subject: [PATCH] CLI: Check HttpApi.Host project for SignalR nuget package target. --- .../Volo/Abp/Cli/ProjectModification/ProjectFinder.cs | 4 ++-- .../Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 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 1a72e3d4e85..45df2a870f2 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 @@ -46,8 +46,8 @@ public static string FindNuGetTargetProjectFile(string[] projectFiles, NuGetPack return FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi.Client"); case NuGetPackageTarget.SignalR: return FindProjectEndsWith(projectFiles, assemblyNames, ".SignalR") ?? - FindProjectEndsWith(projectFiles, assemblyNames, ".Web") ?? - FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi.Host"); + FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi.Host") ?? + FindProjectEndsWith(projectFiles, assemblyNames, ".Web"); case NuGetPackageTarget.Blazor: return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor") ?? FindProjectEndsWith(projectFiles, assemblyNames, ".MauiBlazor");; 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 08152db2f89..372198cde65 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 @@ -625,7 +625,7 @@ await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile private async Task AddNugetAndNpmReferences(ModuleWithMastersInfo module, string[] projectFiles, bool useDotnetCliToInstall) { - var webPackagesWillBeAddedToBlazorServerProject = SouldWebPackagesBeAddedToBlazorServerProject(module, projectFiles); + var webPackagesWillBeAddedToBlazorServerProject = ShouldWebPackagesBeAddedToBlazorServerProject(module, projectFiles); await PublishEventAsync(3, "Adding nuget package references"); foreach (var nugetPackage in module.NugetPackages) @@ -687,7 +687,7 @@ private async Task AddNugetAndNpmReferences(ModuleWithMastersInfo module, string } } - private static bool SouldWebPackagesBeAddedToBlazorServerProject(ModuleWithMastersInfo module, string[] projectFiles) + private static bool ShouldWebPackagesBeAddedToBlazorServerProject(ModuleWithMastersInfo module, string[] projectFiles) { var blazorProject = projectFiles.FirstOrDefault(p => p.EndsWith(".Blazor.csproj"));