From 94be8f0f016e7d1560a24cc937e363c6e1f0b1c3 Mon Sep 17 00:00:00 2001
From: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Date: Tue, 11 Jul 2017 17:05:24 +0100
Subject: [PATCH] CA-258357: Modified the build script to build the MSI
 installer

Added a download link

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
---
 WixInstaller/XenCenter.l10n.diff | 2 +-
 WixInstaller/XenCenter.wxs       | 2 +-
 WixInstaller/en-us.wxl           | 2 +-
 WixInstaller/ja-jp.wxl           | 2 +-
 WixInstaller/zh-cn.wxl           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WixInstaller/XenCenter.l10n.diff b/WixInstaller/XenCenter.l10n.diff
index f18c4c449..a0970b2b5 100644
--- a/WixInstaller/XenCenter.l10n.diff
+++ b/WixInstaller/XenCenter.l10n.diff
@@ -210,7 +210,7 @@
          <Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
          <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
          <PropertyRef Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" />
--        <Condition Message=".NET Framework 4.6 is required for this installation."><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
+-        <Condition Message="Microsoft .NET Framework 4.6 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework"><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
 +        <Condition Message="!(loc.Required_For_Installation)"><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
          <Property Id="PERMACHINEINSTALL">
              <RegistrySearch Id="InstallRegistry" Type="raw" Root="HKLM" Key="Software\[Citrix]\[XenCenter]" Name="InstallDir" />
diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs
index 52bd17ecc..027b22d79 100644
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@@ -310,7 +310,7 @@
         <Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
         <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
         <PropertyRef Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" />
-        <Condition Message=".NET Framework 4.6 is required for this installation."><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
+        <Condition Message="Microsoft .NET Framework 4.6 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework"><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
         <Property Id="PERMACHINEINSTALL">
             <RegistrySearch Id="InstallRegistry" Type="raw" Root="HKLM" Key="Software\[Citrix]\[XenCenter]" Name="InstallDir" />
         </Property>
diff --git a/WixInstaller/en-us.wxl b/WixInstaller/en-us.wxl
index 31625d971..0c79d4452 100644
--- a/WixInstaller/en-us.wxl
+++ b/WixInstaller/en-us.wxl
@@ -11,7 +11,7 @@
     <String Id="XenServer_Update_File">[XenServer] Update File</String>
     <String Id="XenServer_OEM_Update_File">[XenServer] OEM Update File</String>
     <String Id="XenCenter_Saved_Search">[XenCenter] Saved Search</String>
-    <String Id="Required_For_Installation">.NET Framework 4 is required for this installation.</String>
+    <String Id="Required_For_Installation">Microsoft .NET Framework 4.6 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 Citrix XenServer pools by periodically uploading data from the servers to Citrix Insight Services.</String>
 	<String Id="HealthCheckDescrShort">Enables monitoring of the health of your Citrix XenServer pools.</String>
diff --git a/WixInstaller/ja-jp.wxl b/WixInstaller/ja-jp.wxl
index 720247a15..5da970555 100644
--- a/WixInstaller/ja-jp.wxl
+++ b/WixInstaller/ja-jp.wxl
@@ -11,7 +11,7 @@
     <String Id="XenServer_Update_File">[XenServer] アップデート ファイル</String>
     <String Id="XenServer_OEM_Update_File">[XenServer] OEM アップデート ファイル</String>
     <String Id="XenCenter_Saved_Search">[XenCenter] 保存済みの検索</String>
-    <String Id="Required_For_Installation">このインストールには .NET Framework 4 が必要です。</String>
+    <String Id="Required_For_Installation">このインストールには .NET Framework 4.6 が必要です。</String>
     <String Id="Readme">README.TXT</String>
 	<String Id="HealthCheckDescr">サーバーから Citrix Insight Services に定期的にデータをアップロードすることにより、Citrix XenServer プールのヘルス状態の監視を有効にします。</String>
 	<String Id="HealthCheckDescrShort">Citrix XenServer プールのヘルス状態の監視を有効にします。</String>
diff --git a/WixInstaller/zh-cn.wxl b/WixInstaller/zh-cn.wxl
index 78f48deef..354366ab1 100644
--- a/WixInstaller/zh-cn.wxl
+++ b/WixInstaller/zh-cn.wxl
@@ -11,7 +11,7 @@
     <String Id="XenServer_Update_File">[XenServer] 更新文件</String>
     <String Id="XenServer_OEM_Update_File">[XenServer] OEM 更新文件</String>
     <String Id="XenCenter_Saved_Search">[XenCenter] 保存的搜索</String>
-    <String Id="Required_For_Installation">此安装需要 .NET Framework 4。</String>
+    <String Id="Required_For_Installation">此安装需要 .NET Framework 4.6。</String>
     <String Id="Readme">声明.TXT</String>
 	<String Id="HealthCheckDescr">通过定期将数据从服务器上载到 Citrix Insight Services，实现对 Citrix XenServer 池的运行状况监视。</String>
 	<String Id="HealthCheckDescrShort">允许监视 Citrix XenServer 池的运行状况。</String>