Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-24 22:06:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,156 Commits 11 Branches 48 Tags 186 MiB
1ec327dc06
Commit Graph

25 Commits

Author SHA1 Message Date
Alexander Schulz
cd477a4e18 Merge branch 'master' of https://github.com/xenserver/xenadmin into development 
# Conflicts:
#	Branding/Branding.resx
#	Branding/HomePage.mht
#	Branding/HomePage.zh-CN.mht
#	Branding/Images/000_XenCenterAlerts_h32bit_24.png
#	Branding/Images/DlgBmp.bmp
#	Branding/Images/XS.png
#	Branding/Images/about_box_graphic_423x79.png
#	Branding/Images/alerts_32.png
#	Branding/Images/splash.bmp
#	Branding/Images/upsell_16.png
#	Branding/Images/wizard_background.png
#	CFUValidator/CFUValidator.csproj
#	Jenkinsfile
#	LICENSE
#	MAINTAINERS
#	README.md
#	WixInstaller/XenCenter.wxs
#	WixInstaller/branding.wxi
#	WixInstaller/codepagechange.vbs
#	WixInstaller/en-us.wxl
#	WixInstaller/ja-jp.wxl
#	WixInstaller/wix_src.patch
#	WixInstaller/zh-cn.wxl
#	XenAdmin.sln
#	XenAdmin/Commands/Controls/ContextMenuBuilder.cs
#	XenAdmin/Commands/Controls/MigrateVMToolStripMenuItem.cs
#	XenAdmin/Commands/Controls/VMLifeCycleToolStripMenuItem.cs
#	XenAdmin/Commands/CopyTemplateCommand.cs
#	XenAdmin/Commands/CopyVMCommand.cs
#	XenAdmin/Commands/CrossPoolCopyVMCommand.cs
#	XenAdmin/Commands/CrossPoolMigrateCommand.cs
#	XenAdmin/Commands/CrossPoolMoveVMCommand.cs
#	XenAdmin/Commands/DragDropCrossPoolMoveHaltedVMCommand.cs
#	XenAdmin/Commands/DragDropMigrateVMCommand.cs
#	XenAdmin/Commands/MoveVMCommand.cs
#	XenAdmin/ConsoleView/VNCTabView.cs
#	XenAdmin/Core/Updates.cs
#	XenAdmin/Dialogs/AboutDialog.resx
#	XenAdmin/Dialogs/LegalNoticesDialog.cs
#	XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.ja.resx
#	XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.resx
#	XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.zh-CN.resx
#	XenAdmin/Help/HelpManager.cs
#	XenAdmin/Images.cs
#	XenAdmin/MainWindow.Designer.cs
#	XenAdmin/MainWindow.cs
#	XenAdmin/MainWindow.ja.resx
#	XenAdmin/MainWindow.resx
#	XenAdmin/MainWindow.zh-CN.resx
#	XenAdmin/Properties/Resources.Designer.cs
#	XenAdmin/Properties/Settings.Designer.cs
#	XenAdmin/Properties/Settings.settings
#	XenAdmin/SettingsPanels/BootOptionsEditPage.cs
#	XenAdmin/TabPages/GeneralTabPage.Designer.cs
#	XenAdmin/TabPages/GeneralTabPage.cs
#	XenAdmin/TabPages/GeneralTabPage.resx
#	XenAdmin/VNC/VNCException.cs
#	XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs
#	XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateWizard.cs
#	XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/CrossPoolMigrateCanMigrateFilter.cs
#	XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs
#	XenAdmin/Wizards/NewSRWizard.cs
#	XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
#	XenAdmin/XenAdmin.csproj
#	XenAdmin/app.config
#	XenAdminTests/ArchiveTests/ArchiveFactoryTests.cs
#	XenAdminTests/ArchiveTests/ArchiveIteratorTests.cs
#	XenAdminTests/ArchiveTests/ArchiveWriterTests.cs
#	XenAdminTests/ArchiveTests/ThirdPartyArchiveWriterTests.cs
#	XenAdminTests/CompressionTests/CompressionFactoryTests.cs
#	XenAdminTests/CompressionTests/ThirdPartyCompressionStreamTests.cs
#	XenAdminTests/HealthCheckTests/RequestUploadTaskTests.cs
#	XenAdminTests/UnitTests/CPUMaskingTest.cs
#	XenAdminTests/UnitTests/TimeUtilTests.cs
#	XenAdminTests/UnitTests/WlbTests/WlbPoolConfigurationTests.cs
#	XenAdminTests/UnitTests/WlbTests/WlbScheduledTaskTests.cs
#	XenAdminTests/UnitTests/WlbTests/WlbScheduledTasksTests.cs
#	XenAdminTests/XenAdminTests.csproj
#	XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs
#	XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs
#	XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs
#	XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs
#	XenModel/Actions/VM/ImportVmAction.cs
#	XenModel/Actions/VM/VMCrossPoolMigrateAction.cs
#	XenModel/Actions/VM/VMPauseAction.cs
#	XenModel/FriendlyNames.Designer.cs
#	XenModel/FriendlyNames.ja.resx
#	XenModel/FriendlyNames.resx
#	XenModel/FriendlyNames.zh-CN.resx
#	XenModel/HealthCheckSettings.cs
#	XenModel/InvisibleMessages.Designer.cs
#	XenModel/InvisibleMessages.ja.resx
#	XenModel/InvisibleMessages.resx
#	XenModel/InvisibleMessages.zh-CN.resx
#	XenModel/Messages.Designer.cs
#	XenModel/Messages.ja.resx
#	XenModel/Messages.resx
#	XenModel/Messages.zh-CN.resx
#	XenModel/SshConsole.cs
#	XenModel/Utils/Helpers.cs
#	XenModel/XenAPI-Extensions/SR.cs
#	XenModel/XenAPI/ApiVersion.cs
#	XenModel/XenModel.csproj
#	XenServerHealthCheck/Registry.cs
#	scripts/check_copyright.ps1
#	scripts/check_i18n.ps1
#	scripts/check_spelling.ps1
#	scripts/deps-map.json
#	scripts/dictionary.txt
#	scripts/download_hotfixes.ps1
#	scripts/download_packages.ps1
#	scripts/hotfix-map.json
#	splash/util.h
#	xe/Xe.csproj
#	xe/app.manifest
 2023-12-30 16:43:15 +01:00
