Merge master into net9.

Author: bgrainger

.ci/docker-run.sh

@@ -28,7 +28,7 @@ MYSQL=mysql
 if [[ "$IMAGE" == mariadb* ]]; then
   MYSQL_EXTRA='--in-predicate-conversion-threshold=100000'
 fi
-if [ "$IMAGE" == "mariadb:11.2" ]; then
+if [ "$IMAGE" == "mariadb:11.4" ]; then
   MYSQL='mariadb'
 fi
 

.editorconfig

@@ -16,13 +16,16 @@ indent_style = tab
 indent_size = 4
 
 # changes from VS2017 defaults
+csharp_style_expression_bodied_local_functions = true:suggestion
 csharp_style_expression_bodied_methods = true:suggestion
 csharp_style_expression_bodied_constructors = true:suggestion
 csharp_style_expression_bodied_operators = true:suggestion
+csharp_style_namespace_declarations = file_scoped
 csharp_prefer_braces = false:none
 csharp_indent_switch_labels = true
 csharp_space_after_cast = true
 csharp_preserve_single_line_statements = false
+dotnet_style_prefer_conditional_expression_over_return = false:suggestion
 
 # use VS2017 defaults, but make them warnings (instead of none)
 dotnet_style_qualification_for_field = false:warning
@@ -84,7 +87,11 @@ dotnet_diagnostic.CA2100.severity = none # Review SQL queries for security vulne
 dotnet_diagnostic.CA2213.severity = silent # Disposable fields should be disposed.
 dotnet_diagnostic.CA5398.severity = none # Avoid hardcoded SslProtocols values.
 dotnet_diagnostic.IDE0044.severity = error # Make fields readonly.
+dotnet_diagnostic.IDE0045.severity = suggestion # Use conditional expression for assignment.
+dotnet_diagnostic.IDE0058.severity = none # Remove unnecessary expression value.
+dotnet_diagnostic.IDE0059.severity = none # Remove unnecessary value assignment.
 dotnet_diagnostic.IDE0065.severity = error # Using directives must be placed outside of a namespace declaration.
+dotnet_diagnostic.IDE0072.severity = silent # Add missing cases to switch expression.
 dotnet_diagnostic.SA1003.severity = none # Operator must not be followed by whitespace.
 dotnet_diagnostic.SA1008.severity = none # Opening parenthesis must not be preceded by a space.
 dotnet_diagnostic.SA1009.severity = none # Closing parenthesis must not be followed by a space.

Directory.Packages.props

@@ -15,15 +15,15 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="MySql.Data" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="MySql.Data" Version="9.0.0" />
     <PackageVersion Include="NLog" Version="4.5.0" />
     <PackageVersion Include="Serilog" Version="2.6.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageVersion Include="xunit" Version="2.6.6" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
     <PackageVersion Include="YamlDotNet" Version="13.7.1" />
   </ItemGroup>
 

README.md

