From df8311b2aba5ff936323906ef6896a19223f660f Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 27 Jun 2019 14:00:32 +0800 Subject: [PATCH] Use a regular expression to get the package name. --- .../Building/Steps/NugetReferenceReplaceStep.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs index 49ccb308c8..e3fb2e8b29 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text.RegularExpressions; using HtmlAgilityPack; using Volo.Abp.Cli.ProjectBuilding.Files; @@ -92,11 +93,13 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps private string ConvertToNugetReference(string oldValue) { - var directory = new DirectoryInfo(oldValue); - - var newValue = directory.Name.Replace(".csproj", ""); + var newValue = Regex.Match(oldValue, @"\\((?!.+?\\).+?)\.csproj"); + if (newValue.Success && newValue.Groups.Count == 2) + { + return newValue.Groups[1].Value; + } - return newValue; + return oldValue; } private static Stream GenerateStreamFromString(string s)