Follow up PR feedback fixes:

- Removed the GetRepairProgress method from the PackageManager class - Updated the CompositeSearchBehavior in RepairPackageCommand.cs to use AllCatalogs, broadening the scope of package searches. - Also, added a newline for readability in PackageManager.cpp.
microsoft · Oct 5, 2024 · c0f12f3 · c0f12f3
1 parent 309e40e
commit c0f12f3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/Microsoft.Management.Deployment/PackageManager.cpp b/src/Microsoft.Management.Deployment/PackageManager.cpp
@@ -1196,5 +1196,6 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         return GetPackageOperation<Deployment::RepairResult, Deployment::RepairProgress, Deployment::RepairOptions, Deployment::PackageRepairProgressState>(
             true /*canCancelQueueItem*/, nullptr /*queueItem*/, package, options, std::move(callerProcessInfoString));
     }
+
     CoCreatableMicrosoftManagementDeploymentClass(PackageManager);
 }
diff --git a/src/Microsoft.Management.Deployment/PackageManager.h b/src/Microsoft.Management.Deployment/PackageManager.h
@@ -44,8 +44,6 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         // Contract 11.0
         winrt::Windows::Foundation::IAsyncOperationWithProgress<winrt::Microsoft::Management::Deployment::RepairResult, winrt::Microsoft::Management::Deployment::RepairProgress>
             RepairPackageAsync(winrt::Microsoft::Management::Deployment::CatalogPackage package, winrt::Microsoft::Management::Deployment::RepairOptions options);
-        winrt::Windows::Foundation::IAsyncOperationWithProgress<winrt::Microsoft::Management::Deployment::RepairResult, winrt::Microsoft::Management::Deployment::RepairProgress>
-            GetRepairProgress(winrt::Microsoft::Management::Deployment::CatalogPackage package, winrt::Microsoft::Management::Deployment::PackageCatalogInfo catalogInfo);
     };
 
 #if !defined(INCLUDE_ONLY_INTERFACE_METHODS)

diff --git a/src/PowerShell/Microsoft.WinGet.Client.Engine/Commands/RepairPackageCommand.cs b/src/PowerShell/Microsoft.WinGet.Client.Engine/Commands/RepairPackageCommand.cs
@@ -94,7 +94,7 @@ public void Repair(
         {
             var result = this.Execute(
                 async () => await this.GetPackageAndExecuteAsync(
-                    CompositeSearchBehavior.LocalCatalogs | CompositeSearchBehavior.RemotePackagesFromRemoteCatalogs,
+                    CompositeSearchBehavior.AllCatalogs,
                     PSEnumHelpers.ToPackageFieldMatchOption(psPackageFieldMatchOption),
                     async (package, version) =>
                     {