commit 8ffe4fdeb0a818cc3e8d462a9bdf3071137d4c09
author Steve Dower <steve.dower@microsoft.com> Sun Oct 11 18:05:11 2015 -0700
committer Steve Dower <steve.dower@microsoft.com> Sun Oct 11 18:05:11 2015 -0700
tree 8f8a68b397e76f59811aaed46e27d54982e50928
parent b96698112d69ac34f294aa2a7699966e53f826a1

Only detects features from previous version when a bundle is found.
Otherwise, stray registry entries would cause issues.
Also fixes an accelerator collision and improves UAC icons when upgrading.

Tools/msi/bundle/Default.wxl

diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl
index 235f6e4..1f3e77c 100644
--- a/Tools/msi/bundle/Default.wxl
+++ b/Tools/msi/bundle/Default.wxl
@@ -52,7 +52,7 @@
   <String Id="InstallSimpleButtonNote">Use settings preselected by your administrator
 
 [SimpleInstallDescription]</String>
-  <String Id="InstallUpgradeButton">&amp;Upgrade Now</String>
+  <String Id="InstallUpgradeButton">Up&amp;grade Now</String>
   <String Id="InstallUpgradeButtonNote">[TargetDir]
 
 Replaces your existing installation without changing settings.