Skip to content

Commit 273e91a

Browse files
kboortzdahlerlend
kboortz
authored and
dahlerlend
committed
Bug#35613791 - Upgrade from Wix 3.11 to 4.0.1 for Server/Cluster MSI builds
WiX Toolset v3 is no longer actively maintained. Other new and old bugs corrected: Bug#35729602 - MEB msi does not contains the MySQL image like others msi. Bug#35734657 - Server MSI installing in "C:\Program Files (x86)" instead of "C:\Program Files" Change-Id: I08922db98fd7234ffab57e5d05f1c3cb6e297ae8
1 parent 818ba27 commit 273e91a

18 files changed

+218
-370
lines changed

‎packaging/WiX/CMakeLists.txt

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
# along with this program; if not, write to the Free Software
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

23-
IF(NOT WIN32)
24-
RETURN()
25-
ENDIF()
26-
2723
include(wix_setup.cmake)
2824

2925
IF(NOT WIX_DIR)
@@ -40,27 +36,18 @@ SET(CPACK_WIX_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs;
4036
${CMAKE_CURRENT_BINARY_DIR}/redist_check.wxs")
4137
SET(CPACK_MSI_SETUP ${CMAKE_CURRENT_SOURCE_DIR}/cpack_msi_setup.cmake)
4238

43-
ADD_CUSTOM_TARGET(
44-
configure_mysql_server_extra
45-
COMMAND ${CMAKE_COMMAND}
46-
-DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
47-
-DOUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs
48-
-DMAJOR_VERSION=${MAJOR_VERSION}
49-
-DMINOR_VERSION=${MINOR_VERSION}
50-
-P ${CMAKE_CURRENT_SOURCE_DIR}/configure_file.cmake
51-
)
39+
CONFIGURE_FILE(
40+
${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
41+
${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs
42+
@ONLY)
5243

53-
ADD_CUSTOM_TARGET(
54-
configure_redist_check
55-
COMMAND ${CMAKE_COMMAND}
56-
-DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/redist_check.wxs.in
57-
-DOUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/redist_check.wxs
58-
-DLINK_STATIC_RUNTIME_LIBRARIES=${LINK_STATIC_RUNTIME_LIBRARIES}
59-
-DBUNDLE_RUNTIME_LIBRARIES=${BUNDLE_RUNTIME_LIBRARIES}
60-
-P ${CMAKE_CURRENT_SOURCE_DIR}/configure_file.cmake
61-
)
44+
CONFIGURE_FILE(
45+
${CMAKE_CURRENT_SOURCE_DIR}/redist_check.wxs.in
46+
${CMAKE_CURRENT_BINARY_DIR}/redist_check.wxs
47+
@ONLY)
6248

63-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
49+
CONFIGURE_FILE(
50+
${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
6451
${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
6552
@ONLY)
6653

@@ -86,7 +73,6 @@ ADD_CUSTOM_TARGET(
8673
${CONFIG_PARAM}
8774
-P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
8875
)
89-
ADD_DEPENDENCIES(MSI configure_mysql_server_extra configure_redist_check)
9076

9177
IF(TARGET remove_INFO_SRC_from_bs)
9278
ADD_DEPENDENCIES(MSI remove_INFO_SRC_from_bs)

‎packaging/WiX/CPackWixConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
120120
#Feature Documentation
121121
SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
122122
SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
123-
SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
123+
SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2) # Not to install by default
124124

125125
#Feature tests
126126
SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")

‎packaging/WiX/DwordToNumber.vbs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
' Copyright (c) 2010, 2023, Oracle and/or its affiliates.
2+
'
3+
' This program is free software; you can redistribute it and/or modify
4+
' it under the terms of the GNU General Public License, version 2.0,
5+
' as published by the Free Software Foundation.
6+
'
7+
' This program is also distributed with certain software (including
8+
' but not limited to OpenSSL) that is licensed under separate terms,
9+
' as designated in a particular file or component or in included license
10+
' documentation. The authors of MySQL hereby grant you an additional
11+
' permission to link the program and your derivative works with the
12+
' separately licensed software that they have included with MySQL.
13+
'
14+
' This program is distributed in the hope that it will be useful,
15+
' but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
' GNU General Public License, version 2.0, for more details.
18+
'
19+
' You should have received a copy of the GNU General Public License
20+
' along with this program; if not, write to the Free Software
21+
' Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22+
23+
Session.Property("VS14REDISTX64_64_MAJOR") = Replace(Session.Property("VS14REDISTX64_64_MAJOR"),"#","")
24+
Session.Property("VS14REDISTX64_64_MINOR") = Replace(Session.Property("VS14REDISTX64_64_MINOR"),"#","")
25+
Session.Property("VS14REDISTX64_32_MAJOR") = Replace(Session.Property("VS14REDISTX64_32_MAJOR"),"#","")
26+
Session.Property("VS14REDISTX64_32_MINOR") = Replace(Session.Property("VS14REDISTX64_32_MINOR"),"#","")

‎packaging/WiX/configure_file.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
# along with this program; if not, write to the Free Software
2121
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

23-
CONFIGURE_FILE(${INPUT_FILE} ${OUTPUT_FILE})
23+
CONFIGURE_FILE(${INPUT_FILE} ${OUTPUT_FILE} @ONLY)

‎packaging/WiX/cpack_msi_setup.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ FUNCTION(TRAVERSE_FILES dir topdir file file_comp dir_root)
242242
# According to MSDN each DLL or EXE should be in the own component
243243
IF(f_ext MATCHES ".exe" OR f_ext MATCHES ".dll")
244244

245-
FILE(APPEND ${file} " <Component Id='C.${id}' Guid='*' Win64='yes'>\n")
245+
FILE(APPEND ${file} " <Component Id='C.${id}' Bitness='always64'>\n")
246246
FILE(APPEND ${file} " <File Id='F.${id}' KeyPath='yes' Source='${f_native}'/>\n")
247247
FILE(APPEND ${file} " </Component>\n")
248248
FILE(APPEND ${file_comp} " <ComponentRef Id='C.${id}'/>\n")
@@ -257,7 +257,7 @@ FUNCTION(TRAVERSE_FILES dir topdir file file_comp dir_root)
257257
GENERATE_GUID(guid)
258258
SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}")
259259
FILE(APPEND ${file}
260-
"<DirectoryRef Id='${DirectoryRefId}'>\n<Component Guid='${guid}' Id='${ComponentId}' Win64='yes'>${NONEXEFILES}\n</Component></DirectoryRef>\n")
260+
"<DirectoryRef Id='${DirectoryRefId}'>\n<Component Guid='${guid}' Id='${ComponentId}' Bitness='always64'>${NONEXEFILES}\n</Component>\n</DirectoryRef>\n")
261261
FILE(APPEND ${file_comp} " <ComponentRef Id='${ComponentId}'/>\n")
262262
ENDIF()
263263
FOREACH(f ${all_files})

‎packaging/WiX/create_msi.cmake.in

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ SET(LINK_STATIC_RUNTIME_LIBRARIES "@LINK_STATIC_RUNTIME_LIBRARIES@")
2424
SET(BUNDLE_RUNTIME_LIBRARIES "@BUNDLE_RUNTIME_LIBRARIES@")
2525
SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
2626
SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
27-
SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
28-
SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@")
27+
SET(WIX_EXECUTABLE "@WIX_EXECUTABLE@")
2928
SET(CMAKE_COMMAND "@CMAKE_COMMAND@")
3029
SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
3130
SET(VERSION "@VERSION@")
@@ -83,36 +82,27 @@ LIST(APPEND EXCLUDE_FILES
8382

8483
INCLUDE(${CPACK_MSI_SETUP})
8584

86-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in
87-
${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
85+
CONFIGURE_FILE(
86+
${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in
87+
${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs
88+
@ONLY)
8889

89-
SET(EXTRA_CANDLE_ARGS)
90-
IF("$ENV{EXTRA_CANDLE_ARGS}")
91-
SET(EXTRA_CANDLE_ARGS "$ENV{EXTRA_CANDLE_ARGS}")
90+
SET(EXTRA_WIX_ARGS)
91+
IF("$ENV{EXTRA_WIX_ARGS}")
92+
SET(EXTRA_WIX_ARGS "$ENV{EXTRA_WIX_ARGS}")
9293
ENDIF()
9394

94-
SET(EXTRA_LIGHT_ARGS)
95-
IF("$ENV{EXTRA_LIGHT_ARGS}")
96-
SET(EXTRA_LIGHT_ARGS "$ENV{EXTRA_LIGHT_ARGS}")
97-
ENDIF()
98-
99-
FILE(REMOVE mysql_server.wixobj)
10095
EXECUTE_PROCESS(
101-
COMMAND ${CANDLE_EXECUTABLE} -ext WixUtilExtension mysql_server.wxs ${EXTRA_CANDLE_ARGS}
102-
RESULT_VARIABLE CANDLE_RESULT
96+
COMMAND ${WIX_EXECUTABLE} build
97+
-arch x64
98+
-ext WixToolset.UI.wixext -ext WixToolset.Util.wixext ${EXTRA_WIX_ARGS}
99+
-out ${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
100+
mysql_server.wxs
101+
RESULT_VARIABLE WIX_RESULT
102+
OUTPUT_VARIABLE WIX_OUTPUT
103+
ERROR_VARIABLE WIX_OUTPUT
103104
)
104105

105-
IF(CANDLE_RESULT)
106-
MESSAGE(FATAL_ERROR "ERROR: can't run candle")
106+
IF(WIX_RESULT)
107+
MESSAGE(FATAL_ERROR "ERROR: can't run WiX: ${WIX_RESULT} ${WIX_OUTPUT}")
107108
ENDIF()
108-
109-
EXECUTE_PROCESS(
110-
COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension
111-
mysql_server.wixobj -out ${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
112-
${EXTRA_LIGHT_ARGS}
113-
RESULT_VARIABLE LIGHT_RESULT
114-
)
115-
116-
IF(LIGHT_RESULT)
117-
MESSAGE(FATAL_ERROR "ERROR: can't run light")
118-
ENDIF()

‎packaging/WiX/custom_ui.wxs

Lines changed: 38 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
2-
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
1+
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
32

43
<!--
54
Copyright (c) 2010, 2023, Oracle and/or its affiliates.
@@ -28,12 +27,12 @@
2827
<UI Id="WixUI_Mondo_Custom">
2928
<Dialog Id="CustomWelcomeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
3029
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
31-
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
30+
<Publish Event="SpawnDialog" Value="CancelDlg" />
3231
</Control>
3332
<Control Id="Next" Type="PushButton" X="220" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
34-
<Publish Event="NewDialog" Value="LicenseAgreementDlg">NOT OLDERVERSIONBEINGUPGRADED</Publish>
35-
<Publish Event="NewDialog" Value="UpgradeDlg">OLDERVERSIONBEINGUPGRADED</Publish>
36-
</Control>
33+
<Publish Event="NewDialog" Value="LicenseAgreementDlg" Condition="NOT OLDERVERSIONBEINGUPGRADED" />
34+
<Publish Event="NewDialog" Value="UpgradeDlg" Condition="OLDERVERSIONBEINGUPGRADED" />
35+
</Control>
3736
<Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
3837
<Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
3938
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
@@ -44,26 +43,19 @@
4443

4544
<Dialog Id="UpgradeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
4645
<Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="Upgrade">
47-
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
48-
<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
49-
<Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
50-
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
51-
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
46+
<Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
47+
<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
48+
<Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
49+
<Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
50+
<Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
5251
</Control>
5352
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
54-
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
55-
</Control>
56-
<Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
57-
<Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
58-
</Control>
59-
<Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
60-
<Condition Action="show">NOT Installed</Condition>
53+
<Publish Event="SpawnDialog" Value="CancelDlg" />
6154
</Control>
62-
<Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
63-
<Condition Action="show">NOT Installed</Condition>
64-
</Control>
65-
<Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes"
66-
Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade."/>
55+
<Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" DefaultCondition="WixUI_InstallMode = &quot;Remove&quot;" />
56+
<Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)" ShowCondition="NOT Installed" />
57+
<Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)" ShowCondition="NOT Installed" />
58+
<Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes" Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade." />
6759
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
6860
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
6961
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
@@ -72,6 +64,7 @@
7264
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
7365
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
7466
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
67+
<TextStyle Id="WixUI_Font_Title2" FaceName="Tahoma" Size="13" />
7568

7669
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
7770
<Property Id="WixUI_Mode" Value="Mondo" />
@@ -85,36 +78,36 @@
8578
<DialogRef Id="ResumeDlg" />
8679
<DialogRef Id="UserExit" />
8780

88-
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
81+
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
82+
83+
<Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg" />
84+
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="LicenseAccepted = &quot;1&quot;" />
8985

90-
<Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
91-
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
86+
<Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" />
87+
<Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg" />
88+
<Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg" />
89+
<Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg" />
9290

93-
<Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
94-
<Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
95-
<Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
96-
<Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
91+
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1" Condition="WixUI_InstallMode = &quot;Change&quot;" />
92+
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="WixUI_InstallMode = &quot;InstallCustom&quot;" />
93+
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
9794

98-
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
99-
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
100-
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
95+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1" Condition="WixUI_InstallMode = &quot;InstallCustom&quot;" />
96+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="WixUI_InstallMode = &quot;InstallTypical&quot; OR WixUI_InstallMode = &quot;InstallComplete&quot;" />
97+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3" Condition="WixUI_InstallMode = &quot;Change&quot;" />
98+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4" Condition="WixUI_InstallMode = &quot;Repair&quot; OR WixUI_InstallMode = &quot;Remove&quot;" />
10199

102-
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
103-
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
104-
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
105-
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
100+
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
106101

107-
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
102+
<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg" />
103+
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
104+
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
105+
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
108106

109-
<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
110-
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
111-
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
112-
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
107+
<Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg" />
113108

114-
<Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
115-
116109
<InstallUISequence>
117-
<Show Dialog="CustomWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>
110+
<Show Dialog="CustomWelcomeDlg" Before="ProgressDlg" Condition="NOT Installed" />
118111
</InstallUISequence>
119112
</UI>
120113

0 commit comments

Comments
 (0)