Konstantina Chremmou 67d1ddd1d1 Merge remote-tracking branch 'upstream/master' into feature/hyperman ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # Branding/Branding.resx # Jenkinsfile # XenAdmin/Alerts/Types/GuiOldAlert.cs # XenAdmin/Alerts/Types/LicenseAlert.cs # XenAdmin/Commands/RestartToolstackCommand.cs # XenAdmin/Diagnostics/Problems/HostProblem/HostNotSafeToUpgradeWarning.cs # XenAdmin/Dialogs/AllowUpdatesDialog.cs # XenAdmin/Dialogs/OptionsPages/ConfirmationOptionsPage.cs # XenAdmin/Dialogs/RepairSRDialog.cs # XenAdmin/Dialogs/UpsellDialog.cs # XenAdmin/Plugins/UI/TabPageCredentialsDialog.cs # XenAdmin/Program.cs # XenAdmin/Wizards/ConversionWizard/ConversionNetworkPage.cs # XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs # XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs # XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs # XenCenterLib/XSVersionAttribute.cs # XenModel/BrandManager.cs # XenModel/Messages.Designer.cs # XenModel/Messages.resx		2021-05-25 15:51:42 +01:00
..
Definitions	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
Properties	CA-350574: Corrections to signing an appliance.	2021-01-12 12:14:31 +00:00
Schemas	Fix several usage errors identified by Lexica	2017-06-20 14:29:22 +01:00
Utilities	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
app.config	CA-350574: Corrections to signing an appliance.	2021-01-12 12:14:31 +00:00
Compression.cs	CA-347480: Improved ability to cancel an import/export while compressing/uncompressing the files, or packaging into/extracting from an OVA file.	2020-12-18 01:34:25 +00:00
Content.ja.resx	Removed unused code alongside strings in need of branding.	2021-03-31 11:50:32 +01:00
Content.resx	Removed unused code alongside strings in need of branding.	2021-03-31 11:50:32 +01:00
Content.zh-CN.resx	Removed unused code alongside strings in need of branding.	2021-03-31 11:50:32 +01:00
Conversions.cs	Removed unused code alongside strings in need of branding.	2021-03-31 11:50:32 +01:00
DiskInfo.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Messages.Designer.cs	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
Messages.ja.resx	L10n : Resx resync and translation update	2021-03-02 09:44:29 +00:00
Messages.resx	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
Messages.zh-CN.resx	L10n : Resx resync and translation update	2021-03-02 09:44:29 +00:00
OVF.cs	Merge remote-tracking branch 'upstream/master' into feature/hyperman	2021-05-25 15:51:42 +01:00
OvfEventArgs.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Package.cs	CA-350574: Corrections to signing an appliance.	2021-01-12 12:14:31 +00:00
Security.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
Validation.cs	CA-349855: Reworked the disk validation to prevent false warnings about missing disk linkages.	2020-12-18 01:34:25 +00:00
XenOvfApi.csproj	Upgraded log4net to 2.0.12.	2021-04-09 09:16:01 +01:00