From 3a71ff29eb88bff900f36ab8a351e9e4f79be588 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Tue, 14 Feb 2023 22:05:51 +0000 Subject: [PATCH] CP-42155: Removed HealthCheck service leftovers from the build and the installer. Signed-off-by: Konstantina Chremmou --- WixInstaller/XenCenter.wxs | 1 - WixInstaller/branding.wxi | 1 - WixInstaller/branding.wxs | 45 -------------------------------------- WixInstaller/en-us.wxl | 2 -- WixInstaller/ja-jp.wxl | 2 -- WixInstaller/zh-cn.wxl | 2 -- scripts/re-branding.sh | 2 +- scripts/xenadmin-build.sh | 6 ----- 8 files changed, 1 insertion(+), 60 deletions(-) diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs index 1106fe2f8..3bcbebaaf 100644 --- a/WixInstaller/XenCenter.wxs +++ b/WixInstaller/XenCenter.wxs @@ -214,7 +214,6 @@ - diff --git a/WixInstaller/branding.wxi b/WixInstaller/branding.wxi index 163d0ffb5..6cf809daf 100644 --- a/WixInstaller/branding.wxi +++ b/WixInstaller/branding.wxi @@ -46,7 +46,6 @@ - diff --git a/WixInstaller/branding.wxs b/WixInstaller/branding.wxs index f2913a998..141922b39 100644 --- a/WixInstaller/branding.wxs +++ b/WixInstaller/branding.wxs @@ -33,43 +33,6 @@ - - - - - - - - - - - - - - - - - - - @@ -82,17 +45,9 @@ - - - - - - - - \ No newline at end of file diff --git a/WixInstaller/en-us.wxl b/WixInstaller/en-us.wxl index 837e714a1..3addd2741 100644 --- a/WixInstaller/en-us.wxl +++ b/WixInstaller/en-us.wxl @@ -46,8 +46,6 @@ Launch Microsoft .NET Framework 4.8 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework README.TXT - Enables monitoring of the health of your XenServer pools by periodically uploading data from the servers to Citrix Insight Services. - Enables monitoring of the health of your XenServer pools. Language Pack: Japanese Japanese resource files Language Pack: Simplified Chinese diff --git a/WixInstaller/ja-jp.wxl b/WixInstaller/ja-jp.wxl index bcc4b512a..c2da58057 100644 --- a/WixInstaller/ja-jp.wxl +++ b/WixInstaller/ja-jp.wxl @@ -46,8 +46,6 @@ Launch このインストールには、Microsoft .NET Framework 4.8 以降が必要です。https://www.microsoft.com/net/download/framework からインストールしてください。 README.TXT - サーバーから Citrix Insight Services に定期的にデータをアップロードすることにより、XenServer プールのヘルス状態の監視を有効にします。 - XenServer プールのヘルス状態の監視を有効にします。 言語パック: 日本語 日本語のリソース ファイル 言語パック: 簡体字中国語 diff --git a/WixInstaller/zh-cn.wxl b/WixInstaller/zh-cn.wxl index 4f377a020..43664d4c3 100644 --- a/WixInstaller/zh-cn.wxl +++ b/WixInstaller/zh-cn.wxl @@ -46,8 +46,6 @@ Launch 此安装需要 Microsoft .NET Framework 4.8 或更高版本。请从 https://www.microsoft.com/net/download/framework 进行安装 声明.TXT - 通过定期将数据从服务器上载到 Citrix Insight Services，实现对 XenServer 池的运行状况监视。 - 启用对 XenServer 池的运行状况的监视。 语言包: 日语 日语资源文件 语言包: 简体中文 diff --git a/scripts/re-branding.sh b/scripts/re-branding.sh index 80eb37ad5..b01c34e26 100644 --- a/scripts/re-branding.sh +++ b/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} diff --git a/scripts/xenadmin-build.sh b/scripts/xenadmin-build.sh index dab121221..6e4353124 100644 --- a/scripts/xenadmin-build.sh +++ b/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