Remove bundled WinGet COM fallback

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mamoreau-devolutions

src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/NativeWinGetHelper.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Runtime.ExceptionServices;
 using Microsoft.Management.Deployment;
 using UniGetUI.Core.Classes;
 using UniGetUI.Core.Logging;
@@ -21,42 +22,36 @@ internal sealed class NativeWinGetHelper : IWinGetManagerHelper
     public PackageManager WinGetManager = null!;
     public static PackageManager? ExternalWinGetManager;
     private readonly WinGet Manager;
-    private readonly Func<WinGet, IWinGetManagerHelper> _bundledCliHelperFactory;
     private readonly Func<WinGet, IWinGetManagerHelper> _systemCliHelperFactory;
     private readonly Func<IReadOnlyList<CatalogPackage>>? _localPackagesProvider;
     private int _activeLocalPackageQueries;
+    private ExceptionDispatchInfo? _lastActivationException;
 
     public string ActivationMode { get; private set; } = string.Empty;
     public string ActivationSource { get; private set; } = string.Empty;
-    private bool _isBundledActivation;
 
     internal static IReadOnlyList<string> PreferredActivationModes =>
     [
         "packaged COM registration",
         "lower-trust COM registration",
-        "bundled in-proc COM",
     ];
 
     public NativeWinGetHelper(WinGet manager)
         : this(
             manager,
-            bundledCliHelperFactory: null,
             systemCliHelperFactory: null,
             skipInitialization: false,
             localPackagesProvider: null
         ) { }
 
     internal NativeWinGetHelper(
         WinGet manager,
-        Func<WinGet, IWinGetManagerHelper>? bundledCliHelperFactory,
         Func<WinGet, IWinGetManagerHelper>? systemCliHelperFactory,
         bool skipInitialization,
         Func<IReadOnlyList<CatalogPackage>>? localPackagesProvider
     )
     {
         Manager = manager;
-        _bundledCliHelperFactory =
-            bundledCliHelperFactory ?? (static manager => new BundledWinGetHelper(manager));
         _systemCliHelperFactory =
             systemCliHelperFactory
             ?? (static manager => new BundledWinGetHelper(manager, manager.Status.ExecutablePath));
@@ -83,14 +78,9 @@ internal NativeWinGetHelper(
             return;
         }
 
-        InitializeBundledFactory();
-    }
+        _lastActivationException?.Throw();
 
-    internal void UseBundledActivationForTesting()
-    {
-        _isBundledActivation = true;
-        ActivationMode = "bundled in-proc COM";
-        ActivationSource = "test";
+        throw new InvalidOperationException("WinGet: Failed to initialize system COM activation.");
     }
 
     internal bool HasActiveLocalPackageQuery => Volatile.Read(ref _activeLocalPackageQueries) > 0;
@@ -117,15 +107,17 @@ private bool TryInitializeLowerTrustFactory()
         }
         catch (WinGetComActivationException ex)
         {
+            _lastActivationException = ExceptionDispatchInfo.Capture(ex);
             Logger.Warn(
-                $"Lower-trust WinGet COM activation failed ({ex.HResultHex}: {ex.Reason}), attempting bundled in-proc activation..."
+                $"Lower-trust WinGet COM activation failed ({ex.HResultHex}: {ex.Reason})."
             );
             return false;
         }
         catch (Exception ex)
         {
+            _lastActivationException = ExceptionDispatchInfo.Capture(ex);
             Logger.Warn(
-                $"Lower-trust WinGet COM activation failed ({ex.Message}), attempting bundled in-proc activation..."
+                $"Lower-trust WinGet COM activation failed ({ex.Message})."
             );
             return false;
         }
@@ -148,34 +140,22 @@ private bool TryInitializeStandardFactory()
         }
         catch (WinGetComActivationException ex)
         {
+            _lastActivationException = ExceptionDispatchInfo.Capture(ex);
             Logger.Warn(
                 $"Packaged WinGet COM activation failed ({ex.HResultHex}: {ex.Reason}), attempting lower-trust activation..."
             );
             return false;
         }
         catch (Exception ex)
         {
+            _lastActivationException = ExceptionDispatchInfo.Capture(ex);
             Logger.Warn(
                 $"Packaged WinGet COM activation failed ({ex.Message}), attempting lower-trust activation..."
             );
             return false;
         }
     }
 
