Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ protected override async Task<bool> IsPackageValid(IPackage package)
if (package.VersionString == package.NewVersionString)
return false;

if (
package.NormalizedNewVersion != default
Comment thread
GabrielDuf marked this conversation as resolved.
&& package.Manager.CompareVersions(package.VersionString, package.NewVersionString)
is >= 0
)
{
Logger.Info(
$"Ignoring package {package.Id} because the offered version {package.NewVersionString} is not newer than the installed version {package.VersionString}."
);
return false;
}

if (package.NewerVersionIsInstalled())
{
Logger.Info(
Expand Down
57 changes: 57 additions & 0 deletions src/UniGetUI.PackageEngine.Tests/UpgradablePackagesLoaderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,63 @@ await installedLoader.AddForeign(
Assert.True(await loader.EvaluatePackageAsync(package));
}

[Fact]
public async Task EvaluatePackageAsync_RejectsOlderOfferedVersionWithoutTheInstalledList()
{
var manager = new PackageManagerBuilder().Build();
_ = new InstalledPackagesLoader([manager]);
_ = new DiscoverablePackagesLoader([manager]);
var loader = new TestUpgradablePackagesLoader([manager]);

var package = new PackageBuilder()
.WithManager(manager)
.WithId("Daum.PotPlayer")
.WithVersion("260819")
.WithNewVersion("210428")
.Build();

Assert.False(await loader.EvaluatePackageAsync(package));
}

[Theory]
[InlineData("stable")]
[InlineData("latest")]
[InlineData("2.0.0_rc1")]
public async Task EvaluatePackageAsync_KeepsUpdatesWhoseOfferedVersionCannotBeParsed(string newVersion)
{
var manager = new PackageManagerBuilder().Build();
_ = new InstalledPackagesLoader([manager]);
_ = new DiscoverablePackagesLoader([manager]);
var loader = new TestUpgradablePackagesLoader([manager]);

var package = new PackageBuilder()
.WithManager(manager)
.WithId("org.contoso.Flatpak")
.WithVersion("3.2.1")
.WithNewVersion(newVersion)
.Build();

Assert.True(await loader.EvaluatePackageAsync(package));
}

[Fact]
public async Task EvaluatePackageAsync_KeepsUpdatesWhenTheInstalledVersionIsUnknown()
{
var manager = new PackageManagerBuilder().Build();
_ = new InstalledPackagesLoader([manager]);
_ = new DiscoverablePackagesLoader([manager]);
var loader = new TestUpgradablePackagesLoader([manager]);

var package = new PackageBuilder()
.WithManager(manager)
.WithId("Contoso.Unversioned")
.WithVersion("Unknown")
.WithNewVersion("210428")
.Build();

Assert.True(await loader.EvaluatePackageAsync(package));
}

[Fact]
public async Task ApplyWhenAddingPackageAsync_UpdatesDiscoverableAndInstalledTags()
{
Expand Down
Loading