DEVEL15-windows-install-wix-20061218

remove the AFS Server wizard shortcut

add AFS Server dependencies (tcpip and PNP_TDI)

(cherry picked from commit a1c31b6637fe44f2a2ebd4be491b71cc4e0fa922)

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index a24566ff3c21878056c7c549abc8edb9f84aa51a..155ecef73a7594ed56e1ec9adc043017f6c7d810 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1001,7 +1001,9 @@
                             </Component>
                              <Component Win64="$(var.Win64)" Id="cmf_afssvrcfg_EXE" Guid="$(var.cmf_afssvrcfg_EXE_guid)">
                                 <File Id="fileafssvrcfg_EXE" Name="afssv.exe" LongName="afssvrcfg.exe" KeyPath="yes" DiskId="1">
+<!--
                                                                        <Shortcut Id="scSvrCfgWizard" Directory="dirShortCut" Name="SvrCfgWz.lnk" LongName="Server Configuration Wizard.lnk" Description="$(loc.StrCfgWzdDesc)" Arguments="/wizard" Icon="ico_afssvrcfg" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+-->
                                 </File>
                             </Component>
                            <?if $(env.CPU) = "i386"?>
@@ -1016,6 +1018,8 @@
                                                                        <!-- ServiceConfig does nothing 
                                     <ServiceConfig FirstFailureActionType="restart" RestartServiceDelayInSeconds="5" SecondFailureActionType="restart" ThirdFailureActionType="none"/>
                                     -->
+                                    <ServiceDependency Id="Tcpip" />
+                                    <ServiceDependency Id="PNP_TDI" Group="yes"/>
                                 </ServiceInstall>
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_bosserver_EXE" Guid="$(var.cmf_bosserver_EXE_guid)">