PR feedback

Author: JohnMcPMS

src/AppInstallerCLICore/Workflows/PinFlow.cpp

@@ -140,7 +140,7 @@ namespace AppInstaller::CLI::Workflow
                 }
                 else
                 {
-                    auto availableVersion = GetAvailableVersionsForInstalledVersion(package, nullptr)->GetVersion({ pinKey.SourceId, "", "" });
+                    auto availableVersion = GetAvailablePackageFromSource(package, pinKey.SourceId)->GetLatestVersion();
                     if (availableVersion)
                     {
                         packageNameToReport = availableVersion->GetProperty(PackageVersionProperty::Name);

src/AppInstallerCLICore/Workflows/WorkflowBase.cpp

@@ -629,7 +629,7 @@ namespace AppInstaller::CLI::Workflow
 
         for (size_t i = 0; i < searchResult.Matches.size(); ++i)
         {
-            auto latestVersion = GetAvailableVersionsForInstalledVersion(searchResult.Matches[i].Package, nullptr)->GetLatestVersion();
+            auto latestVersion = GetAllAvailableVersions(searchResult.Matches[i].Package)->GetLatestVersion();
 
             table.OutputLine({
                 latestVersion->GetProperty(PackageVersionProperty::Name),
@@ -1349,7 +1349,7 @@ namespace AppInstaller::CLI::Workflow
 
     void ShowAppVersions(Execution::Context& context)
     {
-        auto versions = GetAvailableVersionsForInstalledVersion(context.Get<Execution::Data::Package>(), nullptr)->GetVersionKeys();
+        auto versions = GetAllAvailableVersions(context.Get<Execution::Data::Package>())->GetVersionKeys();
 
         Execution::TableOutput<2> table(context.Reporter, { Resource::String::ShowVersion, Resource::String::ShowChannel });
         for (const auto& version : versions)

src/AppInstallerRepositoryCore/CompositeSource.cpp

@@ -340,7 +340,7 @@ namespace AppInstaller::Repository
             std::shared_ptr<IPackageVersion> m_trackingPackageVersion;
         };
 
-        // A composite package for the installed package of a CompositePackage.
+        // An IPackage for the installed package of a CompositePackage.
         // Supports only a single version of a single package at this time.
         struct CompositeInstalledPackage : public IPackage
         {
@@ -416,9 +416,10 @@ namespace AppInstaller::Repository
             std::string m_overrideVersion;
         };
 
-        // A composite package for the CompositeSource.
+        // An ICompositePackage for the CompositeSource.
         struct CompositePackage : public ICompositePackage
         {
+            // The availablePackage maye only contain one available package within it, as it is expected to be the output of a search on a single source.
             CompositePackage(const std::shared_ptr<ICompositePackage>& installedPackage, const std::shared_ptr<ICompositePackage>& availablePackage = {})
             {
                 if (installedPackage)

src/AppInstallerRepositoryCore/PackageVersionSelection.cpp

@@ -116,6 +116,11 @@ namespace AppInstaller::Repository
         return std::make_shared<AvailablePackageVersionCollection>(composite, installedVersion);
     }
 
+    std::shared_ptr<IPackageVersionCollection> GetAllAvailableVersions(const std::shared_ptr<ICompositePackage>& composite)
+    {
+        return GetAvailableVersionsForInstalledVersion(composite, nullptr);
+    }
+
     std::shared_ptr<IPackageVersion> GetInstalledVersion(const std::shared_ptr<ICompositePackage>& composite)
     {
         auto installedPackage = composite->GetInstalled();

src/AppInstallerRepositoryCore/Public/winget/PackageVersionSelection.h

@@ -16,6 +16,10 @@ namespace AppInstaller::Repository
         const std::shared_ptr<ICompositePackage>& composite,
         const std::shared_ptr<IPackageVersion>& installedVersion);
 
+    // Equivalent to `GetAvailableVersionsForInstalledVersion(composite, nullptr)` to make the intent more clear that the caller wants to ignore any installed
+    // package information.
+    std::shared_ptr<IPackageVersionCollection> GetAllAvailableVersions(const std::shared_ptr<ICompositePackage>& composite);
+
     // Gets the installed version, or a null if there isn't one.
     std::shared_ptr<IPackageVersion> GetInstalledVersion(const std::shared_ptr<ICompositePackage>& composite);
 

src/Microsoft.Management.Deployment/CatalogPackage.cpp

@@ -54,7 +54,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
             [&]()
             {
                 // Vector hasn't been populated yet.
-                for (auto const& versionKey : ::AppInstaller::Repository::GetAvailableVersionsForInstalledVersion(m_package, nullptr)->GetVersionKeys())
+                for (auto const& versionKey : ::AppInstaller::Repository::GetAllAvailableVersions(m_package)->GetVersionKeys())
                 {
                     auto packageVersionId = winrt::make_self<wil::details::module_count_wrapper<
                         winrt::Microsoft::Management::Deployment::implementation::PackageVersionId>>();
@@ -103,7 +103,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
 
         ::AppInstaller::Repository::PackageVersionKey internalVersionKey(winrt::to_string(versionKey.PackageCatalogId()), winrt::to_string(versionKey.Version()), winrt::to_string(versionKey.Channel()));
         std::shared_ptr<::AppInstaller::Repository::IPackageVersion> availableVersion =
-            ::AppInstaller::Repository::GetAvailableVersionsForInstalledVersion(m_package, nullptr)->GetVersion(internalVersionKey);
+            ::AppInstaller::Repository::GetAllAvailableVersions(m_package)->GetVersion(internalVersionKey);
         if (availableVersion)
         {
             auto packageVersionInfoImpl = winrt::make_self<wil::details::module_count_wrapper<