diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-13 13:50:50 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-14 11:12:31 -0500 |
commit | 6a6974a15deb6edf593736cdb8043bfb93064782 (patch) | |
tree | 0ae2afffcd02967ba3fe0f0a5d3e9273811f1e6f /src/ext/Bal/wixstdba/Resources | |
parent | 7d56566b7c51c49ded526466dfae6af9e1709040 (diff) | |
download | wix-6a6974a15deb6edf593736cdb8043bfb93064782.tar.gz wix-6a6974a15deb6edf593736cdb8043bfb93064782.tar.bz2 wix-6a6974a15deb6edf593736cdb8043bfb93064782.zip |
Move infinite loop detection into the hosts.
Tell the BA during Destroy whether it will be reloaded, and let the BA decide then whether it's module should be unloaded.
Show error when infinite prereq loop detected.
Only clip the exit code if they're Win32 errors.
Set related bundle type to none to avoid downgrades during preqba.
Diffstat (limited to 'src/ext/Bal/wixstdba/Resources')
25 files changed, 25 insertions, 0 deletions
diff --git a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl index 19e79bac..f574bb9b 100644 --- a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl | |||
@@ -29,5 +29,6 @@ | |||
29 | <String Id="FailureRestartButton">重新啟動(&R)</String> | 29 | <String Id="FailureRestartButton">重新啟動(&R)</String> |
30 | <String Id="FailureCloseButton">關閉(&C)</String> | 30 | <String Id="FailureCloseButton">關閉(&C)</String> |
31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
32 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 33 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
33 | </WixLocalization> | 34 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl index e6e6f469..11d9f85a 100644 --- a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Restartovat</String> | 32 | <String Id="FailureRestartButton">&Restartovat</String> |
33 | <String Id="FailureCloseButton">&Zavřít</String> | 33 | <String Id="FailureCloseButton">&Zavřít</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl index 98518edc..50412e12 100644 --- a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Genstart</String> | 32 | <String Id="FailureRestartButton">&Genstart</String> |
33 | <String Id="FailureCloseButton">&Luk</String> | 33 | <String Id="FailureCloseButton">&Luk</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl index e60b0c9a..4df66298 100644 --- a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl | |||
@@ -35,5 +35,6 @@ | |||
35 | <String Id="FailureRestartButton">&Neu starten</String> | 35 | <String Id="FailureRestartButton">&Neu starten</String> |
36 | <String Id="FailureCloseButton">&Schließen</String> | 36 | <String Id="FailureCloseButton">&Schließen</String> |
37 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 37 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
38 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
38 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 39 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
39 | </WixLocalization> | 40 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl index ea5dc130..05ac553f 100644 --- a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl | |||
@@ -34,5 +34,6 @@ | |||
34 | <String Id="FailureRestartButton">&Επανεκκίνηση</String> | 34 | <String Id="FailureRestartButton">&Επανεκκίνηση</String> |
35 | <String Id="FailureCloseButton">&Κλείσιμο</String> | 35 | <String Id="FailureCloseButton">&Κλείσιμο</String> |
36 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 36 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
37 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
37 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 38 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
38 | </WixLocalization> | 39 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl index 803cacf5..2b7c0519 100644 --- a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Käynnistä uudelleen</String> | 32 | <String Id="FailureRestartButton">&Käynnistä uudelleen</String> |
33 | <String Id="FailureCloseButton">&Sulje</String> | 33 | <String Id="FailureCloseButton">&Sulje</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl index fb927f2b..3ae1cbd9 100644 --- a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Redémarrer</String> | 32 | <String Id="FailureRestartButton">&Redémarrer</String> |
33 | <String Id="FailureCloseButton">&Fermer</String> | 33 | <String Id="FailureCloseButton">&Fermer</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl index 78c008b2..f491d6f2 100644 --- a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Újraindítás</String> | 32 | <String Id="FailureRestartButton">&Újraindítás</String> |
33 | <String Id="FailureCloseButton">&Bezárás</String> | 33 | <String Id="FailureCloseButton">&Bezárás</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl index b7966340..50bc73e8 100644 --- a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl | |||
@@ -33,5 +33,6 @@ | |||
33 | <String Id="FailureRestartButton">&Riavvia</String> | 33 | <String Id="FailureRestartButton">&Riavvia</String> |
34 | <String Id="FailureCloseButton">&Chiudi</String> | 34 | <String Id="FailureCloseButton">&Chiudi</String> |
35 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 35 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
36 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 37 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
37 | </WixLocalization> | 38 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl index 9b7aa323..106c704a 100644 --- a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl | |||
@@ -29,5 +29,6 @@ | |||
29 | <String Id="FailureRestartButton">再起動(&R)</String> | 29 | <String Id="FailureRestartButton">再起動(&R)</String> |
30 | <String Id="FailureCloseButton">閉じる(&C)</String> | 30 | <String Id="FailureCloseButton">閉じる(&C)</String> |
31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
32 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 33 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
33 | </WixLocalization> | 34 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl index 445d445b..24655588 100644 --- a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl | |||
@@ -29,5 +29,6 @@ | |||
29 | <String Id="FailureRestartButton">다시 시작(&R)</String> | 29 | <String Id="FailureRestartButton">다시 시작(&R)</String> |
30 | <String Id="FailureCloseButton">닫기(&C)</String> | 30 | <String Id="FailureCloseButton">닫기(&C)</String> |
31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
32 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 33 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
33 | </WixLocalization> | 34 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl index 60ba996e..d2e572fc 100644 --- a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Opnieuw opstarten</String> | 32 | <String Id="FailureRestartButton">&Opnieuw opstarten</String> |
33 | <String Id="FailureCloseButton">&Sluiten</String> | 33 | <String Id="FailureCloseButton">&Sluiten</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl index e0718b8d..cb6036ee 100644 --- a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Start på nytt</String> | 32 | <String Id="FailureRestartButton">&Start på nytt</String> |
33 | <String Id="FailureCloseButton">&Lukk</String> | 33 | <String Id="FailureCloseButton">&Lukk</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl index 8b4eb758..41832b13 100644 --- a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Uruchom ponownie</String> | 32 | <String Id="FailureRestartButton">&Uruchom ponownie</String> |
33 | <String Id="FailureCloseButton">&Zamknij</String> | 33 | <String Id="FailureCloseButton">&Zamknij</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl index 0155eb39..08968f93 100644 --- a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl | |||
@@ -31,5 +31,6 @@ | |||
31 | <String Id="FailureRestartButton">&Reiniciar</String> | 31 | <String Id="FailureRestartButton">&Reiniciar</String> |
32 | <String Id="FailureCloseButton">&Fechar</String> | 32 | <String Id="FailureCloseButton">&Fechar</String> |
33 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 33 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
34 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
34 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
35 | </WixLocalization> | 36 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl index 87350745..271d5563 100644 --- a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl | |||
@@ -31,5 +31,6 @@ | |||
31 | <String Id="FailureRestartButton">&Перезагрузить</String> | 31 | <String Id="FailureRestartButton">&Перезагрузить</String> |
32 | <String Id="FailureCloseButton">&Закрыть</String> | 32 | <String Id="FailureCloseButton">&Закрыть</String> |
33 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 33 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
34 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
34 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
35 | </WixLocalization> | 36 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl index 7645a37f..ce6f6eda 100644 --- a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Reštartovať</String> | 32 | <String Id="FailureRestartButton">&Reštartovať</String> |
33 | <String Id="FailureCloseButton">&Zavrieť</String> | 33 | <String Id="FailureCloseButton">&Zavrieť</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl index b00205d8..2d0581b1 100644 --- a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Starta om</String> | 32 | <String Id="FailureRestartButton">&Starta om</String> |
33 | <String Id="FailureCloseButton">&Stäng</String> | 33 | <String Id="FailureCloseButton">&Stäng</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl index 00c3c187..c48a44da 100644 --- a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Yeniden Başlat</String> | 32 | <String Id="FailureRestartButton">&Yeniden Başlat</String> |
33 | <String Id="FailureCloseButton">&Kapat</String> | 33 | <String Id="FailureCloseButton">&Kapat</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl index 72d48267..0398a7f1 100644 --- a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl | |||
@@ -32,5 +32,6 @@ | |||
32 | <String Id="FailureRestartButton">&Ponovni zagon</String> | 32 | <String Id="FailureRestartButton">&Ponovni zagon</String> |
33 | <String Id="FailureCloseButton">&Zapri</String> | 33 | <String Id="FailureCloseButton">&Zapri</String> |
34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 34 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
35 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
36 | </WixLocalization> | 37 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl index 365ee7e6..09f09cb3 100644 --- a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl | |||
@@ -29,5 +29,6 @@ | |||
29 | <String Id="FailureRestartButton">重启(&R)</String> | 29 | <String Id="FailureRestartButton">重启(&R)</String> |
30 | <String Id="FailureCloseButton">关闭(&C)</String> | 30 | <String Id="FailureCloseButton">关闭(&C)</String> |
31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
32 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 33 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
33 | </WixLocalization> | 34 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl index 442a5571..f22822d8 100644 --- a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl | |||
@@ -31,5 +31,6 @@ | |||
31 | <String Id="FailureRestartButton">&Reiniciar</String> | 31 | <String Id="FailureRestartButton">&Reiniciar</String> |
32 | <String Id="FailureCloseButton">&Fechar</String> | 32 | <String Id="FailureCloseButton">&Fechar</String> |
33 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 33 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
34 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
34 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 35 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
35 | </WixLocalization> | 36 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl index 37c0dc05..edbf01c4 100644 --- a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl | |||
@@ -33,5 +33,6 @@ | |||
33 | <String Id="FailureRestartButton">&Reiniciar</String> | 33 | <String Id="FailureRestartButton">&Reiniciar</String> |
34 | <String Id="FailureCloseButton">&Cerrar</String> | 34 | <String Id="FailureCloseButton">&Cerrar</String> |
35 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 35 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
36 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
36 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 37 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
37 | </WixLocalization> | 38 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl index a53b1c83..22fcd3dc 100644 --- a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl | |||
@@ -29,5 +29,6 @@ | |||
29 | <String Id="FailureRestartButton">&Restart</String> | 29 | <String Id="FailureRestartButton">&Restart</String> |
30 | <String Id="FailureCloseButton">&Close</String> | 30 | <String Id="FailureCloseButton">&Close</String> |
31 | <String Id="SCDRUNTIMEFAILUREErrorMessage">[WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment.</String> | 31 | <String Id="SCDRUNTIMEFAILUREErrorMessage">[WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment.</String> |
32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Core runtime even though all of the prerequisites are installed.</String> | ||
32 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 33 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
33 | </WixLocalization> | 34 | </WixLocalization> |
diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl index 5d410888..77859d31 100644 --- a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl | |||
@@ -29,5 +29,6 @@ | |||
29 | <String Id="FailureRestartButton">&Restart</String> | 29 | <String Id="FailureRestartButton">&Restart</String> |
30 | <String Id="FailureCloseButton">&Close</String> | 30 | <String Id="FailureCloseButton">&Close</String> |
31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> | 31 | <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String> |
32 | <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String> | ||
32 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> | 33 | <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String> |
33 | </WixLocalization> | 34 | </WixLocalization> |