Browse Source
Merge pull request #19348 from abpframework/EngincanV/cli-signalr
CLI: Check `HttpApi.Host` project if exists for SignalR nuget package target to add the related package to the project
pull/19364/head
liangshiwei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
4 additions and
4 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
|
|
|
@ -46,8 +46,8 @@ public static class ProjectFinder |
|
|
|
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");; |
|
|
|
|
|
|
|
@ -625,7 +625,7 @@ public class SolutionModuleAdder : ITransientDependency |
|
|
|
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 @@ public class SolutionModuleAdder : ITransientDependency |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
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")); |
|
|
|
|
|
|
|
|