diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs index 47f0f1092d..dc86a720cf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs @@ -5,5 +5,9 @@ public string Name { get; set; } public NpmApplicationType ApplicationType { get; set; } + + public string MinVersion { get; set; } + + public string MaxVersion { get; set; } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 3b5e695203..eddb4b7d87 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -135,24 +135,25 @@ namespace Volo.Abp.Cli.ProjectModification private ModuleWithMastersInfo RemoveIncompatiblePackages(ModuleWithMastersInfo module, string version) { - module.NugetPackages.RemoveAll(np => IsPackageInCompatible(np, version)); + module.NugetPackages.RemoveAll(np => IsPackageInCompatible(np.MinVersion, np.MaxVersion, version)); + module.NpmPackages.RemoveAll(np => IsPackageInCompatible(np.MinVersion, np.MaxVersion, version)); return module; } - private bool IsPackageInCompatible(NugetPackageInfo package, string version) + private bool IsPackageInCompatible(string minVersion, string maxVersion, string version) { try { - if (!string.IsNullOrWhiteSpace(package.MinVersion)) + if (!string.IsNullOrWhiteSpace(minVersion)) { - if (SemanticVersion.Parse(package.MinVersion) > SemanticVersion.Parse(version)) + if (SemanticVersion.Parse(minVersion) > SemanticVersion.Parse(version)) { return true; } } - if (!string.IsNullOrWhiteSpace(package.MaxVersion)) + if (!string.IsNullOrWhiteSpace(maxVersion)) { - if (SemanticVersion.Parse(package.MaxVersion) < SemanticVersion.Parse(version)) + if (SemanticVersion.Parse(maxVersion) < SemanticVersion.Parse(version)) { return true; }