From 6cd139316164a12e6578d13d17723fe02e010cb4 Mon Sep 17 00:00:00 2001
From: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
Date: Thu, 30 Mar 2023 00:16:00 +0100
Subject: [PATCH] Bumped branding to v4.15. Removed leftover references of
 branded components.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
---
 Jenkinsfile                | 2 +-
 WixInstaller/XenCenter.wxs | 1 -
 scripts/xenadmin-build.sh  | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 92a09bc61..47a6d9567 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-def XENADMIN_BRANDING_TAG = 'v4.14'
+def XENADMIN_BRANDING_TAG = 'v4.15'
 
 @Library(['PacmanSharedLibrary', "xencenter-pipeline@v4.7"])
 import com.citrix.pipeline.xencenter.*
diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs
index 71e9ac4eb..b90f8c262 100644
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@@ -184,7 +184,6 @@
             <ComponentRef Id="RegistryEntries" />
             <ComponentRef Id="ApplicationShortcut" />
             <ComponentRef Id="ProgramFilesShortcut" />
-            <ComponentGroupRef Id="BrandedComponents" />
         </Feature>
 
         <UIRef Id="$(var.BrandInstallerUI)" />
diff --git a/scripts/xenadmin-build.sh b/scripts/xenadmin-build.sh
index 31451c27b..842eac5c8 100644
--- a/scripts/xenadmin-build.sh
+++ b/scripts/xenadmin-build.sh
@@ -155,11 +155,11 @@ do
   mkdir -p obj${name} out${name}
 
   WixLangId=$(locale_id ${locale} | tr -d [:space:]) RepoRoot=$(cygpath -w ${REPO}) \
-    ${CANDLE} -ext WiXNetFxExtension -ext WixUtilExtension -out obj${name}/ ${BRANDING_BRAND_CONSOLE_NO_SPACE}.wxs branding.wxs
+    ${CANDLE} -ext WiXNetFxExtension -ext WixUtilExtension -out obj${name}/ ${BRANDING_BRAND_CONSOLE_NO_SPACE}.wxs
 
   ${LIGHT} -sval -ext WiXNetFxExtension -ext WixUtilExtension -out out${name}/${name}.msi \
           -loc wixlib/wixui_${locale}.wxl -loc ${locale}.wxl \
-          obj${name}/${BRANDING_BRAND_CONSOLE_NO_SPACE}.wixobj obj${name}/branding.wixobj lib/WixUI_InstallDir.wixlib
+          obj${name}/${BRANDING_BRAND_CONSOLE_NO_SPACE}.wixobj lib/WixUI_InstallDir.wixlib
 
   cp ${WIX}/out${name}/${name}.msi ${WIX}
 done