CP-42155: Removed HealthCheck service leftovers from the build and the installer.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>

WixInstaller/XenCenter.wxs

@@ -214,7 +214,6 @@
                 <ComponentRef Id="ScResources" />
             </Feature>
         </Feature>
-        <FeatureGroupRef Id="BrandedFeatures" />
 
         <UIRef Id="$(var.BrandInstallerUI)" />
         <UIRef Id="WixUI_ErrorProgressText" />

WixInstaller/branding.wxi

@@ -46,7 +46,6 @@
   <?define AppShortcutGuid="6B875059-26BC-4fa7-ACB7-0B9A4E4665CA"?>
   <?define ReadmeGuid="47427a60-4064-4fdb-878d-04309a0fd9ce"?>
   <?define UpdateFilesGuid="1cfbf607-cc80-4bf8-b2fc-37e69c872316"?>
-  <?define HealthCheckGuid="{9D686BFC-B4FD-435F-AC74-0ACE29425095}"?>
   <?define DummyGuid="98945751-78CD-421F-9478-352AF41F496C"?>
   <?define HiddenFeatures=""?>
   <?define AdditionalFeatures=""?>

WixInstaller/branding.wxs

@@ -33,43 +33,6 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
     <?include branding.wxi ?>
-    <Fragment>
-        <DirectoryRef Id='XenServer'>
-            <Directory Id="HEALTHCHECKSERVICEDIR" Name="XenServerHealthCheckService">
-                <Component Id="XenServerHealthCheck" Guid="$(var.HealthCheckGuid)">
-                    <File Id="HealthCheck_XenServerHealthCheck.exe" Name="XenServerHealthCheck.exe" KeyPath="yes" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\XenServerHealthCheck.exe" />
-                    <File Id="HealthCheck_CommandLib.dll" Name="CommandLib.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\CommandLib.dll" />
-                    <File Id="HealthCheck_CookComputing.XmlRpcV2.dll" Name="CookComputing.XmlRpcV2.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\CookComputing.XmlRpcV2.dll" />
-                    <File Id="HealthCheck_NewtonsoftJsonDLL" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\Newtonsoft.Json.CH.dll" />
-                    <File Id="HealthCheck_ICSharpCode.SharpZipLib.dll" Name="ICSharpCode.SharpZipLib.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\ICSharpCode.SharpZipLib.dll" />
-                    <File Id="HealthCheck_log4net.dll" Name="log4net.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\log4net.dll" />
-                    <File Id="HealthCheck_CoreUtilsLib.dll" Name="CoreUtilsLib.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\CoreUtilsLib.dll" />
-                    <File Id="HealthCheck_XenModel.dll" Name="XenModel.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\XenModel.dll" />
-                    <File Id="HealthCheck_XenServerHealthCheck.exe.config" Name="XenServerHealthCheck.exe.config" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\XenServerHealthCheck.exe.config" />
-                    <ServiceInstall
-                      Id="ServiceInstaller"
-                      Type="ownProcess"
-                      Vital="no"
-                      Name="XenServerHealthCheck"
-                      DisplayName="$(var.BrandProduct) Health Check Service"
-                      Description="!(loc.HealthCheckDescr)"
-                      Start="auto"
-                      Account="LocalSystem"
-                      ErrorControl="normal"
-                      Interactive="no"
-                    />
-                    <ServiceControl
-                        Id="StartService"
-                        Start="install"
-                        Stop="both"
-                        Remove="uninstall"
-                        Name="XenServerHealthCheck"
-                        Wait="yes"
-                    />
-                </Component>
-            </Directory>
-        </DirectoryRef>
-    </Fragment>
     <Fragment>
         <DirectoryRef Id='INSTALLDIR'>
             <Directory Id="TestReso" ShortName="TestReso" Name="TestResources">
@@ -82,17 +45,9 @@
             </Directory>
         </DirectoryRef>
     </Fragment>
-    <Fragment>
-        <Feature Id="HealthCheckService" Title="$(var.BrandProduct) Health Check Service" Description="!(loc.HealthCheckDescrShort)" Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
-            <ComponentRef Id="XenServerHealthCheck" />
-        </Feature>
-    </Fragment>
     <Fragment>
         <ComponentGroup Id="BrandedComponents">
             <ComponentRef Id="TestResources" />
         </ComponentGroup>
-        <FeatureGroup Id="BrandedFeatures">
-            <FeatureRef Id="HealthCheckService" />
-        </FeatureGroup>
     </Fragment>
 </Wix>

WixInstaller/en-us.wxl

@@ -46,8 +46,6 @@
     <String Id="XenCenter_Launch">Launch</String>
     <String Id="Required_For_Installation">Microsoft .NET Framework 4.8 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework</String>
     <String Id="Readme">README.TXT</String>
