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

fix some issues after "merging" 7.6 into master

Browse Source
This commit is contained in:
Alexander Schulz 2019-02-09 02:13:08 +01:00
parent a196ae4076
commit 79330a7e84
9 changed files with 4921 additions and 4959 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
XenAdmin.sln
View File

@ -12,12 +12,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLib", "CommandLib\Co
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xva_verify", "xva_verify\xva_verify.csproj", "{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "splash", "splash\splash.vcxproj", "{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}"
ProjectSection(ProjectDependencies) = postProject
{727E885D-14BE-40F0-9D0B-3853D44D3984} = {727E885D-14BE-40F0-9D0B-3853D44D3984}
{70BDA4BC-F062-4302-8ACD-A15D8BF31D65} = {70BDA4BC-F062-4302-8ACD-A15D8BF31D65}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenAdminTests", "XenAdminTests\XenAdminTests.csproj", "{21B9482C-D255-40D5-ABA7-C8F00F99547C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenCenterLib", "XenCenterLib\XenCenterLib.csproj", "{9861DFA1-B41F-432D-A43F-226257DEBBB9}"
@ -35,12 +29,11 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenServerHealthCheck", "XenServerHealthCheck\XenServerHealthCheck.csproj", "{DEB3208D-1153-407C-8C99-0D8899BE25A5}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "installer-xcp-ng", "installer-xcp-ng\installer-xcp-ng.wixproj", "{E0BDD733-D6EB-4EAF-B020-ED0F1154CF80}"
ProjectSection(ProjectDependencies) = postProject
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB} = {AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xe", "xe\Xe.csproj", "{727E885D-14BE-40F0-9D0B-3853D44D3984}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "splash-xcp-ng", "..\xcpng.splash\splash-xcp-ng\splash-xcp-ng.csproj", "{CD563857-6159-4415-B7B2-A21991F572E3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -100,17 +93,6 @@ Global
{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Release|Win32.Build.0 = Release|Any CPU
{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Release|x64.ActiveCfg = Release|Any CPU
{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Release|x64.Build.0 = Release|Any CPU
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Debug|Any CPU.ActiveCfg = Debug|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Debug|Win32.ActiveCfg = Debug|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Debug|x64.ActiveCfg = Debug|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Release|Any CPU.ActiveCfg = Release|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Release|Mixed Platforms.Build.0 = Release|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Release|Win32.ActiveCfg = Release|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Release|Win32.Build.0 = Release|Win32
{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}.Release|x64.ActiveCfg = Release|Win32
{21B9482C-D255-40D5-ABA7-C8F00F99547C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{21B9482C-D255-40D5-ABA7-C8F00F99547C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{21B9482C-D255-40D5-ABA7-C8F00F99547C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@ -253,6 +235,22 @@ Global
{727E885D-14BE-40F0-9D0B-3853D44D3984}.Release|Win32.Build.0 = Release|Any CPU
{727E885D-14BE-40F0-9D0B-3853D44D3984}.Release|x64.ActiveCfg = Release|Any CPU
{727E885D-14BE-40F0-9D0B-3853D44D3984}.Release|x64.Build.0 = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|Win32.ActiveCfg = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|Win32.Build.0 = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|x64.ActiveCfg = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Debug|x64.Build.0 = Debug|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|Any CPU.Build.0 = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|Win32.ActiveCfg = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|Win32.Build.0 = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|x64.ActiveCfg = Release|Any CPU
{CD563857-6159-4415-B7B2-A21991F572E3}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

85
XenAdmin/MainWindow.Designer.cs generated
View File

@ -1955,8 +1955,8 @@ namespace XenAdmin
private XenAdmin.Commands.CommandToolStripButton AddServerToolbarButton;
private XenAdmin.Commands.CommandToolStripButton RebootToolbarButton;
private XenAdmin.Commands.CommandToolStripButton SuspendToolbarButton;
private XenAdmin.Commands.CommandToolStripButton ForceRebootToolbarButton;
private XenAdmin.Commands.CommandToolStripButton ForceShutdownToolbarButton;
private XenAdmin.Commands.CommandToolStripButton PauseVmToolbarButton;
private XenAdmin.Commands.CommandToolStripButton UnpauseVmToolbarButton;
private XenAdmin.Commands.CommandToolStripButton ForceRebootToolbarButton;
private XenAdmin.Commands.CommandToolStripButton ForceShutdownToolbarButton;
private System.Windows.Forms.ToolTip statusToolTip;
@ -2107,48 +2107,47 @@ namespace XenAdmin
private XenAdmin.Commands.CommandToolStripMenuItem poolReconnectAsToolStripMenuItem;
internal System.Windows.Forms.TabPage TabPageAD;
private System.Windows.Forms.TabPage TabPageGPU;
private CommandToolStripMenuItem powerOnToolStripMenuItem;
private CommandToolStripButton shutDownToolStripButton;
private CommandToolStripButton startVMToolStripButton;
private CommandToolStripButton powerOnHostToolStripButton;
private CommandToolStripButton resumeToolStripButton;
private MigrateVMToolStripMenuItem relocateToolStripMenuItem;
private StartVMOnHostToolStripMenuItem startOnHostToolStripMenuItem;
private ResumeVMOnHostToolStripMenuItem resumeOnToolStripMenuItem;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem1;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem2;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem3;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem4;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem5;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem6;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem7;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem9;
private ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem8;
private TabPage TabPageBallooningUpsell;
private ToolStripMenuItem xenCenterPluginsOnlineToolStripMenuItem;
private CommandToolStripMenuItem MoveVMToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem powerOnToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripButton shutDownToolStripButton;
private XenAdmin.Commands.CommandToolStripButton startVMToolStripButton;
private XenAdmin.Commands.CommandToolStripButton powerOnHostToolStripButton;
private XenAdmin.Commands.CommandToolStripButton resumeToolStripButton;
private XenAdmin.Commands.MigrateVMToolStripMenuItem relocateToolStripMenuItem;
private XenAdmin.Commands.StartVMOnHostToolStripMenuItem startOnHostToolStripMenuItem;
private XenAdmin.Commands.ResumeVMOnHostToolStripMenuItem resumeOnToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem3;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem4;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem5;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem6;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem7;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem9;
private System.Windows.Forms.ToolStripMenuItem pluginItemsPlaceHolderToolStripMenuItem8;
private System.Windows.Forms.ToolStripMenuItem xenCenterPluginsOnlineToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem MoveVMToolStripMenuItem;
//private CommandToolStripMenuItem rollingUpgradeToolStripMenuItem;
private CommandToolStripMenuItem changePoolPasswordToolStripMenuItem;
private ToolStripSeparator toolStripSeparator30;
private CommandToolStripMenuItem virtualAppliancesToolStripMenuItem;
private AssignGroupToolStripMenuItemVM_appliance assignToVirtualApplianceToolStripMenuItem;
private CommandToolStripMenuItem disasterRecoveryToolStripMenuItem;
private CommandToolStripMenuItem DrWizardToolStripMenuItem;
private CommandToolStripMenuItem drConfigureToolStripMenuItem;
private CommandToolStripMenuItem securityGroupsToolStripMenuItem;
private ToolStripSeparator toolStripMenuItem1;
private CommandToolStripMenuItem HostPasswordToolStripMenuItem;
private CommandToolStripMenuItem ChangeRootPasswordToolStripMenuItem;
private CommandToolStripMenuItem forgetSavedPasswordToolStripMenuItem;
private CommandToolStripMenuItem CreateVmFromTemplateToolStripMenuItem;
private CommandToolStripMenuItem newVMFromTemplateToolStripMenuItem;
private CommandToolStripMenuItem InstantVmToolStripMenuItem;
private ToolStripMenuItem importSettingsToolStripMenuItem;
private ToolStripMenuItem exportSettingsToolStripMenuItem;
private ToolStripSeparator toolStripSeparator31;
private CommandToolStripMenuItem destroyServerToolStripMenuItem;
private CommandToolStripMenuItem restartToolstackToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem changePoolPasswordToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator30;
private XenAdmin.Commands.CommandToolStripMenuItem virtualAppliancesToolStripMenuItem;
private XenAdmin.Commands.AssignGroupToolStripMenuItemVM_appliance assignToVirtualApplianceToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem disasterRecoveryToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem DrWizardToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem drConfigureToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem securityGroupsToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private XenAdmin.Commands.CommandToolStripMenuItem HostPasswordToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem ChangeRootPasswordToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem forgetSavedPasswordToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem CreateVmFromTemplateToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem newVMFromTemplateToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem InstantVmToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem exportSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator31;
private XenAdmin.Commands.CommandToolStripMenuItem destroyServerToolStripMenuItem;
private XenAdmin.Commands.CommandToolStripMenuItem restartToolstackToolStripMenuItem;
private XenAdmin.Controls.MainWindowControls.NavigationPane navigationPane;
private XenAdmin.TabPages.AlertSummaryPage alertPage;
private XenAdmin.TabPages.ManageUpdatesPage updatesPage;

1
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -1373,7 +1373,6 @@ namespace XenAdmin.TabPages
else
return string.Empty;
}
}
private static void GenerateVirtualisationStatusForGeneralBox(PDSection s, VM vm)
{

321
XenAdmin/XenAdmin.csproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -12,13 +12,6 @@
<AssemblyName>XenCenterMain</AssemblyName>
<ApplicationIcon>..\Branding\Images\AppIcon.ico</ApplicationIcon>
<SignManifests>false</SignManifests>
<ManifestCertificateThumbprint>68BA129E3A127B1142D19E58F0D429CC5411795F</ManifestCertificateThumbprint>
<ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timestamp.dll</ManifestTimestampUrl>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@ -64,9 +57,6 @@
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="DiscUtils, Version=0.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -106,8 +96,6 @@
<Compile Include="Actions\GUIActions\ExternalPluginAction.cs" />
<Compile Include="Actions\GUIActions\RestoreDismissedUpdatesAction.cs" />
<Compile Include="Actions\GUIActions\MeddlingAction.cs" />
<Compile Include="Actions\GUIActions\IgnoreServerAction.cs" />
<Compile Include="Actions\GUIActions\IgnorePatchAction.cs" />
<Compile Include="Actions\GUIActions\SaveDataSourceStateAction.cs" />
<Compile Include="Actions\GUIActions\SearchAction.cs" />
<Compile Include="Alerts\NewVersionPriorityAlertComparer.cs" />
@ -127,19 +115,19 @@
<Compile Include="Commands\DragDropCrossPoolMoveHaltedVMCommand.cs" />
<Compile Include="Commands\DisablePvsReadCachingCommand.cs" />
<Compile Include="Commands\EnablePvsReadCachingCommand.cs" />
<Compile Include="Commands\PauseVMCommand.cs" />
<Compile Include="Commands\RestartDockerContainerCommand.cs" />
<Compile Include="Commands\ResumeDockerContainerCommand.cs" />
<Compile Include="Commands\PauseDockerContainerCommand.cs" />
<Compile Include="Commands\StopDockerContainerCommand.cs" />
<Compile Include="Commands\StartDockerContainerCommand.cs" />
<Compile Include="Commands\PauseVMCommand.cs" />
<Compile Include="Commands\UnPauseVMCommand.cs" />
<Compile Include="Commands\Controls\EditPropertiesToolStripMenuItem.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Commands\CrossPoolMigrateToHomeCommand.cs" />
<Compile Include="Commands\TrimSRCommand.cs" />
<Compile Include="Commands\ExportResourceReportCommand.cs" />
<Compile Include="Commands\UnPauseVMCommand.cs" />
<Compile Include="Controls\AffinityPicker.cs">
<SubType>UserControl</SubType>
</Compile>
@ -179,7 +167,10 @@
<DependentUpon>DataGridViewEx.cs</DependentUpon>
</Compile>
<Compile Include="Controls\DataGridViewTextAndImageCell.cs" />
<Compile Include="Controls\FolderChangeDialogTreeView.cs">
<Compile Include="Controls\ComboBoxes\EnableableComboBoxEditingControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\TreeViews\FolderChangeDialogTreeView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\ListViewEx.cs">
@ -215,7 +206,7 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\Tags\TagsEditor.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\UpsellPage.cs">
<SubType>UserControl</SubType>
@ -232,12 +223,16 @@
<Compile Include="Diagnostics\Checks\AutomatedUpdatesLicenseCheck.cs" />
<Compile Include="Diagnostics\Checks\DiskSpaceForBatchUpdatesCheck.cs" />
<Compile Include="Diagnostics\Checks\HostCheck.cs" />
<Compile Include="Diagnostics\Checks\PrepareToUpgradeCheck.cs" />
<Compile Include="Diagnostics\Checks\RebootPendingOnMasterCheck.cs" />
<Compile Include="Diagnostics\Checks\HostNeedsRebootCheck.cs" />
<Compile Include="Diagnostics\Checks\SafeToUpgradeCheck.cs" />
<Compile Include="Diagnostics\Checks\HostHasUnsupportedStorageLinkSRCheck.cs" />
<Compile Include="Diagnostics\Checks\ServerSelectionCheck.cs" />
<Compile Include="Diagnostics\Checks\XenCenterVersionCheck.cs" />
<Compile Include="Diagnostics\Checks\HostMemoryPostUpgradeCheck.cs" />
<Compile Include="Diagnostics\Problems\HostProblem\HostMemoryPostUpgradeWarning.cs" />
<Compile Include="Diagnostics\Problems\HostProblem\HostPrepareToUpgradeProblem.cs" />
<Compile Include="Diagnostics\Problems\HostProblem\LicenseRestrictionProblem.cs" />
<Compile Include="Diagnostics\Problems\PoolProblem\MasterIsPendingRestartProblems.cs" />
<Compile Include="Diagnostics\Problems\HostProblem\PrerequisiteUpdateMissing.cs" />
@ -253,6 +248,7 @@
<Compile Include="Diagnostics\Problems\SRProblem\UnsupportedStorageLinkSrIsPresentProblem.cs" />
<Compile Include="Diagnostics\Problems\UtilityProblem\CfuNotAvailableProblem.cs" />
<Compile Include="Diagnostics\Problems\VMProblem\InvalidVCPUConfiguration.cs" />
<Compile Include="Diagnostics\Problems\WarningWithMoreInfo.cs" />
<Compile Include="Dialogs\AttachUsbDialog.cs">
<SubType>Form</SubType>
</Compile>
@ -365,6 +361,12 @@
<Compile Include="Dialogs\UsbUsageDialog.Designer.cs">
<DependentUpon>UsbUsageDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\BallooningDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\BallooningDialog.Designer.cs">
<DependentUpon>BallooningDialog.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@ -451,11 +453,14 @@
<DependentUpon>DockerDetailsPage.cs</DependentUpon>
</Compile>
<Compile Include="TabPages\HomePage.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="TabPages\HomePage.Designer.cs">
<DependentUpon>HomePage.cs</DependentUpon>
</Compile>
<Compile Include="TabPages\NotificationsBasePage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="TabPages\PvsPage.cs">
<SubType>UserControl</SubType>
</Compile>
@ -478,7 +483,6 @@
<Compile Include="Controls\BootOrderListBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Diagnostics\Problems\VMProblem\SuspendedVM.cs" />
<Compile Include="Diagnostics\Problems\VMProblem\ToolsCD.cs" />
<Compile Include="Dialogs\AdPasswordPrompt.cs">
<SubType>Form</SubType>
@ -554,13 +558,13 @@
<DependentUpon>PerfmonAlertOptionsPage.cs</DependentUpon>
</Compile>
<Compile Include="Controls\BlueBorderPanel.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\CustomDataGraph\ArchiveMaintainer.cs">
</Compile>
<Compile Include="Controls\CustomDataGraph\DataArchive.cs" />
<Compile Include="Controls\CustomDataGraph\GraphList.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\CustomDataGraph\GraphList.Designer.cs">
<DependentUpon>GraphList.cs</DependentUpon>
@ -574,12 +578,12 @@
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\DoubleBufferedPanel.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\DoubleBufferedPanel.Designer.cs">
<DependentUpon>DoubleBufferedPanel.cs</DependentUpon>
</Compile>
<Compile Include="Controls\GradientPanel\GradientPanel.cs">
<Compile Include="Controls\GradientPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\HaNtolIndicator.cs">
@ -755,6 +759,13 @@
<Compile Include="Wizards\CrossPoolMigrateWizard\IntraPoolCopyPage.Designer.cs">
<DependentUpon>IntraPoolCopyPage.cs</DependentUpon>
</Compile>
<Compile Include="Wizards\ImportWizard\ImportBootOptionPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizards\ImportWizard\ImportBootOptionPage.Designer.cs">
<DependentUpon>ImportBootOptionPage.cs</DependentUpon>
</Compile>
<Compile Include="Wizards\WizardHelpers.cs" />
<Compile Include="Wizards\ImportWizard\HardwareCompatibilityFilter.cs" />
<Compile Include="Wizards\NewSRWizard_Pages\ChooseSrProvisioningPage.cs">
<SubType>UserControl</SubType>
@ -926,13 +937,13 @@
<DependentUpon>DataKey.cs</DependentUpon>
</Compile>
<Compile Include="Controls\CustomDataGraph\DataPlot.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\CustomDataGraph\DataPlot.designer.cs">
<DependentUpon>DataPlot.cs</DependentUpon>
</Compile>
<Compile Include="Controls\CustomDataGraph\DataPlotNav.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\CustomDataGraph\DataPlotNav.designer.cs">
<DependentUpon>DataPlotNav.cs</DependentUpon>
@ -1003,14 +1014,14 @@
<Compile Include="Wizards\PatchingWizard\PlanActions\DownloadPatchPlanAction.cs" />
<Compile Include="Wizards\PatchingWizard\PlanActions\RestartHostPlanAction.cs" />
<Compile Include="Wizards\PatchingWizard\PlanActions\UploadPatchToMasterPlanAction.cs" />
<Compile Include="Wizards\PatchingWizard\PlanActions\PoolPatchMapping.cs" />
<Compile Include="Wizards\PatchingWizard\PlanActions\XenServerPatchMapping.cs" />
<Compile Include="Wizards\PatchingWizard\PlanActions\RemoveUpdateFilesFromMaster.cs" />
<Compile Include="Wizards\PatchingWizard\PlanActions\RemoveUpdateFile.cs" />
<Compile Include="Wizards\PatchingWizard\PlanActions\InstallSupplementalPackPlanAction.cs" />
<Compile Include="Wizards\PatchingWizard\UpdateProgressBackgroundWorker.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Wizards\PatchingWizard\UpgradeProgressDescriptor.cs" />
<Compile Include="Wizards\RollingUpgradeWizard\PlanActions\RpuUploadAndApplySuppPackPlanAction.cs" />
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeUpgradePage.cs">
<SubType>UserControl</SubType>
</Compile>
@ -1021,6 +1032,12 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Diagnostics\Checks\PoolHasGFS2SR.cs" />
<Compile Include="Wizards\BootModesControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizards\BootModesControl.Designer.cs">
<DependentUpon>BootModesControl.cs</DependentUpon>
</Compile>
<Compile Include="XenSearch\TreeNodeGroupAcceptor.cs">
</Compile>
<Compile Include="Dialogs\FolderChangeDialog.cs">
@ -1030,7 +1047,7 @@
<DependentUpon>FolderChangeDialog.cs</DependentUpon>
</Compile>
<Compile Include="Controls\Folders\FolderEditor.cs">
<SubType>UserControl</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\Folders\FolderListItem.cs" />
<Compile Include="Dialogs\NewTagDialog.cs">
@ -1410,11 +1427,9 @@
<Compile Include="Diagnostics\Problems\HostProblem\HostNotLive.cs" />
<Compile Include="Diagnostics\Problems\VMProblem\LocalCD.cs" />
<Compile Include="Diagnostics\Problems\VMProblem\LocalStorage.cs" />
<Compile Include="Diagnostics\Problems\PoolProblem\NoDefaultSR.cs" />
<Compile Include="Diagnostics\Problems\VMProblem\NoHosts.cs" />
<Compile Include="Diagnostics\Problems\VMProblem\NoPVDrivers.cs" />
<Compile Include="Diagnostics\Problems\HostProblem\NotEnoughMem.cs" />
<Compile Include="Diagnostics\Problems\SRProblem\NotEnoughSpaceToSuspend.cs" />
<Compile Include="Diagnostics\Problems\HostProblem\PrecheckFailed.cs" />
<Compile Include="Diagnostics\Problems\Problem.cs" />
<Compile Include="Wizards\BugToolWizardFiles\GenericSelectHostsPage.cs">
@ -1704,14 +1719,6 @@
<SubType>Designer</SubType>
<DependentUpon>AssignLicenseDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialog.resx">
<SubType>Designer</SubType>
<DependentUpon>BallooningDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialogAdvanced.resx">
<SubType>Designer</SubType>
<DependentUpon>BallooningDialogAdvanced.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\ControlDomainMemoryDialog.resx">
<DependentUpon>ControlDomainMemoryDialog.cs</DependentUpon>
</EmbeddedResource>
@ -1886,6 +1893,15 @@
<SubType>Designer</SubType>
<DependentUpon>SelectVMsToSuspendDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialog.ja.resx">
<DependentUpon>BallooningDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialog.resx">
<DependentUpon>BallooningDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialog.zh-CN.resx">
<DependentUpon>BallooningDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\Wlb\WlbEditScheduledTask.resx">
<SubType>Designer</SubType>
<DependentUpon>WlbEditScheduledTask.cs</DependentUpon>
@ -2183,6 +2199,16 @@
<SubType>Designer</SubType>
<DependentUpon>RBACWarningPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\ImportWizard\ImportBootOptionPage.ja.resx">
<DependentUpon>ImportBootOptionPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\ImportWizard\ImportBootOptionPage.resx">
<DependentUpon>ImportBootOptionPage.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\ImportWizard\ImportBootOptionPage.zh-CN.resx">
<DependentUpon>ImportBootOptionPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\NewSRWizard_Pages\ChooseSrProvisioningPage.ja.resx">
<DependentUpon>ChooseSrProvisioningPage.cs</DependentUpon>
</EmbeddedResource>
@ -2364,10 +2390,6 @@
<EmbeddedResource Include="Wizards\PatchingWizard\AutomatedUpdatesBasePage.zh-CN.resx">
<DependentUpon>AutomatedUpdatesBasePage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_PatchingPage.resx">
<SubType>Designer</SubType>
<DependentUpon>PatchingWizard_PatchingPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_PrecheckPage.resx">
<SubType>Designer</SubType>
<DependentUpon>PatchingWizard_PrecheckPage.cs</DependentUpon>
@ -2660,15 +2682,17 @@
<SubType>Designer</SubType>
<DependentUpon>ConsolePanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_UploadPage.ja.resx">
<DependentUpon>PatchingWizard_UploadPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_UploadPage.resx">
<DependentUpon>PatchingWizard_UploadPage.cs</DependentUpon>
<EmbeddedResource Include="Wizards\BootModesControl.ja.resx">
<DependentUpon>BootModesControl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_UploadPage.zh-CN.resx">
<DependentUpon>PatchingWizard_UploadPage.cs</DependentUpon>
<EmbeddedResource Include="Wizards\BootModesControl.resx">
<DependentUpon>BootModesControl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\BootModesControl.zh-CN.resx">
<DependentUpon>BootModesControl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\WizardProgress.resx">
<DependentUpon>WizardProgress.cs</DependentUpon>
@ -2751,12 +2775,6 @@
<Compile Include="Commands\DestroyHostCommand.cs" />
<Compile Include="Commands\MigrateVirtualDiskCommand.cs" />
<Compile Include="Commands\UpdateVIFCommand.cs" />
<Content Include="Help\XenCenter.chm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Help\XenCenter.ja.chm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Compile Include="Actions\OVFActions\ApplianceAction.cs" />
<Compile Include="Actions\OVFActions\ExportApplianceAction.cs" />
<Compile Include="Actions\GUIActions\GeneralEditPageAction.cs" />
@ -2939,7 +2957,6 @@
<Compile Include="OrganizationalView.cs" />
<Compile Include="Controls\SrPickerItem.cs" />
<Compile Include="Controls\SummaryPanel\ISummaryPanelView.cs" />
<Compile Include="Diagnostics\Checks\HostMaintenanceModeCheck.cs" />
<Compile Include="Diagnostics\Problems\PoolProblem\MissingMultipleFCSRsProblem.cs" />
<Compile Include="Diagnostics\Problems\WarningWithInformationUrl.cs" />
<Compile Include="Dialogs\ConnectionRefusedDialog.cs">
@ -3066,18 +3083,6 @@
<Compile Include="Diagnostics\Problems\VMProblem\RunningVMProblem.cs" />
<Compile Include="Diagnostics\Problems\VMProblem\ExistingVmWarning.cs" />
<Compile Include="Diagnostics\Problems\Warning.cs" />
<Compile Include="Dialogs\DecompressApplianceDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\DecompressApplianceDialog.Designer.cs">
<DependentUpon>DecompressApplianceDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\DownloadApplianceDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\DownloadApplianceDialog.Designer.cs">
<DependentUpon>DownloadApplianceDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\DRConfigureDialog.cs">
<SubType>Form</SubType>
</Compile>
@ -3449,9 +3454,6 @@
<Compile Include="Controls\Ballooning\VMMemoryControlsAdvanced.Designer.cs">
<DependentUpon>VMMemoryControlsAdvanced.cs</DependentUpon>
</Compile>
<Compile Include="Controls\Ballooning\VMMemoryControlsBase.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\Ballooning\VMMemoryControlsBasic.cs">
<SubType>UserControl</SubType>
</Compile>
@ -3699,10 +3701,7 @@
<DependentUpon>DRFailoverWizardStoragePage.cs</DependentUpon>
</Compile>
<Compile Include="Controls\SrPicker.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\SrPicker.Designer.cs">
<DependentUpon>SrPicker.cs</DependentUpon>
<SubType>Component</SubType>
</Compile>
<Compile Include="Wizards\DRWizards\DRFailoverWizardWelcomePage.cs">
<SubType>UserControl</SubType>
@ -3947,12 +3946,11 @@
<Compile Include="Wizards\GenericPages\TvmIpPage.Designer.cs">
<DependentUpon>TvmIpPage.cs</DependentUpon>
</Compile>
<Compile Include="Wizards\PatchingWizard\PatchingWizardModeGuidanceBuilder.cs" />
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeReadyToUpgradePage.cs">
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeExtrasPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeReadyToUpgradePage.Designer.cs">
<DependentUpon>RollingUpgradeReadyToUpgradePage.cs</DependentUpon>
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeExtrasPage.Designer.cs">
<DependentUpon>RollingUpgradeExtrasPage.cs</DependentUpon>
</Compile>
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_UpgradeMode.cs">
<SubType>UserControl</SubType>
@ -4010,21 +4008,6 @@
<Compile Include="Dialogs\AssignLicenseDialog.Designer.cs">
<DependentUpon>AssignLicenseDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\BallooningDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\BallooningDialog.Designer.cs">
<DependentUpon>BallooningDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\BallooningDialogAdvanced.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\BallooningDialogAdvanced.Designer.cs">
<DependentUpon>BallooningDialogAdvanced.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\BallooningDialogBase.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\ReconnectAsDialog.cs">
<SubType>Form</SubType>
</Compile>
@ -4108,12 +4091,6 @@
<Compile Include="UpdateManager.DelayCalculator.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_SelectInstallMethod.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_SelectInstallMethod.Designer.cs">
<DependentUpon>RollingUpgradeWizard_SelectInstallMethod.cs</DependentUpon>
</Compile>
<Compile Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard.cs">
<SubType>Form</SubType>
</Compile>
@ -4218,9 +4195,6 @@
</Compile>
<Compile Include="XenSearch\CustomFieldWrapper.cs" />
<Compile Include="XenSearch\TreeSearch.cs" />
<Content Include="Help\XenCenter.zh-CN.chm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Images\attach_virtualstorage_32.png" />
<None Include="Images\backup_restore_32.png" />
<None Include="Images\copy_16.png" />
@ -4299,10 +4273,6 @@
<None Include="Images\000_Resumed_h32bit_24.png" />
<None Include="Images\000_paused_h32bit_16.png" />
<None Include="Images\000_Resumed_h32bit_16.png" />
<None Include="Images\000_paused_h32bit_16_green.png" />
<None Include="Images\000_Paused_h32bit_24_green.png" />
<None Include="Images\000_Resumed_h32bit_16_green.png" />
<None Include="Images\000_Resumed_h32bit_24_green.png" />
<None Include="Images\000_PiiCustomised_h32bit_16.png" />
<None Include="Images\000_PiiMaybe_h32bit_16.png" />
<None Include="Images\000_PiiNo_h32bit_16.png" />
@ -4336,6 +4306,8 @@
<Content Include="HomePage\css\screen.css" />
<Content Include="HomePage\css\theme.css" />
<Content Include="HomePage\index.html" />
<Content Include="HomePage\index.ja.html" />
<Content Include="HomePage\index.zh-CN.html" />
<Content Include="HomePage\media\grid.png" />
<Content Include="HomePage\media\icons\cx-cloudServerGraphic.png" />
<Content Include="HomePage\media\icons\cx-icon-addServer.png" />
@ -4343,7 +4315,7 @@
<Content Include="HomePage\media\icons\cx-icon-purchaseSupport.png" />
<Content Include="HomePage\media\icons\cx-icon-regServPool.png" />
<Content Include="HomePage\media\icons\cx-icon-tryVirtualization.png" />
<Content Include="HomePage\media\logos\cx-logo-citrixXenServer.png" />
<Content Include="HomePage\media\logos\cx-logo-citrixHypervisor.png" />
<Content Include="Images\000_AddSite_h32bit_16.png" />
<Content Include="Images\000_FilterDates_h32bit_16.png" />
<Content Include="Images\000_FilterServer_h32bit_16.png" />
@ -4367,6 +4339,7 @@
<None Include="Images\000_RebootVM_h32bit_16.png" />
<None Include="Images\000_RemoveIPAddress_h32bit_16.png" />
<None Include="Images\000_RemoveSite_h32bit_16.png" />
<None Include="Images\000_Pool_h32bit_16-w-alert.png" />
<Content Include="Images\000_ServerInProgress_h32bit_16.png" />
<None Include="Images\000_ServerMaintenance_h32bit_16.png" />
<None Include="Images\000_ServerMaintenance_h32bit_32.png" />
@ -4432,6 +4405,7 @@
<None Include="Images\001_WindowView_h32bit_16.png" />
<None Include="Images\000_TestFailover_h32bit_32.png" />
<None Include="Images\015_Download_h32bit_32.png" />
<None Include="Images\000_Server_h32bit_16-w-alert.png" />
<Content Include="Images\000_Severity5_h32bit_16.png" />
<None Include="Images\alert1_16.png" />
<None Include="Images\alert2_16.png" />
@ -4443,8 +4417,8 @@
<Link>Images\alerts_32.png</Link>
</Content>
<Content Include="Images\000_Sites_h32bit_16.png" />
<Content Include="Images\000_SuspendVM_h32bit_16_green.png" />
<Content Include="Images\000_VMPausedDisabled_h32bit_16_green.png" />
<None Include="Images\000_TCP-IPGroup_h32bit_16.png" />
<None Include="Images\015_Download_h32bit_16.png" />
<Content Include="Images\asterisk.png" />
<Content Include="Images\attach_24.png" />
<None Include="Images\cancelled_action_16.png" />
@ -4498,12 +4472,15 @@
<None Include="Images\turbo_16x.png" />
<None Include="Images\linx_16x.png" />
<None Include="Images\yinhekylin_16x.png" />
<None Include="Images\pool_32.png" />
<Content Include="Images\Refresh16.png" />
<None Include="Images\saved_searches_16.png" />
<None Include="Images\server_up_16.png" />
<None Include="Images\saved_searches_24.png" />
<None Include="Images\RunningDC_16.png" />
<Content Include="Images\scilinux_16x.png" />
<None Include="Images\server_32.png" />
<None Include="Images\server_up_32.png" />
<Content Include="Images\sl_luns_16.png" />
<Content Include="Images\debian_16x.png" />
<None Include="Images\desktop.jpg" />
@ -4548,9 +4525,6 @@
<None Include="Images\sl_pools_16.png" />
<None Include="Images\sl_system_16.png" />
<None Include="Images\sl_lun_16.png" />
<Content Include="Images\spacer1x1.gif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Images\SpinningFrame0.png" />
<None Include="Images\SpinningFrame1.png" />
<None Include="Images\SpinningFrame2.png" />
@ -4560,6 +4534,7 @@
<None Include="Images\SpinningFrame6.png" />
<None Include="Images\SpinningFrame7.png" />
<None Include="Images\StoppedDC_16.png" />
<None Include="Images\storage_error_16.png" />
<Content Include="Images\subscribe.png" />
<Content Include="Images\suse_16x.png" />
<Content Include="Images\tempAdd.png" />
@ -4591,42 +4566,19 @@
<Content Include="Images\tshadowtopright.png" />
<Content Include="Images\ubuntu_16x.png" />
<Content Include="..\Branding\Images\upsell_16.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>Images\upsell_16.png</Link>
</Content>
<Content Include="Images\usagebar_0.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_10.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_2.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_3.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_4.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_5.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_6.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_7.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_8.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_9.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\usagebar_0.png" />
<Content Include="Images\usagebar_1.png" />
<Content Include="Images\usagebar_10.png" />
<Content Include="Images\usagebar_2.png" />
<Content Include="Images\usagebar_3.png" />
<Content Include="Images\usagebar_4.png" />
<Content Include="Images\usagebar_5.png" />
<Content Include="Images\usagebar_6.png" />
<Content Include="Images\usagebar_7.png" />
<Content Include="Images\usagebar_8.png" />
<Content Include="Images\usagebar_9.png" />
<None Include="Images\virtualstorage_snapshot_16.png" />
<None Include="Images\vmBackgroundCurrent.png" />
<None Include="Images\vmBackground.png" />
@ -5072,9 +5024,6 @@
<EmbeddedResource Include="Controls\ShadowPanel.zh-CN.resx">
<DependentUpon>ShadowPanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\SrPicker.zh-CN.resx">
<DependentUpon>SrPicker.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\ToolTipContainer.ja.resx">
<DependentUpon>ToolTipContainer.cs</DependentUpon>
</EmbeddedResource>
@ -5198,18 +5147,6 @@
<EmbeddedResource Include="Dialogs\AttachDiskDialog.zh-CN.resx">
<DependentUpon>AttachDiskDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialog.ja.resx">
<DependentUpon>BallooningDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialog.zh-CN.resx">
<DependentUpon>BallooningDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialogAdvanced.ja.resx">
<DependentUpon>BallooningDialogAdvanced.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BallooningDialogAdvanced.zh-CN.resx">
<DependentUpon>BallooningDialogAdvanced.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\BondProperties.ja.resx">
<DependentUpon>BondProperties.cs</DependentUpon>
</EmbeddedResource>
@ -5258,30 +5195,12 @@
<EmbeddedResource Include="Dialogs\DateFilterDialog.zh-CN.resx">
<DependentUpon>DateFilterDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DecompressApplianceDialog.ja.resx">
<DependentUpon>DecompressApplianceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DecompressApplianceDialog.resx">
<DependentUpon>DecompressApplianceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DecompressApplianceDialog.zh-CN.resx">
<DependentUpon>DecompressApplianceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DialogWithProgress.ja.resx">
<DependentUpon>DialogWithProgress.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DialogWithProgress.zh-CN.resx">
<DependentUpon>DialogWithProgress.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DownloadApplianceDialog.ja.resx">
<DependentUpon>DownloadApplianceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DownloadApplianceDialog.resx">
<DependentUpon>DownloadApplianceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DownloadApplianceDialog.zh-CN.resx">
<DependentUpon>DownloadApplianceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\DRConfigureDialog.ja.resx">
<DependentUpon>DRConfigureDialog.cs</DependentUpon>
</EmbeddedResource>
@ -6315,13 +6234,6 @@
<EmbeddedResource Include="Wizards\HAWizard_Pages\Intro.ja.resx">
<DependentUpon>Intro.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\SrPicker.ja.resx">
<DependentUpon>SrPicker.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\SrPicker.resx">
<DependentUpon>SrPicker.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\HAWizard_Pages\Intro.zh-CN.resx">
<DependentUpon>Intro.cs</DependentUpon>
</EmbeddedResource>
@ -6657,6 +6569,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Wizards\NewVMWizard\Page_CpuMem.zh-CN.resx">
<DependentUpon>Page_CpuMem.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\NewVMWizard\Page_Finish.ja.resx">
<DependentUpon>Page_Finish.cs</DependentUpon>
@ -6815,12 +6728,6 @@
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_ModePage.zh-CN.resx">
<DependentUpon>PatchingWizard_ModePage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_PatchingPage.ja.resx">
<DependentUpon>PatchingWizard_PatchingPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_PatchingPage.zh-CN.resx">
<DependentUpon>PatchingWizard_PatchingPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_PrecheckPage.ja.resx">
<DependentUpon>PatchingWizard_PrecheckPage.cs</DependentUpon>
</EmbeddedResource>
@ -6839,14 +6746,14 @@
<EmbeddedResource Include="Wizards\PatchingWizard\PatchingWizard_SelectServers.zh-CN.resx">
<DependentUpon>PatchingWizard_SelectServers.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeReadyToUpgradePage.ja.resx">
<DependentUpon>RollingUpgradeReadyToUpgradePage.cs</DependentUpon>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeExtrasPage.ja.resx">
<DependentUpon>RollingUpgradeExtrasPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeReadyToUpgradePage.resx">
<DependentUpon>RollingUpgradeReadyToUpgradePage.cs</DependentUpon>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeExtrasPage.resx">
<DependentUpon>RollingUpgradeExtrasPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeReadyToUpgradePage.zh-CN.resx">
<DependentUpon>RollingUpgradeReadyToUpgradePage.cs</DependentUpon>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeExtrasPage.zh-CN.resx">
<DependentUpon>RollingUpgradeExtrasPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard.ja.resx">
<DependentUpon>RollingUpgradeWizard.cs</DependentUpon>
@ -6866,12 +6773,6 @@
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_FirstPage.zh-CN.resx">
<DependentUpon>RollingUpgradeWizard_FirstPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_SelectInstallMethod.ja.resx">
<DependentUpon>RollingUpgradeWizard_SelectInstallMethod.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_SelectInstallMethod.zh-CN.resx">
<DependentUpon>RollingUpgradeWizard_SelectInstallMethod.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_UpgradeMode.ja.resx">
<DependentUpon>RollingUpgradeWizard_UpgradeMode.cs</DependentUpon>
</EmbeddedResource>
@ -6879,10 +6780,6 @@
<DependentUpon>RollingUpgradeWizard_UpgradeMode.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard_SelectInstallMethod.resx">
<DependentUpon>RollingUpgradeWizard_SelectInstallMethod.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\RollingUpgradeWizard\RollingUpgradeWizard.resx">
<DependentUpon>RollingUpgradeWizard.cs</DependentUpon>
</EmbeddedResource>
@ -6898,6 +6795,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Wizards\WizardProgress.ja.resx">
<DependentUpon>WizardProgress.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Wizards\WizardProgress.zh-CN.resx">
<DependentUpon>WizardProgress.cs</DependentUpon>
@ -6918,7 +6816,6 @@
<DependentUpon>WorkloadReports.cs</DependentUpon>
</EmbeddedResource>
<None Include="Images\VMTemplate_h32bit_32.png" />
<None Include="Resources\_000_SuspendVM_h32bit_16_green.bmp" />
<Content Include="TestResources\credits.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -7007,6 +6904,8 @@
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">mt.exe -nologo -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\$(Configuration)\$(TargetFileName)";#1</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"</PostBuildEvent>
<PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"
copy "$(ProjectDir)\..\packages\putty.exe" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
</Project>

9414
XenModel/Messages.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

5
XenModel/Utils/Helpers.cs
View File

@ -691,6 +691,11 @@ namespace XenAdmin.Core
return output;
}
public static string BoolToString(bool b)
{
return b ? Messages.YES : Messages.NO;
}
private static readonly Regex IqnRegex = new Regex(@"^iqn\.\d{4}-\d{2}\.([a-zA-Z0-9][-_a-zA-Z0-9]*(\.[a-zA-Z0-9][-_a-zA-Z0-9]*)*)(:.+)?$", RegexOptions.ECMAScript);
public static bool ValidateIscsiIQN(string iqn)

2
XenModel/XenAPI-Extensions/Host.cs
View File

@ -445,7 +445,7 @@ namespace XenAPI
return BoolKeyPreferTrue(h.license_params, "restrict_corosync");
}
//#region Experimental Features
#region Experimental Features
//public static bool CorosyncDisabled(Host h)
//{

4
XenModel/XenAPI-Extensions/Pool.cs
View File

@ -95,10 +95,10 @@ namespace XenAPI
return false;
}
public bool IsFreeLicenseOrExpired
public bool IsFreeLicenseOrExpired()
{
return Connection.Cache.Hosts.Any(h => h.IsExpired());
}
}
/// <summary>
/// Determine whether the given pool is a visible pool, i.e. not a pool-of-one.

10
installer-xcp-ng/installer-xcp-ng.wixproj
View File

@ -42,16 +42,6 @@
<Content Include="license.rtf" />
<Content Include="license.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\splash\splash.vcxproj">
<Name>splash</Name>
<Project>{afb19c9d-dd63-478b-a4a3-8452cbd0b9ab}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">