Commit Graph

29 Commits

Author SHA1 Message Date
Alexander Schulz
1ec327dc06 Mergeconflicts resolved, it builds again! 2023-12-30 18:58:02 +01:00
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
9470e20808 Removed obsolete project CFUValidator.
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
2023-09-12 10:11:58 +01:00
Konstantina Chremmou
214e24589a Removed obsolete project xva_verify.
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
2023-08-24 14:19:07 +01:00
Konstantina Chremmou
c70116691a Corrections as per code review:
- Bumped branding to v4.11.
- Reverted VS version in the solution file.
- Removed brand override registry entry.
- Converted HealthCheck warning pop-up to info pop-up.
- Moved status report actions to a separate folder.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
2023-02-21 16:05:10 +00:00
Konstantina Chremmou
7063b3e130 CP-42155: Removed HealthCheck service and related dialogs.
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
2023-02-21 16:05:09 +00:00
Konstantina Chremmou
6644ef920a CP-41108: Replaced the separate splash screen executable with a form within the application executable.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2022-11-14 09:45:33 +00:00
Konstantina Chremmou
23892df15d Moved the OVF actions to XenModel and removed what was left from XenOvfTransport.
Previously this was not possible due to XenModel-XenOvfTransport cyclical references.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2020-10-07 13:22:33 +01: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
Konstantina Chremmou
88fa402e21 Merged the projects XenAdmin and XenCenterVNC.
Since the standalone VNC control was removed, the VNC code has been used only by
the UI project. According to Microsoft's performance guidelines large single
assemblies are preferable to multiple smaller ones.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2020-05-19 23:10:41 +01:00
Alexander Schulz
2cab770c52 do not build unit tests 2020-02-07 00:04:34 +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
edab306139 removing old splash, adding new XCP-ng splash from Cocoon (Thanks!)
(cherry picked from commit 445d838c71)
2019-05-11 21:30:24 +02:00
Alexander Schulz
79330a7e84 fix some issues after "merging" 7.6 into master 2019-02-09 02:13:08 +01:00
Alexander Schulz
2fe270244a also include xe-project into installer 2019-02-09 00:52:48 +01:00
Alexander Schulz
8b1e0c6e9c include Xe-project (like in XenCenter) 2019-02-09 00:51:22 +01:00
Alexander Schulz
394cf6f8dc build ale projects in Release; Restore per nuget.exe 2019-02-09 00:43:38 +01:00
Alexander Schulz
3d5f231bca Release: just build the projects needed to create the installer 2019-02-09 00:43:37 +01:00
Alexander Schulz
3d0b9fe87e More future-proof installer/updater
https://github.com/xcp-ng/xenadmin/issues/35
2019-02-09 00:35:34 +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
Ji Jiang
b510674136 CA-26880: Fix XenAdmin.sln after revert
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2018-02-07 16:32:19 +00:00
Ji Jiang
4999d97ed7 Revert "CP-21997: Delete unused CFUValidator code"
This reverts commit 95c7e47bf7.
2018-02-06 09:55:36 +00:00
Gabor Apati-Nagy
95c7e47bf7 CP-21997: Delete unused CFUValidator code
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-05-03 14:50:39 +01:00
Cheng Zhang
491e6318ee CP-13080: Run Health Check Tests as part of xenadmin build
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2015-10-09 12:17:12 +08:00
Hui Zhang
ef1faf7776 CP-13057: Add config provider for XenServerHealthCheckService.
Introduce XenServerHealthCheckConfigProvider to implement IXenAdminConfigProvider.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2015-07-17 14:51:27 +08:00
Cheng Zhang
e220e489c9 CP-12158: Read the Call Home upload schedule and determine if an upload can start
1.Add logic to firm an upload can start.
2.Lock will be added if upload can start
3.Add unit test

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2015-06-08 16:32:54 +08:00
Cheng Zhang
1c55e8199a CP-12157: Create XenServerHealthCheck service framework
1.Create a service named XenServerHealthCheck
2.Read the XenCenter Server List from configuration
3.Try to connect to these servers
4.Modify protection of XenCenter config from CurrentUset to LocalMachine

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2015-05-28 17:18:18 +08:00
Gabor Apati-Nagy
a16e0a8ae0 CAR-100: Upgrade to .NET 4.0 instead of 3.5 -- Upgrading projects to target .Net 4.0 & updating to VS2010 format where needed
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-05 14:44:59 +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