Remove MySqlSslMode.Preferred.

This enum value has been deleted in MySql.Data 8.0.11.

Author: bgrainger

tests/MySqlConnector.Tests/MySqlConnectionStringBuilderTests.cs

@@ -51,7 +51,11 @@ public void Defaults()
 #if !BASELINE
 			Assert.Null(csb.ServerRsaPublicKeyFile);
 #endif
+#if !BASELINE
 			Assert.Equal(MySqlSslMode.Preferred, csb.SslMode);
+#else
+			Assert.Equal(MySqlSslMode.Required, csb.SslMode);
+#endif
 			Assert.True(csb.TreatTinyAsBoolean);
 			Assert.False(csb.UseCompression);
 			Assert.Equal("", csb.UserID);

tests/SideBySide/SslTests.cs

@@ -13,6 +13,7 @@ public SslTests(DatabaseFixture database)
 			m_database = database;
 		}
 
+#if !BASELINE
 		[SkippableFact(ConfigSettings.RequiresSsl)]
 		public async Task ConnectSslPreferred()
 		{
@@ -25,18 +26,17 @@ public async Task ConnectSslPreferred()
 				using (var cmd = connection.CreateCommand())
 				{
 					await connection.OpenAsync();
-#if !BASELINE
 					Assert.True(connection.SslIsEncrypted);
 					Assert.True(connection.SslIsSigned);
 					Assert.True(connection.SslIsAuthenticated);
 					Assert.False(connection.SslIsMutuallyAuthenticated);
-#endif
 					cmd.CommandText = "SHOW SESSION STATUS LIKE 'Ssl_version'";
 					var sslVersion = (string)await cmd.ExecuteScalarAsync();
 					Assert.False(string.IsNullOrWhiteSpace(sslVersion));
 				}
 			}
 		}
+#endif
 
 		[SkippableTheory(ConfigSettings.RequiresSsl | ConfigSettings.KnownClientCertificate)]
 		[InlineData("ssl-client.pfx", null, null)]

tests/SideBySide/TestUtilities.cs

@@ -41,11 +41,19 @@ public static string GetSkipReason(ServerFeatures serverFeatures, ConfigSettings
 				return null;
 
 			var csb = AppConfig.CreateConnectionStringBuilder();
-			if (configSettings.HasFlag(ConfigSettings.RequiresSsl) && (csb.SslMode == MySqlSslMode.None || csb.SslMode == MySqlSslMode.Preferred))
+			if (configSettings.HasFlag(ConfigSettings.RequiresSsl) && (csb.SslMode == MySqlSslMode.None
+#if !BASELINE
+			 || csb.SslMode == MySqlSslMode.Preferred
+#endif
+			 ))
 				return "Requires SslMode=Required or higher in connection string";
 
 			if (configSettings.HasFlag(ConfigSettings.TrustedHost) &&
-				(csb.SslMode == MySqlSslMode.None || csb.SslMode == MySqlSslMode.Preferred || csb.SslMode == MySqlSslMode.Required))
+				(csb.SslMode == MySqlSslMode.None ||
+#if !BASELINE
+				csb.SslMode == MySqlSslMode.Preferred ||
+#endif
+				csb.SslMode == MySqlSslMode.Required))
 			{
 				return "Requires SslMode=VerifyCA or higher in connection string";
 			}