Merge pull request #25 from easymorph/development/5.7.1

5.7.1

Author: strongtigerman

src/Client/MorphServerApiClient.cs

@@ -46,22 +46,13 @@ internal ILowLevelApiClient BuildApiClient(ClientConfiguration configuration)
                 throw new ArgumentNullException(nameof(configuration));
             }
 
-#if NETSTANDARD2_0
             // handler will be disposed automatically
             HttpClientHandler aHandler = new HttpClientHandler()
             {
                 ClientCertificateOptions = ClientCertificateOption.Automatic,
                 ServerCertificateCustomValidationCallback = configuration.ServerCertificateCustomValidationCallback
             };
-#elif NETFRAMEWORK
-            // handler will be disposed automatically
-            HttpClientHandler aHandler = new HttpClientHandler()
-            {
-                ClientCertificateOptions = ClientCertificateOption.Automatic
-            };
-#else
-    Not implemented                        
-#endif
+
             var httpClient = BuildHttpClient(configuration, aHandler);
             var restClient = ConstructRestApiClient(httpClient, BuildBaseAddress(configuration), clientConfiguration);
             return new LowLevelApiClient(restClient);

src/Client/MorphServerApiClientGlobalConfig.cs

@@ -10,7 +10,6 @@ namespace Morph.Server.Sdk.Client
     public static class MorphServerApiClientGlobalConfig
     {
 
-#if NETSTANDARD2_0
         private static object obj = new object();
         public static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> ServerCertificateCustomValidationCallback { get; set; } =
             (httpRequestMessage, xcert, xchain, sslerror) =>
@@ -24,7 +23,6 @@ public static class MorphServerApiClientGlobalConfig
                     return false;
                 }
             };            
-#endif
 
         private const string DefaultClientType = "EMS-SDK";
 

src/Client/MorphServerAuthenticator.cs

@@ -67,12 +67,8 @@ static async Task<ApiSession> OpenSessionViaWindowsAuthenticationAsync(OpenSessi
                 ClientCertificateOptions = ClientCertificateOption.Automatic,
                 // required for automatic NTML/Negotiate challenge
                 UseDefaultCredentials = true,
-#if NETSTANDARD2_0
-                ServerCertificateCustomValidationCallback = context.MorphServerApiClient.Config.ServerCertificateCustomValidationCallback        
-#endif
-
-
-    };
+                ServerCertificateCustomValidationCallback = context.MorphServerApiClient.Config.ServerCertificateCustomValidationCallback
+            };
 
             // build a new low level client based on specified handler
             using (var ntmlRestApiClient = context.BuildApiClient(aHandler))

src/Model/ClientConfiguration.cs

@@ -25,13 +25,8 @@ public class ClientConfiguration : IClientConfiguration
         public HttpSecurityState HttpSecurityState { get; set; } = HttpSecurityState.NotEvaluated;
         internal string SDKVersionString { get; set; } = MorphServerApiClientGlobalConfig.SDKVersionString;
 
-
-
-#if NETSTANDARD2_0
         public Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> ServerCertificateCustomValidationCallback { get; set; }
         = MorphServerApiClientGlobalConfig.ServerCertificateCustomValidationCallback;
-#endif
-
     }
 
 }

src/Model/IClientConfiguration.cs

@@ -23,8 +23,6 @@ public interface IClientConfiguration
         Uri ApiUri { get; }
         HttpSecurityState HttpSecurityState { get; }
 
-#if NETSTANDARD2_0
         Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> ServerCertificateCustomValidationCallback { get; }
-#endif
     }
 }

src/Properties/AssemblyInfo.cs

@@ -21,5 +21,5 @@
 [assembly: Guid("72ecc66f-62fe-463f-afad-e1ff5cc19cd9")]
 
 
-[assembly: AssemblyVersion("5.7.0.0")]
-[assembly: AssemblyFileVersion("5.7.0.0")]
+[assembly: AssemblyVersion("5.7.1.0")]
+[assembly: AssemblyFileVersion("5.7.1.0")]