-    private void InitializeBundledFactory()
-    {
-        var factory = new WindowsPackageManagerBundledFactory();
-        var winGetManager = factory.CreatePackageManager();
-        ApplyFactory(
-            factory,
-            winGetManager,
-            "bundled in-proc COM",
-            factory.LibraryPath,
-            "Connected to WinGet API using bundled in-proc activation."
-        );
-        _isBundledActivation = true;
-    }
-
     private void ApplyFactory(
         WindowsPackageManagerFactory factory,
         PackageManager winGetManager,
@@ -321,12 +301,6 @@ var filter_type in new[]
 
     public IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
     {
-        if (_isBundledActivation)
-        {
-            Logger.Info("WinGet is using bundled in-proc COM — falling back to CLI for update detection");
-            return _bundledCliHelperFactory(Manager).GetAvailableUpdates_UnSafe();
-        }
-
         var logger = Manager.TaskLogger.CreateNew(LoggableTaskType.ListUpdates);
         IReadOnlyList<CatalogPackage> nativePackages;
         try
@@ -401,12 +375,6 @@ public IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
 
     public IReadOnlyList<Package> GetInstalledPackages_UnSafe()
     {
-        if (_isBundledActivation)
-        {
-            Logger.Info("WinGet is using bundled in-proc COM — falling back to CLI for installed package detection");
-            return _bundledCliHelperFactory(Manager).GetInstalledPackages_UnSafe();
-        }
-
         var logger = Manager.TaskLogger.CreateNew(LoggableTaskType.ListInstalledPackages);
         IReadOnlyList<CatalogPackage> nativePackages;
         try

src/UniGetUI.PackageEngine.Tests/WinGetManagerTests.cs

@@ -134,39 +134,11 @@ public void GetInstalledPackagesUpdatesNoPackagesFlagForFailureAndRecovery()
     public void NativeWinGetHelperPrefersSystemComBeforeBundledActivation()
     {
         Assert.Equal(
-            ["packaged COM registration", "lower-trust COM registration", "bundled in-proc COM"],
+            ["packaged COM registration", "lower-trust COM registration"],
             NativeWinGetHelper.PreferredActivationModes
         );
     }
 
-    [Fact]
-    public void NativeWinGetHelperUsesBundledFallbackForInstalledPackagesWhenBundledActivationIsSelected()
-    {
-        var manager = new TestableWinGet();
-        var expectedPackage = new PackageBuilder()
-            .WithManager(manager)
-            .WithName("Contoso Tool")
-            .WithId("Contoso.Tool")
-            .WithVersion("1.2.3")
-            .Build();
-        var bundledFallbackHelper = new TestWinGetManagerHelper
-        {
-            GetInstalledPackagesHandler = () => [expectedPackage],
-        };
-        var helper = new NativeWinGetHelper(
-            manager,
-            bundledCliHelperFactory: _ => bundledFallbackHelper,
-            systemCliHelperFactory: null,
-            skipInitialization: true,
-            localPackagesProvider: null
-        );
-        helper.UseBundledActivationForTesting();
-
-        var packages = helper.GetInstalledPackages_UnSafe();
-
-        PackageAssert.Matches(Assert.Single(packages), "Contoso Tool", "Contoso.Tool", "1.2.3");
-    }
-
     [Fact]
     public void NativeWinGetHelperUsesSystemCliFallbackForInstalledPackagesWhenCompositeCatalogFails()
     {
@@ -183,7 +155,6 @@ public void NativeWinGetHelperUsesSystemCliFallbackForInstalledPackagesWhenCompo
         };
         var helper = new NativeWinGetHelper(
             manager,
-            bundledCliHelperFactory: null,
             systemCliHelperFactory: _ => systemCliFallbackHelper,
             skipInitialization: true,
             localPackagesProvider: () =>
@@ -212,7 +183,6 @@ public void NativeWinGetHelperUsesSystemCliFallbackForUpdatesWhenCompositeCatalo
         };
         var helper = new NativeWinGetHelper(
             manager,
-            bundledCliHelperFactory: null,
             systemCliHelperFactory: _ => systemCliFallbackHelper,
             skipInitialization: true,
             localPackagesProvider: () =>
@@ -258,7 +228,6 @@ public void AttemptFastRepairKeepsNativeHelperWhileLocalPackageEnumerationIsStil
         var manager = new TestableWinGet();
         var helper = new NativeWinGetHelper(
             manager,
-            bundledCliHelperFactory: null,
             systemCliHelperFactory: null,
             skipInitialization: true,
             localPackagesProvider: null