Commit Graph

51 Commits

Author SHA1 Message Date
Gabor Apati-Nagy
fa7548129b CA-176169: Copyright statement: Added comma at all places where it was still missing (all extensions now)
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-01-18 17:13:09 +00:00
Callum McIntyre
10d932fc76 [DotNet upgrade] Replace NETFRAMEWORK checks with WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED in Wix checks, which is the correct way to check for a 4.6+ install
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:09:47 +01:00
Callum McIntyre
168dbe4c13 [DotNet upgrade] Upgrade the XenCenter installer to use .net 4.6
In the dotnet installers we now compare the Release Dword against the lowest 4.6 version, accepting anything >=. Build number from https://msdn.microsoft.com/en-us/library/hh925568(v=vs.110).aspx

Also updated the wix check and xe project, as was done in the similar .net 4.5 upgrade

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:09:08 +01:00
Cheng Zhang
76f7946ec4 CA-213045: Make server backup file name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-06-30 10:31:10 +08:00
Mihaela Stoica
0527164425 CA-211417: Remove WLB.chm
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-05-23 11:42:33 +01:00
Mihaela Stoica
e5e1fef0df CA-205594: Added full stop to the Health Check Service description
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-04-08 17:17:10 +01:00
Mihaela Stoica
cc28690670 CA-205594: Better description for the Health Check Service
- change the description displayed in the installer to a shorter sentence

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-04-08 16:28:36 +01:00
Mihaela Stoica
6478ab6c77 CA-205594: Better description for the Health Check Service
- change the installed service description (displayed in Services)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-04-08 15:38:14 +01:00
Gabor Apati-Nagy
d5471423c7 CA-205594: Better description for the Health Check Service
Added new & localized description

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-04-04 15:42:11 +01:00
Mihaela Stoica
a7b5c52e1c CP-16205: Add AdditionalFeatures branding variable
We now have two branding variables, one for hidden features and one for additional features (empty by default)
2016-02-29 14:54:26 +00:00
Gabor Apati-Nagy
cd27e6ad7c CP-15915: fixed typo2 2016-02-26 15:05:03 +00:00
Mihaela Stoica
17a315c907 CA-201074: Added the localised home pages to the installer script
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-25 10:49:03 +00:00
Mihaela Stoica
8dbdd3487b CA-200937: The localised XenCenter installer (XenCenterSetup.l10n.exe) should also install the English help files
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-25 10:18:38 +00:00
Cheng Zhang
bf1f25af61 CA-198895: Have parameter Languages back in xencenter.l10n.diff
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-16 14:37:38 +08:00
Stephen Turner
1cbeda9784 Merge pull request #833 from MihaelaStoica/master
CP-16075: Fix the diff file, after some lines have been removed in a …
2016-02-12 12:24:44 +00:00
Mihaela Stoica
12700a638a CP-16075: Fix the diff file, after some lines have been removed in a previous commit
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-12 12:20:15 +00:00
Stephen Turner
95b395401d Merge pull request #831 from MihaelaStoica/CP-16068
CP-16068: Pick up new RPU hotfixes
2016-02-12 12:15:11 +00:00
Mihaela Stoica
7a46698141 CP-16068: Pick up new RPU hotfixes
- XenCenter build system picks up the RPU hotfixes from Artifactory
- RPU001 and RPU002 replace XS62E006 and XS65ESP1006
- Removed hotfixes from the solution, moved  XS60E001 to Branding folder
- also cleaned up code in the HotfixFactory class, removing MNR and Cowley hotfixes (not supported anymore)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-11 22:18:06 +00:00
Gabor Apati-Nagy
eb9bd591aa Merge remote-tracking branch 'github_xenadmin/master' into inst
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	WixInstaller/XenCenter.l10n.diff
	WixInstaller/XenCenter.wxs
