Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-21 17:11:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,160 Commits 11 Branches 48 Tags 186 MiB
980788a0ab
Commit Graph

58 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
d7b519a53c Updated copyright notice on files. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
 2023-01-30 16:24:16 +00:00
Konstantina Chremmou
f7796582c3 CP-41433: Use the product name for the installation path, and the settings/logs parent folder. 
Also, renamed the placeholder because msbuild converts spaces to underscores
and in debug mode the settings path is different from the one expected.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
 2023-01-25 12:50:49 +00:00
Konstantina Chremmou
4d36f67f46 Renamed placeholders so they are easier to understand. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
 2023-01-25 12:50:49 +00: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
bca04c1b00 Improved documentation for xe.exe. Add the deprecated alongside the new check ID. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-25 11:40:36 +01:00
Konstantina Chremmou
eb0dc04381 Fixed indentation. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-18 20:32:36 +01:00
Konstantina Chremmou
02f59946b9 Fixed further code smells as per code review. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-18 20:28:08 +01:00
Konstantina Chremmou
c4617240aa Corrections as per code review. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-18 20:28:08 +01: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
a02dfbb07e Reworked error handling. Prevent from showing duplicate output of commands in debug mode. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-10 20:47:27 +01:00
Konstantina Chremmou
90097ece49 Use C# naming conventions for properties. Also, do not provide default username. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-10 19:32:44 +01:00
Konstantina Chremmou
76e0b098b2 Removed undocumented argument "server". Added explicit help switch. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-10 19:24:21 +01:00
Konstantina Chremmou
48f7ffe0d6 Removed unimplemented switch --nossl. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
d23c7f2de6 Removed class ThinCliProtocol. Class Config suffices. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
fc13c1e060 Turned magic string into a constant in the Messages class. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
2bc75656cf Show the executable's version when using -version. Updated version check during handshake. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
d662af4f8e Removed field thinCliProtocol.dropOut as it was always false. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
aff3d2ad97 Removed code redundancies. Use C# naming conventions for method, classes and enums. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
a1a577fa22 Removed field thinCliProtocol.dProgress because it was not implemented. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
c226316632 Replaced field thinCliProtocol.dExit with direct call to Environment.Exit(). 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
b343a97b72 Replaced field thinCliProtocol.dConsoleReadLine with direct call to Console.ReadLine(). 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
c992c4b171 Replaced field thinCliProtocol.dConsoleWriteLine with method Logger.Info() 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:54 +01:00
Konstantina Chremmou
e31cfaeda5 Removed field thinCliProtocol.dConsoleWrite. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:53 +01:00
Konstantina Chremmou
2bbebce05f Replaced field thinCliProtocol.dGlobalDebugstatic method Logger.Debug() 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:53 +01:00
Konstantina Chremmou
0abef1f9ca Replaced field thinCliProtocol.dGlobalUsagewith static method Logger.Usage() 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:53 +01:00
Konstantina Chremmou
e2ded395ee Replaced field thinCliProtocol.dGlobalError with static method Logger.Error() 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-05-09 15:21:53 +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
abf4ae3f35 CP-36392 pt.1: Removed unused using directives. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2021-04-07 10:04:47 +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
d045d180a0
Merge pull request #2696 from xenserver/master 
Bring branch dotnet48 up to date with master
 2020-06-15 15:43:52 +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
minli1
cfc49bccf9 CP-33433: Limit XE client to PUT the same file with initial XE commands. 
Signed-off-by: minli1 <min.li1@citrix.com>
 2020-04-24 11:08:25 +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
f7391e991b
CA-156873, CP-31105 (partial): Apply common branding and versioning to assemblies; branding refactoring 
Added brand management files and refactored the following brand variables:
* BRANDING_XENSERVER_UPDATE_URL
* BRANDING_PERF_ALERT_MAIL_LANGUAGE_DEFAULT
* BRANDING_SEARCH
* BRANDING_UPDATE
* BRANDING_BACKUP
* BRANDING_LEGACY_PRODUCT_BRAND
* ISO
* BRANDING_VERSION_5_6
* BRANDING_VERSION_6_2
* BRANDING_VERSION_6_0
* BRANDING_VERSION_6_5
* BRANDING_VERSION_7_0
* BRANDING_VERSION_7_1_2
* BRANDING_VERSION_8_0
* BRANDING_VERSION_8_1
* BRANDIND_COPYRIGHT
* BRANDING_COPYRIGHT_2

Also: Try passing the timestamp server as parameter
 2020-01-22 14:47:39 +00: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
Gabor Apati-Nagy
7c0bc50b4a CA-176169: Changed copyright statements to include the comma in Citrix Systems, 
Inc.

Signed-off-by: Gabor Apati-Nagy<gabor.apati-nagy@citrix.com>
 2017-01-16 19:59:50 +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
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
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
9dcbd0a430 CP-15403: Remove year information in copyright 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-14 10:42:46 +08:00