Browse Source
Merge pull request #15566 from abpframework/EngincanV/cli-npm-package-version
CLI: Exclude leptonx package version when determining the npm package version
pull/15568/head
Yunus Emre Kalkan
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
2 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs
|
|
@ -125,7 +125,6 @@ public class ProjectNpmPackageAdder : ITransientDependency |
|
|
|
|
|
|
|
|
Logger.LogInformation($"Installing '{npmPackage.Name}' package to the project '{packageJsonFilePath}'..."); |
|
|
Logger.LogInformation($"Installing '{npmPackage.Name}' package to the project '{packageJsonFilePath}'..."); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (version == null) |
|
|
if (version == null) |
|
|
{ |
|
|
{ |
|
|
version = DetectAbpVersionOrNull(Path.Combine(directory, "package.json")); |
|
|
version = DetectAbpVersionOrNull(Path.Combine(directory, "package.json")); |
|
|
@ -171,7 +170,7 @@ public class ProjectNpmPackageAdder : ITransientDependency |
|
|
|
|
|
|
|
|
foreach (var package in packages) |
|
|
foreach (var package in packages) |
|
|
{ |
|
|
{ |
|
|
if (package.Name.StartsWith("@abp/") || package.Name.StartsWith("@volo/")) |
|
|
if ((package.Name.StartsWith("@abp/") || package.Name.StartsWith("@volo/")) && !package.Name.Contains("leptonx")) |
|
|
{ |
|
|
{ |
|
|
return package.Value.ToString(); |
|
|
return package.Value.ToString(); |
|
|
} |
|
|
} |
|
|
|