Merge pull request #171 from SebastianC/lambdaIsWindows

Fixes #170 - Refactoring checks for Windows platform to work with AWS/Lambda.
mysql-net · Jan 31, 2017 · 5daf099 · 5daf099
2 parents db81790 + d54b0db
commit 5daf099
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/MySqlConnector/Serialization/ConnectionSettings.cs b/src/MySqlConnector/Serialization/ConnectionSettings.cs
@@ -13,7 +13,7 @@ public ConnectionSettings(MySqlConnectionStringBuilder csb)
 			ConnectionString = csb.ConnectionString;
 
 			// Base Options
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && (csb.Server.StartsWith("/", StringComparison.Ordinal) || csb.Server.StartsWith("./", StringComparison.Ordinal)))
+			if (!Utility.IsWindows() && (csb.Server.StartsWith("/", StringComparison.Ordinal) || csb.Server.StartsWith("./", StringComparison.Ordinal)))
 			{
 				if (!File.Exists(csb.Server))
 					throw new MySqlException("Cannot find Unix Socket at " + csb.Server);

diff --git a/src/MySqlConnector/Serialization/MySqlSession.cs b/src/MySqlConnector/Serialization/MySqlSession.cs
@@ -365,7 +365,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
 
 			// SslProtocols.Tls1.2 throws an exception in Windows, see https://github.com/mysql-net/MySqlConnector/pull/101
 			var sslProtocols = SslProtocols.Tls | SslProtocols.Tls11;
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+			if (!Utility.IsWindows())
 				sslProtocols |= SslProtocols.Tls12;
 
 			var checkCertificateRevocation = cs.SslMode == MySqlSslMode.VerifyFull;

diff --git a/src/MySqlConnector/Serialization/SerializationUtility.cs b/src/MySqlConnector/Serialization/SerializationUtility.cs
@@ -61,7 +61,7 @@ public static void SetKeepalive(Socket socket, uint keepAliveTimeSeconds)
 
 			// If keepAliveTimeSeconds > 0, override keepalive options on the socket
 			const uint keepAliveIntervalMillis = 1000;
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+			if (Utility.IsWindows())
 			{
 				// http://stackoverflow.com/a/11834055/1419658
 				// Windows takes time in milliseconds

diff --git a/src/MySqlConnector/Utility.cs b/src/MySqlConnector/Utility.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Text;
 
 namespace MySql.Data
@@ -96,5 +97,18 @@ public static void WriteUtf8(this BinaryWriter writer, string value, int startIn
 				}
 			}
 		}
-	}
+
+        public static bool IsWindows()
+        {
+            try
+            {
+                // OSPlatform.Windows is not supported on AWS Lambda
+                return RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+            }
+            catch (PlatformNotSupportedException)
+            {
+                return false;
+            }
+        }
+    }
 }