Commit b630eba
committed
win,msi: Upgrade from old upgrade code
This enables the MSI to upgrade old Node.js versions and
early versions of io.js before the upgrade code was changed.
This also reverts 24def66.
PR-URL: #2439
Reviewed-By: Rod Vagg <rod@vagg.org>1 parent a2e4341 commit b630eba
3 files changed
Lines changed: 11 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,7 +3,7 @@ | |||
| 3 | 3 | <!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx --> | |
| 4 | 4 | <String Id="LocaleId">1031</String> | |
| 5 | 5 | ||
| 6 | - <String Id="WelcomeDlgDescription">Dieser Installationsassistent wird [ProductName] auf Ihrem Computer installieren.

WARNUNG: Wenn Sie von io.js v1.0.0 oder v1.0.1 aus updaten wollen, müssen Sie diese Versionen zuerst manuell deinstallieren.</String> | ||
| 6 | + <String Id="WelcomeDlgDescription">Dieser Installationsassistent wird [ProductName] auf Ihrem Computer installieren.</String> | ||
| 7 | 7 | <String Id="InstallDirDlgDescription">Wählen Sie einen anderen Installationsort oder klicken Sie auf Weiter zum installieren.</String> | |
| 8 | 8 | ||
| 9 | 9 | <String Id="MajorUpgrade_DowngradeErrorMessage">Eine neuere Version von [ProductName] ist bereits installiert. Der Installationsassistent wird jetzt geschlossen.</String> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,7 +3,7 @@ | |||
| 3 | 3 | <!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx --> | |
| 4 | 4 | <String Id="LocaleId">1033</String> | |
| 5 | 5 | ||
| 6 | - <String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] on your computer.

WARNING: if you're upgrading from io.js v1.0.0 or v1.0.1, you must first uninstall these versions manually.</String> | ||
| 6 | + <String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] on your computer.</String> | ||
| 7 | 7 | <String Id="InstallDirDlgDescription">Choose a custom location or click Next to install.</String> | |
| 8 | 8 | ||
| 9 | 9 | <String Id="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -25,6 +25,15 @@ | |||
| 25 | 25 | <MajorUpgrade AllowSameVersionUpgrades="yes" | |
| 26 | 26 | DowngradeErrorMessage="!(loc.MajorUpgrade_DowngradeErrorMessage)"/> | |
| 27 | 27 | ||
| 28 | + <Upgrade Id="1d60944c-b9ce-4a71-a7c0-0384eb884baa"> | ||
| 29 | + <UpgradeVersion Maximum="1.0.0" | ||
| 30 | + IncludeMaximum="no" | ||
| 31 | + Property="NODE_0X_DETECTED" /> | ||
| 32 | + <UpgradeVersion Minimum="1.0.0" | ||
| 33 | + IncludeMinimum="yes" | ||
| 34 | + Property="EARLY_IO_DETECTED" /> | ||
| 35 | + </Upgrade> | ||
| 36 | + | ||
| 28 | 37 | <Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\node.ico"/> | |
| 29 | 38 | <Property Id="ARPPRODUCTICON" Value="NodeIcon"/> | |
| 30 | 39 | <Property Id="ApplicationFolderName" Value="node"/> | |
0 commit comments