Changeset 107366 in vbox

Timestamp:

Dec 18, 2024 5:09:41 PM (4 weeks ago)

Author:

vboxsync

Message:

Windows host installer: Fixed detection of previous / newer versions of VirtualBox. Renamed PREVIOUSVERSIONSINSTALLED -> PREVIOUSVERSIONDETECTED to match the rest. Fixes installer validator warnings. bugref:10828

File:

• trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (2 diffs)

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -104 +104 @@
     <Upgrade Id="C4BAD770-BFE8-4D2C-A592-693028A7215B"> <!-- Upgrade of Sun xVM VirtualBox >= v1.6.0 -->
 
-        <!-- Upgrade is flagged if current-install is newer than or equal to package - TODO: should make a dialog appear asking user to confirm downgrade -->
-        <!-- Setting "OnlyDetect" to "no" makes the installer uninstall an already newer installed version -->
-        <UpgradeVersion Property="NEWERVERSIONDETECTED" Minimum="$(var.Property_Version)" IncludeMinimum="no" OnlyDetect="no" />
-
-        <!-- Flag is set if the install will trigger an upgrade of an existing install -->
-        <UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED" Minimum="1.0.0.0" Maximum="$(var.Property_Version)" IncludeMaximum="yes" />
+        <!-- Detect if the same version (as this version) of VirtualBox already is installed.
+             Useful for debugging / testboxes -->
+        <UpgradeVersion Property="SAMEVERSIONDETECTED" Minimum="$(var.Property_Version)" IncludeMinimum="yes"
+                                                       Maximum="$(var.Property_Version)" IncludeMaximum="yes"
+                                                       OnlyDetect="yes" />
+
+        <!-- Detect if a newer version (than this version) of VirtualBox already is installed.
+             @todo Should make a dialog appear asking user to confirm downgrade -->
+        <UpgradeVersion Property="NEWERVERSIONDETECTED" Minimum="$(var.Property_Version)" IncludeMinimum="no"
+                                                        Maximum="9.9.99"                  IncludeMaximum="yes"
+                                                        OnlyDetect="yes" />
+
+        <!-- Detect if an older version (than this version) of VirtualBox already is installed. -->
+        <UpgradeVersion Property="PREVIOUSVERSIONDETECTED" Minimum="1.0.0.0" Maximum="$(var.Property_Version)" IncludeMaximum="no" />
 
     </Upgrade>
@@ -417 +425 @@
 
         <!-- First install the new version and then remove the old version. This is more efficient -->
-        <RemoveExistingProducts After="InstallValidate" Condition="PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED" />
+        <RemoveExistingProducts After="InstallValidate" Condition="PREVIOUSVERSIONDETECTED OR NEWERVERSIONDETECTED" />
 
         <Custom Action="ca_OriginalTargetDir" After="FileCost" Condition="(NOT INSTALLDIR)" />