Update WIX Firefox CustomAction

WE2-925 Signed-off-by: Raul Metsma <[email protected]>
metsma · May 7, 2024 · 84271fa · 84271fa
1 parent 083c77e
commit 84271fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/install/FirefoxAction.CA.dll b/install/FirefoxAction.CA.dll
diff --git a/install/web-eid.wxs b/install/web-eid.wxs
@@ -47,6 +47,8 @@
       BinaryRef="FirefoxAction.CA.dll" DllEntry="ExtensionSettingsRemove" />
     <CustomAction Id="ExtensionSettingsRemove" Return="check" Execute="deferred" Impersonate="no"
       BinaryRef="FirefoxAction.CA.dll" DllEntry="ExtensionSettingsRemove" />
+    <CustomAction Id="ExtensionSettingsUpgrade" Return="check" Execute="deferred" Impersonate="no"
+      BinaryRef="FirefoxAction.CA.dll" DllEntry="ExtensionSettingsFix" />
 
     <CustomAction Id="SetExtensionSettingsForInstall" Property="ExtensionSettingsInstall"
       Value="EXTENSIONSETTINGS_UUID=$(var.FIREFOX_UUID);EXTENSIONSETTINGS_URL=$(var.FIREFOX_URL)" />
@@ -65,6 +67,8 @@
         Condition="NOT (FIREFOXINSTALL=1) AND NOT ((REMOVE=&quot;ALL&quot;) AND (NOT UPGRADINGPRODUCTCODE))" />
       <Custom Action="ExtensionSettingsRemove" Before="InstallFinalize"
         Condition="(REMOVE=&quot;ALL&quot;) AND (NOT UPGRADINGPRODUCTCODE)" />
+      <Custom Action="ExtensionSettingsUpgrade" Before="RemoveExistingProducts"
+        Condition="WIX_UPGRADE_DETECTED" />
     </InstallExecuteSequence>
 
     <StandardDirectory Id="ProgramFiles6432Folder">