Issue 1103 - Migrate Simple Adblock users

installer/src/msi/adblockplusie.wxs

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Compilation Note:
   You may see linking errors that look like these:
     <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote>
   The documentation for this error code talks about custom actions,
     even though the CustomAction keyword does not appear in this source.
   Certain WiX elements are implemented by MSI custom actions,
     which means this source implicitly declares some insofar as the Windows Installer sees it.
   These errors are benign and can be avoided by some fiddling with the registry on the development machine.
@@ skipping 125 matching lines @@
       SimpleAdblock and ABP for IE are using the same CLSID and SimpleAdblock's
       uninstallation is running DllUnregisterServer which removes the CLSID
       from the registry.
     -->
     <MajorUpgrade
       Schedule="afterInstallInitialize"
       AllowDowngrades="yes"
     />
     
     <!--Remove Simple Adblock-->
-    <Property Id="SIMPLEADBLOCKDETECTED" Secure="yes"/>
+    <Property Id="SIMPLEADBLOCKPRODUCTCODE" Secure="yes"/>
     <Upgrade Id="27D7C170-67AA-40D9-978F-5F14B4D0FEEE">
        <UpgradeVersion
           Minimum="0.7.0.0" Maximum="99.0.0.0"
-          Property="SIMPLEADBLOCKDETECTED"
+          Property="SIMPLEADBLOCKPRODUCTCODE"
           IncludeMinimum="yes" IncludeMaximum="no" IgnoreRemoveFailure="no"/>
     </Upgrade>
     <MediaTemplate EmbedCab="yes"/>
 
     <!--
       User interface
     -->
     <UIRef Id="custom_WixUI_InstallDir"/>
     <UIRef Id="WixUI_ErrorProgressText"/>
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
@@ skipping 31 matching lines @@
         Directory="APP_DATA_FOLDER" 
         ExeCommand="cmd /C &quot;rmdir /s /q &quot;.\Simple Adblock&quot;&quot;" 
         Execute="deferred" 
         Return="ignore" 
         HideTarget="no" 
         Impersonate="no" />    
     <!--
       We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit.
       The 64-bit Close_IE action needs to examine 64-bit processes on the system, which are invisible to 32-bit processes.
     -->
-    <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build_dir)\$(var.CA_Configuration)\installer-ca.dll"/>    
-    <InstallExecuteSequence>
+    <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build_dir)\$(var.CA_Configuration)\installer-ca.dll"/>
+    <InstallUISequence>
       <!--
         The LaunchConditions action occurs near the beginning, before any of the expensive operations.
       -->
       <Custom
         Action="Close_IE"
         After="LaunchConditions"
       />
+    </InstallUISequence>
     
+    <InstallExecuteSequence>
       <Custom 
         Action="CleanupSimpleAdblock" 
-        Before="InstallFinalize"><![CDATA[SIMPLEADBLOCKDETECTED <> ""]]></Custom>
+        Before="InstallFinalize"><![CDATA[SIMPLEADBLOCKPRODUCTCODE <> ""]]></Custom>
     </InstallExecuteSequence>
 
     <!--
       We have only a single feature, since there aren't any optional parts.
       The display is hidden for the same reason; there's nothing to choose from.
     -->
     <Feature Id="ProductFeature"
       Title="!(loc.Title)" Description="!(loc.UI_Description)"
       Display="hidden">
       <ComponentGroupRef Id="Installation_Folders"/>
@@ skipping 619 matching lines @@
     <ComponentGroup Id="INI_Files">
       <ComponentRef Id="ini_settings.ini"/>
       <ComponentRef Id="simpleAdblockPrefs"/>
     </ComponentGroup>
     <DirectoryRef Id="ABP_APPDATA_FOLDER">
       <Directory Id="ini" FileSource="$(var.plugin_dir)\files">
         <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9a66">
           <File Name="settings.ini"/>
         </Component>
         <Component Id="simpleAdblockPrefs" Guid="cc30c3b0-c713-01e2-7b8b-1800200c9a65">
-          <Condition><![CDATA[SIMPLEADBLOCKDETECTED <> ""]]></Condition>
+          <Condition><![CDATA[SIMPLEADBLOCKPRODUCTCODE <> ""]]></Condition>
           <File Name="prefs.json"/>
         </Component>
       </Directory>
     </DirectoryRef>
 
     <?include ../installer-lib/custom-i18n.wxi ?>
     <?include ../custom-action/close_ie.wxi ?>
   </Product>
 </Wix>