diff --git a/src/MySqlConnector/CompatibilitySuppressions.xml b/src/MySqlConnector/CompatibilitySuppressions.xml index 1bb44ab01..35851e7b5 100644 --- a/src/MySqlConnector/CompatibilitySuppressions.xml +++ b/src/MySqlConnector/CompatibilitySuppressions.xml @@ -1,11 +1,31 @@  + + + CP0001 + T:System.Data.Common.DbColumn + lib/net461/MySqlConnector.dll + lib/netstandard2.0/MySqlConnector.dll + true + + + CP0001 + T:System.Data.Common.DbColumn + lib/net462/MySqlConnector.dll + lib/net471/MySqlConnector.dll + CP0001 T:System.Data.Common.DbDataSource lib/net6.0/MySqlConnector.dll lib/net7.0/MySqlConnector.dll + + CP0008 + T:MySqlConnector.MySqlDataReader + lib/netstandard2.0/MySqlConnector.dll + lib/net462/MySqlConnector.dll + CP0008 T:MySqlConnector.MySqlBatchCommandCollection @@ -13,29 +33,32 @@ lib/net6.0/MySqlConnector.dll - CP0001 - T:System.Data.Common.DbColumn - lib/net461/MySqlConnector.dll - lib/net471/MySqlConnector.dll + CP1002 + System.Data.Common, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + lib/net5.0/MySqlConnector.dll + lib/netstandard2.1/MySqlConnector.dll + true - CP0001 - T:System.Data.Common.DbColumn - lib/net461/MySqlConnector.dll - lib/netstandard2.0/MySqlConnector.dll + CP1002 + System.Runtime, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + lib/net5.0/MySqlConnector.dll + lib/netstandard2.1/MySqlConnector.dll true - CP0001 - T:System.Data.Common.DbColumn - lib/net462/MySqlConnector.dll - lib/net471/MySqlConnector.dll + CP1002 + System.Data.Common, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + lib/netcoreapp3.1/MySqlConnector.dll + lib/netstandard2.1/MySqlConnector.dll + true - CP0008 - T:MySqlConnector.MySqlDataReader - lib/netstandard2.0/MySqlConnector.dll - lib/net462/MySqlConnector.dll + CP1002 + System.Runtime, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + lib/netcoreapp3.1/MySqlConnector.dll + lib/netstandard2.1/MySqlConnector.dll + true PKV006 diff --git a/src/MySqlConnector/Core/ConnectionSettings.cs b/src/MySqlConnector/Core/ConnectionSettings.cs index 768357de6..99c66d702 100644 --- a/src/MySqlConnector/Core/ConnectionSettings.cs +++ b/src/MySqlConnector/Core/ConnectionSettings.cs @@ -72,7 +72,7 @@ public ConnectionSettings(MySqlConnectionStringBuilder csb) TlsVersions |= SslProtocols.Tls11; else if (minorVersion == '2') TlsVersions |= SslProtocols.Tls12; -#if NETCOREAPP3_0_OR_GREATER +#if NETCOREAPP3_0_OR_GREATER || NET48_OR_GREATER else if (minorVersion == '3') TlsVersions |= SslProtocols.Tls13; #endif diff --git a/src/MySqlConnector/MySqlConnector.csproj b/src/MySqlConnector/MySqlConnector.csproj index 4ae3c8e46..bf3a491bd 100644 --- a/src/MySqlConnector/MySqlConnector.csproj +++ b/src/MySqlConnector/MySqlConnector.csproj @@ -1,7 +1,7 @@ - net462;net471;netstandard2.0;netstandard2.1;net6.0;net7.0 + net462;net471;net48;netstandard2.0;netstandard2.1;net6.0;net7.0 A truly async MySQL ADO.NET provider, supporting MySQL Server, MariaDB, Amazon Aurora, Azure Database for MySQL, Google Cloud SQL, and more. Copyright 2016–2023 Bradley Grainger Bradley Grainger @@ -19,15 +19,13 @@ - + - + - - diff --git a/src/MySqlConnector/Utilities/NullableAttributes.cs b/src/MySqlConnector/Utilities/NullableAttributes.cs index 39beefa27..b444c36c0 100644 --- a/src/MySqlConnector/Utilities/NullableAttributes.cs +++ b/src/MySqlConnector/Utilities/NullableAttributes.cs @@ -1,7 +1,7 @@ // Supports using nullable attributes on older frameworks. // Copied from https://github.com/dotnet/corefx/blob/master/src/Common/src/CoreLib/System/Diagnostics/CodeAnalysis/NullableAttributes.cs -#if NET462 || NET471 || NETSTANDARD2_0 || NETCOREAPP2_1 +#if NET462 || NET471 || NET48 || NETSTANDARD2_0 || NETCOREAPP2_1 namespace System.Diagnostics.CodeAnalysis; /// Specifies that null is allowed as an input even if the corresponding type disallows it.