2016-02-11 18:55:54 +00:00
Gabor Apati-Nagy
2be155f4b5 CP-16075: Removed unneeded lines from diff
This makes sure the latest changes to the WXS will not brake the diff.
2016-02-10 14:43:47 +00:00
Mihaela Stoica
9f99c37f83 CP-16012: Rename branding variables
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-10 11:52:30 +00:00
Gabor Apati-Nagy
6cff4d546a Merge pull request #803 from MihaelaStoica/CP-15405
CP-15405: Signing and packaging changes
2016-02-02 15:48:28 +00:00
Mihaela Stoica
a34cffbd64 Merge pull request #806 from cheng--zhang/CP-15404
CP-15404: Make help file rebrandable
2016-02-02 11:00:20 +00:00
Mihaela Stoica
1726f8ce63 CP-15405: Fix packaging issues
(Cherry picked from cream-indigo)

Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-02-02 10:23:02 +00:00
Cheng Zhang
c209bae16e CP-15404: Make help file rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 13:19:14 +08:00
Cheng Zhang
38a50e1754 CP-15404: Make install dir rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 09:45:04 +08:00
Cheng Zhang
40e3ba3d66 CP-15162: Add desktop shortcut to installdlg
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-01 18:38:55 +08:00
Cheng Zhang
4da4cf9b86 Revert "CA-179515: Move to online help: update the installer not to install the .chm"
This reverts commit cf8de9ae86

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-28 17:24:41 +08:00
Cheng Zhang
9f09d8cb60 CP-15404: Make component GUID rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 14:55:59 +08:00
Cheng Zhang
58575a7d15 CP-15404: Install test repo by required
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 14:21:55 +08:00
Cheng Zhang
a2d62b2c2b CP-15404: Add reg key to hide feature
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 14:21:47 +08:00
Cheng Zhang
9b4d772250 CP-15404: Install readme files based on condition
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 14:21:26 +08:00
Cheng Zhang
25b60eb220 CP-15404: Install HealthCheck by condition
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-25 16:51:43 +08:00
Cheng Zhang
d03a570b6b CP-15400: Use condition check to install xenserver updates
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:29 +08:00
Cheng Zhang
3157f8dd30 CP-15404: Rebranding the installer and fix translation issue
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:20 +08:00
Cheng Zhang
1485a056e9 CP-15399: Make xsupdate rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:12 +08:00
Cheng Zhang
992ee9e62f CP-15400: Make xensearch rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-20 11:33:54 +08:00
Cheng Zhang
15ef3410a3 CP-15398: Make file name and dir rebrandablei
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:55 +08:00
Cheng Zhang
08741a1fa0 CP-15398: Make texture company name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:54 +08:00
Cheng Zhang
a33d10bade CP-15398: Make texture XenCenter rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 18:52:53 +08:00
Cheng Zhang
b74ae83300 CP-15396: Rename dir of XenAdmin-Branding to Branding
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-11 17:28:31 +08:00
Cheng Zhang
a9214c3463 CP-15396: Use xenadmin-branding and change the location of icons
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-08 16:29:59 +08:00
Mihaela Stoica
cf8de9ae86 CA-179515: Move to online help: update the installer not to install the .chm
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2015-10-09 13:22:05 +01:00
Gabor Apati-Nagy
2dc496491d CP-13390: Update XenCenter installer to require .NET 4.5
fix for XenCenter.l10n.diff
2015-08-06 16:15:57 +01:00
Sorin Sbarnea
2d6ff407f9 Corrected line endings for WIX patch and added few missing temp dirs to gitignore. 2015-07-19 19:06:59 +01:00
Gabor Apati-Nagy
409c89fbec CP-12161: Add the Call Home service to the XenCenter installer
Updating diff to keep offsets (of hunks) unchanged

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2015-07-02 12:32:39 +01:00
Gabor Apati-Nagy
d70dedc5d4 [CA-125183] Fix: XenCenterSetup.exe to install, requires .NET 3.5 rather than .NET 4 on Windows8 x64, WS 2012, WS 2008 SP2 x32
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2014-01-14 15:28:15 +00:00
Adrian Jachacy
c96da7ba38 CA-110446: XenCenter Installation: multiple install on same OS when
selected installation for all users.

Changed XeCenter.wxs file (and updated XenCenter.l10n.diff accordingly) to
set ALLUSERS property when InstallDir key found in HKLM registry, i.e.
previous version of XenCenter was installed for "All users" (the
property is not set when previous version was installed for "Just me"). The
property is cleared after searching for related products is finished to
allow the user changing installation context in GUI.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-07-02 12:36:41 +01:00
Adrian Jachacy
2ff85de32f CA-106455: XenCenter Installation: multiple install on same OS when selected installation for all users; Asking for .NET 3.5 while repair or uninstall.
1. Added missing copyright header to XenCenter.l10n.diff file.
2. Added -ext WiXNetFxExtension to CANDLE command in xenadmin-build.sh
file.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-07-01 13:45:25 +01:00
Adrian Jachacy
750bf609d5 CA-106455: XenCenter Installation: multiple install on same OS when selected installation for all users; Asking for .NET 3.5 while repair or uninstall.
Changed the way we check whether .NET 2.0/.NET 3.5 framework is already
installed on the user machine or not.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-07-01 11:02:01 +01:00