git.iko.soy/typeable/pandoc
on master help sign in
WiX: Revert back to “Minimal” template.

The “Advanced” template doesn’t uninstall previous version if it was installed per-machine. FindRelatedProducts action executes before ALLUSERS property is set and search is performed in per-user products only.

commit7c572acbd659381997f2559d23beb2eb6b588c41 authorFyodor Sheremetyev <sheremetyev@gmail.com> dateFri 15 Mar 2013, 21:43 (14 years ago) parentef40aa9
1 file changed+8−6
compare with master
unifiedsplit
windows/pandoc.wxs+8−6
windows/pandoc.wxs+8−6
@@ -21,16 +21,17 @@
2121 <RemoveExistingProducts After="InstallFinalize"/>
2222 </InstallExecuteSequence>
2323
24− <Property Id="ApplicationFolderName" Value="Pandoc" />
25− <Property Id="WixAppFolder" Value="WixPerUserFolder" />
2624 <Property Id="DISABLEADVTSHORTCUTS" Value="1" />
2725
28− <CustomAction Id="WixSetPerUserFolderOverride" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder][ApplicationFolderName]" Execute="immediate" />
26+ <CustomAction Id="SetPerUserFolder" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder]Pandoc" Execute="immediate" />
27+ <CustomAction Id="SetPerMachineFolder" Property="APPLICATIONFOLDER" Value="[ProgramFilesFolder]Pandoc" Execute="immediate" />
2928 <InstallExecuteSequence>
30− <Custom Action="WixSetPerUserFolderOverride" After="WixSetPerUserFolder">ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
29+ <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
30+ <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
3131 </InstallExecuteSequence>
3232 <InstallUISequence>
33− <Custom Action="WixSetPerUserFolderOverride" After="WixSetPerUserFolder">ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
33+ <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
34+ <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
3435 </InstallUISequence>
3536
3637 <Directory Id="TARGETDIR" Name="SourceDir">
@@ -103,7 +104,8 @@
103104 </Feature>
104105 </Feature>
105106
106− <UIRef Id="WixUI_Advanced" />
107+ <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
108+ <UIRef Id="WixUI_Minimal" />
107109 <UIRef Id="WixUI_ErrorProgressText" />
108110 <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" />
109111