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>

WixInstaller/XenCenter.wxs

@@ -74,7 +74,6 @@
                             <File Id="IonicZipDLL" Source="$(env.RepoRoot)\XenAdmin\bin\Release\Ionic.Zip.dll" />
                             <File Id="MSTSCLibDLL" Source="$(env.RepoRoot)\XenAdmin\bin\Release\MSTSCLib.dll" />
                             <File Id="XenCenterLibDLL" Source="$(env.RepoRoot)\XenAdmin\bin\Release\XenCenterLib.dll" />
-                            <File Id="XenCenterVNCDLL" Source="$(env.RepoRoot)\XenAdmin\bin\Release\XenCenterVNC.dll" />
                             <File Id="XenModelDLL" Source="$(env.RepoRoot)\XenAdmin\bin\Release\XenModel.dll" />
                             <File Id="DiscUtils" Source="$(env.RepoRoot)\XenAdmin\bin\Release\DiscUtils.dll" />
                             <File Id="XenOvf" Source="$(env.RepoRoot)\XenAdmin\bin\Release\XenOvf.dll" />

XenAdmin.sln

@@ -18,8 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenAdminTests", "XenAdminTe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenCenterLib", "XenCenterLib\XenCenterLib.csproj", "{9861DFA1-B41F-432D-A43F-226257DEBBB9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenCenterVNC", "XenCenterVNC\XenCenterVNC.csproj", "{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenModel", "XenModel\XenModel.csproj", "{B306FC59-4441-4A5F-9F54-D3F68D4EE38D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenOvfApi", "XenOvfApi\XenOvfApi.csproj", "{2D78AC6C-B867-484A-A447-3C6FC8B8EAF7}"
@@ -106,16 +104,6 @@ Global
 		{9861DFA1-B41F-432D-A43F-226257DEBBB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9861DFA1-B41F-432D-A43F-226257DEBBB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9861DFA1-B41F-432D-A43F-226257DEBBB9}.Release|Win32.ActiveCfg = Release|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Release|Win32.ActiveCfg = Release|Any CPU
 		{B306FC59-4441-4A5F-9F54-D3F68D4EE38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B306FC59-4441-4A5F-9F54-D3F68D4EE38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B306FC59-4441-4A5F-9F54-D3F68D4EE38D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

XenAdmin/XenAdmin.csproj

@@ -761,6 +761,17 @@
       <DependentUpon>UsbPage.cs</DependentUpon>
     </Compile>
     <Compile Include="Diagnostics\Problems\PoolProblem\PoolHasGFS2SRProblem.cs" />
+    <Compile Include="VNC\GraphicsUtils.cs" />
+    <Compile Include="VNC\IVNCGraphicsClient.cs" />
+    <Compile Include="VNC\KeyMap.cs" />
+    <Compile Include="VNC\KeyMap.Designer.cs">
+      <DependentUpon>KeyMap.cs</DependentUpon>
+    </Compile>
+    <Compile Include="VNC\KeySet.cs" />
+    <Compile Include="VNC\MyStream.cs" />
+    <Compile Include="VNC\ProtocolVersion.cs" />
+    <Compile Include="VNC\VNCException.cs" />
+    <Compile Include="VNC\VNCStream.cs" />
     <Compile Include="Wizards\BallooningWizard.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -2270,6 +2281,9 @@
       <SubType>Designer</SubType>
       <DependentUpon>PhysicalStoragePage.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="VNC\KeyMap.resx">
+      <DependentUpon>KeyMap.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Wizards\BallooningWizard.resx">
       <SubType>Designer</SubType>
       <DependentUpon>BallooningWizard.cs</DependentUpon>
@@ -6942,10 +6956,6 @@
       <Project>{9861DFA1-B41F-432D-A43F-226257DEBBB9}</Project>
       <Name>XenCenterLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\XenCenterVNC\XenCenterVNC.csproj">
-      <Project>{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}</Project>
-      <Name>XenCenterVNC</Name>
-    </ProjectReference>
     <ProjectReference Include="..\XenModel\XenModel.csproj">
       <Project>{B306FC59-4441-4A5F-9F54-D3F68D4EE38D}</Project>
       <Name>XenModel</Name>

XenCenterVNC/Properties/AssemblyInfo.cs

@@ -1,66 +0,0 @@
-/* Copyright (c) Citrix Systems, Inc. 
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, 
- * with or without modification, are permitted provided 
- * that the following conditions are met: 
- * 
- * *   Redistributions of source code must retain the above 
- *     copyright notice, this list of conditions and the 
- *     following disclaimer. 
- * *   Redistributions in binary form must reproduce the above 
- *     copyright notice, this list of conditions and the 
- *     following disclaimer in the documentation and/or other 
- *     materials provided with the distribution. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("XenCenterVNC")]
-[assembly: AssemblyDescription("[Citrix] [XenCenter] VNC library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("[Citrix]")]
-[assembly: AssemblyProduct("[XenCenter]")]
-[assembly: AssemblyCopyright("Copyright © [BRANDING_COMPANY_NAME_LEGAL]")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7746a90f-6841-46f1-bf45-d497fc68a9f6")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0000")]
-[assembly: XenCenterLib.XSVersion("[BRANDING_PRODUCT_VERSION]")]
-[assembly: InternalsVisibleTo("XenAdminTests")]

XenCenterVNC/XenCenterVNC.csproj

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XenCenterVNC</RootNamespace>
-    <AssemblyName>XenCenterVNC</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GraphicsUtils.cs" />
-    <Compile Include="IVNCGraphicsClient.cs" />
-    <Compile Include="KeyMap.cs" />
-    <Compile Include="KeyMap.Designer.cs">
-      <DependentUpon>KeyMap.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="KeySet.cs" />
-    <Compile Include="MyStream.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ProtocolVersion.cs" />
-    <Compile Include="VNCException.cs" />
-    <Compile Include="VNCStream.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="KeyMap.resx">
-      <DependentUpon>KeyMap.cs</DependentUpon>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>KeyMap.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\XenCenterLib\XenCenterLib.csproj">
-      <Project>{9861DFA1-B41F-432D-A43F-226257DEBBB9}</Project>
-      <Name>XenCenterLib</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

XenCenterVNC/app.config

@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>

scripts/re-branding.sh

@@ -79,7 +79,7 @@ do
 done
 
 #AssemblyInfo rebranding
-for projectName in CommandLib xe XenAdmin XenAdminTests XenCenterLib XenCenterVNC XenModel XenOvfApi XenOvfTransport XenServerHealthCheck xva_verify
+for projectName in CommandLib xe XenAdmin XenAdminTests XenCenterLib XenModel XenOvfApi XenOvfTransport XenServerHealthCheck xva_verify
 do
   assemblyInfo="${REPO}/${projectName}/Properties/AssemblyInfo.cs"
   version_csharp ${assemblyInfo} && rebranding_global ${assemblyInfo}

scripts/xenadmin-build.sh

@@ -86,7 +86,7 @@ SIGN_DESCR="${BRANDING_COMPANY_NAME_SHORT} ${BRANDING_BRAND_CONSOLE}"
 if [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] || [ -z "$5" ] || [ -z "$6" ] ; then
   echo "Some signing parameters are not set; skip signing binaries"
 else
-  for file in XenCenterMain.exe CommandLib.dll MSTSCLib.dll XenCenterLib.dll XenCenterVNC.dll XenModel.dll XenOvf.dll XenOvfTransport.dll
+  for file in XenCenterMain.exe CommandLib.dll MSTSCLib.dll XenCenterLib.dll XenModel.dll XenOvf.dll XenOvfTransport.dll
   do
     cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} ${file} "${SIGN_DESCR}"
   done
@@ -210,7 +210,7 @@ cp ${REPO}/CFUValidator/bin/Release/CFUValidator.zip ${OUTPUT_DIR}/CFUValidator.
 #now package the pdbs
 cp ${REPO}/packages/*.pdb ${OUTPUT_DIR}
 
-cp ${REPO}/XenAdmin/bin/Release/{CommandLib.pdb,${BRANDING_BRAND_CONSOLE}.pdb,XenCenterLib.pdb,XenCenterMain.pdb,XenCenterVNC.pdb,XenModel.pdb,XenOvf.pdb,XenOvfTransport.pdb} \
+cp ${REPO}/XenAdmin/bin/Release/{CommandLib.pdb,${BRANDING_BRAND_CONSOLE}.pdb,XenCenterLib.pdb,XenCenterMain.pdb,XenModel.pdb,XenOvf.pdb,XenOvfTransport.pdb} \
    ${REPO}/xe/bin/Release/xe.pdb \
    ${REPO}/xva_verify/bin/Release/xva_verify.pdb \
    ${REPO}/XenServerHealthCheck/bin/Release/XenServerHealthCheck.pdb \