Merge pull request #2711 from xenserver/dotnet48

Merge branch dotnet48 into master

CFUValidator/CFUValidator.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CFUValidator</RootNamespace>
     <AssemblyName>CFUValidator</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>

CFUValidator/app.config

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

CommandLib/CommandLib.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="16.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CommandLib</RootNamespace>
     <AssemblyName>CommandLib</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

README.md

@@ -34,7 +34,8 @@ How to build XenCenter
 To build XenCenter, you need
 
 * the source from xenadmin repository
-* Visual Studio 2017
+* Visual Studio 2019
+* .NET Framework 4.8
 
 and also some libraries which we do not store in the source tree:
 

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" />
@@ -254,8 +253,10 @@
         <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
         <Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
         <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
-        <PropertyRef Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" />
+        <PropertyRef Id='WIXNETFX4RELEASEINSTALLED'/>
-        <Condition Message="!(loc.Required_For_Installation)"><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
+        <Condition Message="!(loc.Required_For_Installation)">
+            <![CDATA[Installed OR (WIXNETFX4RELEASEINSTALLED >= "#528040")]]>
+        </Condition>
         <Property Id="PERMACHINEINSTALL">
             <RegistrySearch Id="InstallRegistry" Type="raw" Root="HKLM" Key="Software\$(var.CompanyNameShort)\$(var.BrandConsole)" Name="InstallDir" />
         </Property>

WixInstaller/en-us.wxl

@@ -44,7 +44,7 @@
     <String Id="XenServer_Update_File">Update File</String>
     <String Id="XenServer_OEM_Update_File">OEM Update File</String>
     <String Id="XenCenter_Saved_Search">Saved Search</String>
-    <String Id="Required_For_Installation">Microsoft .NET Framework 4.6 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework</String>
+    <String Id="Required_For_Installation">Microsoft .NET Framework 4.8 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework</String>
     <String Id="Readme">README.TXT</String>
     <String Id="HealthCheckDescr">Enables monitoring of the health of your Citrix Hypervisor pools by periodically uploading data from the servers to Citrix Insight Services.</String>
     <String Id="HealthCheckDescrShort">Enables monitoring of the health of your Citrix Hypervisor pools.</String>

WixInstaller/ja-jp.wxl

@@ -44,7 +44,7 @@
     <String Id="XenServer_Update_File">アップデート ファイル</String>
     <String Id="XenServer_OEM_Update_File">OEM アップデート ファイル</String>
     <String Id="XenCenter_Saved_Search">保存済みの検索</String>
-    <String Id="Required_For_Installation">このインストールには、Microsoft .NET Framework 4.6 以降が必要です。https://www.microsoft.com/net/download/framework からインストールしてください。</String>
+    <String Id="Required_For_Installation">このインストールには、Microsoft .NET Framework 4.8 以降が必要です。https://www.microsoft.com/net/download/framework からインストールしてください。</String>
     <String Id="Readme">README.TXT</String>
     <String Id="HealthCheckDescr">サーバーから Citrix Insight Services に定期的にデータをアップロードすることにより、Citrix Hypervisor プールのヘルス状態の監視を有効にします。</String>
     <String Id="HealthCheckDescrShort">Citrix Hypervisor プールのヘルス状態の監視を有効にします。</String>

WixInstaller/zh-cn.wxl

@@ -44,7 +44,7 @@
     <String Id="XenServer_Update_File">更新文件</String>
     <String Id="XenServer_OEM_Update_File">OEM 更新文件</String>
     <String Id="XenCenter_Saved_Search">保存的搜索</String>
-    <String Id="Required_For_Installation">此安装需要 Microsoft .NET Framework 4.6 或更高版本。请从 https://www.microsoft.com/net/download/framework 安装</String>
+    <String Id="Required_For_Installation">此安装需要 Microsoft .NET Framework 4.8 或更高版本。请从 https://www.microsoft.com/net/download/framework 安装</String>
     <String Id="Readme">声明.TXT</String>
     <String Id="HealthCheckDescr">通过定期将数据从服务器上载到 Citrix Insight Services，实现对 Citrix Hypervisor 池的运行状况监视。</String>
     <String Id="HealthCheckDescrShort">启用对 Citrix Hypervisor 池的运行状况的监视。</String>

