Remove RuntimeInformation on full framework. Fixes #381

Author: bgrainger

src/MySqlConnector/MySqlConnector.csproj

@@ -22,7 +22,6 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
     <PackageReference Include="System.Buffers" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
     <Reference Include="System.Data" />
     <Reference Include="System.Transactions" />

src/MySqlConnector/Serialization/MySqlSession.cs

@@ -887,20 +887,16 @@ private static byte[] CreateConnectionAttributes()
 			attributesWriter.WriteLengthEncodedString(typeof(MySqlSession).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion);
 			try
 			{
-				var os = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "Windows" :
-					RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "Linux" :
-						RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "macOS" : null;
-				var osDetails = RuntimeInformation.OSDescription;
-				var platform = RuntimeInformation.ProcessArchitecture.ToString();
+				Utility.GetOSDetails(out var os, out var osDescription, out var architecture);
 				if (os != null)
 				{
 					attributesWriter.WriteLengthEncodedString("_os");
 					attributesWriter.WriteLengthEncodedString(os);
 				}
 				attributesWriter.WriteLengthEncodedString("_os_details");
-				attributesWriter.WriteLengthEncodedString(osDetails);
+				attributesWriter.WriteLengthEncodedString(osDescription);
 				attributesWriter.WriteLengthEncodedString("_platform");
-				attributesWriter.WriteLengthEncodedString(platform);
+				attributesWriter.WriteLengthEncodedString(architecture);
 			}
 			catch (PlatformNotSupportedException)
 			{

src/MySqlConnector/Utility.cs

@@ -220,6 +220,18 @@ public static void WriteUtf8(this BinaryWriter writer, string value, int startIn
 			}
 		}
 
+#if NET45 || NET46
+		public static bool IsWindows() => Environment.OSVersion.Platform == PlatformID.Win32NT;
+
+		public static void GetOSDetails(out string os, out string osDescription, out string architecture)
+		{
+			os = Environment.OSVersion.Platform == PlatformID.Win32NT ? "Windows" :
+				Environment.OSVersion.Platform == PlatformID.Unix ? "Linux" :
+				Environment.OSVersion.Platform == PlatformID.MacOSX ? "macOS" : null;
+			osDescription = Environment.OSVersion.VersionString;
+			architecture = IntPtr.Size == 8 ? "X64" : "X86";
+		}
+#else
 		public static bool IsWindows()
 		{
 			try
@@ -232,5 +244,15 @@ public static bool IsWindows()
 				return false;
 			}
 		}
+
+		public static void GetOSDetails(out string os, out string osDescription, out string architecture)
+		{
+			os = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "Windows" :
+				RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "Linux" :
+				RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "macOS" : null;
+			osDescription = RuntimeInformation.OSDescription;
+			architecture = RuntimeInformation.ProcessArchitecture.ToString();
+		}
+#endif
 	}
 }