Browse Source

Merge remote-tracking branch 'origin/rel-10.7' into auto-merge-forward/rel-10.7-to-rel-11.0-154

pull/26428/head
github-actions[bot] 2 weeks ago
parent
commit
7b13328b6d
  1. 14
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetApiResponse.cs
  2. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs
  3. 73
      framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectModification/MyGetApiResponse_Tests.cs

14
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<MyGetPackage> Packages { get; set; }
/// <summary>
/// Returns the latest version of the given package, or <c>null</c> if the response doesn't contain it.
/// <see cref="Packages"/> and <see cref="MyGetPackage.Versions"/> can be <c>null</c> when the endpoint
/// answers with an unexpected payload, so both are treated as "no version available".
/// </summary>
public string GetLatestVersionOrNull(string packageId)
{
return Packages?
.FirstOrDefault(p => p?.Id == packageId)?
.Versions?
.LastOrDefault();
}
}

2
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);
}
/// <summary>

73
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<MyGetPackage>
{
new() { Id = "Volo.Abp.Account", Versions = new List<string> { "10.6.0", "10.7.0-preview.1" } },
new() { Id = "Volo.Abp.Core", Versions = new List<string> { "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<MyGetPackage>
{
new() { Id = "Volo.Abp.Account", Versions = new List<string> { "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<MyGetPackage>
{
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<MyGetPackage>
{
null,
new() { Id = "Volo.Abp.Core", Versions = new List<string> { "10.7.0-preview.1" } }
}
};
response.GetLatestVersionOrNull("Volo.Abp.Core").ShouldBe("10.7.0-preview.1");
}
}
Loading…
Cancel
Save