Skip to content

Commit b630eba

Browse files
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 <[email protected]>
1 parent a2e4341 commit b630eba

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

tools/msvs/msi/i18n/de-de.wxl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx -->
44
<String Id="LocaleId">1031</String>
55

6-
<String Id="WelcomeDlgDescription">Dieser Installationsassistent wird [ProductName] auf Ihrem Computer installieren.&#xD;&#xA;&#xD;&#xA;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>
77
<String Id="InstallDirDlgDescription">Wählen Sie einen anderen Installationsort oder klicken Sie auf Weiter zum installieren.</String>
88

99
<String Id="MajorUpgrade_DowngradeErrorMessage">Eine neuere Version von [ProductName] ist bereits installiert. Der Installationsassistent wird jetzt geschlossen.</String>

tools/msvs/msi/i18n/en-us.wxl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx -->
44
<String Id="LocaleId">1033</String>
55

6-
<String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] on your computer.&#xD;&#xA;&#xD;&#xA;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>
77
<String Id="InstallDirDlgDescription">Choose a custom location or click Next to install.</String>
88

99
<String Id="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String>

tools/msvs/msi/product.wxs

+9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@
2525
<MajorUpgrade AllowSameVersionUpgrades="yes"
2626
DowngradeErrorMessage="!(loc.MajorUpgrade_DowngradeErrorMessage)"/>
2727

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+
2837
<Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\node.ico"/>
2938
<Property Id="ARPPRODUCTICON" Value="NodeIcon"/>
3039
<Property Id="ApplicationFolderName" Value="node"/>

0 commit comments

Comments
 (0)