@@ -3,7 +3,8 @@
 [![NuGet](https://img.shields.io/nuget/vpre/MySqlConnector.svg)](https://www.nuget.org/packages/MySqlConnector/)
 
 This is an [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/) data
-provider for [MySQL](https://www.mysql.com/). It provides implementations of
+provider for [MySQL](https://www.mysql.com/) and other compatible servers including [MariaDB](https://www.mariadb.org).
+It provides implementations of
 `DbConnection`, `DbCommand`, `DbDataReader`, `DbTransaction`—the classes
 needed to query and update databases from managed code.
 
@@ -21,7 +22,7 @@ This library outperforms MySQL Connector/NET (`MySql.Data`) on benchmarks:
 
 ### Server Compatibility
 
-This library is compatible with [many MySQL-compatible servers](https://mysqlconnector.net/#server-compatibility).
+This library is compatible with [many MySQL-compatible servers](https://mysqlconnector.net/#server-compatibility), including MySQL 5.5 and newer and MariaDB 10.x and newer.
 MySql.Data [only supports MySQL Server](https://bugs.mysql.com/bug.php?id=109331).
 
 ### Bug Fixes

azure-pipelines.yml

@@ -210,16 +210,16 @@ jobs:
     vmimage: 'ubuntu-20.04'
   strategy:
     matrix:
-      'MySQL 5.7':
-        image: 'mysql:5.7'
-        connectionStringExtra: 'Tls Cipher Suites=TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256'
-        unsupportedFeatures: 'CachingSha2Password,Ed25519,QueryAttributes,Tls11,Tls13,UuidToBin'
       'MySQL 8.0':
         image: 'mysql:8.0'
         connectionStringExtra: 'AllowPublicKeyRetrieval=True'
         unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
-      'MySQL 8.3':
-        image: 'mysql:8.3'
+      'MySQL 8.4':
+        image: 'mysql:8.4'
+        connectionStringExtra: 'AllowPublicKeyRetrieval=True'
+        unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
+      'MySQL 9.0':
+        image: 'mysql:9.0'
         connectionStringExtra: 'AllowPublicKeyRetrieval=True'
         unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
       'MariaDB 10.6':
@@ -230,8 +230,8 @@ jobs:
         image: 'mariadb:10.11'
         connectionStringExtra: ''
         unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
-      'MariaDB 11.2':
-        image: 'mariadb:11.2'
+      'MariaDB 11.4':
+        image: 'mariadb:11.4'
         connectionStringExtra: ''
         unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
   steps:

contrib/NewRelic/README.md

@@ -229,7 +229,7 @@ Connection pooling is enabled by default. These options are used to configure it
     <td>The minimum number of connections to leave in the pool if ConnectionIdleTimeout is reached.</td>
   </tr>
   <tr id="MaximumPoolSize">
-    <td>Maximum Pool Size, Max Pool Size, MaximumPoolsize, maxpoolsize</td>
+    <td>Maximum Pool Size, Max Pool Size, MaximumPoolSize, maxpoolsize</td>
     <td>100</td>
     <td>The maximum number of connections allowed in the pool.</td>
   </tr>
@@ -515,7 +515,7 @@ from your connection string when migrating from Connector/NET to MySqlConnector.
     <td>Use <a href="/overview/logging/">MySqlConnector logging</a> (which is more flexible) instead.</td>
   </tr>
   <tr id="OldGetStringBehavior">
-    <td></td>
+    <td>OldGetStringBehavior</td>
     <td>false</td>
     <td>This option is temporary in Connector/NET and unsupported in MySqlConnector.</td>
   </tr>

docs/content/connection-options.md

@@ -64,8 +64,8 @@ Server  | Versions | Notes
 Amazon Aurora RDS | 2.x, 3.x | Use `Pipelining=False` [for Aurora 2.x](https://mysqlconnector.net/troubleshooting/aurora-freeze/)
 Azure Database for MySQL | 5.7, 8.0 | Single Server and Flexible Server
 Google Cloud SQL for MySQL | 5.6, 5.7, 8.0 |
-MariaDB | 10.x (**10.6**, **10.11**), 11.x (**11.2**) |
-MySQL | 5.5, 5.6, **5.7**, 8.x (**8.0**, **8.3**) | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 and 5.7 are EOL
+MariaDB | 10.x (**10.6**, **10.11**), 11.x (**11.4**) |
+MySQL | 5.5, 5.6, 5.7, 8.x (**8.0**, **8.4**), **9.0** | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 and 5.7 are EOL
 Percona Server | 5.6, 5.7, 8.0 |
 PlanetScale | | See PlanetScale [MySQL compatibility notes](https://planetscale.com/docs/reference/mysql-compatibility)
 ProxySQL | 2.x | Some [compatibility issues](https://github.com/search?q=repo%3Amysql-net%2FMySqlConnector+proxysql&type=issues)

docs/content/home.md

@@ -1,5 +1,5 @@
 ---
-lastmod: 2024-01-20
+lastmod: 2024-04-22
 date: 2017-03-27
 menu:
   main:
@@ -11,6 +11,29 @@ weight: 30
 
 # Version History
 
+### 2.3.7
+
+* Fix `NullReferenceException` in `MySqlDataReader.ActivateResultSet` and `MySqlDataReader.DisposeAsync`: [#1459](https://github.com/mysql-net/MySqlConnector/issues/1459).
+  * This bug likely also caused "Packet received out-of-order" errors.
+  * This was introduced in 2.3.0.
+* Fix rare `NullReferenceException` in `ServerSession` during cancellation: [#1472](https://github.com/mysql-net/MySqlConnector/issues/1472).
+* Fix `Foreign Keys` schema not being generated asynchronously.
+
+### 2.3.6
+
+* Fix `VerifyCA` incompatibility with AWS Aurora: [#1462](https://github.com/mysql-net/MySqlConnector/issues/1462).
+* Verify that the server's root certificate is present (in the list of provided CA certificates) when using the `SslCa` connection string option and `SslMode` is `VerifyCA` or `VerifyFull`.
+* Optimization: Use pipelining to begin a transaction: [#1286](https://github.com/mysql-net/MySqlConnector/issues/1286).
+  * Use `Pipelining = False;` in your connection string to disable this optimization if there are compatibility issues.
+* Optimization: cache `START TRANSACTION` payloads.
+* Add transaction logging: [#1411](https://github.com/mysql-net/MySqlConnector/issues/1411).
+* Fix incompatibility with MySQL Server 5.1: [#1445](https://github.com/mysql-net/MySqlConnector/issues/1445).
+  * This fixes a regression introduced in 2.3.0.
+
+#### MySqlConnector.DependencyInjection
+
+* Add overload of `AddMySqlDataSource` that takes an `Action<IServiceProvider, MySqlDataSourceBuilder>` action to configure the `MySqlDataSourceBuilder` instance: [#1316](https://github.com/mysql-net/MySqlConnector/issues/1316).
+
 ### 2.3.5
 
 * DLL files within the NuGet packages are now digitally signed.
@@ -700,7 +723,7 @@ weight: 30
 
 * **Breaking** `MySqlBulkLoader` (for local files) and `LOAD DATA LOCAL INFILE` are disabled by default.
   * Set `AllowLoadLocalInfile=true` in the connection string to enable loading local data.
-  * This is a security measure; see https://fl.vu/mysql-load-data for details.
+  * This is a security measure; see https://mysqlconnector.net/load-data for details.
 * Add `AllowLoadLocalInfile` connection string option: [#643](https://github.com/mysql-net/MySqlConnector/issues/643).
 * Add `SslCert` and `SslKey` connection string options to specify a client certificate using PEM files: [#641](https://github.com/mysql-net/MySqlConnector/issues/641).
 * Add `SslCa` alias for the `CACertificateFile` connection string option: [#640](https://github.com/mysql-net/MySqlConnector/issues/640).

docs/content/overview/version-history.md

@@ -16,15 +16,15 @@ menu:
 
 When using `MySqlTransaction` from a C# program, you may receive the following error:
 
-* **System.InvalidOperationException: The transaction associated with this command is not the connection's active transaction; see https://fl.vu/mysql-trans**
+* **System.InvalidOperationException: The transaction associated with this command is not the connection's active transaction**
 
 By default, MySqlConnector requires `MySqlCommand.Transaction` to be set to the connection's active transaction in order for the command to be executed successfully. This strictness is intended to catch programming bugs related to using the wrong transaction, a disposed transaction, or forgetting to set the transaction (and using the default value `null`).
 
 However, this strictness can make migrating from Connector/NET more difficult, as it may require significant code changes to pass the current transaction through to all command objects. It can also be challenging when using a library like Dapper that creates the `MySqlCommand` objects itself.
 
 ## Workaround: Use IgnoreCommandTransaction=true
 
-To easily migrate code from Connector/NET, use the `IgnoreCommandTransaction=true` connection string setting to emulate Connector/NET's behaviour and not validate the value of `MySqlCommand.Transaction`. By doing this, you will not need the code fixes prescribed below.
+To easily migrate code from Connector/NET, use the `IgnoreCommandTransaction=true` connection string setting to emulate Connector/NET's behavior and not validate the value of `MySqlCommand.Transaction`. By doing this, you will not need the code fixes prescribed below.
 
 ## Code Fix: Set MySqlCommand.Transaction