From 2b93c22d35f61bbeb9e5e4549e7b0eb2e51df54d Mon Sep 17 00:00:00 2001
From: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Date: Wed, 17 Feb 2021 01:54:38 +0000
Subject: [PATCH] Minor corrections to enable local build without applying
 external branding.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
---
 WixInstaller/branding.wxi | 2 ++
 WixInstaller/branding.wxs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WixInstaller/branding.wxi b/WixInstaller/branding.wxi
index 7df34cf8b..55a4279b3 100644
--- a/WixInstaller/branding.wxi
+++ b/WixInstaller/branding.wxi
@@ -54,6 +54,8 @@
   <?define CompanyNameLegal="@COMPANY_NAME_LEGAL@"?>
   <?define CompanyNameShort="@COMPANY_NAME_SHORT@"?>
   <?define BrandConsole="@BRAND_CONSOLE@"?>
+  <?define BrandConsoleNoSpace="@BRAND_CONSOLE_NO_SPACE@"?>
+  <?define BrandConsoleShort="@BRAND_CONSOLE_SHORT@"?>
   <?define BrandProduct="@PRODUCT_BRAND@"?>
   <?define FileExtBackup="xbk"?>
   <?define FileExtUpdate="xsupdate"?>
diff --git a/WixInstaller/branding.wxs b/WixInstaller/branding.wxs
index 578a24e57..8a1741322 100644
--- a/WixInstaller/branding.wxs
+++ b/WixInstaller/branding.wxs
@@ -45,7 +45,7 @@
                     <File Id="HealthCheck_ICSharpCode.SharpZipLib.dll" Name="ICSharpCode.SharpZipLib.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\ICSharpCode.SharpZipLib.dll" />
                     <File Id="HealthCheck_Ionic.Zip.dll" Name="Ionic.Zip.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\Ionic.Zip.dll" />
                     <File Id="HealthCheck_log4net.dll" Name="log4net.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\log4net.dll" />
-                    <File Id="HealthCheck_XenCenterLib.dll" Name="XenCenterLib.dll" Source="$(env.RepoRoot)\XenServerHealthCheck\bin\Release\XenCenterLib.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