diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs index af02817401..fb7d6659a2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; namespace Volo.Abp.Cli.ProjectModification; @@ -7,4 +8,17 @@ public class MyGetApiResponse public string _date { get; set; } public List Packages { get; set; } + + /// + /// Returns the latest version of the given package, or null if the response doesn't contain it. + /// and can be null when the endpoint + /// answers with an unexpected payload, so both are treated as "no version available". + /// + public string GetLatestVersionOrNull(string packageId) + { + return Packages? + .FirstOrDefault(p => p?.Id == packageId)? + .Versions? + .LastOrDefault(); + } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs index cad3671ba1..9dd6528980 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs @@ -374,7 +374,7 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency { var myGetPack = await _myGetPackageListFinder.GetPackagesAsync(); - return myGetPack.Packages.FirstOrDefault(p => p.Id == packageId)?.Versions.LastOrDefault(); + return myGetPack?.GetLatestVersionOrNull(packageId); } /// diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectModification/MyGetApiResponse_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectModification/MyGetApiResponse_Tests.cs new file mode 100644 index 0000000000..410aa42709 --- /dev/null +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectModification/MyGetApiResponse_Tests.cs @@ -0,0 +1,73 @@ +using System.Collections.Generic; +using Shouldly; +using Volo.Abp.Cli.ProjectModification; +using Xunit; + +namespace Volo.Abp.Cli; + +public class MyGetApiResponse_Tests +{ + [Fact] + public void GetLatestVersionOrNull_Should_Return_Last_Version_Of_Package() + { + var response = new MyGetApiResponse + { + Packages = new List + { + new() { Id = "Volo.Abp.Account", Versions = new List { "10.6.0", "10.7.0-preview.1" } }, + new() { Id = "Volo.Abp.Core", Versions = new List { "10.6.0", "10.7.0-preview.1", "10.7.0-preview.2" } } + } + }; + + response.GetLatestVersionOrNull("Volo.Abp.Core").ShouldBe("10.7.0-preview.2"); + } + + [Fact] + public void GetLatestVersionOrNull_Should_Return_Null_When_Package_Does_Not_Exist() + { + var response = new MyGetApiResponse + { + Packages = new List + { + new() { Id = "Volo.Abp.Account", Versions = new List { "10.7.0-preview.1" } } + } + }; + + response.GetLatestVersionOrNull("Volo.Abp.Core").ShouldBeNull(); + } + + [Fact] + public void GetLatestVersionOrNull_Should_Return_Null_When_Packages_Is_Null() + { + new MyGetApiResponse { Packages = null }.GetLatestVersionOrNull("Volo.Abp.Core").ShouldBeNull(); + } + + [Fact] + public void GetLatestVersionOrNull_Should_Return_Null_When_Package_Versions_Is_Null() + { + var response = new MyGetApiResponse + { + Packages = new List + { + new() { Id = "Volo.Abp.Core", Versions = null } + } + }; + + response.GetLatestVersionOrNull("Volo.Abp.Core").ShouldBeNull(); + } + + [Fact] + public void GetLatestVersionOrNull_Should_Ignore_Null_Package_Entries() + { + var response = new MyGetApiResponse + { + Packages = new List + { + null, + new() { Id = "Volo.Abp.Core", Versions = new List { "10.7.0-preview.1" } } + } + }; + + response.GetLatestVersionOrNull("Volo.Abp.Core").ShouldBe("10.7.0-preview.1"); + } +}