From 855117ac9df7fb4e7ddb0abac6b621d2239b07ae Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 2 Apr 2021 15:35:11 +0300 Subject: [PATCH] Cli add-package: Should also replace package references in other projects resolves https://github.com/abpframework/abp/issues/8352 --- .../ProjectNugetPackageAdder.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs index 7d9f81056f..6d88ecb3ec 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs @@ -113,7 +113,12 @@ namespace Volo.Abp.Cli.ProjectModification if (withSourceCode) { await AddSourceCode(projectFile, solutionFile, package, version); - await ConvertPackageReferenceToProjectReference(projectFile, solutionFile, package); + + var projectFilesInSolution = Directory.GetFiles(Path.GetDirectoryName(solutionFile), "*.csproj", SearchOption.AllDirectories); + foreach (var projectFileInSolution in projectFilesInSolution) + { + await ConvertPackageReferenceToProjectReference(projectFileInSolution, solutionFile, package); + } if (addSourceCodeToSolutionFile) { @@ -145,7 +150,7 @@ namespace Volo.Abp.Cli.ProjectModification var nodes = doc.SelectNodes( $"/Project/ItemGroup/PackageReference[starts-with(@Include, '{package.Name}')]"); - if (nodes == null) + if (nodes == null || nodes.Count < 1) { return; } @@ -277,7 +282,14 @@ namespace Volo.Abp.Cli.ProjectModification package.Target == NuGetPackageTarget.BlazorServer || package.Target == NuGetPackageTarget.BlazorWebAssembly)) { - await RunBundleForBlazorAsync(projectFile); + try + { + await RunBundleForBlazorAsync(projectFile); + } + catch (Exception e) + { + Logger.LogWarning("Couldn't run bundle for blazor."); + } } Logger.LogInformation("Successfully installed.");