diff --git a/CFUValidator/CFUValidator.csproj b/CFUValidator/CFUValidator.csproj index 5a7aa7437..aafb06d40 100644 --- a/CFUValidator/CFUValidator.csproj +++ b/CFUValidator/CFUValidator.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties CFUValidator CFUValidator - v4.6 + v4.8 512 publish\ true diff --git a/CFUValidator/app.config b/CFUValidator/app.config index 2e71eabc1..99dca7597 100644 --- a/CFUValidator/app.config +++ b/CFUValidator/app.config @@ -1,3 +1,3 @@ - + diff --git a/CommandLib/CommandLib.csproj b/CommandLib/CommandLib.csproj index b23b45eb3..184df5260 100644 --- a/CommandLib/CommandLib.csproj +++ b/CommandLib/CommandLib.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties CommandLib CommandLib - v4.6 + v4.8 diff --git a/README.md b/README.md index 0f5fcce9c..de3e709a0 100644 --- a/README.md +++ b/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: diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs index e5a162375..2b3459c6d 100644 --- a/WixInstaller/XenCenter.wxs +++ b/WixInstaller/XenCenter.wxs @@ -74,7 +74,6 @@ - @@ -254,8 +253,10 @@ - - + + + = "#528040")]]> + diff --git a/WixInstaller/en-us.wxl b/WixInstaller/en-us.wxl index 43e225b44..f5244601e 100644 --- a/WixInstaller/en-us.wxl +++ b/WixInstaller/en-us.wxl @@ -44,7 +44,7 @@ Update File OEM Update File Saved Search - Microsoft .NET Framework 4.6 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework + Microsoft .NET Framework 4.8 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework README.TXT Enables monitoring of the health of your Citrix Hypervisor pools by periodically uploading data from the servers to Citrix Insight Services. Enables monitoring of the health of your Citrix Hypervisor pools. diff --git a/WixInstaller/ja-jp.wxl b/WixInstaller/ja-jp.wxl index 43a7691ea..5f22da623 100644 --- a/WixInstaller/ja-jp.wxl +++ b/WixInstaller/ja-jp.wxl @@ -44,7 +44,7 @@ アップデート ファイル OEM アップデート ファイル 保存済みの検索 - このインストールには、Microsoft .NET Framework 4.6 以降が必要です。https://www.microsoft.com/net/download/framework からインストールしてください。 + このインストールには、Microsoft .NET Framework 4.8 以降が必要です。https://www.microsoft.com/net/download/framework からインストールしてください。 README.TXT サーバーから Citrix Insight Services に定期的にデータをアップロードすることにより、Citrix Hypervisor プールのヘルス状態の監視を有効にします。 Citrix Hypervisor プールのヘルス状態の監視を有効にします。 diff --git a/WixInstaller/zh-cn.wxl b/WixInstaller/zh-cn.wxl index 5efa8e7d2..cc33f2192 100644 --- a/WixInstaller/zh-cn.wxl +++ b/WixInstaller/zh-cn.wxl @@ -44,7 +44,7 @@ 更新文件 OEM 更新文件 保存的搜索 - 此安装需要 Microsoft .NET Framework 4.6 或更高版本。请从 https://www.microsoft.com/net/download/framework 安装 + 此安装需要 Microsoft .NET Framework 4.8 或更高版本。请从 https://www.microsoft.com/net/download/framework 安装 声明.TXT 通过定期将数据从服务器上载到 Citrix Insight Services，实现对 Citrix Hypervisor 池的运行状况监视。 启用对 Citrix Hypervisor 池的运行状况的监视。 diff --git a/XenAdmin.sln b/XenAdmin.sln index e6d61156d..139cb84b3 100644 --- a/XenAdmin.sln +++ b/XenAdmin.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2048 +# Visual Studio Version 16 +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 diff --git a/XenAdmin/Properties/AssemblyInfo.cs b/XenAdmin/Properties/AssemblyInfo.cs index 0bd991e73..9d4de40c7 100644 --- a/XenAdmin/Properties/AssemblyInfo.cs +++ b/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"), - InternalsVisibleTo("XenAdminScalabilityTests")] +[assembly: InternalsVisibleTo("XenAdminTests")] diff --git a/XenAdmin/Properties/Resources.Designer.cs b/XenAdmin/Properties/Resources.Designer.cs index ff9d39f31..1c43a79e5 100755 --- a/XenAdmin/Properties/Resources.Designer.cs +++ b/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 { diff --git a/XenAdmin/Properties/Settings.Designer.cs b/XenAdmin/Properties/Settings.Designer.cs index ce8a84d5f..5de1e8d08 100644 --- a/XenAdmin/Properties/Settings.Designer.cs +++ b/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()))); diff --git a/XenCenterVNC/GraphicsUtils.cs b/XenAdmin/VNC/GraphicsUtils.cs similarity index 100% rename from XenCenterVNC/GraphicsUtils.cs rename to XenAdmin/VNC/GraphicsUtils.cs diff --git a/XenCenterVNC/IVNCGraphicsClient.cs b/XenAdmin/VNC/IVNCGraphicsClient.cs similarity index 100% rename from XenCenterVNC/IVNCGraphicsClient.cs rename to XenAdmin/VNC/IVNCGraphicsClient.cs diff --git a/XenCenterVNC/KeyMap.Designer.cs b/XenAdmin/VNC/KeyMap.Designer.cs similarity index 100% rename from XenCenterVNC/KeyMap.Designer.cs rename to XenAdmin/VNC/KeyMap.Designer.cs diff --git a/XenCenterVNC/KeyMap.cs b/XenAdmin/VNC/KeyMap.cs similarity index 100% rename from XenCenterVNC/KeyMap.cs rename to XenAdmin/VNC/KeyMap.cs diff --git a/XenCenterVNC/KeyMap.resx b/XenAdmin/VNC/KeyMap.resx similarity index 100% rename from XenCenterVNC/KeyMap.resx rename to XenAdmin/VNC/KeyMap.resx diff --git a/XenCenterVNC/KeySet.cs b/XenAdmin/VNC/KeySet.cs similarity index 100% rename from XenCenterVNC/KeySet.cs rename to XenAdmin/VNC/KeySet.cs diff --git a/XenCenterVNC/MyStream.cs b/XenAdmin/VNC/MyStream.cs similarity index 100% rename from XenCenterVNC/MyStream.cs rename to XenAdmin/VNC/MyStream.cs diff --git a/XenCenterVNC/VNCException.cs b/XenAdmin/VNC/VNCException.cs similarity index 100% rename from XenCenterVNC/VNCException.cs rename to XenAdmin/VNC/VNCException.cs diff --git a/XenCenterVNC/VNCStream.cs b/XenAdmin/VNC/VNCStream.cs similarity index 95% rename from XenCenterVNC/VNCStream.cs rename to XenAdmin/VNC/VNCStream.cs index 907fff35b..f760a1807 100644 --- a/XenCenterVNC/VNCStream.cs +++ b/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("expected protocol version: " + s); - } + throw new VNCException("Unexpected protocol version " + s); - return new ProtocolVersion(Int32.Parse(match.Groups[1].Value), - Int32.Parse(match.Groups[2].Value)); + int major = Int32.Parse(match.Groups[1].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(); diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index c876b67f4..87e386946 100755 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ XenAdmin XenCenterMain ..\Branding\Images\AppIcon.ico - v4.6 + v4.8 publish\ true Disk @@ -766,6 +766,16 @@ UsbPage.cs + + + + + KeyMap.cs + + + + + Form @@ -2275,6 +2285,9 @@ Designer PhysicalStoragePage.cs + + KeyMap.cs + Designer BallooningWizard.cs @@ -6927,10 +6940,6 @@ {9861DFA1-B41F-432D-A43F-226257DEBBB9} XenCenterLib - - {BD345C89-E8F4-4767-9BE0-1F0EAB7FA927} - XenCenterVNC - {B306FC59-4441-4A5F-9F54-D3F68D4EE38D} XenModel @@ -6993,4 +7002,4 @@ copy "$(ProjectDir)\..\packages\putty.exe" "$(TargetDir)" - + \ No newline at end of file diff --git a/XenAdmin/app.config b/XenAdmin/app.config index 7d799e194..8853f1619 100644 --- a/XenAdmin/app.config +++ b/XenAdmin/app.config @@ -17,8 +17,7 @@ - + @@ -55,7 +54,7 @@ 0 - + 80 @@ -97,7 +96,7 @@ False - + False @@ -113,24 +112,22 @@ - + - + - + False - + 0 @@ -151,10 +148,10 @@ False - + - + False @@ -172,7 +169,7 @@ False - + False @@ -283,5 +280,5 @@ - + diff --git a/XenAdminTests/CodeTests/AssemblyTests.cs b/XenAdminTests/CodeTests/AssemblyTests.cs index a7a418d8c..985f514ab 100644 --- a/XenAdminTests/CodeTests/AssemblyTests.cs +++ b/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(); var extra = new List(); diff --git a/XenAdminTests/Properties/AssemblyInfo.cs b/XenAdminTests/Properties/AssemblyInfo.cs index c63e9b037..7f8d96b03 100644 --- a/XenAdminTests/Properties/AssemblyInfo.cs +++ b/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")] diff --git a/XenAdminTests/XenAdminTests.csproj b/XenAdminTests/XenAdminTests.csproj index f6a1cf95c..8d8393beb 100644 --- a/XenAdminTests/XenAdminTests.csproj +++ b/XenAdminTests/XenAdminTests.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties XenAdminTests XenAdminTests - v4.6 + v4.8 diff --git a/XenAdminTests/app.config b/XenAdminTests/app.config index 9bc184fe9..e4a4bbf6c 100644 --- a/XenAdminTests/app.config +++ b/XenAdminTests/app.config @@ -256,6 +256,6 @@ - + diff --git a/XenCenterLib/Archive/TarArchiveIterator.cs b/XenCenterLib/Archive/TarArchiveIterator.cs index 03ec8fb96..f50d2d942 100644 --- a/XenCenterLib/Archive/TarArchiveIterator.cs +++ b/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) diff --git a/XenCenterLib/Archive/TarArchiveWriter.cs b/XenCenterLib/Archive/TarArchiveWriter.cs index a3c585ad3..e2c156425 100644 --- a/XenCenterLib/Archive/TarArchiveWriter.cs +++ b/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); diff --git a/XenCenterLib/Archive/ZipArchiveIterator.cs b/XenCenterLib/Archive/ZipArchiveIterator.cs index 56dd97444..4b5d03fde 100644 --- a/XenCenterLib/Archive/ZipArchiveIterator.cs +++ b/XenCenterLib/Archive/ZipArchiveIterator.cs @@ -49,6 +49,10 @@ namespace XenCenterLib.Archive public event Action CurrentFileExtractProgressChanged; public event Action CurrentFileExtractCompleted; + public DotNetZipZipIterator() + { + } + public DotNetZipZipIterator(Stream inputStream) { Initialise(inputStream); diff --git a/XenCenterLib/Archive/ZipArchiveWriter.cs b/XenCenterLib/Archive/ZipArchiveWriter.cs index f8866656a..d3f927133 100644 --- a/XenCenterLib/Archive/ZipArchiveWriter.cs +++ b/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) diff --git a/XenCenterLib/XenCenterLib.csproj b/XenCenterLib/XenCenterLib.csproj index 59ada7eff..0f7a666c7 100644 --- a/XenCenterLib/XenCenterLib.csproj +++ b/XenCenterLib/XenCenterLib.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties XenCenterLib XenCenterLib - v4.6 + v4.8 512 diff --git a/XenCenterLib/app.config b/XenCenterLib/app.config index 6d54bd1db..8a046a0b8 100644 --- a/XenCenterLib/app.config +++ b/XenCenterLib/app.config @@ -1,3 +1,3 @@ - + diff --git a/XenCenterVNC/Properties/AssemblyInfo.cs b/XenCenterVNC/Properties/AssemblyInfo.cs deleted file mode 100644 index 7cc29d7e3..000000000 --- a/XenCenterVNC/Properties/AssemblyInfo.cs +++ /dev/null @@ -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")] diff --git a/XenCenterVNC/ProtocolVersion.cs b/XenCenterVNC/ProtocolVersion.cs deleted file mode 100644 index 30fed262c..000000000 --- a/XenCenterVNC/ProtocolVersion.cs +++ /dev/null @@ -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; - } - } -} diff --git a/XenCenterVNC/XenCenterVNC.csproj b/XenCenterVNC/XenCenterVNC.csproj deleted file mode 100644 index c0596dde0..000000000 --- a/XenCenterVNC/XenCenterVNC.csproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {BD345C89-E8F4-4767-9BE0-1F0EAB7FA927} - Library - Properties - XenCenterVNC - XenCenterVNC - v4.6 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - false - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - true - false - - - - False - ..\packages\log4net.dll - - - - 3.5 - - - - - - - - - - KeyMap.resx - True - True - - - - - - - - - - - KeyMap.cs - ResXFileCodeGenerator - KeyMap.Designer.cs - Designer - - - - - - - - {9861DFA1-B41F-432D-A43F-226257DEBBB9} - XenCenterLib - - - - - \ No newline at end of file diff --git a/XenCenterVNC/app.config b/XenCenterVNC/app.config deleted file mode 100644 index 6d54bd1db..000000000 --- a/XenCenterVNC/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/XenModel/FriendlyNames.Designer.cs b/XenModel/FriendlyNames.Designer.cs index 408711a9e..ac88832d4 100644 --- a/XenModel/FriendlyNames.Designer.cs +++ b/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 { diff --git a/XenModel/InvisibleMessages.Designer.cs b/XenModel/InvisibleMessages.Designer.cs index 69a53caf8..bfc4ffdc5 100644 --- a/XenModel/InvisibleMessages.Designer.cs +++ b/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 { diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index c6752ee11..6f46761e0 100755 --- a/XenModel/Messages.Designer.cs +++ b/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 { diff --git a/XenModel/XenAPI/FriendlyErrorNames.Designer.cs b/XenModel/XenAPI/FriendlyErrorNames.Designer.cs index 7fe13ce14..4cba3458a 100755 --- a/XenModel/XenAPI/FriendlyErrorNames.Designer.cs +++ b/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 { diff --git a/XenModel/XenModel.csproj b/XenModel/XenModel.csproj index 526a451fb..dba744607 100755 --- a/XenModel/XenModel.csproj +++ b/XenModel/XenModel.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties XenAdmin XenModel - v4.6 + v4.8 512 diff --git a/XenOvfApi/Messages.Designer.cs b/XenOvfApi/Messages.Designer.cs index a40c0ceef..cb35bef5f 100644 --- a/XenOvfApi/Messages.Designer.cs +++ b/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 { diff --git a/XenOvfApi/Properties/Settings.Designer.cs b/XenOvfApi/Properties/Settings.Designer.cs index 30b821da1..c6f6edd6a 100644 --- a/XenOvfApi/Properties/Settings.Designer.cs +++ b/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()))); diff --git a/XenOvfApi/XenOvfApi.csproj b/XenOvfApi/XenOvfApi.csproj index e0090b5ad..445fdaabb 100644 --- a/XenOvfApi/XenOvfApi.csproj +++ b/XenOvfApi/XenOvfApi.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties XenOvf XenOvf - v4.6 + v4.8 512 OnOutputUpdated http://redtfs01:8080 @@ -185,7 +185,7 @@ - + \ No newline at end of file diff --git a/XenOvfApi/app.config b/XenOvfApi/app.config index 2dfdca20e..004cabf58 100644 --- a/XenOvfApi/app.config +++ b/XenOvfApi/app.config @@ -229,8 +229,7 @@ - + xen-3.0-unknown xen-3.0-x32 xen-3.0-x86 @@ -300,5 +299,5 @@ - + diff --git a/XenOvfTransport/Messages.Designer.cs b/XenOvfTransport/Messages.Designer.cs index f20cfb7fe..afb86029b 100644 --- a/XenOvfTransport/Messages.Designer.cs +++ b/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 { diff --git a/XenOvfTransport/Properties/Settings.Designer.cs b/XenOvfTransport/Properties/Settings.Designer.cs index 53fe7757d..cae7d0ba3 100644 --- a/XenOvfTransport/Properties/Settings.Designer.cs +++ b/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()))); diff --git a/XenOvfTransport/XenOvfTransport.csproj b/XenOvfTransport/XenOvfTransport.csproj index 62bb69e28..b011a9a0b 100644 --- a/XenOvfTransport/XenOvfTransport.csproj +++ b/XenOvfTransport/XenOvfTransport.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties XenOvfTransport XenOvfTransport - v4.6 + v4.8 512 @@ -111,7 +111,7 @@ --> - + \ No newline at end of file diff --git a/XenOvfTransport/app.config b/XenOvfTransport/app.config index a7d69729f..48161534e 100644 --- a/XenOvfTransport/app.config +++ b/XenOvfTransport/app.config @@ -55,8 +55,7 @@ - + Pool-wide network associated with eth0 Network 0 @@ -76,8 +75,7 @@ - + network_config=auto #REQUIRED: MUST BE FIRST Values: "auto" "manual" network_mode=dhcp #REQUIRED: MUST BE SECOND Values: "dhcp" "manual" network_port=3260 #OPTIONAL: port for config is manual @@ -93,8 +91,7 @@ - + \PAGEFILE.SYS \HIBERFIL.SYS \SYSTEM VOLUME INFORMATION @@ -114,7 +111,7 @@ True - + 256 @@ -159,5 +156,5 @@ - + diff --git a/XenServerHealthCheck/Properties/Settings.Designer.cs b/XenServerHealthCheck/Properties/Settings.Designer.cs index a3334f344..e5c94c75d 100644 --- a/XenServerHealthCheck/Properties/Settings.Designer.cs +++ b/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()))); diff --git a/XenServerHealthCheck/XenServerHealthCheck.csproj b/XenServerHealthCheck/XenServerHealthCheck.csproj index bf0c0ead8..384a03db8 100755 --- a/XenServerHealthCheck/XenServerHealthCheck.csproj +++ b/XenServerHealthCheck/XenServerHealthCheck.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties XenServerHealthCheck XenServerHealthCheck - v4.6 + v4.8 512 diff --git a/XenServerHealthCheck/app.config b/XenServerHealthCheck/app.config index df24da977..7aceecbf8 100755 --- a/XenServerHealthCheck/app.config +++ b/XenServerHealthCheck/app.config @@ -29,7 +29,7 @@ - + @@ -46,22 +46,21 @@ - + 40000 - + 0 - + False @@ -76,16 +75,16 @@ False - + - + 1 - + diff --git a/packages/DOTNET_BUILD_LOCATION b/packages/DOTNET_BUILD_LOCATION index a25155b3f..f2820b82d 100644 --- a/packages/DOTNET_BUILD_LOCATION +++ b/packages/DOTNET_BUILD_LOCATION @@ -1 +1 @@ -xc-local-release/dotnet-packages/master/31 +xc-local-build/dotnet-packages/dotnet48/3 diff --git a/scripts/deps-map.json b/scripts/deps-map.json index abf6cb70d..cd42c1dcf 100644 --- a/scripts/deps-map.json +++ b/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" }, diff --git a/scripts/re-branding.sh b/scripts/re-branding.sh index 085a7ff70..fd1750fcd 100644 --- a/scripts/re-branding.sh +++ b/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} diff --git a/scripts/xenadmin-build.sh b/scripts/xenadmin-build.sh index 91cde72a7..b878dfa07 100644 --- a/scripts/xenadmin-build.sh +++ b/scripts/xenadmin-build.sh @@ -58,8 +58,8 @@ SCRATCH_DIR=${REPO}/_scratch OUTPUT_DIR=${REPO}/_output #build -MSBUILD=MSBuild.exe -SWITCHES="/m /verbosity:minimal /p:Configuration=Release /p:TargetFrameworkVersion=v4.6 /p:VisualStudioVersion=15.0" +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.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 \ diff --git a/splash/splash.vcxproj b/splash/splash.vcxproj index f167fb2fb..06e4b03c8 100644 --- a/splash/splash.vcxproj +++ b/splash/splash.vcxproj @@ -14,19 +14,19 @@ {AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB} test Win32Proj - 10.0.17134.0 + 10.0.18362.0 Application Unicode true - v141 + v142 Application Unicode - v141 + v142 diff --git a/xe/Xe.csproj b/xe/Xe.csproj index fbc6f4bff..cc9fe8b38 100755 --- a/xe/Xe.csproj +++ b/xe/Xe.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ ThinCLI xe ..\Branding\Images\AppIcon.ico - v4.6 + v4.8 true 0 diff --git a/xe/app.config b/xe/app.config index 2e71eabc1..99dca7597 100644 --- a/xe/app.config +++ b/xe/app.config @@ -1,3 +1,3 @@ - + diff --git a/xva_verify/app.config b/xva_verify/app.config index 2e71eabc1..99dca7597 100644 --- a/xva_verify/app.config +++ b/xva_verify/app.config @@ -1,3 +1,3 @@ - + diff --git a/xva_verify/verify_main.cs b/xva_verify/verify_main.cs index 88cc2e314..4bd793ed6 100644 --- a/xva_verify/verify_main.cs +++ b/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) { diff --git a/xva_verify/xva_verify.csproj b/xva_verify/xva_verify.csproj index 026b82981..2694055f6 100755 --- a/xva_verify/xva_verify.csproj +++ b/xva_verify/xva_verify.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -13,7 +13,7 @@ ..\Branding\Images\AppIcon.ico - v4.6 + v4.8