Merge pull request #15 from easymorph/development/5.3.2

ems-cmd 5.3.2

Author: strongtigerman

README.md

@@ -8,13 +8,13 @@ EasyMorph Server Command Line Client (in further text – **ems-cmd**) allows yo
 
 OS Windows x86/x64  with .Net 4.7.2 or later
 
-OS Windows/ Linux / MacOS with dotnet 3.1 or higher (netcoreapp3.1)
+OS Windows/ Linux / MacOS with net 6.0 or higher (net6.0)
 
 **EasyMorh Server**
 
 Morph.Server.Sdk.dll (deployed together with ems-cmd). Also [hosted on github](https://github.com/easymorph/server-sdk)  
 
-[EasyMorph Server 1.2](http://easymorph.com/server.html) or higher (installed on a separate machine)
+[EasyMorph Server 5.0](http://easymorph.com/server.html) or higher (installed on a separate machine)
 
 
 #### Download

src/BusinessLogic/NetworkUtil.cs

@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1 || NET6_0_OR_GREATER
 using System.Net.Http;
 #endif
 using System.Net.Security;
@@ -46,7 +46,7 @@ public static void ConfigureServicePointManager(bool suppressSslErrors)
 #endif
         }
 
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1 || NET6_0_OR_GREATER
         internal static void ConfigureServerCertificateCustomValidationCallback(bool suppressSslErrors)
         {
 

src/Program.cs

@@ -11,7 +11,7 @@
 using System.Net;
 using System.Reflection;
 using Morph.Server.Sdk.Model;
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1 || NET6_0_OR_GREATER
 using System.Net.Http;
 #endif
 
@@ -85,7 +85,7 @@ static void ProcessException(Exception previousException, Exception e, ConsoleOu
                 consoleOutput.WriteError(rpe.ServerResponseString);
             }
 
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1 || NET6_0_OR_GREATER
             else if (e is HttpRequestException m && m.HResult == -2147012721)
 #elif NETFRAMEWORK
             else if (e is AuthenticationException)
@@ -117,7 +117,7 @@ static async Task MainAsync(Parameters parameters)
             try
             {
                 NetworkUtil.ConfigureServicePointManager(parameters.SuppressSslErrors);
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1 || NET6_0_OR_GREATER
                 NetworkUtil.ConfigureServerCertificateCustomValidationCallback(parameters.SuppressSslErrors);
 #endif
                 //MorphServerApiClientGlobalConfig.FileTransferTimeout = TimeSpan.FromSeconds(2);

src/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ems-cmd")]
-[assembly: AssemblyCopyright("Copyright © EasyMorph Inc. 2017-2022")]
+[assembly: AssemblyCopyright("Copyright © EasyMorph Inc. 2017-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -18,5 +18,5 @@
 [assembly: Guid("6e61eac0-2957-415d-89af-ea675fc244cb")]
 
 
-[assembly: AssemblyVersion("5.2.2.0")]
-[assembly: AssemblyFileVersion("5.2.2.0")]
+[assembly: AssemblyVersion("5.3.2.0")]
+[assembly: AssemblyFileVersion("5.3.2.0")]

src/ems-cmd.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>    
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>    
   </PropertyGroup>
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>