feat: Improve version compare

Author: davidkallesen

src/Atc.Installer.Wpf.ComponentProvider/ComponentProviderViewModel_LogicBase.cs

@@ -1000,13 +1000,14 @@ private void WorkOnAnalyzeAndUpdateStatesForDotNetVersion()
             installationMainFile = Path.Combine(installationMainPath, $"{Name}.dll");
         }
 
-        if (!File.Exists(InstalledMainFilePath.GetValueAsString()))
+        var resolvedInstalledMainFilePath = InstalledMainFilePath.GetValueAsString();
+        if (!File.Exists(resolvedInstalledMainFilePath))
         {
             InstallationState = ComponentInstallationState.NotInstalled;
         }
 
         if (File.Exists(installationMainFile) &&
-            File.Exists(InstalledMainFilePath.GetValueAsString()))
+            File.Exists(resolvedInstalledMainFilePath))
         {
             Version? sourceVersion = null;
             var installationMainFileVersion = FileVersionInfo.GetVersionInfo(installationMainFile);
@@ -1017,16 +1018,23 @@ private void WorkOnAnalyzeAndUpdateStatesForDotNetVersion()
             }
 
             Version? destinationVersion = null;
-            var installedMainFileVersion = FileVersionInfo.GetVersionInfo(InstalledMainFilePath.GetValueAsString());
+            var installedMainFileVersion = FileVersionInfo.GetVersionInfo(resolvedInstalledMainFilePath);
             if (installedMainFileVersion?.FileVersion is not null)
             {
                 destinationVersion = new Version(installedMainFileVersion.FileVersion);
                 InstalledVersion = installedMainFileVersion.FileVersion;
             }
 
-            if (sourceVersion is not null &&
-                destinationVersion is not null &&
-                sourceVersion.IsNewerThan(destinationVersion))
+            if (VersionHelper.IsDefault(sourceVersion, destinationVersion))
+            {
+                var sourcePath = new DirectoryInfo(installationMainFile).Parent!;
+                var destinationPath = new DirectoryInfo(resolvedInstalledMainFilePath).Parent!;
+                if (sourcePath.GetTotalFilesLength("*.dll") != destinationPath.GetTotalFilesLength("*.dll"))
+                {
+                    InstallationState = ComponentInstallationState.InstalledWithOldVersion;
+                }
+            }
+            else if (VersionHelper.IsSourceNewerThanDestination(sourceVersion, destinationVersion))
             {
                 InstallationState = ComponentInstallationState.InstalledWithOldVersion;
             }
@@ -1083,25 +1091,9 @@ private void WorkOnAnalyzeAndUpdateStatesForNodeJsVersion()
             }
             else
             {
-                try
-                {
-                    var isNewerThan = new Version(sourceVersion).IsNewerThan(new Version(destinationVersion));
-                    InstallationState = isNewerThan
-                        ? ComponentInstallationState.InstalledWithOldVersion
-                        : ComponentInstallationState.Installed;
-                }
-                catch
-                {
-                    var sortedSet = new SortedSet<string>(StringComparer.Ordinal)
-                    {
-                        sourceVersion,
-                        destinationVersion,
-                    };
-
-                    InstallationState = destinationVersion == sortedSet.First()
-                        ? ComponentInstallationState.InstalledWithOldVersion
-                        : ComponentInstallationState.Installed;
-                }
+                InstallationState = VersionHelper.IsSourceNewerThanDestination(sourceVersion, destinationVersion)
+                    ? ComponentInstallationState.InstalledWithOldVersion
+                    : ComponentInstallationState.Installed;
             }
         }
     }

src/Atc.Installer.Wpf.ComponentProvider/ValueConverters/ComponentProviderVersionCompareVisibilityVisibleValueConverter.cs

@@ -25,11 +25,11 @@ HostingFrameworkType.DonNetFramework48 or
             HostingFrameworkType.DotNet7 or
             HostingFrameworkType.DotNet8)
         {
-            return AnalyzeForForDotNet(vm);
+            return AnalyzeVersion(vm);
         }
 
         return vm.ComponentType == ComponentType.InternetInformationService
-            ? AnalyzeForJsVersion(vm)
+            ? AnalyzeVersion(vm)
             : Visibility.Collapsed;
     }
 
@@ -39,32 +39,9 @@ HostingFrameworkType.DotNet7 or
         object? parameter,
         CultureInfo culture) => null;
 
-    private static Visibility AnalyzeForJsVersion(
+    private static Visibility AnalyzeVersion(
         ComponentProviderViewModel vm)
-    {
-        if (vm.InstallationVersion == vm.InstalledVersion)
-        {
-            return Visibility.Collapsed;
-        }
-
-        var sortedSet = new SortedSet<string>(StringComparer.Ordinal)
-        {
-            vm.InstallationVersion!,
-            vm.InstalledVersion!,
-        };
-
-        return vm.InstalledVersion == sortedSet.First()
+        => VersionHelper.IsSourceNewerThanDestination(vm.InstallationVersion, vm.InstalledVersion)
             ? Visibility.Visible
             : Visibility.Collapsed;
-    }
-
-    private static Visibility AnalyzeForForDotNet(
-        ComponentProviderViewModel vm)
-    {
-        var sourceVersion = new Version(vm.InstallationVersion!);
-        var destinationVersion = new Version(vm.InstalledVersion!);
-        return sourceVersion.IsNewerThan(destinationVersion)
-            ? Visibility.Visible
-            : Visibility.Collapsed;
-    }
 }