diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2020-02-13 17:09:45 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-27 16:21:39 +0000 |
| commit | 37c0df01bb74749e403d1ee3d396344227867918 (patch) | |
| tree | 8e2df59ba91edadca30cac04975e819bc7f27b2a | |
| parent | b4f0cfe1d7fc292728f27edf7b3eee90ba5fd5b4 (diff) | |
| download | mongo-37c0df01bb74749e403d1ee3d396344227867918.tar.gz | |
SERVER-44853 MSI Should skip install MongoD service dialog when mongod is not selected to be installed
(cherry picked from commit a56d4030fc278b40a320e45422f7ee8e4eaecc34)
| -rw-r--r-- | src/mongo/installer/msi/wxs/UIFragment.wxs | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/mongo/installer/msi/wxs/UIFragment.wxs b/src/mongo/installer/msi/wxs/UIFragment.wxs index 9dc73b1de23..1ccbe3901bf 100644 --- a/src/mongo/installer/msi/wxs/UIFragment.wxs +++ b/src/mongo/installer/msi/wxs/UIFragment.wxs @@ -7,8 +7,12 @@ <Publish Event="NewDialog" Value="MongoSetupTypeDlg" Dialog="LicenseAgreementDlg" Control="Next">LicenseAccepted = "1"</Publish>
<Publish Event="NewDialog" Value="MongoSetupTypeDlg" Dialog="CustomizeDlg" Control="Back">WixUI_InstallMode = "InstallCustom"</Publish>
- <Publish Event="NewDialog" Value="ServiceDlg" Dialog="CustomizeDlg" Control="Next"></Publish>
- <Publish Event="NewDialog" Value="CompassDlg" Dialog="VerifyReadyDlg" Control="Back"></Publish>
+ <Publish Event="NewDialog" Value="ServiceDlg" Dialog="CustomizeDlg" Control="Next">
+ <![CDATA[&Server = 3]]>
+ </Publish>
+ <Publish Event="NewDialog" Value="CompassDlg" Dialog="CustomizeDlg" Control="Next">
+ <![CDATA[NOT (&Server = 3)]]>
+ </Publish>
<!-- A custom setup type dialog box with only Complete and Custom buttons -->
<Dialog Id="MongoSetupTypeDlg" X="50" Y="50" Width="370" Height="270" Title="[ProductName] Setup">
@@ -160,7 +164,19 @@ <Control Id="InstallCompass" CheckBoxValue="1" Property="SHOULD_INSTALL_COMPASS" X="15" Y="243" Width="150" Height="17" Text="Install MongoDB Compass" Type="CheckBox" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back" TabSkip="no">
- <Publish Event="NewDialog" Value="ServiceDlg">1</Publish>
+ <Publish Event="NewDialog" Value="ServiceDlg">
+ <![CDATA[&Server = 3]]>
+ </Publish>
+ <Publish Event="NewDialog" Value="MongoSetupTypeDlg">
+ <![CDATA[
+ NOT (&Server = 3) AND (WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete")
+ ]]>
+ </Publish>
+ <Publish Event="NewDialog" Value="CustomizeDlg" Order="2">
+ <![CDATA[
+ NOT (&Server = 3) AND WixUI_InstallMode = "InstallCustom"
+ ]]>
+ </Publish>
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" TabSkip="no" Disabled="no" >
<Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
|