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 @@ -37,7 +37,11 @@ protected override async Task<bool> IsPackageValid(IPackage package)
IgnoredPackages[package.Id] = package;
return false;
}
if ((await InstallationOptions.FromPackageAsync(package)).SkipMinorUpdates && package.IsUpdateMinor()) return false;
if ((await InstallationOptions.FromPackageAsync(package)).SkipMinorUpdates && package.IsUpdateMinor())
{
Logger.Info($"Ignoring package {package.Id} because it is a minor update ({package.VersionString} -> {package.NewVersionString}) and SkipMinorUpdates is set to true.");
return false;
}
if (package.NewerVersionIsInstalled()) return false;
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,18 +296,9 @@ public virtual bool NewerVersionIsInstalled()
public virtual bool IsUpdateMinor()
{
if (!IsUpgradable) return false;
string[] VersionSplit = VersionString.Split(".");
string[] NewVersionSplit = NewVersionString.Split(".");

// When in doubt, return false
if (VersionSplit.Length < 3 || NewVersionSplit.Length < 3) return false;

if (
VersionSplit[0] != NewVersionSplit[0] ||
VersionSplit[1] != NewVersionSplit[1]
) return false; // Major update

return VersionSplit[2].CompareTo(NewVersionSplit[2]) < 0;
return NormalizedVersion.Major == NormalizedNewVersion.Major && NormalizedVersion.Minor == NormalizedNewVersion.Minor &&
(NormalizedVersion.Patch != NormalizedNewVersion.Patch || NormalizedVersion.Remainder != NormalizedNewVersion.Remainder);
}

public virtual SerializablePackage_v1 AsSerializable()
Expand Down
Loading