Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 12:30:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,159 Commits 11 Branches 48 Tags 186 MiB
a5946b281b
Commit Graph

31 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
0d70266173 CP-40748: Upgrade log4net to 2.0.15 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2022-10-04 11:00:12 +01:00
Danilo Del Busso
487eba2edf CA-368321: Update Json.NET from 10.0.2 to 13.0.1 
Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
 2022-08-15 13:39:48 +01:00
Danilo Del Busso
dc282732d3 CP-38530: Bump dotnet-pacakges version 
Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
 2022-01-07 10:04:43 +00:00
Danilo Del Busso
6f6c768913 CP-38424: Bump dotnet-packages build location 
Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
 2021-10-27 15:18:47 +01:00
Konstantina Chremmou
3f4737c57a Upgraded log4net to 2.0.12. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2021-04-09 09:16:01 +01:00
Konstantina Chremmou
54e8347a5c CP-34826: Upgraded DiscUtils to version 0.11. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-10-13 14:34:15 +01:00
Konstantina Chremmou
cdd650d40e Fixed 3rd party library references in the solution project files. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-09-08 10:34:08 +01:00
Konstantina Chremmou
56fdf0402e CA-342572, CA-342031: Bumped version of 3rd party libraries. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-08-21 09:11:35 +01:00
Konstantina Chremmou
e4e25f30fc CP-32921: Use the full path for the MSBuild executable. Temporary new location for the third party libraries. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-05-25 23:03:02 +01:00
Alexander Schulz
95db41efde Merge branch 'upstream' into development 2020-03-11 16:10:50 +01:00
Konstantina Chremmou
cbc5ca168b CP-31322: Generate a zip file that includes the xeadmin and dotnet-packages sources. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-03-04 12:40:20 +00:00
Konstantina Chremmou
b409313364 Script consolidation and partial port to PowerShell. 
- Moved all scripts to new folder 'scripts'.
- Replaced preliminary check bash scripts with PowerShell scripts.
- Added proper spellcheck with aspell (travis only).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2020-03-04 12:40:20 +00:00
Alexander Schulz
c3dcc35d30 Merge branch 'upstream' into development 2020-02-06 23:14:52 +01:00
Konstantina Chremmou
423e619101 Updated 3rd party libraries; includes upgrade to PuTTY 0.73 (CP-32362) 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2019-11-14 12:14:26 +00:00
Konstantina Chremmou
6c095a7977 Use a single location for the dotnet-packages artifacts (follows CA-251400). 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2019-05-23 15:33:46 +01:00
Konstantina Chremmou
ff1cf916f1 Moved utility script into the packages folder where it is more relevant and less obscure. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2019-05-23 15:33:46 +01:00
Alexander Schulz
15f736fc33 Restore Nuget-packages with nuget.exe 
https://github.com/xcp-ng/xenadmin/issues/65
 2019-02-09 00:43:38 +01:00
Konstantina Chremmou
67cb80cb3b CA-284234: Updated the dotnet-packages reference. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2018-04-17 13:32:05 +01:00
Mihaela Stoica
e13051ba23
Update DOTNET_BUILD_LOCATION_CTXSIGN 2018-03-12 10:49:14 +00:00
Konstantina Chremmou
47523ce632 Renamed manifest files as Windows seem to single out 'manifest'. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2018-02-28 13:55:15 +00:00
Konstantina Chremmou
5529626ac5 CA-284234: Used patched version of Json.NET. 
Also, fixed deserialization for errors on servers using JsonRpc v1.0.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2018-02-28 11:05:29 +00:00
Konstantina Chremmou
b53b65aa8f Added dependency on the Json.NET dll. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-27 13:17:13 +00:00
Gabor Apati-Nagy
8ff3b6c2f2 CA-260366: Adding description when signing 2017-08-18 14:15:55 +01:00
Gabor Apati-Nagy
d375f3a164 CA-260366: Adding description when signing 
Updated dotnet-packages location
 2017-08-16 17:17:40 +01:00
Mihaela Stoica
f54cbb6164 CA-254545: Update the DOTNET_BUILD_LOCATION to the build containing the patched xml-rpc 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-05-19 10:16:19 +01:00
Konstantina Chremmou
08858e1af0 Bumped location for third party libraries. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-04-25 10:09:32 +01:00
Mihaela Stoica
063faac782 CA-250934: Update the DOTNET_BUILD_LOCATION to the build containing the updated sign.bat file 2017-04-21 16:18:58 +01:00
Mihaela Stoica
da52a9b28a Update DOTNET_BUILD_LOCATION 
Reference the dotnet-packges build containing the updated sign.bat
 2017-03-06 17:15:19 +00:00
Konstantina Chremmou
c783e18450 CA-242451: Use a different location for binaries built with CTXSIGN defined (the actual location will be updated when the build is available). Use latest dotnet-packages. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-02-17 17:01:32 +00:00
Konstantina Chremmou
88b7cd53b4 CP-20149: Build overhaul: build XenCenter using a Jenkinsfile. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-01-18 13:48:42 +00:00