working on test; refactoring to use COM code for update availability

Author: JohnMcPMS

src/AppInstallerCLICore/Commands/DscPackageResource.cpp

@@ -179,6 +179,57 @@ namespace AppInstaller::CLI
 
                 return result;
             }
+
+        private:
+            bool TestVersion()
+            {
+                if (Input.Version())
+                {
+                    if (Output.Version())
+                    {
+                        return Utility::Version{ Input.Version().value() } == Utility::Version{ Output.Version().value() };
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    return true;
+                }
+            }
+
+            bool TestScope()
+            {
+                if (Input.Scope())
+                {
+                    if (Output.Scope())
+                    {
+                        return Utility::ToLower(Input.Scope().value()) == Utility::ToLower(Output.Scope().value());
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    return true;
+                }
+            }
+
+            bool TestLatest()
+            {
+                if (Input.UseLatest())
+                {
+
+                }
+                else
+                {
+                    return true;
+                }
+            }
         };
     }
 

src/AppInstallerCLICore/ExecutionReporter.cpp

@@ -48,6 +48,8 @@ namespace AppInstaller::CLI::Execution
     Reporter::Reporter(const Reporter& other, clone_t) :
         Reporter(other.m_out, other.m_in)
     {
+        SetChannel(other.m_channel);
+
         if (other.m_style.has_value())
         {
             SetStyle(*other.m_style);

src/AppInstallerRepositoryCore/PackageVersionSelection.cpp

@@ -3,6 +3,7 @@
 #include "pch.h"
 #include "Public/winget/PackageVersionSelection.h"
 #include "Public/winget/RepositorySource.h"
+#include "Public/winget/PinningData.h"
 
 
 namespace AppInstaller::Repository
@@ -154,4 +155,55 @@ namespace AppInstaller::Repository
     {
         return GetAvailablePackageFromSource(composite->GetAvailable(), sourceIdentifier);
     }
+
+    DefaultInstallVersionData GetDefaultInstallVersion(const std::shared_ptr<ICompositePackage>& composite)
+    {
+        using namespace AppInstaller::Pinning;
+
+        DefaultInstallVersionData result;
+
+        auto installedVersion = AppInstaller::Repository::GetInstalledVersion(composite);
+        auto availableVersions = AppInstaller::Repository::GetAvailableVersionsForInstalledVersion(composite, installedVersion);
+
+        PinningData pinningData{ PinningData::Disposition::ReadOnly };
+        auto evaluator = pinningData.CreatePinStateEvaluator(PinBehavior::ConsiderPins, installedVersion);
+
+        AppInstaller::CLI::Execution::COMContext context;
+        AppInstaller::Repository::IPackageVersion::Metadata installationMetadata =
+            installedVersion ? installedVersion->GetMetadata() : AppInstaller::Repository::IPackageVersion::Metadata{};
+        AppInstaller::CLI::Workflow::ManifestComparator manifestComparator{ context, installationMetadata };
+
+        auto availableVersionKeys = availableVersions->GetVersionKeys();
+        for (const auto& availableVersionKey : availableVersionKeys)
+        {
+            auto availableVersion = availableVersions->GetVersion(availableVersionKey);
+
+            if (installedVersion && !evaluator.IsUpdate(availableVersion))
+            {
+                // Version too low or different channel for upgrade
+                continue;
+            }
+
+            if (evaluator.EvaluatePinType(availableVersion) != AppInstaller::Pinning::PinType::Unknown)
+            {
+                // Pinned
+                continue;
+            }
+
+            auto manifestComparatorResult = manifestComparator.GetPreferredInstaller(availableVersion->GetManifest());
+            if (!manifestComparatorResult.installer.has_value())
+            {
+                // No applicable installer
+                continue;
+            }
+
+            result.LatestApplicableVersion = availableVersion;
+            if (installedVersion)
+            {
+                result.UpdateAvailable = true;
+            }
+
+            break;
+        }
+    }
 }

src/AppInstallerRepositoryCore/Public/winget/PackageVersionSelection.h

@@ -25,4 +25,13 @@ namespace AppInstaller::Repository
 
     // Gets the available IPackage corresponding to the given source identifier.
     std::shared_ptr<IPackage> GetAvailablePackageFromSource(const std::shared_ptr<ICompositePackage>& composite, const std::string_view sourceIdentifier);
+
+    struct DefaultInstallVersionData
+    {
+        std::shared_ptr<AppInstaller::Repository::IPackageVersion> LatestApplicableVersion;
+        bool UpdateAvailable = false;
+    };
+
+    // Determines the default install version and whether an update is available.
+    DefaultInstallVersionData GetDefaultInstallVersion(const std::shared_ptr<ICompositePackage>& composite);
 }

src/Microsoft.Management.Deployment/CatalogPackage.cpp

@@ -74,8 +74,8 @@ namespace winrt::Microsoft::Management::Deployment::implementation
             {
                 using namespace AppInstaller::Pinning;
 
-                auto availableVersions = AppInstaller::Repository::GetAvailableVersionsForInstalledVersion(m_package);
                 auto installedVersion = AppInstaller::Repository::GetInstalledVersion(m_package);
+                auto availableVersions = AppInstaller::Repository::GetAvailableVersionsForInstalledVersion(m_package, installedVersion);
 
                 PinningData pinningData{ PinningData::Disposition::ReadOnly };
                 auto evaluator = pinningData.CreatePinStateEvaluator(PinBehavior::ConsiderPins, installedVersion);