From 44d710c5ee77ee6039cc05b160b0a5332dda1366 Mon Sep 17 00:00:00 2001
From: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Date: Fri, 31 Mar 2017 16:54:26 +0100
Subject: [PATCH] CA-242405: Fixed Metadata in XenCenterSetup.exe

Added the build number to the file version

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
---
 dotNetInstaller/XenCenterSetupBootstrapper.xml      | 2 +-
 dotNetInstaller/XenCenterSetupBootstrapper_l10n.xml | 2 +-
 mk/re-branding.sh                                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dotNetInstaller/XenCenterSetupBootstrapper.xml b/dotNetInstaller/XenCenterSetupBootstrapper.xml
index acad4e9f1..044100859 100644
--- a/dotNetInstaller/XenCenterSetupBootstrapper.xml
+++ b/dotNetInstaller/XenCenterSetupBootstrapper.xml
@@ -30,7 +30,7 @@
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
    SUCH DAMAGE.
 -->
-<configurations lcid_type="UserExe" show_language_selector="False" language_selector_title="" language_selector_ok="OK" language_selector_cancel="Cancel" configuration_no_match_message="" ui_level="basic" fileversion="[BRANDING_PRODUCT_VERSION]" productversion="[BRANDING_PRODUCT_VERSION]" log_enabled="False" log_file="#TEMPPATH\XenCenterExeInstallerLog.txt">
+<configurations lcid_type="UserExe" show_language_selector="False" language_selector_title="" language_selector_ok="OK" language_selector_cancel="Cancel" configuration_no_match_message="" ui_level="basic" fileversion="[BRANDING_PRODUCT_VERSION].[BRANDING_BUILD_NUMBER]" productversion="[BRANDING_PRODUCT_VERSION]" log_enabled="False" log_file="#TEMPPATH\XenCenterExeInstallerLog.txt">
   <schema version="2.3.16.0" generator="dotNetInstaller InstallerEditor" />
   <fileattributes><fileattribute name="CompanyName" value="[BRANDING_COMPANY_NAME_LEGAL]" /><fileattribute name="FileDescription" value="[Citrix] [XenCenter] Installer" /><fileattribute name="ProductName" value="[Citrix] [XenCenter]" /><fileattribute name="LegalCopyright" value="[BRANDING_COPYRIGHT]"/><fileattribute name="LegalTrademarks" /></fileattributes>
   <configuration dialog_caption="[Citrix] [XenCenter] Installer" dialog_message="In order to install [Citrix] [XenCenter] you must first install these components:" dialog_message_uninstall="" dialog_bitmap="#APPPATH\banner.bmp" skip_caption="Skip" install_caption="Install" uninstall_caption="Uninstall" cancel_caption="Close" status_installed=" (Installed)" status_notinstalled="" failed_exec_command_continue="" installation_completed="[Citrix] [XenCenter] installed successfully!" uninstallation_completed="[Citrix] [XenCenter] uninstalled successfully!" installation_none="[Citrix] [XenCenter] is already installed!" uninstallation_none="[Citrix] [XenCenter] is not installed!" installing_component_wait="Installing %s. Wait, this operation could take some time ..." uninstalling_component_wait="Uninstalling %s. Wait, this operation could take some time ..." reboot_required="To continue the installation you must restart your computer. Restart now?" must_reboot_required="False" dialog_otherinfo_caption="" dialog_otherinfo_link="" complete_command="" complete_command_silent="" complete_command_basic="" wait_for_complete_command="True" prompt_for_optional_components="False" auto_close_if_installed="True" auto_close_on_error="False" reload_on_error="False" dialog_show_installed="False" dialog_show_uninstalled="False" dialog_show_required="False" cab_dialog_message="%s" cab_cancelled_message="" cab_dialog_caption="" cab_path="#TEMPPATH\#GUID" cab_path_autodelete="False" dialog_default_button="cancel" dialog_position="" dialog_components_list_position="" dialog_message_position="" dialog_bitmap_position="" dialog_otherinfo_link_position="" dialog_osinfo_position="" dialog_install_button_position="" dialog_cancel_button_position="" dialog_skip_button_position="" auto_start="True" auto_continue_on_reboot="False" reboot_cmd="" show_progress_dialog="False" show_cab_dialog="False" disable_wow64_fs_redirection="False" administrator_required="False" administrator_required_message="[Citrix] [XenCenter] installation requires administration rights." type="install" lcid_filter="" language_id="" language="" os_filter="" os_filter_min="" os_filter_max="" processor_architecture_filter="" supports_install="True" supports_uninstall="True">
diff --git a/dotNetInstaller/XenCenterSetupBootstrapper_l10n.xml b/dotNetInstaller/XenCenterSetupBootstrapper_l10n.xml
index aac09d28c..19e477e1b 100644
--- a/dotNetInstaller/XenCenterSetupBootstrapper_l10n.xml
+++ b/dotNetInstaller/XenCenterSetupBootstrapper_l10n.xml
@@ -30,7 +30,7 @@
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
    SUCH DAMAGE.
 -->
