Tried to fix the version diff bug in 5540

Author: github-actions[bot]

src/AppInstallerCLITests/Versions.cpp

@@ -470,3 +470,33 @@ TEST_CASE("OpenTypeFontVersion", "[versions]")
     REQUIRE(version.IsUnknown());
     REQUIRE(version.ToString() == "Unknown");
 }
+
+TEST_CASE("VersionParseIgnoreParentheses", "[versions]")
+{
+    // Test case for GitHub issue #5540
+    // Version strings with parenthetical text should be treated the same as without
+    Version versionWithParens("17.14.6 (June 2025)");
+    Version versionWithoutParens("17.14.6");
+    
+    // These should be considered equal for comparison purposes
+    REQUIRE(versionWithParens == versionWithoutParens);
+    REQUIRE_FALSE(versionWithParens < versionWithoutParens);
+    REQUIRE_FALSE(versionWithParens > versionWithoutParens);
+    
+    // Test VersionAndChannel comparison which is used in IsUpdatedBy
+    VersionAndChannel versionWithParensVC(versionWithParens, Channel("");
+    VersionAndChannel versionWithoutParensVC(versionWithoutParens, Channel("");
+    
+    // Should not consider this an update
+    REQUIRE_FALSE(versionWithParensVC.IsUpdatedBy(versionWithoutParensVC));
+    REQUIRE_FALSE(versionWithoutParensVC.IsUpdatedBy(versionWithParensVC));
+    
+    // Test with different formats of parenthetical text
+    Version version1("1.2.3 (Build 456)");
+    Version version2("1.2.3");
+    Version version3("1.2.3 (Release)");
+    
+    REQUIRE(version1 == version2);
+    REQUIRE(version2 == version3);
+    REQUIRE(version1 == version3);
+}

src/AppInstallerSharedLib/Versions.cpp

@@ -279,11 +279,18 @@ namespace AppInstaller::Utility
         // Only true if this is less than, other is not, OR this is none, other is greater than
         return (m_approximateComparator == ApproximateComparator::LessThan && other.m_approximateComparator != ApproximateComparator::LessThan) ||
             (m_approximateComparator == ApproximateComparator::None && other.m_approximateComparator == ApproximateComparator::GreaterThan);
-    }
-
-    Version::Part::Part(const std::string& part)
+    }    Version::Part::Part(const std::string& part)
     {
         std::string interimPart = Utility::Trim(part.c_str());
+        
+        // Strip parenthetical text for version comparison
+        // e.g., "17.14.6 (June 2025)" becomes "17.14.6"
+        size_t parenPos = interimPart.find('(');
+        if (parenPos != std::string::npos)
+        {
+            interimPart = Utility::Trim(interimPart.substr(0, parenPos));
+        }
+        
         const char* begin = interimPart.c_str();
         char* end = nullptr;
         errno = 0;

src/Microsoft.Management.Deployment/CatalogPackage.cpp

@@ -67,8 +67,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
 
     void CatalogPackage::InitializeDefaultInstallVersion()
     {
-        std::call_once(m_defaultInstallVersionOnceFlag,
-            [&]()
+        std::call_once(m_defaultInstallVersionOnceFlag,            [&]()
             {
                 using namespace AppInstaller::Pinning;
 
@@ -77,10 +76,12 @@ namespace winrt::Microsoft::Management::Deployment::implementation
 
                 std::shared_ptr<::AppInstaller::Repository::IPackageVersion> latestVersion =
                     evaluator.GetLatestAvailableVersionForPins(::AppInstaller::Repository::GetAvailableVersionsForInstalledVersion(m_package));
+                
+                // Always set m_updateAvailable, regardless of whether latestVersion is null
+                m_updateAvailable = latestVersion && evaluator.IsUpdate(latestVersion);
+
                 if (latestVersion)
                 {
-                    m_updateAvailable = evaluator.IsUpdate(latestVersion);
-
                     // DefaultInstallVersion hasn't been created yet, create and populate it.
                     // DefaultInstallVersion is the LatestAvailableVersion of the internal package object.
                     auto latestVersionImpl = winrt::make_self<wil::details::module_count_wrapper<