Browse Source

Update NugetReferenceReplaceStep.cs

pull/1774/head
Yunus Emre Kalkan 7 years ago
parent
commit
55c4520b43
  1. 14
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs

14
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs

@ -19,8 +19,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
new NugetReferenceReplacer( new NugetReferenceReplacer(
context.Files, context.Files,
"MyCompanyName", "MyCompanyName.MyProjectName",
"MyProjectName",
nugetPackageVersion nugetPackageVersion
).Run(); ).Run();
} }
@ -47,19 +46,16 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
private class NugetReferenceReplacer private class NugetReferenceReplacer
{ {
private readonly List<FileEntry> _entries; private readonly List<FileEntry> _entries;
private readonly string _companyNamePlaceHolder; private readonly string _companyAndProjectNamePlaceHolder;
private readonly string _projectNamePlaceHolder;
private readonly string _nugetPackageVersion; private readonly string _nugetPackageVersion;
public NugetReferenceReplacer( public NugetReferenceReplacer(
List<FileEntry> entries, List<FileEntry> entries,
string companyNamePlaceHolder, string companyAndProjectNamePlaceHolder,
string projectNamePlaceHolder,
string nugetPackageVersion) string nugetPackageVersion)
{ {
_entries = entries; _entries = entries;
_companyNamePlaceHolder = companyNamePlaceHolder; _companyAndProjectNamePlaceHolder = companyAndProjectNamePlaceHolder;
_projectNamePlaceHolder = projectNamePlaceHolder;
_nugetPackageVersion = nugetPackageVersion; _nugetPackageVersion = nugetPackageVersion;
} }
@ -96,7 +92,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
var oldNodeIncludeValue = oldNode.Attributes["Include"].Value; var oldNodeIncludeValue = oldNode.Attributes["Include"].Value;
// ReSharper disable once PossibleNullReferenceException : Can not be null because nodes are selected with include attribute filter in previous method // ReSharper disable once PossibleNullReferenceException : Can not be null because nodes are selected with include attribute filter in previous method
if (oldNodeIncludeValue.Contains($"{_companyNamePlaceHolder}.{_projectNamePlaceHolder}")) if (oldNodeIncludeValue.Contains($"{_companyAndProjectNamePlaceHolder}"))
{ {
continue; continue;
} }

Loading…
Cancel
Save