Improvements to WinGet's package update blacklisting logic (fix #2929)

Author: marticliment

src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs

@@ -6,6 +6,7 @@
 using UniGetUI.PackageEngine.Classes.Packages.Classes;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.PackageClasses;
 using Architecture = UniGetUI.PackageEngine.Enums.Architecture;
 using InstallOptions = UniGetUI.PackageEngine.Serializable.InstallOptions;
 
@@ -147,7 +148,7 @@ protected override OperationVeredict _getOperationResult(
 
         if (uintCode is 0x8A150109)
         {   // TODO: Restart required to finish installation
-            if (operation is OperationType.Update) MarkUpgradeAsDone(package);
+            if (operation is OperationType.Update or OperationType.Install) MarkUpgradeAsDone(package);
             return OperationVeredict.Success;
         }
 
@@ -180,13 +181,13 @@ protected override OperationVeredict _getOperationResult(
 
         if (uintCode is 0x8A15010D or 0x8A15004F or 0x8A15010E)
         {   // Application is already installed
-            if (operation is OperationType.Update) MarkUpgradeAsDone(package);
+            if (operation is OperationType.Update or OperationType.Install) MarkUpgradeAsDone(package);
             return OperationVeredict.Success;
         }
 
         if (returnCode is 0)
         {   // Operation succeeded
-            if (operation is OperationType.Update) MarkUpgradeAsDone(package);
+            if (operation is OperationType.Update or OperationType.Install) MarkUpgradeAsDone(package);
             return OperationVeredict.Success;
         }
 
@@ -214,7 +215,12 @@ protected override OperationVeredict _getOperationResult(
 
     private static void MarkUpgradeAsDone(IPackage package)
     {
-        Settings.SetDictionaryItem<string, string>(Settings.K.WinGetAlreadyUpgradedPackages, package.Id, package.NewVersionString);
+        var options = InstallOptionsFactory.LoadApplicable(package);
+        string version;
+        if (package.IsUpgradable) version = package.NewVersionString;
+        else if (options.Version != "") version = options.Version;
+        else version = package.VersionString;
+        Settings.SetDictionaryItem<string, string>(Settings.K.WinGetAlreadyUpgradedPackages, package.Id, version);
     }
 
     public static bool UpdateAlreadyInstalled(IPackage package)