From 477faeec6e733c6ea1d86ffe468ced30dc5a4e05 Mon Sep 17 00:00:00 2001
From: John McPherson <johnmcp@microsoft.com>
Date: Thu, 27 Mar 2025 11:56:29 -0700
Subject: [PATCH 1/2] More graceful failure handling

---
 .../PredefinedInstalledSourceFactory.cpp      | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp b/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
index 8e7d0cad44..d2f67f6397 100644
--- a/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
+++ b/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
@@ -68,14 +68,49 @@ namespace AppInstaller::Repository::Microsoft
 
             IIterable<Package> packages;
             PackageManager packageManager;
+
             if (scope == Manifest::ScopeEnum::Machine)
             {
-                packages = packageManager.FindProvisionedPackages();
+                // May not be present on our oldest supported systems; simply ignore for the time being.
+                IPackageManager9 packageManager9 = packageManager.try_as<IPackageManager9>();
+                if (packageManager9)
+                {
+                    packages = packageManager.FindProvisionedPackages();
+                }
+                else
+                {
+                    AICLI_LOG(Repo, Warning, << "FindProvisionedPackages is not available on this version of Windows");
+                }
             }
             else
             {
                 // TODO: Consider if Optional packages should also be enumerated
-                packages = packageManager.FindPackagesForUserWithPackageTypes({}, PackageTypes::Main | PackageTypes::Framework);
+                for (PackageTypes types : { PackageTypes::Main | PackageTypes::Framework, PackageTypes::Main, PackageTypes::Framework })
+                {
+                    try
+                    {
+                        packages = packageManager.FindPackagesForUserWithPackageTypes({}, types);
+                    }
+                    catch (const winrt::hresult_error& hre)
+                    {
+                        if (hre.code() == E_NOT_SET)
+                        {
+                            // This OS issue occurs frequently enough that we will attempt to work around it by enumerating progressively fewer packages
+                            AICLI_LOG(Repo, Warning, << "FindPackagesForUserWithPackageTypes returned E_NOT_SET for types: " << ToIntegral(types));
+                        }
+                        else
+                        {
+                            throw;
+                        }
+                    }
+                }
+            }
+
+            // Failed to retrieve even an empty package list; make sure that these cases have a log to indicate why.
+            if (!packages)
+            {
+                AICLI_LOG(Repo, Warning, << "MSIX package list not populated");
+                return;
             }
 
             // Reuse the same manifest object, as we will be setting the same values every time.

From 5506afea0d8b18b44446a41a546e7a60076cc59f Mon Sep 17 00:00:00 2001
From: John McPherson <johnmcp@microsoft.com>
Date: Thu, 27 Mar 2025 12:03:58 -0700
Subject: [PATCH 2/2] break

---
 .../Microsoft/PredefinedInstalledSourceFactory.cpp               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp b/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
index d2f67f6397..17fee85ebc 100644
--- a/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
+++ b/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
@@ -90,6 +90,7 @@ namespace AppInstaller::Repository::Microsoft
                     try
                     {
                         packages = packageManager.FindPackagesForUserWithPackageTypes({}, types);
+                        break;
                     }
                     catch (const winrt::hresult_error& hre)
                     {