Implements minimumUpdateVersion for MSI for multiple instance setups.

Author: Horcrux7

src/com/inet/gradle/setup/msi/WxsFileBuilder.java

@@ -145,7 +145,7 @@ void build() throws Exception {
             Element update = getOrCreateChild( product, "MajorUpgrade" );
             addAttributeIfNotExists( update, "AllowDowngrades", "yes" );
 
-            addMinimumVersionCheck();
+            addMinimumVersionCheck( getGuid( "UpgradeCode" ), 0 );
         }
 
         // Directory
@@ -235,24 +235,26 @@ private void registerSchemeDefinition( ProtocolHandler handler ) {
 
     /**
      * Add a minimum version for update check if set.
+     * @param upgradeCode the GUID of the upgrade code
+     * @param instance the instance number
      */
-    private void addMinimumVersionCheck() {
+    private void addMinimumVersionCheck( String upgradeCode, int instance ) {
         String version = setup.getMinimumUpdateVersion();
         String message = setup.getMinimumUpdateMessage();
         if( version != null && message != null ) {
             // https://stackoverflow.com/questions/65787694/wix-prevent-only-certain-older-versions-from-being-updated
 
-            Element upgrade = getOrCreateChildById( product, "Upgrade", getGuid( "UpgradeCode" ) );
-            Element upgradeVersion = getOrCreateChildByKeyValue( upgrade, "UpgradeVersion", "Property", "UNSUPPORTED_UPGRADE_VERSION_FOUND" );
+            Element upgrade = getOrCreateChildById( product, "Upgrade", upgradeCode );
+            Element upgradeVersion = getOrCreateChildByKeyValue( upgrade, "UpgradeVersion", "Property", "UNSUPPORTED_UPGRADE_VERSION_FOUND_" + instance );
             addAttributeIfNotExists( upgradeVersion, "OnlyDetect", "yes" );
             addAttributeIfNotExists( upgradeVersion, "Maximum", version );
             addAttributeIfNotExists( upgradeVersion, "IncludeMaximum", "no" );
 
-            Element customAction = getOrCreateChildByKeyValue( product, "CustomAction", "Id", "UpgrateFromVersionNotSupported" );
+            Element customAction = getOrCreateChildByKeyValue( product, "CustomAction", "Id", "UpgrateFromVersionNotSupported_" + instance );
             addAttributeIfNotExists( customAction, "Error", message );
 
-            Element action = addCustomActionToSequence( "UpgrateFromVersionNotSupported", false, "FindRelatedProducts", true, null );
-            action.setTextContent( "UNSUPPORTED_UPGRADE_VERSION_FOUND" );
+            Element action = addCustomActionToSequence( "UpgrateFromVersionNotSupported_" + instance, false, "FindRelatedProducts", true, null );
+            action.setTextContent( "UNSUPPORTED_UPGRADE_VERSION_FOUND_" + instance );
         }
     }
 
@@ -1427,6 +1429,8 @@ private void addMultiInstanceTransforms() throws IOException {
             Element upgradeVersion = getOrCreateChildByKeyValue( upgrade, "UpgradeVersion", "Property", "WIX_UPGRADE_DETECTED_" + i );
             addAttributeIfNotExists( upgradeVersion, "Minimum", "0.0.0.0" );
             addAttributeIfNotExists( upgradeVersion, "MigrateFeatures", "yes" );
+
+            addMinimumVersionCheck( guid, i );
         }
         Element executeSequence = getOrCreateChild( product, "InstallExecuteSequence" );
         Element removeExistingProducts = getOrCreateChild( executeSequence, "RemoveExistingProducts" );

testBuilds/setupBuilder.gradle

@@ -33,6 +33,7 @@ setupBuilder {
     application = "Setup Builder Test"
     description = 'Build a test Programm.'
     icons = "test-icon.icns"
+    vendor = 'Sample Company Inc.'
 
     licenseFile "license_en.txt"
     licenseFile {
@@ -57,7 +58,7 @@ setupBuilder {
     }
     service {
         displayName = "i-net TestLaunch Server"
-        id = "helpdesk"
+        id = "testservice"
     }
     version = "3.0"
     minimumUpdateVersion "2.5"
@@ -97,6 +98,7 @@ msi{
     languages = ["en-us"]
     //external file("fragmentDlg.wxs")
     //wxsTemplate = "template.wxs"
+    multiInstanceCount = 10
 }
 
 dmg.dependsOn jar