From 5bbe63e1a4b3f207b2d0bbf752ef1abad48f49ef Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 24 Mar 2021 15:35:56 +0300 Subject: [PATCH] Update ProjectNugetPackageAdder.cs --- .../ProjectNugetPackageAdder.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 5fb5564909..8665a80bc3 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 @@ -83,6 +83,11 @@ namespace Volo.Abp.Cli.ProjectModification bool withSourceCode = false, bool addSourceCodeToSolutionFile = false) { + if (version == null) + { + version = GetAbpVersionOrNull(projectFile); + } + await AddAsPackageReference(projectFile, package, version, useDotnetCliToInstall); if (withSourceCode) @@ -204,11 +209,6 @@ namespace Volo.Abp.Cli.ProjectModification return; } - if (version == null) - { - version = GetAbpVersionOrNull(projectFileContent); - } - using (DirectoryHelper.ChangeCurrentDirectory(Path.GetDirectoryName(projectFile))) { Logger.LogInformation( @@ -301,8 +301,10 @@ namespace Volo.Abp.Cli.ProjectModification return Task.CompletedTask; } - private string GetAbpVersionOrNull(string projectFileContent) + private string GetAbpVersionOrNull(string projectFile) { + var projectFileContent = File.ReadAllText(projectFile); + var doc = new XmlDocument() {PreserveWhitespace = true}; doc.Load(StreamHelper.GenerateStreamFromString(projectFileContent));