Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/1913/head
Halil İbrahim Kalkan 7 years ago
parent
commit
8854f9d27d
  1. 19
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs

19
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs

@ -128,9 +128,22 @@ namespace Volo.Abp.Cli.ProjectModification
protected virtual List<JProperty> GetAbpPackagesFromPackageJson(JObject fileObject) protected virtual List<JProperty> GetAbpPackagesFromPackageJson(JObject fileObject)
{ {
var dependencies = (JObject)fileObject["dependencies"]; var dependencyList = new [] { "dependencies", "devDependencies", "peerDependencies" };
var properties = dependencies.Properties().ToList(); var abpPackages = new List<JProperty>();
var abpPackages = properties.Where(p => p.Name.StartsWith("@abp/") || p.Name.StartsWith("@volo/")).ToList();
foreach (var dependencyListName in dependencyList)
{
var dependencies = (JObject)fileObject[dependencyListName];
if (dependencies == null)
{
continue;
}
var properties = dependencies.Properties().ToList();
abpPackages.AddRange(properties.Where(p => p.Name.StartsWith("@abp/") || p.Name.StartsWith("@volo/")).ToList());
}
return abpPackages; return abpPackages;
} }

Loading…
Cancel
Save