Konstantina Chremmou
54c2fbb3f1 Manifest updates: 
- Removed target to add manifest using mt.exe. The manifest is already in the project and embedded in the executable after the build.
- Removed Windows Vista and Windows 8 as .NET Framework 4.8 is not installable there.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
 2023-08-24 14:19:07 +01:00
Konstantina Chremmou
adec15e2ac CP-40739: Build with VS 2022. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
 2023-08-24 14:19:07 +01:00
Konstantina Chremmou
d9a603629f Moved common assembly properties to a separate file. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
 2023-01-25 12:50:49 +00:00
Konstantina Chremmou
5c632a5592 Moved Logger class to its own file. Improved the format of the logged messages. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-18 11:43:57 +01:00
Konstantina Chremmou
dd0c5d4891 CP-36392: Implemented server certificate validation. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-10 21:44:29 +01:00
Konstantina Chremmou
113dab51d5 Moved CommandLib classes used only by Xe to the latter project where they belong. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:53 +01:00
Konstantina Chremmou
f852167ad1 Created re-usable project target to add manifest to an assembly. Be specific about the mt executable to use. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2021-02-16 10:07:46 +00:00
Konstantina Chremmou
41afa2a753 CP-32921: Target .NET Framework 4.8 and build using VS2019 tools. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-05-19 23:10:41 +01:00
Alexander Schulz
95db41efde Merge branch 'upstream' into development 2020-03-11 16:10:50 +01:00
Alexander Schulz
c3dcc35d30 Merge branch 'upstream' into development 2020-02-06 23:14:52 +01:00
Konstantina Chremmou
6c59501265 Corrections around signing manifests. Updated .gitignore. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-01-10 12:00:50 +00:00
Konstantina Chremmou
ec298938c3 CP-32561: Upgraded WiX Toolset to 3.11.2. Also: 
- Changed the verbosity of some commands.
- Do not compile the splash screen twice.
- Do not brand obsolete folder XenServer.
- Moved the WiX source patch to a more relevant folder.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-01-10 12:00:50 +00:00
Konstantina Chremmou
d22b212afa Renamed property as there are clashes with a child class (will have to be refactored in future). Treat warnings as errors in all projects. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2019-08-22 14:03:30 +01:00
Konstantina Chremmou
fb46678585 Added the xe project to the solution. Minor refactoring. 
If all projects to build are in the solution, it's easier to spot breakages
if, for example, the dependencies change.
Moved global class methods within the MainClass.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2019-07-05 10:50:10 +01:00
Alexander Schulz
2fe270244a also include xe-project into installer 2019-02-09 00:52:48 +01:00
Aaron Robson
6353043b15 CP-27819: Switch to Visual Studio 2017 (into master) (#2305) 
* CP-27819: Manually setting the ToolsVersion to 15.0 (VS2017) in all .csproj files for consistency and to attempt to enforce consistency of dev environments with the explicitness of the msbuild scripts as used in the build environments.
Auto updated as many of the .sln and .csproj files as VS2017 was willing to do https://docs.microsoft.com/en-us/visualstudio/ide/reference/upgrade-devenv-exe?view=vs-2017 and included changes to the gitignore to ensure that the update report and backup files are not included in the repo.

* CP-27819: Tidying up by removing FileUpgradeFlags, OldToolsVersion and UpgradeBackupLocation nodes from the .csproj files as they are produced as hints for how to revert project upgrades for which we can use version control.

* CP-27819: Removing redundant "ManifestCertificateThumbprint" and "ManifestTimestampUrl" nodes from project files "mk\sign.bat" has been used for this purpose for some time now.

* CP-27819: Updated readme to reflect that VS2017 is now in use.

Signed-off-by: Aaron Robson <aaron.robson@citrix.com>
 2018-11-09 11:23:32 +00: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
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
Stephen Turner
5fc5cd4085 CP-13392: Convert xe.exe to .NET 4.5 2015-09-04 15:55:34 +01:00
Sorin Sbarnea
908bacf6c2 Enabled back the exection of devtools and improved the logging 2015-07-27 08:26:26 +01:00
Sorin Sbarnea
03d176829c Configured to use mt.exe from the PATH and repaired the target name for splash project, which was supposed to be XenCenter.exe 2015-07-27 08:08:53 +01:00
Gabor Apati-Nagy
5a5013cb91 [CA-125535] Fix: Windows xe CLI failing due to .NET error 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2014-01-20 13:32:06 +00:00
Mihaela Stoica
bd36a85bff CP-4816: Initial commit to git repo 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2013-06-24 12:41:48 +01:00