-<configurations lcid_type="UserExe" show_language_selector="False" language_selector_title="" language_selector_ok="OK" language_selector_cancel="Cancel" configuration_no_match_message="" ui_level="basic" fileversion="[BRANDING_PRODUCT_VERSION]" productversion="[BRANDING_PRODUCT_VERSION]" log_enabled="False" log_file="#TEMPPATH\XenCenterExeInstallerLog.txt">
+<configurations lcid_type="UserExe" show_language_selector="False" language_selector_title="" language_selector_ok="OK" language_selector_cancel="Cancel" configuration_no_match_message="" ui_level="basic" fileversion="[BRANDING_PRODUCT_VERSION].[BRANDING_BUILD_NUMBER]" productversion="[BRANDING_PRODUCT_VERSION]" log_enabled="False" log_file="#TEMPPATH\XenCenterExeInstallerLog.txt">
   <schema version="2.3.16.0" generator="dotNetInstaller InstallerEditor" />
   <fileattributes><fileattribute name="CompanyName" value="[BRANDING_COMPANY_NAME_LEGAL]" /><fileattribute name="FileDescription" value="[Citrix] [XenCenter] Installer" /><fileattribute name="ProductName" value="[Citrix] [XenCenter]" /><fileattribute name="LegalCopyright" value="[BRANDING_COPYRIGHT]"/><fileattribute name="LegalTrademarks" /></fileattributes>
   <configuration dialog_caption="[Citrix] [XenCenter] Installer" dialog_message="In order to install [Citrix] [XenCenter] you must first install these components:" dialog_message_uninstall="" dialog_bitmap="#APPPATH\banner.bmp" skip_caption="Skip" install_caption="Install" uninstall_caption="Uninstall" cancel_caption="Close" status_installed=" (Installed)" status_notinstalled="" failed_exec_command_continue="" installation_completed="[Citrix] [XenCenter] installed successfully!" uninstallation_completed="[Citrix] [XenCenter] uninstalled successfully!" installation_none="[Citrix] [XenCenter] is already installed!" uninstallation_none="[Citrix] [XenCenter] is not installed!" installing_component_wait="Installing %s. Wait, this operation could take some time ..." uninstalling_component_wait="Uninstalling %s. Wait, this operation could take some time ..." reboot_required="To continue the installation you must restart your computer. Restart now?" must_reboot_required="False" dialog_otherinfo_caption="" dialog_otherinfo_link="" complete_command="" complete_command_silent="" complete_command_basic="" wait_for_complete_command="True" prompt_for_optional_components="False" auto_close_if_installed="True" auto_close_on_error="False" reload_on_error="False" dialog_show_installed="False" dialog_show_uninstalled="False" dialog_show_required="False" cab_dialog_message="%s" cab_cancelled_message="" cab_dialog_caption="" cab_path="#TEMPPATH\#GUID" cab_path_autodelete="False" dialog_default_button="cancel" dialog_position="" dialog_components_list_position="" dialog_message_position="" dialog_bitmap_position="" dialog_otherinfo_link_position="" dialog_osinfo_position="" dialog_install_button_position="" dialog_cancel_button_position="" dialog_skip_button_position="" auto_start="True" auto_continue_on_reboot="False" reboot_cmd="" show_progress_dialog="False" show_cab_dialog="False" disable_wow64_fs_redirection="False" administrator_required="False" administrator_required_message="[Citrix] [XenCenter] installation requires administration rights." type="install" lcid_filter="" language_id="" language="" os_filter="" os_filter_min="" os_filter_max="" processor_architecture_filter="" supports_install="True" supports_uninstall="True">
diff --git a/mk/re-branding.sh b/mk/re-branding.sh
index 1f19b5744..7cc051463 100755
--- a/mk/re-branding.sh
+++ b/mk/re-branding.sh
@@ -53,6 +53,7 @@ rebranding_global()
         -e "s#\[XenServer product\]#${BRANDING_PRODUCT_BRAND}#g" \
         -e "s#\[BRANDING_PRODUCT_VERSION\]#${BRANDING_XC_PRODUCT_VERSION}#g" \
         -e "s#\[BRANDING_PRODUCT_VERSION_TEXT\]#${BRANDING_PRODUCT_VERSION_TEXT}#g" \
+        -e "s#\[BRANDING_BUILD_NUMBER\]#${BUILD_NUMBER}#g" \
         -e "s#\[xensearch\]#${BRANDING_SEARCH}#g" \
         -e "s#\[xsupdate\]#${BRANDING_UPDATE}#g" \
         -e "s#\[XenServer\]#${BRANDING_SERVER}#g" \