Get rid of NETSTANDARD1_3 and NETSTANDARD1_6 #ifdef's

jstedfast · Dec 28, 2023 · d70707d · d70707d
1 parent 9369932
commit d70707d
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 25 deletions.
diff --git a/MailKit/Net/NetworkStream.cs b/MailKit/Net/NetworkStream.cs
@@ -147,9 +147,7 @@ void Cleanup ()
 		void Disconnect ()
 		{
 			try {
-#if !NETSTANDARD1_3 && !NETSTANDARD1_6
 				Socket.Disconnect (false);
-#endif
 				Socket.Dispose ();
 			} catch {
 				return;

diff --git a/MailKit/Net/Proxy/HttpsProxyClient.cs b/MailKit/Net/Proxy/HttpsProxyClient.cs
@@ -198,10 +198,8 @@ bool ValidateRemoteCertificate (object sender, X509Certificate certificate, X509
 
 			if (ServerCertificateValidationCallback != null) {
 				valid = ServerCertificateValidationCallback (ProxyHost, certificate, chain, sslPolicyErrors);
-#if !NETSTANDARD1_3 && !NETSTANDARD1_6
 			} else if (ServicePointManager.ServerCertificateValidationCallback != null) {
 				valid = ServicePointManager.ServerCertificateValidationCallback (ProxyHost, certificate, chain, sslPolicyErrors);
-#endif
 			} else {
 				valid = sslPolicyErrors == SslPolicyErrors.None;
 			}

diff --git a/MailKit/Net/Smtp/SmtpClient.cs b/MailKit/Net/Smtp/SmtpClient.cs
@@ -544,10 +544,8 @@ bool ValidateRemoteCertificate (object sender, X509Certificate certificate, X509
 
 			if (ServerCertificateValidationCallback != null) {
 				valid = ServerCertificateValidationCallback (uri.Host, certificate, chain, sslPolicyErrors);
-#if !NETSTANDARD1_3 && !NETSTANDARD1_6
 			} else if (ServicePointManager.ServerCertificateValidationCallback != null) {
 				valid = ServicePointManager.ServerCertificateValidationCallback (uri.Host, certificate, chain, sslPolicyErrors);
-#endif
 			} else {
 				valid = DefaultServerCertificateValidationCallback (uri.Host, certificate, chain, sslPolicyErrors);
 			}

diff --git a/MailKit/Security/SaslMechanism.cs b/MailKit/Security/SaslMechanism.cs
@@ -35,10 +35,6 @@
 
 using MailKit.Net;
 
-#if NETSTANDARD1_3 || NETSTANDARD1_6
-using MD5 = MimeKit.Cryptography.MD5;
-#endif
-
 namespace MailKit.Security {
 	/// <summary>
 	/// A SASL authentication mechanism.
@@ -699,11 +695,7 @@ public static string SaslPrep (string s)
 				}
 			}
 
-#if !NETSTANDARD1_3 && !NETSTANDARD1_6
 			return builder.ToString ().Normalize (NormalizationForm.FormKC);
-#else
-			return builder.ToString ();
-#endif
 		}
 
 		internal static string GenerateEntropy (int n)

diff --git a/MailKit/Security/SaslMechanismCramMd5.cs b/MailKit/Security/SaslMechanismCramMd5.cs
@@ -28,12 +28,7 @@
 using System.Net;
 using System.Text;
 using System.Threading;
-
-#if NETSTANDARD1_3 || NETSTANDARD1_6
-using MD5 = MimeKit.Cryptography.MD5;
-#else
 using System.Security.Cryptography;
-#endif
 
 namespace MailKit.Security {
 	/// <summary>

diff --git a/MailKit/Security/SaslMechanismDigestMd5.cs b/MailKit/Security/SaslMechanismDigestMd5.cs
@@ -34,10 +34,6 @@
 
 using MimeKit.Utils;
 
-#if NETSTANDARD1_3 || NETSTANDARD1_6
-using MD5 = MimeKit.Cryptography.MD5;
-#endif
-
 namespace MailKit.Security {
 	/// <summary>
 	/// The DIGEST-MD5 SASL mechanism.

diff --git a/UnitTests/Security/SslHandshakeExceptionTests.cs b/UnitTests/Security/SslHandshakeExceptionTests.cs
@@ -226,10 +226,8 @@ bool ValidateRemoteCertificate (object sender, X509Certificate certificate, X509
 
 				if (ServerCertificateValidationCallback != null) {
 					valid = ServerCertificateValidationCallback (hostName, certificate, chain, sslPolicyErrors);
-#if !NETSTANDARD1_3 && !NETSTANDARD1_6
 				} else if (ServicePointManager.ServerCertificateValidationCallback != null) {
 					valid = ServicePointManager.ServerCertificateValidationCallback (hostName, certificate, chain, sslPolicyErrors);
-#endif
 				} else {
 					valid = DefaultServerCertificateValidationCallback (hostName, certificate, chain, sslPolicyErrors);
 				}