diff --git a/README.md b/README.md
index 635aafb08..0b8f4ceaf 100644
--- a/README.md
+++ b/README.md
@@ -4,44 +4,50 @@ XenCenter
This repository contains the source code for XenCenter.
XenCenter is a Windows-based management tool for XenServer environments
-which enables users to manage and monitor XenServer hosts and resource pools,
+which enables users to manage and monitor XenServer hosts and resource pools,
and to deploy, monitor, manage and migrate virtual machines.
XenCenter is written mostly in C#.
-
+
Contributions
-------------
-The preferable way to contribute patches is to fork the repository on Github and
-then submit a pull request. If for some reason you can't use Github to submit a
-pull request, then you may send your patch for review to the
-xs-devel@lists.xenserver.org mailing list, with a link to a public git repository
-for review. Please see the CONTRIB.md file for some general guidelines on submitting
-changes.
+The preferable way to contribute patches is to fork the repository on Github and
+then submit a pull request. If for some reason you can't use Github to submit a
+pull request, then you may send your patch for review to the
+xs-devel@lists.xenserver.org mailing list, with a link to a public git repository
+for review. Please see the [CONTRIB](CONTRIB) file for some general guidelines
+on submitting changes.
License
-------
-This code is licensed under the BSD 2-Clause license. Please see the LICENSE
-file for more information.
+This code is licensed under the BSD 2-Clause license. Please see the
+[LICENSE](LICENSE) file for more information.
How to build XenCenter
----------------------
-To build XenCenter, you need
- * the source from xenadmin repository
- * Visual Studio 2013
-
-and also some libraries which we do not store in the source tree:
- * CookComputing.XmlRpcV2.dll
- * DiscUtils.dll
- * ICSharpCode.SharpZipLib.dll
- * Ionic.Zip.dll
- * log4net.dll
+To build XenCenter, you need
+
+* the source from xenadmin repository
+* Visual Studio 2013
+
+and also some libraries which we do not store in the source tree:
+
+* CookComputing.XmlRpcV2.dll
+* Newtonsoft.Json.dll
+* DiscUtils.dll
+* ICSharpCode.SharpZipLib.dll
+* Ionic.Zip.dll
+* log4net.dll
+
+You can find the source code of these libraries (along with some patches) in
+[dotnet-packages](https://github.com/xenserver/dotnet-packages) repository.
-You can find the source code of these libraries (along with some patches) in dotnet-packages repository.
-
You also need NUnit libraries
- * nunit.framework.dll
- * Moq.dll
-which can be obtained from http://www.nunit.org/
+
+* nunit.framework.dll
+* Moq.dll
+
+which can be obtained from .
diff --git a/WixInstaller/XenCenter.l10n.diff b/WixInstaller/XenCenter.l10n.diff
index a0970b2b5..db8493f8a 100644
--- a/WixInstaller/XenCenter.l10n.diff
+++ b/WixInstaller/XenCenter.l10n.diff
@@ -28,8 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
---- XenCenter.wxs Mon May 23 11:07:59 2016
-+++ XenCenter.l10n.wxs Mon May 23 11:09:01 2016
+--- XenCenter.wxs Fri Dec 8 13:23:08 2017
++++ XenCenter.l10n.wxs Fri Dec 8 13:23:08 2017
@@ -40,7 +40,7 @@
@@ -39,7 +39,7 @@
-@@ -84,70 +84,72 @@
+@@ -85,70 +85,72 @@
@@ -135,7 +135,7 @@
-@@ -172,12 +174,34 @@
+@@ -173,12 +175,34 @@
@@ -171,7 +171,7 @@
-@@ -222,7 +246,7 @@
+@@ -223,7 +247,7 @@
Vital="no"
Name="XenServerHealthCheck"
DisplayName="[Citrix] [XenServer] Health Check Service"
@@ -180,7 +180,7 @@
Start="auto"
Account="LocalSystem"
ErrorControl="normal"
-@@ -277,13 +301,15 @@
+@@ -278,13 +302,15 @@
@@ -197,7 +197,7 @@
-@@ -291,7 +317,7 @@
+@@ -292,7 +318,7 @@
@@ -206,7 +206,7 @@
-@@ -310,7 +336,7 @@
+@@ -311,7 +337,7 @@
diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs
index 027b22d79..dcebba575 100644
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@@ -72,6 +72,7 @@
+
diff --git a/mk/build-installers.sh b/mk/build-installers.sh
index 17ae21827..5a1677b2e 100644
--- a/mk/build-installers.sh
+++ b/mk/build-installers.sh
@@ -1,33 +1,33 @@
#!/bin/bash
-# Copyright (c) Citrix Systems, Inc.
+# Copyright (c) Citrix Systems, Inc.
# All rights reserved.
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-# * Redistributions of source code must retain the above
-# copyright notice, this list of conditions and the
-# following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the
-# following disclaimer in the documentation and/or other
-# materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#
+# Redistribution and use in source and binary forms,
+# with or without modification, are permitted provided
+# that the following conditions are met:
+#
+# * Redistributions of source code must retain the above
+# copyright notice, this list of conditions and the
+# following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the
+# following disclaimer in the documentation and/or other
+# materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
set -eu
@@ -49,6 +49,7 @@ do
done
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat CookComputing.XmlRpcV2.dll "XML-RPC.NET by Charles Cook, signed by ${BRANDING_COMPANY_NAME_SHORT}"
+cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat Newtonsoft.Json.dll "JSON.NET by James Newton-King, signed by ${BRANDING_COMPANY_NAME_SHORT}"
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat log4net.dll "Log4Net by The Apache Software Foundation, signed by ${BRANDING_COMPANY_NAME_SHORT}"
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat ICSharpCode.SharpZipLib.dll "SharpZipLib by IC#Code, signed by ${BRANDING_COMPANY_NAME_SHORT}"
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat DiscUtils.dll "DiscUtils by Kenneth Bell, signed by ${BRANDING_COMPANY_NAME_SHORT}"
@@ -56,7 +57,7 @@ cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat Ionic.Zip.dll "OSS, signe
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat putty.exe "PuTTY by Simon Tatham, signed by ${BRANDING_COMPANY_NAME_SHORT}"
#copy signed files in XenServerHealthService folder
-cp ${REPO}/XenAdmin/bin/Release/{CommandLib.dll,XenCenterLib.dll,XenModel.dll,CookComputing.XmlRpcV2.dll,log4net.dll,ICSharpCode.SharpZipLib.dll,Ionic.Zip.dll} \
+cp ${REPO}/XenAdmin/bin/Release/{CommandLib.dll,XenCenterLib.dll,XenModel.dll,CookComputing.XmlRpcV2.dll,Newtonsoft.Json.dll,log4net.dll,ICSharpCode.SharpZipLib.dll,Ionic.Zip.dll} \
${REPO}/XenServerHealthCheck/bin/Release
#sign XenServerHealthService
@@ -77,13 +78,13 @@ compile_installer()
langid=1033
name=$1
fi
-
+
cd ${WIX}
mkdir -p obj${name}
Branding=${BRANDING_BRAND_CONSOLE} WixLangId=${langid} ${CANDLE} -ext WiXNetFxExtension -out obj${name}/ $1.wxs
-
+
mkdir -p out${name}
-
+
${LIGHT} -nologo obj${name}/$1.wixobj lib/WixUI_InstallDir.wixlib -loc wixlib/wixui_$2.wxl -loc $2.wxl -ext WiXNetFxExtension -out out${name}/${name}.msi
}
@@ -94,7 +95,7 @@ sign_msi()
#create just english msi
if [ "XenCenter" != "${BRANDING_BRAND_CONSOLE}" ]
-then
+then
cd ${WIX}
mv XenCenter.wxs ${BRANDING_BRAND_CONSOLE}.wxs
mv XenCenter.l10n.wxs ${BRANDING_BRAND_CONSOLE}.l10n.wxs
@@ -111,7 +112,7 @@ cp ${WIX}/out${BRANDING_BRAND_CONSOLE}.l10n/${BRANDING_BRAND_CONSOLE}.l10n.msi \
${WIX}/out${BRANDING_BRAND_CONSOLE}.l10n.ja-jp/${BRANDING_BRAND_CONSOLE}.l10n.ja-jp.msi \
${WIX}/out${BRANDING_BRAND_CONSOLE}.l10n.zh-cn/${BRANDING_BRAND_CONSOLE}.l10n.zh-cn.msi \
${WIX}
-
+
cd ${WIX} && cp ${BRANDING_BRAND_CONSOLE}.l10n.msi ${BRANDING_BRAND_CONSOLE}.l10n.zh-tw.msi
cd ${WIX} && cscript /nologo CodePageChange.vbs ZH-TW ${BRANDING_BRAND_CONSOLE}.l10n.zh-tw.msi