Browse Source
Merge pull request #23386 from abpframework/auto-merge/rel-9-2/3896
Merge branch rel-9.3 with rel-9.2
pull/23387/head
maliming
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
7 additions and
1 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
|
|
|
@ -210,7 +210,7 @@ public class NpmPackagesUpdater : ITransientDependency |
|
|
|
|
|
|
|
if (!specifiedVersion.IsNullOrWhiteSpace()) |
|
|
|
{ |
|
|
|
if (package.Name.IndexOf("leptonx", StringComparison.InvariantCultureIgnoreCase) > 0 && !specifiedLeptonXVersion.IsNullOrWhiteSpace()) |
|
|
|
if (IsLeptonXPackage(package) && !specifiedLeptonXVersion.IsNullOrWhiteSpace()) |
|
|
|
{ |
|
|
|
if (!SpecifiedVersionExists(specifiedLeptonXVersion, package)) |
|
|
|
{ |
|
|
|
@ -289,6 +289,12 @@ public class NpmPackagesUpdater : ITransientDependency |
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
private static bool IsLeptonXPackage(JProperty package) |
|
|
|
{ |
|
|
|
return package.Name.IndexOf("leptonx", StringComparison.InvariantCultureIgnoreCase) > 0 |
|
|
|
|| package.Name.IndexOf("lepton-x", StringComparison.InvariantCultureIgnoreCase) > 0; |
|
|
|
} |
|
|
|
|
|
|
|
protected virtual bool IsPrerelease(string version) |
|
|
|
{ |
|
|
|
if (version == null) |
|
|
|
|
