Browse Source

Merge pull request #18313 from abpframework/auto-merge/rel-8-0/2305

Merge branch dev with rel-8.0
pull/18324/head
maliming 3 years ago
committed by GitHub
parent
commit
1dcc9771f4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs

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

@ -184,6 +184,7 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency
var currentVersion = versionAttribute.Value; var currentVersion = versionAttribute.Value;
var isLeptonXPackage = packageId.Contains("LeptonX"); var isLeptonXPackage = packageId.Contains("LeptonX");
var isStudioPackage = packageId.StartsWith("Volo.Abp.Studio.");
if(isLeptonXPackage) if(isLeptonXPackage)
{ {
//'SemanticVersion.TryParse' can not parse the version if the version contains floating version resolution, such as '*-*' //'SemanticVersion.TryParse' can not parse the version if the version contains floating version resolution, such as '*-*'
@ -201,7 +202,7 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency
if (!specifiedVersion.IsNullOrWhiteSpace()) if (!specifiedVersion.IsNullOrWhiteSpace())
{ {
if (isLeptonXPackage) if (isLeptonXPackage || isStudioPackage)
{ {
Logger.LogWarning("Package: {0} could not be updated. Please manually update the package version yourself to prevent version mismatches.", packageId); Logger.LogWarning("Package: {0} could not be updated. Please manually update the package version yourself to prevent version mismatches.", packageId);
continue; continue;
@ -241,6 +242,10 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency
latestVersion = (await _packageVersionCheckerService.GetLatestVersionOrNullAsync(leptonXPackageName, includeNightlyPreviews, includeReleaseCandidates))?.Version?.ToString(); latestVersion = (await _packageVersionCheckerService.GetLatestVersionOrNullAsync(leptonXPackageName, includeNightlyPreviews, includeReleaseCandidates))?.Version?.ToString();
} }
else if(isStudioPackage)
{
latestVersion = (await _packageVersionCheckerService.GetLatestVersionOrNullAsync(packageId, includeNightlyPreviews, includeReleaseCandidates))?.Version?.ToString();
}
else else
{ {
latestVersion = latestMyGetVersion == null ? await GetLatestVersionFromMyGet(packageId) : latestMyGetVersion; latestVersion = latestMyGetVersion == null ? await GetLatestVersionFromMyGet(packageId) : latestMyGetVersion;
@ -267,13 +272,13 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency
SemanticVersion latestVersion; SemanticVersion latestVersion;
if (currentSemanticVersion.IsPrerelease && !switchToStable) if (currentSemanticVersion.IsPrerelease && !switchToStable)
{ {
latestVersion = latestNugetReleaseCandidateVersion == null || isLeptonXPackage latestVersion = latestNugetReleaseCandidateVersion == null || isLeptonXPackage || isStudioPackage
? (await _packageVersionCheckerService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: true))?.Version ? (await _packageVersionCheckerService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: true))?.Version
: latestNugetReleaseCandidateVersion; : latestNugetReleaseCandidateVersion;
} }
else else
{ {
latestVersion = latestNugetVersion == null || isLeptonXPackage latestVersion = latestNugetVersion == null || isLeptonXPackage || isStudioPackage
? (await _packageVersionCheckerService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: includeReleaseCandidates))?.Version ? (await _packageVersionCheckerService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: includeReleaseCandidates))?.Version
: latestNugetVersion; : latestNugetVersion;
} }

Loading…
Cancel
Save