From 867ab0f149db8c5cd8455410a27cfe38fd286171 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Sat, 15 Feb 2020 18:51:11 +0100 Subject: [PATCH] Fix upgrading from previous version As the language and platform-dependent component GUIDs changed and we wish to retain the original destination folders and filenames the RemoveExistingProducts custom action is now invoked differently according to the version of the product we are upgrading. When we are upgrading an old package with legacy component GUIDs, we're uninstalling it before installing the new one. When we will be upgrading a modern package with platform/language dependent component GUIDs, we will remove the leftover components after installing the new one. This should deliver compatible upgrades of existing versions while providing optimal upgrading in the future. Signed-off-by: Simon Rozman --- MSI/MSIBuild | 2 +- MSI/MSICA | 2 +- MSI/ZRCola/Main/Makefile | Bin 294348 -> 294368 bytes include/MSIBuildCfg.mak | Bin 9770 -> 9888 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 836708c..a9d2493 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 836708c45b6b428b452e526eb8c8ddbea2394ed6 +Subproject commit a9d2493ce35314b2757550c36e13d59cc8bec555 diff --git a/MSI/MSICA b/MSI/MSICA index e975f5b..ad49c00 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit e975f5bc31e86a1ae847027a0159363aeebaf980 +Subproject commit ad49c00a058ca601f9bc4a451bf78853c09f9b39 diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 388eaaed28611c4b28069b41abca8372b0dd77c5..38c4f354e11a2464d180408853346ff609f1170b 100644 GIT binary patch delta 28 kcmX@}Tkyee!G;#b7N!>FEi7&U(>L(3NNo2CU}@3?0JBI6ng9R* delta 23 ecmaFxTkyFEi7&U+oJ+l+H?VdfC)VS diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index ace207ea35e70364f8c971ce5a2864e792ee4c6a..602d896febb79f849662b1b0478e5b2374320e13 100644 GIT binary patch delta 113 zcmZ4Gv%q&lpYY^m973@{46Y2m4E_vZKsuhm2}rsDc_7hv22Tb*hG2#e21f=TAdF{l s2Fmy`xB$gNfEdKK1(H5MkpQ3$e;^$SR1*R=Arz!?vY^!B#abdl04P2cP5=M^ delta 15 XcmZ4ByUJ%npYUWhfjNs8hzJ1yG;#&w