-    <String Id="HealthCheckDescr">Enables monitoring of the health of your XenServer pools by periodically uploading data from the servers to Citrix Insight Services.</String>
-    <String Id="HealthCheckDescrShort">Enables monitoring of the health of your XenServer pools.</String>
     <String Id="JapaneseTitle">Language Pack: Japanese</String>
     <String Id="JapaneseDescr">Japanese resource files</String>
     <String Id="SimplifiedChineseTitle">Language Pack: Simplified Chinese</String>

WixInstaller/ja-jp.wxl

@@ -46,8 +46,6 @@
     <String Id="XenCenter_Launch">Launch</String>
     <String Id="Required_For_Installation">このインストールには、Microsoft .NET Framework 4.8 以降が必要です。https://www.microsoft.com/net/download/framework からインストールしてください。</String>
     <String Id="Readme">README.TXT</String>
-    <String Id="HealthCheckDescr">サーバーから Citrix Insight Services に定期的にデータをアップロードすることにより、XenServer プールのヘルス状態の監視を有効にします。</String>
-    <String Id="HealthCheckDescrShort">XenServer プールのヘルス状態の監視を有効にします。</String>
     <String Id="JapaneseTitle">言語パック: 日本語</String>
     <String Id="JapaneseDescr">日本語のリソース ファイル</String>
     <String Id="SimplifiedChineseTitle">言語パック: 簡体字中国語</String>

WixInstaller/zh-cn.wxl

@@ -46,8 +46,6 @@
     <String Id="XenCenter_Launch">Launch</String>
     <String Id="Required_For_Installation">此安装需要 Microsoft .NET Framework 4.8 或更高版本。请从 https://www.microsoft.com/net/download/framework 进行安装</String>
     <String Id="Readme">声明.TXT</String>
-    <String Id="HealthCheckDescr">通过定期将数据从服务器上载到 Citrix Insight Services，实现对 XenServer 池的运行状况监视。</String>
-    <String Id="HealthCheckDescrShort">启用对 XenServer 池的运行状况的监视。</String>
     <String Id="JapaneseTitle">语言包: 日语</String>
     <String Id="JapaneseDescr">日语资源文件</String>
     <String Id="SimplifiedChineseTitle">语言包: 简体中文</String>

scripts/re-branding.sh

@@ -56,7 +56,7 @@ version_csharp "${REPO}/CommonAssemblyInfo.cs"
 rebranding_global "${REPO}/CommonAssemblyInfo.cs"
 
 #AssemblyInfo rebranding
-for projectDir in CFUValidator CommandLib xe XenAdmin XenAdminTests XenCenterLib XenModel XenOvfApi XenServerHealthCheck xva_verify
+for projectDir in CFUValidator CommandLib xe XenAdmin XenAdminTests XenCenterLib XenModel XenOvfApi xva_verify
 do
   assemblyInfo="${REPO}/${projectDir}/Properties/AssemblyInfo.cs"
   version_csharp ${assemblyInfo}

scripts/xenadmin-build.sh

@@ -108,15 +108,10 @@ if [ -f "${SIGN_BAT}" ] ; then
   cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} ICSharpCode.SharpZipLib.dll "SharpZipLib"
   cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} DiscUtils.dll "DiscUtils"
 
-  cd ${REPO}/XenServerHealthCheck/bin/Release && ${SIGN_BAT} XenServerHealthCheck.exe "${BRANDING_BRAND_CONSOLE}"
 else
   echo "Sign script does not exist; skip signing binaries"
 fi
 
-#copy files (signed accordingly) in XenServerHealthService folder
-cp ${REPO}/XenAdmin/bin/Release/{CommandLib.dll,CoreUtilsLib.dll,XenModel.dll,CookComputing.XmlRpcV2.dll,Newtonsoft.Json.CH.dll,log4net.dll,ICSharpCode.SharpZipLib.dll} \
-  ${REPO}/XenServerHealthCheck/bin/Release
-
 #prepare wix
 
 WIX_BIN=${SCRATCH_DIR}/wixbin
@@ -214,7 +209,6 @@ cp ${REPO}/packages/*.pdb ${OUTPUT_DIR}
 cp ${REPO}/XenAdmin/bin/Release/{CommandLib.pdb,${BRANDING_BRAND_CONSOLE_NO_SPACE}.pdb,CoreUtilsLib.pdb,${BRANDING_BRAND_CONSOLE_NO_SPACE}.pdb,XenModel.pdb,XenOvf.pdb} \
    ${REPO}/xe/bin/Release/xe.pdb \
    ${REPO}/xva_verify/bin/Release/xva_verify.pdb \
-   ${REPO}/XenServerHealthCheck/bin/Release/XenServerHealthCheck.pdb \
    ${OUTPUT_DIR}
 
 cd ${OUTPUT_DIR} && zip -r -m  ${BRANDING_BRAND_CONSOLE_NO_SPACE}.Symbols.zip *.pdb