Installer should FindPackages By FamilyName that are of Main and Framework PackageTypes ONLY.

Author: Santosh Chintalapati

installer/dev/InstallActivityContext.h

@@ -39,7 +39,7 @@ namespace WindowsAppRuntimeInstaller::InstallActivity
         GUID m_deploymentErrorActivityId{};
         WindowsAppRuntimeInstaller_TraceLogger::Install m_activity;
         WilFailure m_lastFailure{};
-        HANDLE m_hEventLog;
+        HANDLE m_hEventLog{};
         bool m_isLocalSystemUser{ Security::User::IsLocalSystem() };
         winrt::hstring m_existingPackageIfHigherVersion;
 

installer/dev/console.cpp

@@ -9,7 +9,7 @@ void WindowsAppRuntimeInstaller::Console::DisplayHeader()
 {
     std::wcout << L"WindowsAppRuntimeInstaller -- Installs the Microsoft Windows App SDK runtime"
         << "version: " << WINDOWSAPPSDK_RELEASE_VERSION;
-    if (CompareStringOrdinal(WINDOWSAPPSDK_RELEASE_CHANNEL_W, static_cast<int>(sizeof(WINDOWSAPPSDK_RELEASE_CHANNEL_W)), L"", static_cast<int>(sizeof(L"")), TRUE) == CSTR_EQUAL)
+    if (CompareStringOrdinal(WINDOWSAPPSDK_RELEASE_CHANNEL_W, -1, L"", -1, TRUE) == CSTR_EQUAL)
     {
         std::wcout << "-" << WINDOWSAPPSDK_RELEASE_CHANNEL_W;
     }

installer/dev/install.cpp

@@ -281,7 +281,9 @@ namespace WindowsAppRuntimeInstaller
         // Check if a higher version of the package is already installed.
         PackageManager packageManager;
         winrt::hstring currentUserSID;
-        const auto installedPackages = packageManager.FindPackagesForUser(currentUserSID, packageProperties->familyName.get());
+        auto installedPackages{ packageManager.FindPackagesForUserWithPackageTypes(currentUserSID, packageProperties->familyName.get(),
+                                                                                                            ::Windows::Management::Deployment::PackageTypes::Framework |
+                                                                                                            ::Windows::Management::Deployment::PackageTypes::Main) };
         bool isPackageInstalledAndIsPackageStatusOK{};
 
         // installedPackages can contain only one version of the packagefamily across all servicing revisions of a WindowsAppSDK version.
@@ -291,11 +293,7 @@ namespace WindowsAppRuntimeInstaller
             // For the already installed package of same WindowsAppSDK Major.Minor version with matching architecture, compare version
             if (installedPackage.Id().Architecture() == packageProperties->architecture)
             {
-                UINT64 installedPackageVersion = ((static_cast<UINT64>(installedPackage.Id().Version().Major) << 48) +
-                    (static_cast<UINT64>(installedPackage.Id().Version().Minor) << 32) +
-                    (static_cast<UINT64>(installedPackage.Id().Version().Build) << 16) +
-                    static_cast<UINT64>(installedPackage.Id().Version().Revision));
-
+                const auto installedPackageVersion{ AppModel::Package::ToPackageVersion(installedPackage.Id().Version()).Version };
                 if (installedPackageVersion > packageProperties->version)
                 {
                     installActivityContext.SetExistingPackageIfHigherVersion(installedPackage.Id().FullName());

installer/dev/pch.h

@@ -32,6 +32,7 @@
 #include <Security.IntegrityLevel.h>
 #include <Security.User.h>
 #include <PushNotifications-Constants.h>
+#include <AppModel.Package.h>
 
 #include "tracelogging.h"
 #include "InstallActivityContext.h"