XenAdmin.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.28010.2048
+VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenAdmin", "XenAdmin\XenAdmin.csproj", "{70BDA4BC-F062-4302-8ACD-A15D8BF31D65}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -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}"
@@ -71,6 +69,7 @@ Global
 		{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Debug|Win32.Build.0 = Debug|Any CPU
 		{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A70D7E7-EAB2-4C36-B3F4-85B79D2384B5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -106,16 +105,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/Properties/AssemblyInfo.cs

@@ -63,5 +63,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("0.0.0.0")]
 [assembly: AssemblyFileVersion("0000")]
 [assembly: XenCenterLib.XSVersion("[BRANDING_PRODUCT_VERSION]")]
-[assembly: InternalsVisibleTo("XenAdminTests"),
+[assembly: InternalsVisibleTo("XenAdminTests")]
-           InternalsVisibleTo("XenAdminScalabilityTests")]

XenAdmin/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace XenAdmin.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

XenAdmin/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace XenAdmin.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

XenAdmin/VNC/VNCStream.cs

@@ -181,7 +181,7 @@ namespace DotNetVnc
             thread.Start(password);
         }
 
-        private ProtocolVersion getProtocolVersion()
+        private void CheckProtocolVersion()
         {
             byte[] buffer = new byte[12];
             this.stream.readFully(buffer, 0, 12);
@@ -191,12 +191,13 @@ namespace DotNetVnc
             Regex regex = new Regex("RFB ([0-9]{3})\\.([0-9]{3})\n");
             Match match = regex.Match(s);
             if (!match.Success)
-            {
+                throw new VNCException("Unexpected protocol version " + s);
-                throw new VNCException("expected protocol version: " + s);
-            }
 
-            return new ProtocolVersion(Int32.Parse(match.Groups[1].Value),
+            int major = Int32.Parse(match.Groups[1].Value);
-                                       Int32.Parse(match.Groups[2].Value));
+            int minor = Int32.Parse(match.Groups[2].Value);
+
+            if (major < 3)
+                throw new VNCException($"Unsupported protocol version {major}.{minor}");
         }
 
         private void sendProtocolVersion()
@@ -330,17 +331,6 @@ namespace DotNetVnc
             this.stream.writeInt16(height);
         }
 
