Browse Source

Restore the sourceFile variable.

pull/3060/head
maliming 7 years ago
parent
commit
b740ca2292
  1. 9
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs

9
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -52,6 +52,7 @@ namespace Volo.Abp.Cli.ProjectModification
foreach (XmlNode oldNode in nodes) foreach (XmlNode oldNode in nodes)
{ {
var tempSourceFile = sourceFile;
var oldNodeIncludeValue = oldNode?.Attributes?["Include"]?.Value; var oldNodeIncludeValue = oldNode?.Attributes?["Include"]?.Value;
var moduleName = nugetPackageList.FirstOrDefault(n => n.NugetPackage.Name == oldNodeIncludeValue)?.ModuleName; var moduleName = nugetPackageList.FirstOrDefault(n => n.NugetPackage.Name == oldNodeIncludeValue)?.ModuleName;
@ -67,11 +68,11 @@ namespace Volo.Abp.Cli.ProjectModification
if (oldNodeIncludeValue.EndsWith(".test", StringComparison.InvariantCultureIgnoreCase) || if (oldNodeIncludeValue.EndsWith(".test", StringComparison.InvariantCultureIgnoreCase) ||
oldNodeIncludeValue.EndsWith(".tests", StringComparison.InvariantCultureIgnoreCase)) oldNodeIncludeValue.EndsWith(".tests", StringComparison.InvariantCultureIgnoreCase))
{ {
sourceFile = "test"; tempSourceFile = "test";
} }
else else
{ {
sourceFile = "src"; tempSourceFile = "src";
} }
} }
else else
@ -81,7 +82,7 @@ namespace Volo.Abp.Cli.ProjectModification
} }
var referenceProjectPath = var referenceProjectPath =
$"{localPathPrefix}{moduleName}\\{sourceFile}\\{oldNodeIncludeValue}\\{oldNodeIncludeValue}.csproj"; $"{localPathPrefix}{moduleName}\\{tempSourceFile}\\{oldNodeIncludeValue}\\{oldNodeIncludeValue}.csproj";
XmlNode newNode = GetNewReferenceNode(doc, referenceProjectPath); XmlNode newNode = GetNewReferenceNode(doc, referenceProjectPath);

Loading…
Cancel
Save