From b7cf3c8b8ad5c2c149b781581d87eeb7f06c1292 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 15 Sep 2021 11:15:45 +0300 Subject: [PATCH] Update CsprojFileManager.cs --- .../Volo/Abp/Studio/Modifying/CsprojFileManager.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/CsprojFileManager.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/CsprojFileManager.cs index 4087f5d6ae..61a7d0c084 100644 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/CsprojFileManager.cs +++ b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/CsprojFileManager.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Threading.Tasks; using System.Xml; using Volo.Abp.DependencyInjection; @@ -13,10 +14,19 @@ namespace Volo.Abp.Studio.Packages.Modifying { var document = await GetXmlDocumentAsync(filePath); - if (document.SelectNodes($"/Project/ItemGroup/ProjectReference[starts-with(@Include, '{projectToReference}')]").Count > 0) + /*if (document.SelectNodes($"/Project/ItemGroup/ProjectReference[ends-with(@Include, '{Path.GetFileName(projectToReference)}')]").Count > 0) { - // Project reference is already added. return; + }*/ + + var packageReferenceToSameProject = + document.SelectNodes( + $"/Project/ItemGroup/PackageReference[starts-with(@Include, '{Path.GetFileName(projectToReference).RemovePostFix(".csproj")}')]" + ); + + if (packageReferenceToSameProject.Count > 0) + { + packageReferenceToSameProject[0].ParentNode.RemoveChild(packageReferenceToSameProject[0]); } var relativePath = PathHelper.GetRelativePath(filePath, projectToReference);