Browse Source

Update VoloNugetPackagesVersionUpdater.cs

pull/21548/head
EngincanV 2 years ago
parent
commit
3968c799f6
  1. 28
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs

28
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs

@ -228,28 +228,30 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency
continue; continue;
} }
if (isLeptonXPackage && !string.IsNullOrWhiteSpace(leptonXPackageVersion)) var isLeptonXPackageWithVersion = isLeptonXPackage && !string.IsNullOrWhiteSpace(leptonXPackageVersion);
if (isLeptonXPackageWithVersion || await SpecifiedVersionExists(specifiedVersion, packageId))
{ {
specifiedVersion = leptonXPackageVersion; TryUpdatingPackage(isLeptonXPackageWithVersion ? leptonXPackageVersion : specifiedVersion);
} }
else
if (await SpecifiedVersionExists(specifiedVersion, packageId))
{ {
var specifiedSemanticVersion = SemanticVersion.Parse(specifiedVersion); Logger.LogWarning("Package \"{PackageId}\" specified version v{SpecifiedVersion} does not exist!", packageId, specifiedVersion);
}
void TryUpdatingPackage(string versionToUpdate)
{
var specifiedSemanticVersion = SemanticVersion.Parse(versionToUpdate);
if (specifiedSemanticVersion > currentSemanticVersion) if (specifiedSemanticVersion > currentSemanticVersion)
{ {
Logger.LogInformation("Updating package \"{PackageId}\" from v{CurrentVersion} to v{SpecifiedVersion}", packageId, currentVersion, specifiedVersion); Logger.LogInformation("Updating package \"{PackageId}\" from v{CurrentVersion} to v{SpecifiedVersion}", packageId, currentVersion, versionToUpdate);
versionAttribute.Value = specifiedVersion; versionAttribute.Value = versionToUpdate;
} }
else else
{ {
Logger.LogWarning("Unable to update package \"{PackageId}\" version v{CurrentVersion} to v{SpecifiedVersion}", packageId, currentVersion, specifiedVersion); Logger.LogWarning("Unable to update package \"{PackageId}\" version v{CurrentVersion} to v{SpecifiedVersion}", packageId, currentVersion, versionToUpdate);
} }
} }
else
{
Logger.LogWarning("Package \"{PackageId}\" specified version v{SpecifiedVersion} does not exist!", packageId, specifiedVersion);
}
} }
else else
{ {
@ -273,7 +275,7 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency
} }
else else
{ {
latestVersion = latestMyGetVersion == null ? await GetLatestVersionFromMyGet(packageId) : latestMyGetVersion; latestVersion = latestMyGetVersion ?? await GetLatestVersionFromMyGet(packageId);
} }
if(latestVersion == null) if(latestVersion == null)

Loading…
Cancel
Save