-        private void handshake()
-        {
-            ProtocolVersion protocolVersion = getProtocolVersion();
-            if (protocolVersion.major < 3)
-            {
-                throw new VNCException(
-                    "don't know protocol version " + protocolVersion.major
-                 );
-            }
-        }
-
         private void authenticationExchange(char[] password)
         {
             Log.Debug("authenticationExchange");
@@ -1387,7 +1377,7 @@ namespace DotNetVnc
 
             try
             {
-                handshake();
+                CheckProtocolVersion();
                 sendProtocolVersion();
                 authenticationExchange(password);
                 clientInitialization();

XenAdmin/XenAdmin.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="16.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +11,7 @@
     <RootNamespace>XenAdmin</RootNamespace>
     <AssemblyName>XenCenterMain</AssemblyName>
     <ApplicationIcon>..\Branding\Images\AppIcon.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -766,6 +766,16 @@
       <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\VNCException.cs" />
+    <Compile Include="VNC\VNCStream.cs" />
     <Compile Include="Wizards\BallooningWizard.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -2275,6 +2285,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>
@@ -6927,10 +6940,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>
@@ -6993,4 +7002,4 @@
 
 copy "$(ProjectDir)\..\packages\putty.exe" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

XenAdmin/app.config

@@ -17,8 +17,7 @@
             </setting>
             <setting name="ServerList" serializeAs="Xml">
                 <value>
-                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
-                        xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
                 </value>
             </setting>
             <setting name="LocalSRsVisible" serializeAs="String">
@@ -55,7 +54,7 @@
                 <value>0</value>
             </setting>
             <setting name="ProxyAddress" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="ProxyPort" serializeAs="String">
                 <value>80</value>
@@ -97,7 +96,7 @@
                 <value>False</value>
             </setting>
             <setting name="LatestXenCenterSeen" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SeenAllowUpdatesDialog" serializeAs="String">
                 <value>False</value>
@@ -113,24 +112,22 @@
             </setting>
             <setting name="DisabledPlugins" serializeAs="Xml">
                 <value>
-                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
-                        xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
                 </value>
             </setting>
             <setting name="IgnoreFirstRunWizards" serializeAs="Xml">
                 <value>
-                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
-                        xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
                 </value>
             </setting>
             <setting name="ServerStatusPath" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="RollingUpgradeWizardShowFirstPage" serializeAs="String">
                 <value>False</value>
             </setting>
             <setting name="ApplicationVersion" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="UncaptureShortcutKey" serializeAs="String">
                 <value>0</value>
@@ -151,10 +148,10 @@
                 <value>False</value>
             </setting>
             <setting name="ProxyUsername" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="ProxyPassword" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="BypassProxyForServers" serializeAs="String">
                 <value>False</value>
@@ -172,7 +169,7 @@
                 <value>False</value>
             </setting>
             <setting name="HelpLastUsed" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="EjectSharedIsoOnUpdate" serializeAs="String">
                 <value>False</value>
@@ -283,5 +280,5 @@
       <level value="INFO"/>
     </logger>
   </log4net>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
 </configuration>

XenAdminTests/CodeTests/AssemblyTests.cs

@@ -51,7 +51,7 @@ namespace XenAdminTests.CodeTests
             var assembly = FindAssemblyByNameRecursively(assemblyName);
             Assert.NotNull($"Assembly {assemblyName} was not found.");
 
-            var excludeFromCheck = new[] {"XenAdmin.Help.HelpManager", "XenAdmin.Branding"};
+            var excludeFromCheck = new[] {"XenAdmin.Help.HelpManager", "XenAdmin.Branding", "DotNetVnc.KeyMap"};
             var missing = new List<string>();
             var extra = new List<string>();
 

XenAdminTests/Properties/AssemblyInfo.cs

@@ -64,4 +64,3 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: InternalsVisibleTo("XenAdminScalabilityTests")]

XenAdminTests/XenAdminTests.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="16.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XenAdminTests</RootNamespace>
     <AssemblyName>XenAdminTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

XenAdminTests/app.config

@@ -256,6 +256,6 @@
     </TestRunner>
   </NUnit>
 
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
   
 </configuration>

XenCenterLib/Archive/TarArchiveIterator.cs

@@ -44,6 +44,10 @@ namespace XenCenterLib.Archive
         private TarEntry tarEntry;
         private bool disposed;
 
+        public SharpZipTarArchiveIterator()
+        {
+        }
+
         public SharpZipTarArchiveIterator(Stream compressedTarFile, CompressionFactory.Type compressionType)
         {
             if (compressionType == CompressionFactory.Type.Gz)

XenCenterLib/Archive/TarArchiveWriter.cs

@@ -43,6 +43,10 @@ namespace XenCenterLib.Archive
         private const long bufferSize = 32*1024;
         protected bool disposed;
 
+        public SharpZipTarArchiveWriter()
+        {
+        }
+
         public SharpZipTarArchiveWriter(Stream outputStream)
         {
             tar = new TarOutputStream(outputStream);

XenCenterLib/Archive/ZipArchiveIterator.cs

@@ -49,6 +49,10 @@ namespace XenCenterLib.Archive
         public event Action<long, long> CurrentFileExtractProgressChanged;
         public event Action CurrentFileExtractCompleted;
 
+        public DotNetZipZipIterator()
+        {
+        }
+
         public DotNetZipZipIterator(Stream inputStream)
         {
             Initialise(inputStream);

XenCenterLib/Archive/ZipArchiveWriter.cs

@@ -38,17 +38,17 @@ namespace XenCenterLib.Archive
 {
     class DotNetZipZipWriter : ArchiveWriter
     {
-        private ZipOutputStream zip = null;
+        private ZipOutputStream zip;
         private bool disposed;
 
-        public DotNetZipZipWriter(Stream outputStream) : this()
+        public DotNetZipZipWriter(Stream outputStream)
         {
             zip = new ZipOutputStream( outputStream ) {EnableZip64 = Zip64Option.AsNecessary};
+            disposed = false;
         }
 
         public DotNetZipZipWriter()
         {
-            disposed = false;
         }
 
         public override void SetBaseStream(Stream outputStream)

XenCenterLib/XenCenterLib.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XenCenterLib</RootNamespace>
     <AssemblyName>XenCenterLib</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

XenCenterLib/app.config

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

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/ProtocolVersion.cs

@@ -1,46 +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;
-
-namespace DotNetVnc
-{
-	public class ProtocolVersion {
-        public int major;
-        public int minor;
-
-        public ProtocolVersion(int major, int minor) {
-            this.major = major;
-            this.minor = minor;
-        }
-	}
-}

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>

XenModel/FriendlyNames.Designer.cs

@@ -19,7 +19,7 @@ namespace XenAdmin {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class FriendlyNames {

XenModel/InvisibleMessages.Designer.cs

@@ -19,7 +19,7 @@ namespace XenAdmin {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class InvisibleMessages {

XenModel/Messages.Designer.cs

@@ -19,7 +19,7 @@ namespace XenAdmin {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Messages {

XenModel/XenAPI/FriendlyErrorNames.Designer.cs

@@ -19,7 +19,7 @@ namespace XenAPI {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class FriendlyErrorNames {

XenModel/XenModel.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XenAdmin</RootNamespace>
     <AssemblyName>XenModel</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

XenOvfApi/Messages.Designer.cs

@@ -19,7 +19,7 @@ namespace XenOvf {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Messages {

XenOvfApi/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace XenOvf.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

XenOvfApi/XenOvfApi.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XenOvf</RootNamespace>
     <AssemblyName>XenOvf</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
     <SccAuxPath>http://redtfs01:8080</SccAuxPath>
@@ -185,7 +185,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties Reset="1" AssemblyVersion="1" AssemblyFileVersion="1" StartDate="20090814" />
+      <UserProperties StartDate="20090814" AssemblyFileVersion="1" AssemblyVersion="1" Reset="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>

XenOvfApi/app.config

@@ -229,8 +229,7 @@
    </setting>
    <setting name="knownVirtualSystemTypes" serializeAs="Xml">
     <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
       <string>xen-3.0-unknown</string>
       <string>xen-3.0-x32</string>
       <string>xen-3.0-x86</string>
@@ -300,5 +299,5 @@
    </setting>
   </XenOvf.Properties.Settings>
 	</applicationSettings>
- <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup>
+ <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
 </configuration>

XenOvfTransport/Messages.Designer.cs

@@ -19,7 +19,7 @@ namespace XenOvfTransport {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Messages {

XenOvfTransport/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace XenOvfTransport.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

XenOvfTransport/XenOvfTransport.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XenOvfTransport</RootNamespace>
     <AssemblyName>XenOvfTransport</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -111,7 +111,7 @@
   -->
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties StartDate="20090814" AssemblyFileVersion="1" AssemblyVersion="1" Reset="1" />
+      <UserProperties Reset="1" AssemblyVersion="1" AssemblyFileVersion="1" StartDate="20090814" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>

XenOvfTransport/app.config

@@ -55,8 +55,7 @@
    </setting>
    <setting name="iSCSINetworkName" serializeAs="Xml">
     <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
       <string>Pool-wide network associated with eth0</string>
       <string>Network 0</string>
      </ArrayOfString>
@@ -76,8 +75,7 @@
    </setting>
    <setting name="iSCSITransferVMNetwork" serializeAs="Xml">
     <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
       <string>network_config=auto #REQUIRED: MUST BE FIRST Values:  "auto" "manual"</string>
       <string>network_mode=dhcp #REQUIRED: MUST BE SECOND Values: "dhcp" "manual"</string>
       <string>network_port=3260 #OPTIONAL: port for config is manual</string>
@@ -93,8 +91,7 @@
    </setting>
    <setting name="EXCLUDED_FILES_COPY" serializeAs="Xml">
     <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
       <string>\PAGEFILE.SYS</string>
       <string>\HIBERFIL.SYS</string>
       <string>\SYSTEM VOLUME INFORMATION</string>
@@ -114,7 +111,7 @@
     <value>True</value>
    </setting>
    <setting name="ApplianceFolderPath" serializeAs="String">
-    <value />
+    <value/>
    </setting>
    <setting name="FixupOsMemorySizeAsMB" serializeAs="String">
     <value>256</value>
@@ -159,5 +156,5 @@
 			</setting>
 		</XenTransport.Properties.Settings>
 	</applicationSettings>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup>
+	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
 </configuration>

XenServerHealthCheck/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace XenServerHealthCheck.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

XenServerHealthCheck/XenServerHealthCheck.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XenServerHealthCheck</RootNamespace>
     <AssemblyName>XenServerHealthCheck</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>

XenServerHealthCheck/app.config

@@ -29,7 +29,7 @@
     </root>
   </log4net>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
@@ -46,22 +46,21 @@
   <userSettings>
     <XenServerHealthCheck.Properties.Settings>
       <setting name="UUID" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="HttpTimeout" serializeAs="String">
         <value>40000</value>
       </setting>
       <setting name="ServerList" serializeAs="Xml">
         <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
         </value>
       </setting>
       <setting name="ProxySetting" serializeAs="String">
         <value>0</value>
       </setting>
       <setting name="ProxyAddress" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="BypassProxyForServers" serializeAs="String">
         <value>False</value>
@@ -76,16 +75,16 @@
         <value>False</value>
       </setting>
       <setting name="ProxyUsername" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ProxyPassword" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ProxyAuthenticationMethod" serializeAs="String">
         <value>1</value>
       </setting>
       <setting name="XenCenterMetadata" serializeAs="String">
-        <value />
+        <value/>
       </setting>
     </XenServerHealthCheck.Properties.Settings>
   </userSettings>

packages/DOTNET_BUILD_LOCATION

@@ -1 +1 @@
-xc-local-release/dotnet-packages/master/31
+xc-local-build/dotnet-packages/dotnet48/3

scripts/deps-map.json

@@ -6,42 +6,42 @@
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/putty.exe",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/putty.exe",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/CookComputing.XmlRpcV2.dll",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/CookComputing.XmlRpcV2.dll",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/Newtonsoft.Json.CH.dll",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/Newtonsoft.Json.CH.dll",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/DiscUtils.dll",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/DiscUtils.dll",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/ICSharpCode.SharpZipLib.dll",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/ICSharpCode.SharpZipLib.dll",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/Ionic.Zip.dll",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/Ionic.Zip.dll",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/log4net.dll",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/log4net.dll",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
     {
-      "pattern": "@REMOTE_DOTNET@/dotnet46/*.pdb",
+      "pattern": "@REMOTE_DOTNET@/dotnet48/*.pdb",
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },

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

@@ -58,8 +58,8 @@ SCRATCH_DIR=${REPO}/_scratch
 OUTPUT_DIR=${REPO}/_output
 
 #build
-MSBUILD=MSBuild.exe
+MSBUILD="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Professional/MSBuild/Current/Bin/MSBuild.exe"
-SWITCHES="/m /verbosity:minimal /p:Configuration=Release /p:TargetFrameworkVersion=v4.6 /p:VisualStudioVersion=15.0"
+SWITCHES="/m /verbosity:minimal /p:Configuration=Release /p:TargetFrameworkVersion=v4.8 /p:VisualStudioVersion=16.0"
 
 mkdir_clean ${SCRATCH_DIR}
 mkdir_clean ${OUTPUT_DIR}
@@ -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
@@ -218,7 +218,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 \

splash/splash.vcxproj

@@ -14,19 +14,19 @@
     <ProjectGuid>{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}</ProjectGuid>
     <RootNamespace>test</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

xe/Xe.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="16.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +11,7 @@
     <RootNamespace>ThinCLI</RootNamespace>
     <AssemblyName>xe</AssemblyName>
     <ApplicationIcon>..\Branding\Images\AppIcon.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>

xe/app.config

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

xva_verify/app.config

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

xva_verify/verify_main.cs

@@ -36,7 +36,7 @@ using System.Text;
 
 namespace xva_verify
 {
-    class MainClass
+    static class MainClass
     {
         public static void Main(string[] args)
         {

xva_verify/xva_verify.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="16.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
     <ApplicationIcon>..\Branding\Images\AppIcon.ico</ApplicationIcon>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">